Remove PEXCEPTION_REGISTRATION_RECORD
Francois Gouget
fgouget at free.fr
Fri Aug 13 06:06:33 CDT 2004
The Windows headers don't define PEXCEPTION_REGISTRATION_RECORD.
Actually they don't define the corresponding struct either, all we see
of it is this:
typedef struct _NT_TIB {
struct _EXCEPTION_REGISTRATION_RECORD *ExceptionList;
...
This patch just removes the pointer type since it's really not needed.
This way we don't need to for winapi_test to ignore it.
Changelog:
* dlls/msvcrt/except.c
dlls/ntdll/tests/generated.c
tools/winapi/tests.dat
The Windows headers don't define PEXCEPTION_REGISTRATION_RECORD.
Remove it.
Index: dlls/msvcrt/except.c
===================================================================
RCS file: /var/cvs/wine/dlls/msvcrt/except.c,v
retrieving revision 1.30
diff -u -r1.30 except.c
--- dlls/msvcrt/except.c 25 Jun 2004 01:19:15 -0000 1.30
+++ dlls/msvcrt/except.c 11 Aug 2004 14:32:35 -0000
@@ -123,7 +123,7 @@
/*******************************************************************
* _global_unwind2 (MSVCRT.@)
*/
-void _global_unwind2(PEXCEPTION_REGISTRATION_RECORD frame)
+void _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame)
{
TRACE("(%p)\n",frame);
RtlUnwind( frame, 0, 0, 0 );
@@ -165,9 +165,9 @@
* _except_handler2 (MSVCRT.@)
*/
int _except_handler2(PEXCEPTION_RECORD rec,
- PEXCEPTION_REGISTRATION_RECORD frame,
+ EXCEPTION_REGISTRATION_RECORD* frame,
PCONTEXT context,
- PEXCEPTION_REGISTRATION_RECORD* dispatcher)
+ EXCEPTION_REGISTRATION_RECORD** dispatcher)
{
FIXME("exception %lx flags=%lx at %p handler=%p %p %p stub\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
@@ -227,7 +227,7 @@
if (retval == EXCEPTION_EXECUTE_HANDLER)
{
/* Unwind all higher frames, this one will handle the exception */
- _global_unwind2((PEXCEPTION_REGISTRATION_RECORD)frame);
+ _global_unwind2((EXCEPTION_REGISTRATION_RECORD*)frame);
_local_unwind2(frame, trylevel);
/* Set our trylevel to the enclosing block, and call the __finally
Index: dlls/ntdll/tests/generated.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/tests/generated.c,v
retrieving revision 1.9
diff -u -r1.9 generated.c
--- dlls/ntdll/tests/generated.c 4 May 2004 00:41:11 -0000 1.9
+++ dlls/ntdll/tests/generated.c 11 Aug 2004 14:43:39 -0000
@@ -1073,13 +981,6 @@
TEST_TYPE_POINTER(PEXCEPTION_RECORD, 80, 4);
}
-static void test_pack_PEXCEPTION_REGISTRATION_RECORD(void)
-{
- /* PEXCEPTION_REGISTRATION_RECORD */
- TEST_TYPE(PEXCEPTION_REGISTRATION_RECORD, 4, 4);
- TEST_TYPE_POINTER(PEXCEPTION_REGISTRATION_RECORD, 8, 4);
-}
-
static void test_pack_PFLOATING_SAVE_AREA(void)
{
/* PFLOATING_SAVE_AREA */
@@ -2191,7 +2076,6 @@
test_pack_PEXCEPTION_HANDLER();
test_pack_PEXCEPTION_POINTERS();
test_pack_PEXCEPTION_RECORD();
- test_pack_PEXCEPTION_REGISTRATION_RECORD();
test_pack_PFLOATING_SAVE_AREA();
test_pack_PGENERIC_MAPPING();
test_pack_PHANDLE();
Index: tools/winapi/tests.dat
===================================================================
RCS file: /var/cvs/wine/tools/winapi/tests.dat,v
retrieving revision 1.13
diff -u -r1.13 tests.dat
--- tools/winapi/tests.dat 11 Aug 2004 20:52:37 -0000 1.13
+++ tools/winapi/tests.dat 11 Aug 2004 22:58:27 -0000
@@ -765,7 +761,6 @@
PEXCEPTION_HANDLER
PEXCEPTION_POINTERS
PEXCEPTION_RECORD
-PEXCEPTION_REGISTRATION_RECORD
PFLOATING_SAVE_AREA
!PFPO_DATA
PGENERIC_MAPPING
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
In theory, theory and practice are the same, but in practice they're different.
More information about the wine-patches
mailing list