ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineoss.drv: Use wine_dbg_sprintf() in a few debug utility functions.

Browse Source
This commit is contained in:
Henri Verbeet 2009-11-30 10:22:10 +01:00 committed by Alexandre Julliard
parent 7151cdc8a2
commit 3be325040c
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/wineoss.drv/audio.c
View File

@ -107,7 +107,6 @@ unsigned numInDev;
/* These strings used only for tracing */ /* These strings used only for tracing */
static const char * getCmdString(enum win_wm_message msg) static const char * getCmdString(enum win_wm_message msg)
{ {
static char unknown[32];
#define MSG_TO_STR(x) case x: return #x #define MSG_TO_STR(x) case x: return #x
switch(msg) { switch(msg) {
MSG_TO_STR(WINE_WM_PAUSING); MSG_TO_STR(WINE_WM_PAUSING);
@ -121,8 +120,7 @@ static const char * getCmdString(enum win_wm_message msg)
MSG_TO_STR(WINE_WM_STOPPING); MSG_TO_STR(WINE_WM_STOPPING);
} }
#undef MSG_TO_STR #undef MSG_TO_STR
sprintf(unknown, "UNKNOWN(0x%08x)", msg); return wine_dbg_sprintf("UNKNOWN(0x%08x)", msg);
return unknown;
} }
int getEnables(OSS_DEVICE *ossdev) int getEnables(OSS_DEVICE *ossdev)
@ -133,7 +131,6 @@ int getEnables(OSS_DEVICE *ossdev)
static const char * getMessage(UINT msg) static const char * getMessage(UINT msg)
{ {
static char unknown[32];
#define MSG_TO_STR(x) case x: return #x #define MSG_TO_STR(x) case x: return #x
switch(msg) { switch(msg) {
MSG_TO_STR(DRVM_INIT); MSG_TO_STR(DRVM_INIT);
@ -175,8 +172,7 @@ static const char * getMessage(UINT msg)
MSG_TO_STR(DRV_QUERYDSOUNDDESC); MSG_TO_STR(DRV_QUERYDSOUNDDESC);
} }
#undef MSG_TO_STR #undef MSG_TO_STR
sprintf(unknown, "UNKNOWN(0x%04x)", msg); return wine_dbg_sprintf("UNKNOWN(0x%04x)", msg);
return unknown;
} }
static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1)

20
dlls/wineoss.drv/mixer.c
View File

@ -113,7 +113,6 @@ static struct mixer MIX_Mixers[MAX_MIXERDRV];
static const char * getMessage(UINT uMsg) static const char * getMessage(UINT uMsg)
{ {
static char str[64];
#define MSG_TO_STR(x) case x: return #x; #define MSG_TO_STR(x) case x: return #x;
switch (uMsg) { switch (uMsg) {
MSG_TO_STR(DRVM_INIT); MSG_TO_STR(DRVM_INIT);
@ -130,13 +129,11 @@ static const char * getMessage(UINT uMsg)
MSG_TO_STR(MXDM_SETCONTROLDETAILS); MSG_TO_STR(MXDM_SETCONTROLDETAILS);
} }
#undef MSG_TO_STR #undef MSG_TO_STR
sprintf(str, "UNKNOWN(%08x)", uMsg); return wine_dbg_sprintf("UNKNOWN(%08x)", uMsg);
return str;
} }
static const char * getIoctlCommand(int command) static const char * getIoctlCommand(int command)
{ {
static char str[64];
#define IOCTL_TO_STR(x) case x: return #x; #define IOCTL_TO_STR(x) case x: return #x;
switch (command) { switch (command) {
IOCTL_TO_STR(SOUND_MIXER_VOLUME); IOCTL_TO_STR(SOUND_MIXER_VOLUME);
@ -172,13 +169,11 @@ static const char * getIoctlCommand(int command)
#endif #endif
} }
#undef IOCTL_TO_STR #undef IOCTL_TO_STR
sprintf(str, "UNKNOWN(%08x)", command); return wine_dbg_sprintf("UNKNOWN(%08x)", command);
return str;
} }
static const char * getControlType(DWORD dwControlType) static const char * getControlType(DWORD dwControlType)
{ {
static char str[64];
#define TYPE_TO_STR(x) case x: return #x #define TYPE_TO_STR(x) case x: return #x
switch (dwControlType) { switch (dwControlType) {
TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM); TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM);
@ -214,13 +209,11 @@ static const char * getControlType(DWORD dwControlType)
TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME); TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME);
} }
#undef TYPE_TO_STR #undef TYPE_TO_STR
sprintf(str, "UNKNOWN(%08x)", dwControlType); return wine_dbg_sprintf("UNKNOWN(%08x)", dwControlType);
return str;
} }
static const char * getComponentType(DWORD dwComponentType) static const char * getComponentType(DWORD dwComponentType)
{ {
static char str[64];
#define TYPE_TO_STR(x) case x: return #x; #define TYPE_TO_STR(x) case x: return #x;
switch (dwComponentType) { switch (dwComponentType) {
TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_DST_UNDEFINED); TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_DST_UNDEFINED);
@ -245,13 +238,11 @@ static const char * getComponentType(DWORD dwComponentType)
TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG); TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG);
} }
#undef TYPE_TO_STR #undef TYPE_TO_STR
sprintf(str, "UNKNOWN(%08x)", dwComponentType); return wine_dbg_sprintf("UNKNOWN(%08x)", dwComponentType);
return str;
} }
static const char * getTargetType(DWORD dwType) static const char * getTargetType(DWORD dwType)
{ {
static char str[64];
#define TYPE_TO_STR(x) case x: return #x; #define TYPE_TO_STR(x) case x: return #x;
switch (dwType) { switch (dwType) {
TYPE_TO_STR(MIXERLINE_TARGETTYPE_UNDEFINED); TYPE_TO_STR(MIXERLINE_TARGETTYPE_UNDEFINED);
@ -262,8 +253,7 @@ static const char * getTargetType(DWORD dwType)
TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX); TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX);
} }
#undef TYPE_TO_STR #undef TYPE_TO_STR
sprintf(str, "UNKNOWN(%08x)", dwType); return wine_dbg_sprintf("UNKNOWN(%08x)", dwType);
return str;
} }
static const WCHAR sz_short_volume [] = {'V','o','l',0}; static const WCHAR sz_short_volume [] = {'V','o','l',0};