Alexandre Julliard : include: The FLOATING_SAVE_AREA type is i386-specific.
Module: wine Branch: master Commit: 4a1379d804eb7986a9ad59a213e11ce1fcb956db URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1379d804eb7986a9ad59a213... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 17:55:22 2010 +0200 include: The FLOATING_SAVE_AREA type is i386-specific. --- dlls/ntdll/tests/generated.c | 88 ------------------------------------------ include/winnt.h | 6 +- tools/winapi/tests.dat | 5 +- 3 files changed, 5 insertions(+), 94 deletions(-) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index b7f1c9d..fdba6e8 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -438,40 +438,6 @@ static void test_pack_EXECUTION_STATE(void) TEST_TYPE_UNSIGNED(EXECUTION_STATE) } -static void test_pack_FLOATING_SAVE_AREA(void) -{ - /* FLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (FLOATING_SAVE_AREA, 112) - TEST_TYPE_ALIGN (FLOATING_SAVE_AREA, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ControlWord, 0) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, TagWord, 8) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorOffset, 12) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorSelector, 16) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataOffset, 20) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataSelector, 24) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, RegisterArea, 80) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, RegisterArea, 1) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, RegisterArea, 28) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108) -} - static void test_pack_FPO_DATA(void) { /* FPO_DATA */ @@ -1976,15 +1942,6 @@ static void test_pack_PEXCEPTION_RECORD(void) TEST_TARGET_ALIGN(PEXCEPTION_RECORD, 8) } -static void test_pack_PFLOATING_SAVE_AREA(void) -{ - /* PFLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (PFLOATING_SAVE_AREA, 8) - TEST_TYPE_ALIGN (PFLOATING_SAVE_AREA, 8) - TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112) - TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4) -} - static void test_pack_PFPO_DATA(void) { /* PFPO_DATA */ @@ -3847,40 +3804,6 @@ static void test_pack_EXECUTION_STATE(void) TEST_TYPE_UNSIGNED(EXECUTION_STATE) } -static void test_pack_FLOATING_SAVE_AREA(void) -{ - /* FLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (FLOATING_SAVE_AREA, 112) - TEST_TYPE_ALIGN (FLOATING_SAVE_AREA, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ControlWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ControlWord, 0) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, StatusWord, 4) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, TagWord, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, TagWord, 8) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorOffset, 12) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, ErrorSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, ErrorSelector, 16) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataOffset, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataOffset, 20) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, DataSelector, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, DataSelector, 24) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, RegisterArea, 80) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, RegisterArea, 1) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, RegisterArea, 28) - TEST_FIELD_SIZE (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_ALIGN (FLOATING_SAVE_AREA, Cr0NpxState, 4) - TEST_FIELD_OFFSET(FLOATING_SAVE_AREA, Cr0NpxState, 108) -} - static void test_pack_FPO_DATA(void) { /* FPO_DATA */ @@ -5385,15 +5308,6 @@ static void test_pack_PEXCEPTION_RECORD(void) TEST_TARGET_ALIGN(PEXCEPTION_RECORD, 4) } -static void test_pack_PFLOATING_SAVE_AREA(void) -{ - /* PFLOATING_SAVE_AREA */ - TEST_TYPE_SIZE (PFLOATING_SAVE_AREA, 4) - TEST_TYPE_ALIGN (PFLOATING_SAVE_AREA, 4) - TEST_TARGET_SIZE (PFLOATING_SAVE_AREA, 112) - TEST_TARGET_ALIGN(PFLOATING_SAVE_AREA, 4) -} - static void test_pack_PFPO_DATA(void) { /* PFPO_DATA */ @@ -6921,7 +6835,6 @@ static void test_pack(void) test_pack_EXECUTION_STATE(); test_pack_FARPROC(); test_pack_FLOAT(); - test_pack_FLOATING_SAVE_AREA(); test_pack_FPO_DATA(); test_pack_GENERIC_MAPPING(); test_pack_GLOBALHANDLE(); @@ -7021,7 +6934,6 @@ static void test_pack(void) test_pack_PCWSTR(); test_pack_PEXCEPTION_POINTERS(); test_pack_PEXCEPTION_RECORD(); - test_pack_PFLOATING_SAVE_AREA(); test_pack_PFPO_DATA(); test_pack_PGENERIC_MAPPING(); test_pack_PHANDLE(); diff --git a/include/winnt.h b/include/winnt.h index 86a9781..a56e4ad 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -746,6 +746,9 @@ typedef enum _HEAP_INFORMATION_CLASS { /* The Win32 register context */ +/* i386 context definitions */ +#ifdef __i386__ + #define SIZE_OF_80387_REGISTERS 80 typedef struct _FLOATING_SAVE_AREA @@ -761,9 +764,6 @@ typedef struct _FLOATING_SAVE_AREA DWORD Cr0NpxState; } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA; -/* i386 context definitions */ -#ifdef __i386__ - #define MAXIMUM_SUPPORTED_EXTENSION 512 typedef struct _CONTEXT diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3c1c1cf..b4b596c 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -649,7 +649,6 @@ CCHAR CHAR COLORREF !CONTEXT # Architecture dependent -!CONTEXT86 # Architecture dependent DATE DOUBLE DWORD @@ -663,7 +662,7 @@ EXCEPTION_RECORD EXECUTION_STATE FARPROC FLOAT -FLOATING_SAVE_AREA +!FLOATING_SAVE_AREA # Architecture dependent FPO_DATA GENERIC_MAPPING GLOBALHANDLE @@ -767,7 +766,7 @@ PCWSTR !PEXCEPTION_HANDLER # Wine-only type PEXCEPTION_POINTERS PEXCEPTION_RECORD -PFLOATING_SAVE_AREA +!PFLOATING_SAVE_AREA # Architecture dependent PFPO_DATA PGENERIC_MAPPING PHANDLE
participants (1)
-
Alexandre Julliard