Skip to content

W
wine-cw
Commit 493cf88b authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

Remove these Wine-only types:

EnumICMProfilesProcCallback PEXCEPTION_REGISTRATION_RECORD Don't test these Wine-only types: EMRSETTEXTJUSTIFICATION EXCEPTION_REGISTRATION_RECORD Remove EXCEPTION_FRAME, it doesn't exist at all.
parent 6f4be549
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 51 deletions
dlls/gdi/tests/generated.c
View file @ 493cf88b
...@@ -1321,15 +1321,6 @@ static void test_pack_EMRSETTEXTCOLOR(void) ...@@ -1321,15 +1321,6 @@ static void test_pack_EMRSETTEXTCOLOR(void)
TEST_FIELD(EMRSETTEXTCOLOR, COLORREF, crColor, 8, 4, 4); TEST_FIELD(EMRSETTEXTCOLOR, COLORREF, crColor, 8, 4, 4);
} }
static void test_pack_EMRSETTEXTJUSTIFICATION(void)
{
/* EMRSETTEXTJUSTIFICATION (pack 4) */
TEST_TYPE(EMRSETTEXTJUSTIFICATION, 16, 4);
TEST_FIELD(EMRSETTEXTJUSTIFICATION, EMR, emr, 0, 8, 4);
TEST_FIELD(EMRSETTEXTJUSTIFICATION, INT, nBreakExtra, 8, 4, 4);
TEST_FIELD(EMRSETTEXTJUSTIFICATION, INT, nBreakCount, 12, 4, 4);
}
static void test_pack_EMRSETVIEWPORTEXTEX(void) static void test_pack_EMRSETVIEWPORTEXTEX(void)
{ {
/* EMRSETVIEWPORTEXTEX (pack 4) */ /* EMRSETVIEWPORTEXTEX (pack 4) */
...@@ -1574,18 +1565,6 @@ static void test_pack_EXTLOGPEN(void) ...@@ -1574,18 +1565,6 @@ static void test_pack_EXTLOGPEN(void)
TEST_FIELD(EXTLOGPEN, DWORD[1], elpStyleEntry, 24, 4, 4); TEST_FIELD(EXTLOGPEN, DWORD[1], elpStyleEntry, 24, 4, 4);
} }
static void test_pack_EnumICMProfilesProcCallbackA(void)
{
/* EnumICMProfilesProcCallbackA */
TEST_TYPE(EnumICMProfilesProcCallbackA, 4, 4);
}
static void test_pack_EnumICMProfilesProcCallbackW(void)
{
/* EnumICMProfilesProcCallbackW */
TEST_TYPE(EnumICMProfilesProcCallbackW, 4, 4);
}
static void test_pack_FIXED(void) static void test_pack_FIXED(void)
{ {
/* FIXED (pack 4) */ /* FIXED (pack 4) */
...@@ -3950,7 +3929,6 @@ static void test_pack(void) ...@@ -3950,7 +3929,6 @@ static void test_pack(void)
test_pack_EMRSETSTRETCHBLTMODE(); test_pack_EMRSETSTRETCHBLTMODE();
test_pack_EMRSETTEXTALIGN(); test_pack_EMRSETTEXTALIGN();
test_pack_EMRSETTEXTCOLOR(); test_pack_EMRSETTEXTCOLOR();
test_pack_EMRSETTEXTJUSTIFICATION();
test_pack_EMRSETVIEWPORTEXTEX(); test_pack_EMRSETVIEWPORTEXTEX();
test_pack_EMRSETVIEWPORTORGEX(); test_pack_EMRSETVIEWPORTORGEX();
test_pack_EMRSETWINDOWEXTEX(); test_pack_EMRSETWINDOWEXTEX();
...@@ -3972,8 +3950,6 @@ static void test_pack(void) ...@@ -3972,8 +3950,6 @@ static void test_pack(void)
test_pack_EXTLOGFONTA(); test_pack_EXTLOGFONTA();
test_pack_EXTLOGFONTW(); test_pack_EXTLOGFONTW();
test_pack_EXTLOGPEN(); test_pack_EXTLOGPEN();
test_pack_EnumICMProfilesProcCallbackA();
test_pack_EnumICMProfilesProcCallbackW();
test_pack_FIXED(); test_pack_FIXED();
test_pack_FONTENUMPROCA(); test_pack_FONTENUMPROCA();
test_pack_FONTENUMPROCW(); test_pack_FONTENUMPROCW();
......
dlls/msvcrt/except.c
View file @ 493cf88b
...@@ -54,7 +54,7 @@ typedef struct _SCOPETABLE ...@@ -54,7 +54,7 @@ typedef struct _SCOPETABLE
typedef struct _MSVCRT_EXCEPTION_FRAME typedef struct _MSVCRT_EXCEPTION_FRAME
{ {
EXCEPTION_REGISTRATION_RECORD *prev; EXCEPTION_REGISTRATION_RECORD *prev;
void (*handler)(PEXCEPTION_RECORD, PEXCEPTION_REGISTRATION_RECORD, void (*handler)(PEXCEPTION_RECORD, EXCEPTION_REGISTRATION_RECORD*,
PCONTEXT, PEXCEPTION_RECORD); PCONTEXT, PEXCEPTION_RECORD);
PSCOPETABLE scopetable; PSCOPETABLE scopetable;
int trylevel; int trylevel;
...@@ -346,7 +346,7 @@ void _MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval, CONTEXT86* co ...@@ -346,7 +346,7 @@ void _MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval, CONTEXT86* co
TRACE("cur_frame=%lx\n",cur_frame); TRACE("cur_frame=%lx\n",cur_frame);
if (cur_frame != jmp->Registration) if (cur_frame != jmp->Registration)
_global_unwind2((PEXCEPTION_REGISTRATION_RECORD)jmp->Registration); _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)jmp->Registration);
if (jmp->Registration) if (jmp->Registration)
{ {
......
dlls/ntdll/exception.c
View file @ 493cf88b
...@@ -224,7 +224,7 @@ static void EXC_DefaultHandling( EXCEPTION_RECORD *rec, CONTEXT *context ) ...@@ -224,7 +224,7 @@ static void EXC_DefaultHandling( EXCEPTION_RECORD *rec, CONTEXT *context )
*/ */
void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context )
{ {
PEXCEPTION_REGISTRATION_RECORD frame, dispatch, nested_frame; EXCEPTION_REGISTRATION_RECORD *frame, *dispatch, *nested_frame;
EXCEPTION_RECORD newrec; EXCEPTION_RECORD newrec;
DWORD res, c; DWORD res, c;
...@@ -251,7 +251,7 @@ void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context ) ...@@ -251,7 +251,7 @@ void WINAPI EXC_RtlRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context )
frame = NtCurrentTeb()->Tib.ExceptionList; frame = NtCurrentTeb()->Tib.ExceptionList;
nested_frame = NULL; nested_frame = NULL;
while (frame != (PEXCEPTION_REGISTRATION_RECORD)~0UL) while (frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL)
{ {
/* Check frame address */ /* Check frame address */
if (((void*)frame < NtCurrentTeb()->Tib.StackLimit) || if (((void*)frame < NtCurrentTeb()->Tib.StackLimit) ||
...@@ -317,11 +317,11 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) ...@@ -317,11 +317,11 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec )
/******************************************************************* /*******************************************************************
* RtlUnwind (NTDLL.@) * RtlUnwind (NTDLL.@)
*/ */
void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, PVOID unusedEip, void WINAPI EXC_RtlUnwind( EXCEPTION_REGISTRATION_RECORD* pEndFrame, PVOID unusedEip,
PEXCEPTION_RECORD pRecord, PVOID returnEax, CONTEXT *context ) PEXCEPTION_RECORD pRecord, PVOID returnEax, CONTEXT *context )
{ {
EXCEPTION_RECORD record, newrec; EXCEPTION_RECORD record, newrec;
PEXCEPTION_REGISTRATION_RECORD frame, dispatch; EXCEPTION_REGISTRATION_RECORD *frame, *dispatch;
#ifdef __i386__ #ifdef __i386__
context->Eax = (DWORD)returnEax; context->Eax = (DWORD)returnEax;
...@@ -344,7 +344,7 @@ void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, PVOID unuse ...@@ -344,7 +344,7 @@ void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, PVOID unuse
/* get chain of exception frames */ /* get chain of exception frames */
frame = NtCurrentTeb()->Tib.ExceptionList; frame = NtCurrentTeb()->Tib.ExceptionList;
while ((frame != (PEXCEPTION_REGISTRATION_RECORD)~0UL) && (frame != pEndFrame)) while ((frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) && (frame != pEndFrame))
{ {
/* Check frame address */ /* Check frame address */
if (pEndFrame && (frame > pEndFrame)) if (pEndFrame && (frame > pEndFrame))
......
dlls/ntdll/tests/generated.c
View file @ 493cf88b
...@@ -375,14 +375,6 @@ static void test_pack_EXCEPTION_RECORD(void) ...@@ -375,14 +375,6 @@ static void test_pack_EXCEPTION_RECORD(void)
TEST_FIELD(EXCEPTION_RECORD, DWORD[EXCEPTION_MAXIMUM_PARAMETERS], ExceptionInformation, 20, 60, 4); TEST_FIELD(EXCEPTION_RECORD, DWORD[EXCEPTION_MAXIMUM_PARAMETERS], ExceptionInformation, 20, 60, 4);
} }
static void test_pack_EXCEPTION_REGISTRATION_RECORD(void)
{
/* EXCEPTION_REGISTRATION_RECORD (pack 4) */
TEST_TYPE(EXCEPTION_REGISTRATION_RECORD, 8, 4);
TEST_FIELD(EXCEPTION_REGISTRATION_RECORD, struct _EXCEPTION_REGISTRATION_RECORD *, Prev, 0, 4, 4);
TEST_FIELD(EXCEPTION_REGISTRATION_RECORD, PEXCEPTION_HANDLER, Handler, 4, 4, 4);
}
static void test_pack_EXECUTION_STATE(void) static void test_pack_EXECUTION_STATE(void)
{ {
/* EXECUTION_STATE */ /* EXECUTION_STATE */
...@@ -2069,7 +2061,6 @@ static void test_pack(void) ...@@ -2069,7 +2061,6 @@ static void test_pack(void)
test_pack_DWORD_PTR(); test_pack_DWORD_PTR();
test_pack_EXCEPTION_POINTERS(); test_pack_EXCEPTION_POINTERS();
test_pack_EXCEPTION_RECORD(); test_pack_EXCEPTION_RECORD();
test_pack_EXCEPTION_REGISTRATION_RECORD();
test_pack_EXECUTION_STATE(); test_pack_EXECUTION_STATE();
test_pack_FARPROC(); test_pack_FARPROC();
test_pack_FLOAT(); test_pack_FLOAT();
......
include/wingdi.h
View file @ 493cf88b
...@@ -434,11 +434,8 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE) ...@@ -434,11 +434,8 @@ DECL_WINELIB_TYPE_AW(LOGCOLORSPACE)
#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24))) #define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
/* ICM stuff */ /* ICM stuff */
typedef INT (CALLBACK *EnumICMProfilesProcCallbackA)(LPSTR lpszFilename,LPARAM lParam); typedef INT (CALLBACK *ICMENUMPROCA)(LPSTR lpszFilename,LPARAM lParam);
typedef INT (CALLBACK *EnumICMProfilesProcCallbackW)(LPWSTR lpszFilename,LPARAM lParam); typedef INT (CALLBACK *ICMENUMPROCW)(LPWSTR lpszFilename,LPARAM lParam);
DECL_WINELIB_TYPE_AW(EnumICMProfilesProcCallback)
typedef EnumICMProfilesProcCallbackA ICMENUMPROCA;
typedef EnumICMProfilesProcCallbackW ICMENUMPROCW;
DECL_WINELIB_TYPE_AW(ICMENUMPROC) DECL_WINELIB_TYPE_AW(ICMENUMPROC)
......
include/winnt.h
View file @ 493cf88b
...@@ -1505,7 +1505,7 @@ typedef struct _EXCEPTION_REGISTRATION_RECORD ...@@ -1505,7 +1505,7 @@ typedef struct _EXCEPTION_REGISTRATION_RECORD
{ {
struct _EXCEPTION_REGISTRATION_RECORD *Prev; struct _EXCEPTION_REGISTRATION_RECORD *Prev;
PEXCEPTION_HANDLER Handler; PEXCEPTION_HANDLER Handler;
} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; } EXCEPTION_REGISTRATION_RECORD;
/* /*
* function pointer to a exception filter * function pointer to a exception filter
......
tools/winapi/tests.dat
View file @ 493cf88b
...@@ -140,7 +140,7 @@ EMRSETROP2 ...@@ -140,7 +140,7 @@ EMRSETROP2
EMRSETSTRETCHBLTMODE EMRSETSTRETCHBLTMODE
EMRSETTEXTALIGN EMRSETTEXTALIGN
EMRSETTEXTCOLOR EMRSETTEXTCOLOR
EMRSETTEXTJUSTIFICATION !EMRSETTEXTJUSTIFICATION # Wine-only type
EMRSETVIEWPORTEXTEX EMRSETVIEWPORTEXTEX
EMRSETVIEWPORTORGEX EMRSETVIEWPORTORGEX
EMRSETWINDOWEXTEX EMRSETWINDOWEXTEX
...@@ -162,8 +162,6 @@ ENUMLOGFONTW ...@@ -162,8 +162,6 @@ ENUMLOGFONTW
EXTLOGFONTA EXTLOGFONTA
EXTLOGFONTW EXTLOGFONTW
EXTLOGPEN EXTLOGPEN
EnumICMProfilesProcCallbackA
EnumICMProfilesProcCallbackW
FIXED FIXED
FONTENUMPROCA FONTENUMPROCA
FONTENUMPROCW FONTENUMPROCW
...@@ -651,10 +649,9 @@ DWORD32 ...@@ -651,10 +649,9 @@ DWORD32
DWORD64 DWORD64
DWORDLONG DWORDLONG
DWORD_PTR DWORD_PTR
EXCEPTION_FRAME
EXCEPTION_POINTERS EXCEPTION_POINTERS
EXCEPTION_RECORD EXCEPTION_RECORD
EXCEPTION_REGISTRATION_RECORD !EXCEPTION_REGISTRATION_RECORD # Wine-only type
EXECUTION_STATE EXECUTION_STATE
FARPROC FARPROC
FLOAT FLOAT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment