Skip to content

Commit b164436

Browse files
committed
[INCLUDE/WINE] GetNTVersion() and other changes for kernel32 winetest sync
- [INCLUDE/WINE] Add GetNTVersion() macro, useful for determining Windows versions in Wine tests we need to bring up for older Windows versions. - [INCLUDE/WINE] Header changes needed for kernel32 winetest - [WINETESTS] Perform any fixes needed from breaking header changes
1 parent ad807f8 commit b164436

File tree

10 files changed

+596
-18
lines changed

10 files changed

+596
-18
lines changed

modules/rostests/winetests/kernel32/debugger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static BOOL (WINAPI *pIsDebuggerPresent)(void);
4242

4343
static LONG child_failures;
4444

45-
static void WINETEST_PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...)
45+
static void __WINE_PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...)
4646
{
4747
va_list valist;
4848

modules/rostests/winetests/kernel32/process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ static void get_file_name(char* buf)
285285
* static void childPrintf
286286
*
287287
*/
288-
static void WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...)
288+
static void __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...)
289289
{
290290
va_list valist;
291291
char buffer[1024+4*MAX_LISTED_ENV_VAR];

modules/rostests/winetests/riched20/richole.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
#include <imm.h>
3535
#include <textserv.h>
3636
#include <wine/test.h>
37-
#ifdef __REACTOS__
38-
#define debugstr_guid wine_dbgstr_guid
39-
#endif
4037

4138
#define EXPECT_TODO_WINE 0x80000000UL
4239

modules/rostests/winetests/shell32/shlexec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static char* decodeA(const char* str)
112112
return ptr;
113113
}
114114

115-
static void WINAPIV WINETEST_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...)
115+
static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...)
116116
{
117117
__ms_va_list valist;
118118
char buffer[1024];
@@ -346,7 +346,7 @@ static void dump_child_(const char* file, int line)
346346
***/
347347

348348
static char shell_call[2048];
349-
static void WINAPIV WINETEST_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...)
349+
static void WINAPIV __WINE_PRINTF_ATTR(2,3) _okShell(int condition, const char *msg, ...)
350350
{
351351
__ms_va_list valist;
352352
char buffer[2048];

modules/rostests/winetests/windowscodecs/ddsformat.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
#include "wincodec.h"
2525
#include "wine/test.h"
2626

27-
#ifdef __REACTOS__
28-
#define debugstr_guid wine_dbgstr_guid
29-
#endif
30-
3127
#define GET_RGB565_R(color) ((BYTE)(((color) >> 11) & 0x1F))
3228
#define GET_RGB565_G(color) ((BYTE)(((color) >> 5) & 0x3F))
3329
#define GET_RGB565_B(color) ((BYTE)(((color) >> 0) & 0x1F))

sdk/include/wine/exception.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ extern "C" {
2626
#define EXCEPTION_VM86_PICRETURN 0x80000112
2727

2828
#ifndef _RTLTYPES_H
29+
#ifndef __WINE_WINNT_EXCEPTION_REGISTRATION_RECORD
30+
#define __WINE_WINNT_EXCEPTION_REGISTRATION_RECORD
2931
struct _EXCEPTION_REGISTRATION_RECORD;
3032

3133
typedef
@@ -43,6 +45,7 @@ struct _EXCEPTION_REGISTRATION_RECORD
4345
struct _EXCEPTION_REGISTRATION_RECORD * Prev;
4446
PEXCEPTION_HANDLER Handler;
4547
};
48+
#endif // __WINE_WINNT_EXCEPTION_REGISTRATION_RECORD
4649
#else
4750
typedef struct _WINE_EXCEPTION_REGISTRATION_RECORD
4851
{

0 commit comments

Comments
 (0)