--- mstools/samples/playsnd/playsnd.h 2018/08/09 18:21:49 1.1 +++ mstools/samples/playsnd/playsnd.h 2018/08/09 18:23:55 1.1.1.2 @@ -30,7 +30,9 @@ #define IDM_SYNC 401 #define IDM_NOWAIT 402 -#define IDM_RESOURCEID 403 +#define IDM_NODEFAULT 403 + +#define IDM_RESOURCEID 408 #define IDM_ICONHAND 501 #define IDM_ICONQUESTION 502 @@ -72,6 +74,7 @@ extern char szAppName[SIZEOFAPPNAME]; extern HWND ghwndMain; extern BOOL bSync; extern BOOL bNoWait; +extern BOOL bNoDefault; extern BOOL bResourceID; int APIENTRY MainWndProc(HWND, UINT, WPARAM ,LPARAM); @@ -132,11 +135,11 @@ extern void Resource(DWORD wParam); #define dGetDebugLevel(lpszModule) (__iDebugLevel = dDbgGetLevel(lpszModule)) #define dSaveDebugLevel(lpszModule) (dDbgSaveLevel(lpszModule, __iDebugLevel)) - #define dprintf dDbgOut - #define dprintf1 if (__iDebugLevel >= 1) dDbgOut - #define dprintf2 if (__iDebugLevel >= 2) dDbgOut - #define dprintf3 if (__iDebugLevel >= 3) dDbgOut - #define dprintf4 if (__iDebugLevel >= 4) dDbgOut + #define dprintf( _x_ ) dDbgOut _x_ + #define dprintf1( _x_ ) if (__iDebugLevel >= 1) dDbgOut _x_ + #define dprintf2( _x_ ) if (__iDebugLevel >= 2) dDbgOut _x_ + #define dprintf3( _x_ ) if (__iDebugLevel >= 3) dDbgOut _x_ + #define dprintf4( _x_ ) if (__iDebugLevel >= 4) dDbgOut _x_ #define WinAssert(exp) \ ((exp) ? (void)0 : dDbgAssert(#exp, __FILE__, __LINE__)) @@ -149,11 +152,11 @@ extern void Resource(DWORD wParam); #define dGetDebugLevel(lpszModule) 0 #define dSaveDebugLevel(lpszModule) 0 - #define dprintf if (0) ((int (*)(char *, ...)) 0) - #define dprintf1 if (0) ((int (*)(char *, ...)) 0) - #define dprintf2 if (0) ((int (*)(char *, ...)) 0) - #define dprintf3 if (0) ((int (*)(char *, ...)) 0) - #define dprintf4 if (0) ((int (*)(char *, ...)) 0) + #define dprintf(x) + #define dprintf1(x) + #define dprintf2(x) + #define dprintf3(x) + #define dprintf4(x) #define WinAssert(exp) 0 #define WinEval(exp) (exp)