Remove/don't test Wine-only types
Francois Gouget
fgouget at free.fr
Sat Aug 21 13:31:38 CDT 2004
I could not find EMRSETTEXTJUSTIFICATION anywhere in the Windows headers
but we use it and I saw no other type with the same structure there.
Also it integrate well with all the other similar structures in wingdi.h
so I left it there and simply told winapi_test to not test it.
EnumICMProfilesProcCallback is a bit different. It's mentioned in the
MSDN but is missing from the Visual C++ 6 headers and from the Platform
SDK headers. Also it's redundant with ICMENUMPROC which is what is
actually declared and used in the Windows headers. So I simply removed
it since I don't see how a Windows applications could be using it.
EXCEPTION_REGISTRATION_RECORD is not defined in the Windows headers, all
they use is the forward definition for 'struct
_EXCEPTION_REGISTRATION_RECORD*'. I left it anyway but told I removed
the PEXCEPTION_REGISTRATION_RECORD (for real this time) since we really
don't need it.
Changelog:
* include/wingdi.h
include/winnt.h
dlls/gdi/tests/generated.c
dlls/msvcrt/except.c
dlls/ntdll/exception.c
dlls/ntdll/tests/generated.c
tools/winapi/tests.dat
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.
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
Broadcast message : fin du monde dans cinq minutes, repentez vous !
-------------- next part --------------
Index: include/wingdi.h
===================================================================
RCS file: /var/cvs/wine/include/wingdi.h,v
retrieving revision 1.110
diff -u -r1.110 wingdi.h
--- include/wingdi.h 20 Aug 2004 19:26:28 -0000 1.110
+++ include/wingdi.h 20 Aug 2004 23:20:02 -0000
@@ -434,11 +434,8 @@
#define CMYK(c,m,y,k) ((COLORREF)((((BYTE)(k)|((WORD)((BYTE)(y))<<8))|(((DWORD)(BYTE)(m))<<16))|(((DWORD)(BYTE)(c))<<24)))
/* ICM stuff */
-typedef INT (CALLBACK *EnumICMProfilesProcCallbackA)(LPSTR lpszFilename,LPARAM lParam);
-typedef INT (CALLBACK *EnumICMProfilesProcCallbackW)(LPWSTR lpszFilename,LPARAM lParam);
-DECL_WINELIB_TYPE_AW(EnumICMProfilesProcCallback)
-typedef EnumICMProfilesProcCallbackA ICMENUMPROCA;
-typedef EnumICMProfilesProcCallbackW ICMENUMPROCW;
+typedef INT (CALLBACK *ICMENUMPROCA)(LPSTR lpszFilename,LPARAM lParam);
+typedef INT (CALLBACK *ICMENUMPROCW)(LPWSTR lpszFilename,LPARAM lParam);
DECL_WINELIB_TYPE_AW(ICMENUMPROC)
Index: include/winnt.h
===================================================================
RCS file: /var/cvs/wine/include/winnt.h,v
retrieving revision 1.187
diff -u -r1.187 winnt.h
--- include/winnt.h 13 Aug 2004 23:55:43 -0000 1.187
+++ include/winnt.h 19 Aug 2004 22:11:46 -0000
@@ -1505,7 +1505,7 @@
{
struct _EXCEPTION_REGISTRATION_RECORD *Prev;
PEXCEPTION_HANDLER Handler;
-} EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD;
+} EXCEPTION_REGISTRATION_RECORD;
/*
* function pointer to a exception filter
Index: dlls/gdi/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/gdi/tests/generated.c,v
retrieving revision 1.10
diff -u -r1.10 generated.c
--- dlls/gdi/tests/generated.c 4 May 2004 00:41:11 -0000 1.10
+++ dlls/gdi/tests/generated.c 20 Aug 2004 14:25:10 -0000
@@ -1321,15 +1321,6 @@
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)
{
/* EMRSETVIEWPORTEXTEX (pack 4) */
@@ -1574,18 +1565,6 @@
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)
{
/* FIXED (pack 4) */
@@ -3950,7 +3929,6 @@
test_pack_EMRSETSTRETCHBLTMODE();
test_pack_EMRSETTEXTALIGN();
test_pack_EMRSETTEXTCOLOR();
- test_pack_EMRSETTEXTJUSTIFICATION();
test_pack_EMRSETVIEWPORTEXTEX();
test_pack_EMRSETVIEWPORTORGEX();
test_pack_EMRSETWINDOWEXTEX();
@@ -3972,8 +3950,6 @@
test_pack_EXTLOGFONTA();
test_pack_EXTLOGFONTW();
test_pack_EXTLOGPEN();
- test_pack_EnumICMProfilesProcCallbackA();
- test_pack_EnumICMProfilesProcCallbackW();
test_pack_FIXED();
test_pack_FONTENUMPROCA();
test_pack_FONTENUMPROCW();
Index: dlls/msvcrt/except.c
===================================================================
RCS file: /var/cvs/wine/dlls/msvcrt/except.c,v
retrieving revision 1.31
diff -u -r1.31 except.c
--- dlls/msvcrt/except.c 13 Aug 2004 23:22:30 -0000 1.31
+++ dlls/msvcrt/except.c 19 Aug 2004 22:11:46 -0000
@@ -54,7 +54,7 @@
typedef struct _MSVCRT_EXCEPTION_FRAME
{
EXCEPTION_REGISTRATION_RECORD *prev;
- void (*handler)(PEXCEPTION_RECORD, PEXCEPTION_REGISTRATION_RECORD,
+ void (*handler)(PEXCEPTION_RECORD, EXCEPTION_REGISTRATION_RECORD*,
PCONTEXT, PEXCEPTION_RECORD);
PSCOPETABLE scopetable;
int trylevel;
@@ -346,7 +346,7 @@
TRACE("cur_frame=%lx\n",cur_frame);
if (cur_frame != jmp->Registration)
- _global_unwind2((PEXCEPTION_REGISTRATION_RECORD)jmp->Registration);
+ _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)jmp->Registration);
if (jmp->Registration)
{
Index: dlls/ntdll/exception.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/exception.c,v
retrieving revision 1.69
diff -u -r1.69 exception.c
--- dlls/ntdll/exception.c 20 Feb 2004 20:19:23 -0000 1.69
+++ dlls/ntdll/exception.c 19 Aug 2004 22:11:46 -0000
@@ -224,7 +224,7 @@
*/
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;
DWORD res, c;
@@ -251,7 +251,7 @@
frame = NtCurrentTeb()->Tib.ExceptionList;
nested_frame = NULL;
- while (frame != (PEXCEPTION_REGISTRATION_RECORD)~0UL)
+ while (frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL)
{
/* Check frame address */
if (((void*)frame < NtCurrentTeb()->Tib.StackLimit) ||
@@ -317,11 +317,11 @@
/*******************************************************************
* 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 )
{
EXCEPTION_RECORD record, newrec;
- PEXCEPTION_REGISTRATION_RECORD frame, dispatch;
+ EXCEPTION_REGISTRATION_RECORD *frame, *dispatch;
#ifdef __i386__
context->Eax = (DWORD)returnEax;
@@ -344,7 +344,7 @@
/* get chain of exception frames */
frame = NtCurrentTeb()->Tib.ExceptionList;
- while ((frame != (PEXCEPTION_REGISTRATION_RECORD)~0UL) && (frame != pEndFrame))
+ while ((frame != (EXCEPTION_REGISTRATION_RECORD*)~0UL) && (frame != pEndFrame))
{
/* Check frame address */
if (pEndFrame && (frame > pEndFrame))
Index: dlls/ntdll/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/tests/generated.c,v
retrieving revision 1.14
diff -u -r1.14 generated.c
--- dlls/ntdll/tests/generated.c 19 Aug 2004 20:34:42 -0000 1.14
+++ dlls/ntdll/tests/generated.c 20 Aug 2004 14:25:10 -0000
@@ -375,14 +376,6 @@
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)
{
/* EXECUTION_STATE */
@@ -2069,7 +2062,6 @@
test_pack_DWORD_PTR();
test_pack_EXCEPTION_POINTERS();
test_pack_EXCEPTION_RECORD();
- test_pack_EXCEPTION_REGISTRATION_RECORD();
test_pack_EXECUTION_STATE();
test_pack_FARPROC();
test_pack_FLOAT();
Index: tools/winapi/tests.dat
===================================================================
RCS file: /var/cvs/wine/tools/winapi/tests.dat,v
retrieving revision 1.18
diff -u -r1.18 tests.dat
--- tools/winapi/tests.dat 19 Aug 2004 20:34:42 -0000 1.18
+++ tools/winapi/tests.dat 20 Aug 2004 23:20:26 -0000
@@ -140,7 +140,7 @@
EMRSETSTRETCHBLTMODE
EMRSETTEXTALIGN
EMRSETTEXTCOLOR
-EMRSETTEXTJUSTIFICATION
+!EMRSETTEXTJUSTIFICATION # Wine-only type
EMRSETVIEWPORTEXTEX
EMRSETVIEWPORTORGEX
EMRSETWINDOWEXTEX
@@ -162,8 +162,6 @@
EXTLOGFONTA
EXTLOGFONTW
EXTLOGPEN
-EnumICMProfilesProcCallbackA
-EnumICMProfilesProcCallbackW
FIXED
FONTENUMPROCA
FONTENUMPROCW
@@ -651,10 +648,9 @@
DWORD64
DWORDLONG
DWORD_PTR
-EXCEPTION_FRAME
EXCEPTION_POINTERS
EXCEPTION_RECORD
-EXCEPTION_REGISTRATION_RECORD
+!EXCEPTION_REGISTRATION_RECORD # Wine-only type
EXECUTION_STATE
FARPROC
FLOAT
More information about the wine-patches
mailing list