October 2010 - Wine-Commits

Aric Stewart : strmbase: Implement STRMBASE_DllGetClassObject and STRMBASE_DllCanUnloadNow.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 2c3bc2cf569b877f1452cc6d480f0fa076df8ae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c3bc2cf569b877f1452cc6d4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 19 13:24:29 2010 -0500 strmbase: Implement STRMBASE_DllGetClassObject and STRMBASE_DllCanUnloadNow. --- dlls/qcap/qcap.spec | 2 +- dlls/qcap/qcap_main.c | 153 +-------------------------------------------- dlls/strmbase/dllfunc.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 2 + 4 files changed, 166 insertions(+), 152 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c3bc2cf569b877f1452c…

1 0

Nikolay Sivov : msxml3: Silence urlmon query failures for IXMLDocument.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 514a5c091f3b48133f3e758dba89cf8b799740e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=514a5c091f3b48133f3e758db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 20 02:32:26 2010 +0400 msxml3: Silence urlmon query failures for IXMLDocument. --- dlls/msxml3/xmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index de0a212..93ff499 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -253,7 +253,7 @@ static HRESULT WINAPI bsc_QueryInterface( return S_OK; } - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

Alexandre Julliard : include: The FLOATING_SAVE_AREA type is i386-specific.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 4a1379d804eb7986a9ad59a213e11ce1fcb956db URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1379d804eb7986a9ad59a21… 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

1 0

Nikolay Sivov : msxml3: Add support for IStream destination in save().
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 657f64dd064cab9ee4b17867052aee61f668bd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=657f64dd064cab9ee4b178670… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 20 02:29:43 2010 +0400 msxml3: Add support for IStream destination in save(). --- dlls/msxml3/domdoc.c | 83 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 8230feb..c401100 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2056,8 +2056,7 @@ static HRESULT WINAPI domdoc_loadXML( return hr; } -static int XMLCALL domdoc_save_writecallback(void *ctx, const char *buffer, - int len) +static int XMLCALL domdoc_save_writecallback(void *ctx, const char *buffer, int len) { DWORD written = -1; @@ -2075,13 +2074,33 @@ static int XMLCALL domdoc_save_closecallback(void *ctx) return CloseHandle(ctx) ? 0 : -1; } +static int XMLCALL domdoc_stream_save_writecallback(void *ctx, const char *buffer, int len) +{ + ULONG written = 0; + HRESULT hr; + + hr = IStream_Write((IStream*)ctx, buffer, len, &written); + if (hr != S_OK) + { + WARN("stream write error: 0x%08x\n", hr); + return -1; + } + else + return written; +} + +static int XMLCALL domdoc_stream_save_closecallback(void *ctx) +{ + IStream_Release((IStream*)ctx); + return 0; +} + static HRESULT WINAPI domdoc_save( IXMLDOMDocument3 *iface, VARIANT destination ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - HANDLE handle; - xmlSaveCtxtPtr ctx; + xmlSaveCtxtPtr ctx = NULL; xmlNodePtr xmldecl; HRESULT ret = S_OK; @@ -2097,9 +2116,10 @@ static HRESULT WINAPI domdoc_save( if(V_VT(&destination) == VT_UNKNOWN) { IUnknown *pUnk = V_UNKNOWN(&destination); - IXMLDOMDocument2 *pDocument; + IXMLDOMDocument2 *document; + IStream *stream; - ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument3, (void**)&pDocument); + ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument3, (void**)&document); if(ret == S_OK) { VARIANT_BOOL success; @@ -2108,40 +2128,53 @@ static HRESULT WINAPI domdoc_save( ret = IXMLDOMDocument3_get_xml(iface, &xml); if(ret == S_OK) { - ret = IXMLDOMDocument3_loadXML(pDocument, xml, &success); + ret = IXMLDOMDocument3_loadXML(document, xml, &success); SysFreeString(xml); } - IXMLDOMDocument3_Release(pDocument); + IXMLDOMDocument3_Release(document); + return ret; } - TRACE("ret %d\n", ret); + ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); + if(ret == S_OK) + { + ctx = xmlSaveToIO(domdoc_stream_save_writecallback, + domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); - return ret; + if(!ctx) + { + IStream_Release(stream); + return E_FAIL; + } + } } - - handle = CreateFileW( V_BSTR(&destination), GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); - if( handle == INVALID_HANDLE_VALUE ) + else { - WARN("failed to create file\n"); - return S_FALSE; - } + /* save with file path */ + HANDLE handle = CreateFileW( V_BSTR(&destination), GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + if( handle == INVALID_HANDLE_VALUE ) + { + WARN("failed to create file\n"); + return E_FAIL; + } - /* disable top XML declaration */ - ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, XML_SAVE_NO_DECL); - if (!ctx) - { - CloseHandle(handle); - return S_FALSE; + /* disable top XML declaration */ + ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, + handle, NULL, XML_SAVE_NO_DECL); + if (!ctx) + { + CloseHandle(handle); + return E_FAIL; + } } xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; xmldoc_link_xmldecl(get_doc(This), xmldecl); - /* will close file through close callback */ + /* will release resources through close callback */ xmlSaveClose(ctx); return ret;

