[SDK] Do not include windef.h into stubs.h

This prevents pulling in function declarations that are incompatible with the generated stubs.
This commit is contained in:
Timo Kreuzer 2023-10-07 10:22:34 +03:00
parent 3b7c7d8e68
commit a27b8009e0
4 changed files with 34 additions and 10 deletions

View file

@ -1,4 +1,5 @@
#include <windef.h>
#include <stubs.h> #include <stubs.h>
#undef UNIMPLEMENTED #undef UNIMPLEMENTED

View file

@ -1,3 +1,4 @@
#include <windef.h>
#include <stubs.h> #include <stubs.h>
#undef UNIMPLEMENTED #undef UNIMPLEMENTED
@ -24,4 +25,4 @@ size_t _heapused( size_t *pUsed, size_t *pCommit )
return( 0 ); return( 0 );
} }
int _fileinfo = 0; int _fileinfo = 0;

View file

@ -1,3 +1,4 @@
#include <windef.h>
#include <stubs.h> #include <stubs.h>
#undef UNIMPLEMENTED #undef UNIMPLEMENTED

View file

@ -1,6 +1,28 @@
#define WIN32_NO_STATUS
#define _NTSYSTEM_ #ifndef _WINDEF_
#include <windef.h> typedef unsigned short wchar_t;
typedef unsigned long DWORD, ULONG;
typedef void* PVOID;
#define __int64 long long
#ifdef _WIN64
typedef unsigned long long ULONG_PTR;
#else
typedef unsigned long ULONG_PTR;
#endif
#define EXCEPTION_MAXIMUM_PARAMETERS 15
typedef struct _EXCEPTION_RECORD {
DWORD ExceptionCode;
DWORD ExceptionFlags;
struct _EXCEPTION_RECORD* ExceptionRecord;
PVOID ExceptionAddress;
DWORD NumberParameters;
ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS];
} EXCEPTION_RECORD, * PEXCEPTION_RECORD;
#define EXCEPTION_NONCONTINUABLE 0x01
#endif
#ifndef PRIx64 #ifndef PRIx64
#define PRIx64 "I64x" #define PRIx64 "I64x"
@ -9,24 +31,23 @@
#define EXCEPTION_WINE_STUB 0x80000100 #define EXCEPTION_WINE_STUB 0x80000100
#define EH_NONCONTINUABLE 0x01 #define EH_NONCONTINUABLE 0x01
NTSYSAPI void
VOID __stdcall
NTAPI
RtlRaiseException( RtlRaiseException(
_In_ PEXCEPTION_RECORD ExceptionRecord PEXCEPTION_RECORD ExceptionRecord
); );
ULONG ULONG
__cdecl __cdecl
DbgPrint( DbgPrint(
_In_z_ _Printf_format_string_ PCSTR Format, const char* Format,
... ...
); );
#define __wine_spec_unimplemented_stub(module, function) \ #define __wine_spec_unimplemented_stub(module, function) \
{ \ { \
EXCEPTION_RECORD ExceptionRecord = {0}; \ EXCEPTION_RECORD ExceptionRecord = {0}; \
ExceptionRecord.ExceptionRecord = NULL; \ ExceptionRecord.ExceptionRecord = 0; \
ExceptionRecord.ExceptionCode = EXCEPTION_WINE_STUB; \ ExceptionRecord.ExceptionCode = EXCEPTION_WINE_STUB; \
ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; \ ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; \
ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)module; \ ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)module; \