Skip to content

Commit b793243

Browse files
authored
[SDK][SHELL32_APITEST][USER32_APITEST] Update <msgdump.h> to version 21 (reactos#9171)
Modernize development tools. JIRA issue: N/A - Update <msgdump.h> to version 21. - Adapt shell32_apitest and user32_apitest.
1 parent ace5f8b commit b793243

3 files changed

Lines changed: 143 additions & 120 deletions

File tree

modules/rostests/apitests/shell32/SHAppBarMessage.cpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,7 @@ SHAppBarMessageWrap(DWORD dwMessage, PAPPBARDATA pData)
7474
#undef ARRAYSIZE
7575
#define ARRAYSIZE _countof
7676

77-
void appbar_tprintf(const TCHAR *fmt, ...)
78-
{
79-
TCHAR szText[512];
80-
va_list va;
81-
va_start(va, fmt);
82-
wvsprintf(szText, fmt, va);
83-
#ifdef UNICODE
84-
printf("%ls", szText);
85-
#else
86-
printf("%s", szText);
87-
#endif
88-
va_end(va);
89-
}
90-
91-
#define MSGDUMP_TPRINTF appbar_tprintf
77+
#define MSGDUMP_PRINTF printf
9278
#include "msgdump.h"
9379

9480
#endif // def VERBOSE

modules/rostests/apitests/user32/MessageStateAnalyzer.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include <imm.h>
1212
#include <strsafe.h>
1313

14+
//#define VERBOSE
15+
1416
#define MAX_MSGS 512
1517

1618
static MSG s_Msgs[MAX_MSGS];
@@ -22,9 +24,14 @@ static HWND s_hImeWnd = NULL;
2224
static WNDPROC s_fnOldEditWndProc = NULL;
2325
static WNDPROC s_fnOldImeWndProc = NULL;
2426

25-
#define MSGDUMP_PRINTF trace
26-
#define MSGDUMP_PREFIX s_prefix
27-
#include "msgdump.h" /* msgdump.h needs MSGDUMP_TPRINTF and MSGDUMP_PREFIX */
27+
#ifdef VERBOSE
28+
#define MSGDUMP_PRINTF printf
29+
#define MSGDUMP_PREFIX s_prefix
30+
#include "msgdump.h" /* msgdump.h needs MSGDUMP_PRINTF and MSGDUMP_PREFIX */
31+
#else
32+
#define MD_msgdump(hwnd, uMsg, wParam, lParam)
33+
#define MD_msgresult(hwnd, uMsg, wParam, lParam, lResult)
34+
#endif
2835

2936
static void MD_build_prefix(void)
3037
{

0 commit comments

Comments
 (0)