ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The Windows headers don't define PEXCEPTION_REGISTRATION_RECORD. 

Remove it.
This commit is contained in:
Francois Gouget 2004-08-13 23:22:30 +00:00 committed by Alexandre Julliard
parent edf55ec7d9
commit 6f902f16fb
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msvcrt/except.c
View File

@ -123,7 +123,7 @@ __ASM_GLOBAL_FUNC(_EH_prolog,
/******************************************************************* /*******************************************************************
* _global_unwind2 (MSVCRT.@) * _global_unwind2 (MSVCRT.@)
*/ */
void _global_unwind2(PEXCEPTION_REGISTRATION_RECORD frame) void _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame)
{ {
TRACE("(%p)\n",frame); TRACE("(%p)\n",frame);
RtlUnwind( frame, 0, 0, 0 ); RtlUnwind( frame, 0, 0, 0 );
@ -165,9 +165,9 @@ void _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel)
* _except_handler2 (MSVCRT.@) * _except_handler2 (MSVCRT.@)
*/ */
int _except_handler2(PEXCEPTION_RECORD rec, int _except_handler2(PEXCEPTION_RECORD rec,
PEXCEPTION_REGISTRATION_RECORD frame, EXCEPTION_REGISTRATION_RECORD* frame,
PCONTEXT context, PCONTEXT context,
PEXCEPTION_REGISTRATION_RECORD* dispatcher) EXCEPTION_REGISTRATION_RECORD** dispatcher)
{ {
FIXME("exception %lx flags=%lx at %p handler=%p %p %p stub\n", FIXME("exception %lx flags=%lx at %p handler=%p %p %p stub\n",
rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
@ -227,7 +227,7 @@ int _except_handler3(PEXCEPTION_RECORD rec,
if (retval == EXCEPTION_EXECUTE_HANDLER) if (retval == EXCEPTION_EXECUTE_HANDLER)
{ {
/* Unwind all higher frames, this one will handle the exception */ /* 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); _local_unwind2(frame, trylevel);
/* Set our trylevel to the enclosing block, and call the __finally /* Set our trylevel to the enclosing block, and call the __finally

8
dlls/ntdll/tests/generated.c
View File

@ -1073,13 +1073,6 @@ static void test_pack_PEXCEPTION_RECORD(void)
TEST_TYPE_POINTER(PEXCEPTION_RECORD, 80, 4); 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) static void test_pack_PFLOATING_SAVE_AREA(void)
{ {
/* PFLOATING_SAVE_AREA */ /* PFLOATING_SAVE_AREA */
@ -2194,7 +2187,6 @@ static void test_pack(void)
test_pack_PEXCEPTION_HANDLER(); test_pack_PEXCEPTION_HANDLER();
test_pack_PEXCEPTION_POINTERS(); test_pack_PEXCEPTION_POINTERS();
test_pack_PEXCEPTION_RECORD(); test_pack_PEXCEPTION_RECORD();
test_pack_PEXCEPTION_REGISTRATION_RECORD();
test_pack_PFLOATING_SAVE_AREA(); test_pack_PFLOATING_SAVE_AREA();
test_pack_PGENERIC_MAPPING(); test_pack_PGENERIC_MAPPING();
test_pack_PHANDLE(); test_pack_PHANDLE();

1
tools/winapi/tests.dat
View File

@ -768,7 +768,6 @@ PEXCEPTION_FRAME
PEXCEPTION_HANDLER PEXCEPTION_HANDLER
PEXCEPTION_POINTERS PEXCEPTION_POINTERS
PEXCEPTION_RECORD PEXCEPTION_RECORD
PEXCEPTION_REGISTRATION_RECORD
PFLOATING_SAVE_AREA PFLOATING_SAVE_AREA
!PFPO_DATA !PFPO_DATA
PGENERIC_MAPPING PGENERIC_MAPPING