1 0

Alexandre Julliard : include: Get rid of the non-standard CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 41454fe18b147763c91b8fd5f2e21275f5570259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41454fe18b147763c91b8fd5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:48:52 2010 +0200 include: Get rid of the non-standard CONTEXT86 type. --- include/wine/winbase16.h | 2 +- include/winnt.h | 48 +++++++++++++-------------------------------- 2 files changed, 15 insertions(+), 35 deletions(-) diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index b70ecd6..0f26d8c 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -492,7 +492,7 @@ BOOL16 WINAPI GlobalUnlock16(HGLOBAL16); BOOL16 WINAPI GlobalUnWire16(HGLOBAL16); SEGPTR WINAPI GlobalWire16(HGLOBAL16); WORD WINAPI InitAtomTable16(WORD); -void WINAPI InitTask16(CONTEXT86*); +void WINAPI InitTask16(CONTEXT*); BOOL16 WINAPI IsBadCodePtr16(SEGPTR); BOOL16 WINAPI IsBadHugeReadPtr16(SEGPTR,DWORD); BOOL16 WINAPI IsBadHugeWritePtr16(SEGPTR,DWORD); diff --git a/include/winnt.h b/include/winnt.h index 8c17159..86a9781 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -746,15 +746,6 @@ typedef enum _HEAP_INFORMATION_CLASS { /* The Win32 register context */ -/* CONTEXT is the CPU-dependent context; it should be used */ -/* wherever a platform-specific context is needed (e.g. exception */ -/* handling, Win32 register functions). */ - -/* CONTEXT86 is the i386-specific context; it should be used */ -/* wherever only a 386 context makes sense (e.g. DOS interrupts, */ -/* Win16 register functions), so that this code can be compiled */ -/* on all platforms. */ - #define SIZE_OF_80387_REGISTERS 80 typedef struct _FLOATING_SAVE_AREA @@ -770,9 +761,12 @@ 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 _CONTEXT86 +typedef struct _CONTEXT { DWORD ContextFlags; @@ -810,35 +804,21 @@ typedef struct _CONTEXT86 DWORD SegSs; BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; -} CONTEXT86; +} CONTEXT; #define CONTEXT_X86 0x00010000 #define CONTEXT_i386 CONTEXT_X86 #define CONTEXT_i486 CONTEXT_X86 -#define CONTEXT86_CONTROL (CONTEXT_i386 | 0x0001) /* SS:SP, CS:IP, FLAGS, BP */ -#define CONTEXT86_INTEGER (CONTEXT_i386 | 0x0002) /* AX, BX, CX, DX, SI, DI */ -#define CONTEXT86_SEGMENTS (CONTEXT_i386 | 0x0004) /* DS, ES, FS, GS */ -#define CONTEXT86_FLOATING_POINT (CONTEXT_i386 | 0x0008L) /* 387 state */ -#define CONTEXT86_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010L) /* DB 0-3,6,7 */ -#define CONTEXT86_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020L) -#define CONTEXT86_FULL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS) -#define CONTEXT86_ALL (CONTEXT86_CONTROL | CONTEXT86_INTEGER | CONTEXT86_SEGMENTS | \ - CONTEXT86_FLOATING_POINT | CONTEXT86_DEBUG_REGISTERS | CONTEXT86_EXTENDED_REGISTERS) - -/* i386 context definitions */ -#ifdef __i386__ - -#define CONTEXT_CONTROL CONTEXT86_CONTROL -#define CONTEXT_INTEGER CONTEXT86_INTEGER -#define CONTEXT_SEGMENTS CONTEXT86_SEGMENTS -#define CONTEXT_FLOATING_POINT CONTEXT86_FLOATING_POINT -#define CONTEXT_DEBUG_REGISTERS CONTEXT86_DEBUG_REGISTERS -#define CONTEXT_EXTENDED_REGISTERS CONTEXT86_EXTENDED_REGISTERS -#define CONTEXT_FULL CONTEXT86_FULL -#define CONTEXT_ALL CONTEXT86_ALL - -typedef CONTEXT86 CONTEXT; +#define CONTEXT_CONTROL (CONTEXT_i386 | 0x0001) /* SS:SP, CS:IP, FLAGS, BP */ +#define CONTEXT_INTEGER (CONTEXT_i386 | 0x0002) /* AX, BX, CX, DX, SI, DI */ +#define CONTEXT_SEGMENTS (CONTEXT_i386 | 0x0004) /* DS, ES, FS, GS */ +#define CONTEXT_FLOATING_POINT (CONTEXT_i386 | 0x0008L) /* 387 state */ +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_i386 | 0x0010L) /* DB 0-3,6,7 */ +#define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386 | 0x0020L) +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS) +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | \ + CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS | CONTEXT_EXTENDED_REGISTERS) #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1

1 0

Alexandre Julliard : krnl386.exe: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 1b2604384b8e6cce2a8170ca5226b924f9e20b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2604384b8e6cce2a8170ca5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:48:31 2010 +0200 krnl386.exe: Avoid using the CONTEXT86 type. --- dlls/krnl386.exe16/dosaspi.c | 6 +- dlls/krnl386.exe16/dosdev.c | 20 ++++---- dlls/krnl386.exe16/dosexe.c | 8 ++-- dlls/krnl386.exe16/dosexe.h | 96 ++++++++++++++++---------------- dlls/krnl386.exe16/dosvm.c | 20 ++++---- dlls/krnl386.exe16/error.c | 2 +- dlls/krnl386.exe16/fpu.c | 26 +++++----- dlls/krnl386.exe16/global.c | 3 +- dlls/krnl386.exe16/instr.c | 26 +++++----- dlls/krnl386.exe16/int09.c | 4 +- dlls/krnl386.exe16/int10.c | 4 +- dlls/krnl386.exe16/int13.c | 6 +- dlls/krnl386.exe16/int15.c | 2 +- dlls/krnl386.exe16/int16.c | 4 +- dlls/krnl386.exe16/int21.c | 90 +++++++++++++++--------------- dlls/krnl386.exe16/int25.c | 2 +- dlls/krnl386.exe16/int26.c | 2 +- dlls/krnl386.exe16/int2f.c | 20 ++++---- dlls/krnl386.exe16/int31.c | 36 ++++++------ dlls/krnl386.exe16/int33.c | 8 ++-- dlls/krnl386.exe16/int67.c | 16 +++--- dlls/krnl386.exe16/interrupts.c | 66 +++++++++++----------- dlls/krnl386.exe16/kernel16_private.h | 4 +- dlls/krnl386.exe16/ne_module.c | 6 +- dlls/krnl386.exe16/ne_segment.c | 4 +- dlls/krnl386.exe16/relay.c | 12 ++-- dlls/krnl386.exe16/snoop.c | 8 ++-- dlls/krnl386.exe16/task.c | 4 +- dlls/krnl386.exe16/thunk.c | 60 ++++++++++---------- dlls/krnl386.exe16/timer.c | 6 +- dlls/krnl386.exe16/vxd.c | 32 ++++++------ dlls/krnl386.exe16/wowthunk.c | 2 +- 32 files changed, 302 insertions(+), 303 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b2604384b8e6cce2a817…

1 0

Alexandre Julliard : windebug: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 16c9b10dc9a1e158a730e5852a15ba48ac1b6090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16c9b10dc9a1e158a730e5852… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:38:23 2010 +0200 windebug: Avoid using the CONTEXT86 type. --- dlls/windebug.dll16/windebug.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windebug.dll16/windebug.c b/dlls/windebug.dll16/windebug.c index 7b913b2..8b5baa7 100644 --- a/dlls/windebug.dll16/windebug.c +++ b/dlls/windebug.dll16/windebug.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dll); * WinNotify (WINDEBUG.3) * written without _any_ docu */ -void WINAPI WinNotify16(CONTEXT86 *context) +void WINAPI WinNotify16(CONTEXT *context) { FIXME("(AX=%04x):stub.\n", LOWORD(context->Eax)); switch (LOWORD(context->Eax))

1 0

Alexandre Julliard : system.drv: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: fe0f0c03490212c6ed6ff9af484b3db79b5933cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0f0c03490212c6ed6ff9af4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:38:17 2010 +0200 system.drv: Avoid using the CONTEXT86 type. --- dlls/system.drv16/system.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/system.drv16/system.c b/dlls/system.drv16/system.c index 7d8433a..2d4cb6b 100644 --- a/dlls/system.drv16/system.c +++ b/dlls/system.drv16/system.c @@ -63,7 +63,7 @@ static void CALLBACK SYSTEM_TimerTick( LPVOID arg, DWORD low, DWORD high ) if ((SYS_Timers[i].ticks -= SYS_TIMER_RATE) <= 0) { FARPROC16 proc = SYS_Timers[i].callback16; - CONTEXT86 context; + CONTEXT context; SYS_Timers[i].ticks += SYS_Timers[i].rate;

1 0

Alexandre Julliard : user.exe: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: d86df456022732da7663a70a92fb06a9e7689ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d86df456022732da7663a70a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:37:22 2010 +0200 user.exe: Avoid using the CONTEXT86 type. --- dlls/user.exe16/message.c | 2 +- dlls/user.exe16/user.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index c642e85..b10b761 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -243,7 +243,7 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA { WNDPROC16 func = arg; int index = winproc_to_index( func ); - CONTEXT86 context; + CONTEXT context; size_t size = 0; struct { diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 710ed62..030dd0d 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1809,7 +1809,7 @@ BOOL16 WINAPI SetDeskWallPaper16( LPCSTR filename ) /*********************************************************************** * keybd_event (USER.289) */ -void WINAPI keybd_event16( CONTEXT86 *context ) +void WINAPI keybd_event16( CONTEXT *context ) { DWORD dwFlags = 0; @@ -1824,7 +1824,7 @@ void WINAPI keybd_event16( CONTEXT86 *context ) /*********************************************************************** * mouse_event (USER.299) */ -void WINAPI mouse_event16( CONTEXT86 *context ) +void WINAPI mouse_event16( CONTEXT *context ) { mouse_event( LOWORD(context->Eax), LOWORD(context->Ebx), LOWORD(context->Ecx), LOWORD(context->Edx), MAKELONG(context->Esi, context->Edi) );

1 0

Alexandre Julliard : vmm.vxd: Avoid using the CONTEXT86 type.
by Alexandre Julliard Oct. 20, 2010

Oct. 20, 2010

Module: wine Branch: master Commit: 911d6d3c4c1529e41cbcb77d5e676ba53c5312b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911d6d3c4c1529e41cbcb77d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 15:37:18 2010 +0200 vmm.vxd: Avoid using the CONTEXT86 type. --- dlls/vmm.vxd/vmm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vmm.vxd/vmm.c b/dlls/vmm.vxd/vmm.c index 2887a2d..ff737dc 100644 --- a/dlls/vmm.vxd/vmm.c +++ b/dlls/vmm.vxd/vmm.c @@ -120,7 +120,7 @@ static const char * const VMM_Service_Name[N_VMM_SERVICE] = /* Pop a DWORD from the 32-bit stack */ -static inline DWORD stack32_pop( CONTEXT86 *context ) +static inline DWORD stack32_pop( CONTEXT *context ) { DWORD ret = *(DWORD *)context->Esp; context->Esp += sizeof(DWORD); @@ -131,7 +131,7 @@ static inline DWORD stack32_pop( CONTEXT86 *context ) /*********************************************************************** * VxDCall (VMM.VXD.@) */ -DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT86 *context ) +DWORD WINAPI VMM_VxDCall( DWORD service, CONTEXT *context ) { static int warned;

1 0