September 2009 - Wine-Commits

Alexandre Julliard : ntdll/tests: Retrieve the number of processors through GetSystemInfo.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 2e8de49ee154412b792956ceabb1d0300deae7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8de49ee154412b792956cea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 21:09:47 2009 +0200 ntdll/tests: Retrieve the number of processors through GetSystemInfo. --- dlls/ntdll/tests/info.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6495acc..69126fa 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -896,12 +896,14 @@ static void test_affinity(void) PROCESS_BASIC_INFORMATION pbi; DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; + SYSTEM_INFO si; + GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); proc_affinity = (DWORD_PTR)pbi.Reserved2[0]; - ok( proc_affinity == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, "Unexpected process affinity\n" ); - proc_affinity = 1 << NtCurrentTeb()->Peb->NumberOfProcessors; + ok( proc_affinity == (1 << si.dwNumberOfProcessors) - 1, "Unexpected process affinity\n" ); + proc_affinity = 1 << si.dwNumberOfProcessors; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -913,8 +915,8 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); - ok( tbi.AffinityMask == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, "Unexpected thread affinity\n" ); - thread_affinity = 1 << NtCurrentTeb()->Peb->NumberOfProcessors; + ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); + thread_affinity = 1 << si.dwNumberOfProcessors; status = pNtSetInformationThread( GetCurrentThread(), ThreadAffinityMask, &thread_affinity, sizeof(thread_affinity) ); ok( status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); @@ -929,7 +931,7 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( tbi.AffinityMask == 1, "Unexpected thread affinity\n" ); - if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) + if (si.dwNumberOfProcessors <= 1) { skip("only one processor, skipping affinity testing\n"); return; @@ -947,14 +949,14 @@ static void test_affinity(void) todo_wine ok( tbi.AffinityMask == 2, "Unexpected thread affinity\n" ); - proc_affinity = (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1; + proc_affinity = (1 << si.dwNumberOfProcessors) - 1; status = pNtSetInformationProcess( GetCurrentProcess(), ProcessAffinityMask, &proc_affinity, sizeof(proc_affinity) ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); /* Resetting the process affinity also resets the thread affinity */ status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); todo_wine - ok( tbi.AffinityMask == (1 << NtCurrentTeb()->Peb->NumberOfProcessors) - 1, + ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity" ); }

1 0

Jörg Höhle : ole32/tests: Guard ReleaseStgMedium with SUCCEEDED.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 08df19b40510f37d89bb7740abcacfa6ad246f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08df19b40510f37d89bb7740a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Sep 29 17:49:20 2009 +0200 ole32/tests: Guard ReleaseStgMedium with SUCCEEDED. --- dlls/ole32/tests/clipboard.c | 56 ++++++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index e58ac02..626d244 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -477,8 +477,6 @@ static void test_get_clipboard(void) hr = IDataObject_QueryGetData(data_obj, &fmtetc); ok(hr == DV_E_FORMATETC || broken(hr == S_OK), "IDataObject_QueryGetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); - if (hr == S_OK) - ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.cfFormat = CF_RIFF; @@ -499,19 +497,19 @@ static void test_get_clipboard(void) InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); - ReleaseStgMedium(&stgmedium); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.dwAspect = 0xdeadbeef; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); - ReleaseStgMedium(&stgmedium); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.dwAspect = DVASPECT_THUMBNAIL; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); - ReleaseStgMedium(&stgmedium); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.lindex = 256; @@ -528,11 +526,13 @@ static void test_get_clipboard(void) fmtetc.cfFormat = CF_RIFF; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_HGLOBAL); fmtetc.tymed = TYMED_FILE; hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); ok(DataObjectImpl_GetData_calls == 6, "DataObjectImpl_GetData should have been called 6 times instead of %d times\n", DataObjectImpl_GetData_calls); @@ -967,7 +967,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 0, "GetData called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); hr = OleGetClipboard(&get2); ok(hr == S_OK, "got %08x\n", hr); @@ -1004,7 +1004,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); refs = count_refs(src); ok(refs == old_refs + 1, "%d %d\n", refs, old_refs); @@ -1014,7 +1014,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); refs = count_refs(src); ok(refs == 2, "%d\n", refs); @@ -1047,7 +1047,7 @@ static void test_consumer_refs(void) hr = IDataObject_GetData(get1, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(DataObjectImpl_GetData_calls == 1, "GetData not called\n"); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); refs = count_refs(src); ok(refs == 1, "%d\n", refs); @@ -1096,23 +1096,24 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, CF_TEXT, TYMED_ISTREAM); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, CF_TEXT, TYMED_ISTORAGE); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == E_FAIL, "got %08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, CF_TEXT, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); /* stream format -> global & stream */ @@ -1120,23 +1121,24 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_stream, TYMED_ISTORAGE); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == E_FAIL, "got %08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_stream, TYMED_HGLOBAL); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_stream, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); /* storage format -> global, stream & storage */ @@ -1144,34 +1146,36 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); - hr = IStorage_Stat(med.u.pstg, &stat, STATFLAG_NONAME); - ok(hr == S_OK, "got %08x\n", hr); - ok(stat.grfMode == (STGM_SHARE_EXCLUSIVE | STGM_READWRITE), "got %08x\n", stat.grfMode); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) { + hr = IStorage_Stat(med.u.pstg, &stat, STATFLAG_NONAME); + ok(hr == S_OK, "got %08x\n", hr); + ok(stat.grfMode == (STGM_SHARE_EXCLUSIVE | STGM_READWRITE), "got %08x\n", stat.grfMode); + ReleaseStgMedium(&med); + } InitFormatEtc(fmt, cf_storage, TYMED_ISTREAM); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTREAM, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_storage, TYMED_HGLOBAL); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_storage, TYMED_HGLOBAL | TYMED_ISTREAM); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_storage, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); /* complex format with target device */ @@ -1180,7 +1184,7 @@ static void test_flushed_getdata(void) ok(hr == DV_E_FORMATETC || broken(hr == S_OK), /* win9x, winme & nt4 */ "got %08x\n", hr); - if(hr == S_OK) ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); InitFormatEtc(fmt, cf_another, 0xffff); memset(&dm, 0, sizeof(dm)); @@ -1199,7 +1203,7 @@ static void test_flushed_getdata(void) hr = IDataObject_GetData(get, &fmt, &med); ok(hr == S_OK, "got %08x\n", hr); ok(med.tymed == TYMED_ISTORAGE, "got %x\n", med.tymed); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); HeapFree(GetProcessHeap(), 0, fmt.ptd); @@ -1356,7 +1360,7 @@ static void test_nonole_clipboard(void) ok(hr == S_OK, "got %08x\n", hr); obj_type = GetObjectType(U(med).hEnhMetaFile); ok(obj_type == OBJ_ENHMETAFILE, "got %d\n", obj_type); - ReleaseStgMedium(&med); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); IDataObject_Release(get);

1 0

Alexandre Julliard : toolhelp.dll16: Add ntdll import.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: bd48cf2f4bb709883b1d7b7c7f22ee3215042c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd48cf2f4bb709883b1d7b7c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 20:59:51 2009 +0200 toolhelp.dll16: Add ntdll import. --- dlls/toolhelp.dll16/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/toolhelp.dll16/Makefile.in b/dlls/toolhelp.dll16/Makefile.in index 74b45f2..75d8842 100644 --- a/dlls/toolhelp.dll16/Makefile.in +++ b/dlls/toolhelp.dll16/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = toolhelp.dll16 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll EXTRADLLFLAGS = -Wb,--subsystem,win16 C_SRCS = toolhelp.c

1 0

Alexandre Julliard : system.drv16: Add ntdll import.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: d52ad5e9a6c6fc6b383d6ad085c7cf4e6a0150bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52ad5e9a6c6fc6b383d6ad08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 20:52:56 2009 +0200 system.drv16: Add ntdll import. --- dlls/system.drv16/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/system.drv16/Makefile.in b/dlls/system.drv16/Makefile.in index 2fa90cf..f3e64b0 100644 --- a/dlls/system.drv16/Makefile.in +++ b/dlls/system.drv16/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = system.drv16 -IMPORTS = kernel32 +IMPORTS = kernel32 ntdll EXTRADLLFLAGS = -Wb,--subsystem,win16 C_SRCS = system.c

1 0

Alexandre Julliard : configure: Don't build wow32. dll when 16-bit support is disabled.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 4d9a05ff0baa6035d664f1925a53b4d39b33e2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9a05ff0baa6035d664f1925… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 20:13:58 2009 +0200 configure: Don't build wow32.dll when 16-bit support is disabled. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 70a62bb..ceb6e20 100755 --- a/configure +++ b/configure @@ -4086,6 +4086,7 @@ then enable_w32skrnl=${enable_w32skrnl:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} + enable_wow32=${enable_wow32:-no} fi if test -n "$with_wine64" diff --git a/configure.ac b/configure.ac index 0c1c0bf..d489f00 100644 --- a/configure.ac +++ b/configure.ac @@ -178,6 +178,7 @@ then enable_w32skrnl=${enable_w32skrnl:-no} enable_winedos=${enable_winedos:-no} enable_winevdm=${enable_winevdm:-no} + enable_wow32=${enable_wow32:-no} fi dnl Some special cases for the wow64 build

1 0

Alexandre Julliard : ws2_32: Remove remaining 16-bit code from async. c and simplify the code.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: f507e3c41601f3310b7074eb5b6acb9e7ca60001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f507e3c41601f3310b7074eb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 20:03:36 2009 +0200 ws2_32: Remove remaining 16-bit code from async.c and simplify the code. --- dlls/ws2_32/async.c | 346 ++++++++++++--------------------------------------- 1 files changed, 80 insertions(+), 266 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f507e3c41601f3310b707…

1 0

Alexandre Julliard : ws2_32: Define a common header struct for async queries, and switch to 32-bit types.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 6905a6c2ad40ed12b3e014e7433eee37f50c51c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6905a6c2ad40ed12b3e014e74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 18:25:05 2009 +0200 ws2_32: Define a common header struct for async queries, and switch to 32-bit types. --- dlls/ws2_32/async.c | 79 ++++++++++++++++++++++++++------------------------ 1 files changed, 41 insertions(+), 38 deletions(-) diff --git a/dlls/ws2_32/async.c b/dlls/ws2_32/async.c index 157c35b..5948aa8 100644 --- a/dlls/ws2_32/async.c +++ b/dlls/ws2_32/async.c @@ -132,7 +132,7 @@ UINT wsaHerrno(int errnr); #define AQ_WIN16 0x00 #define AQ_WIN32 0x04 -#define HB_WIN32(hb) (hb->flags & AQ_WIN32) +#define HB_WIN32(hb) (hb->query.flags & AQ_WIN32) #define AQ_COPYPTR1 0x10 #define AQ_DUPLOWPTR1 0x20 #define AQ_MASKPTR1 0x30 @@ -144,12 +144,21 @@ UINT wsaHerrno(int errnr); /* 16-bit values are used internally (to be sure handle comparison works right in 16-bit apps). */ #define WSA_H32(h16) ((HANDLE)(ULONG_PTR)(h16)) +struct async_query_header +{ + HWND hWnd; + UINT uMsg; + void *sbuf; + INT sbuflen; + UINT flags; + HANDLE handle; +}; + /* Generic async query struct. we use symbolic names for the different queries * for readability. */ typedef struct _async_query { - HWND16 hWnd; - UINT16 uMsg; + struct async_query_header query; LPCSTR ptr1; #define host_name ptr1 #define host_addr ptr1 @@ -163,12 +172,6 @@ typedef struct _async_query { #define serv_port int1 int int2; #define host_type int2 - SEGPTR sbuf; - INT16 sbuflen; - - HANDLE16 async_handle; - int flags; - int qt; char xbuf[1]; } async_query; @@ -202,10 +205,10 @@ static int list_dup(char** l_src, char* ref, char* base, int item_size) return (p - ref); } -static DWORD finish_query( async_query *aq, LPARAM lparam ) +static DWORD finish_query( struct async_query_header *query, LPARAM lparam ) { - PostMessageW( HWND_32(aq->hWnd), aq->uMsg, (WPARAM)aq->async_handle, lparam ); - HeapFree( GetProcessHeap(), 0, aq ); + PostMessageW( query->hWnd, query->uMsg, (WPARAM)query->handle, lparam ); + HeapFree( GetProcessHeap(), 0, query ); return 0; } @@ -274,7 +277,7 @@ static DWORD WINAPI async_gethostbyname(LPVOID arg) int size = 0; WORD fail = 0; struct hostent *he; - char *copy_hostent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_hostent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; int ebufsize=1024; @@ -298,13 +301,13 @@ static DWORD WINAPI async_gethostbyname(LPVOID arg) ebufsize *=2; extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; } - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); HeapFree(GetProcessHeap(),0,extrabuf); #else EnterCriticalSection( &csWSgetXXXbyYYY ); he = gethostbyname(aq->host_name); - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif @@ -314,7 +317,7 @@ static DWORD WINAPI async_gethostbyname(LPVOID arg) } done: - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } static DWORD WINAPI async_gethostbyaddr(LPVOID arg) @@ -323,7 +326,7 @@ static DWORD WINAPI async_gethostbyaddr(LPVOID arg) int size = 0; WORD fail = 0; struct hostent *he; - char *copy_hostent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_hostent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 char *extrabuf; int ebufsize=1024; @@ -338,13 +341,13 @@ static DWORD WINAPI async_gethostbyaddr(LPVOID arg) ebufsize *=2; extrabuf=HeapReAlloc(GetProcessHeap(),0,extrabuf,ebufsize) ; } - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((locerr < 0) ? wsaErrno() : wsaHerrno(locerr)); HeapFree(GetProcessHeap(),0,extrabuf); #else EnterCriticalSection( &csWSgetXXXbyYYY ); he = gethostbyaddr(aq->host_addr,aq->host_len,aq->host_type); - if (he) size = WS_copy_he(copy_hostent,(char*)aq->sbuf,aq->sbuflen,he,aq->flags); + if (he) size = WS_copy_he(copy_hostent, aq->query.sbuf, aq->query.sbuflen, he, aq->query.flags); else fail = ((h_errno < 0) ? wsaErrno() : wsaHerrno(h_errno)); LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif @@ -352,7 +355,7 @@ static DWORD WINAPI async_gethostbyaddr(LPVOID arg) fail = WSAENOBUFS; size = -size; } - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } /* ----- protoent */ @@ -414,11 +417,11 @@ static DWORD WINAPI async_getprotobyname(LPVOID arg) #ifdef HAVE_GETPROTOBYNAME struct protoent *pe; - char *copy_protoent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_protoent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); pe = getprotobyname(aq->proto_name); if (pe) { - size = WS_copy_pe(copy_protoent,(char*)aq->sbuf,aq->sbuflen,pe,aq->flags); + size = WS_copy_pe(copy_protoent, aq->query.sbuf, aq->query.sbuflen, pe, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -432,7 +435,7 @@ static DWORD WINAPI async_getprotobyname(LPVOID arg) #else fail = WSANO_DATA; #endif - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } static DWORD WINAPI async_getprotobynumber(LPVOID arg) @@ -443,11 +446,11 @@ static DWORD WINAPI async_getprotobynumber(LPVOID arg) #ifdef HAVE_GETPROTOBYNUMBER struct protoent *pe; - char *copy_protoent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_protoent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); pe = getprotobynumber(aq->proto_number); if (pe) { - size = WS_copy_pe(copy_protoent,(char*)aq->sbuf,aq->sbuflen,pe,aq->flags); + size = WS_copy_pe(copy_protoent, aq->query.sbuf, aq->query.sbuflen, pe, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -461,7 +464,7 @@ static DWORD WINAPI async_getprotobynumber(LPVOID arg) #else fail = WSANO_DATA; #endif - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } /* ----- servent */ @@ -527,12 +530,12 @@ static DWORD WINAPI async_getservbyname(LPVOID arg) int size = 0; WORD fail = 0; struct servent *se; - char *copy_servent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_servent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); se = getservbyname(aq->serv_name,aq->serv_proto); if (se) { - size = WS_copy_se(copy_servent,(char*)aq->sbuf,aq->sbuflen,se,aq->flags); + size = WS_copy_se(copy_servent, aq->query.sbuf, aq->query.sbuflen, se, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -544,7 +547,7 @@ static DWORD WINAPI async_getservbyname(LPVOID arg) fail = WSANO_DATA; } LeaveCriticalSection( &csWSgetXXXbyYYY ); - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } static DWORD WINAPI async_getservbyport(LPVOID arg) @@ -553,13 +556,13 @@ static DWORD WINAPI async_getservbyport(LPVOID arg) int size = 0; WORD fail = 0; struct servent *se; - char *copy_servent = HB_WIN32(aq) ? (char*)aq->sbuf : (char*)MapSL(aq->sbuf); + char *copy_servent = HB_WIN32(aq) ? aq->query.sbuf : MapSL((SEGPTR)aq->query.sbuf); EnterCriticalSection( &csWSgetXXXbyYYY ); #ifdef HAVE_GETSERVBYPORT se = getservbyport(aq->serv_port,aq->serv_proto); if (se) { - size = WS_copy_se(copy_servent,(char*)aq->sbuf,aq->sbuflen,se,aq->flags); + size = WS_copy_se(copy_servent, aq->query.sbuf, aq->query.sbuflen, se, aq->query.flags); if (size < 0) { fail = WSAENOBUFS; size = -size; @@ -574,7 +577,7 @@ static DWORD WINAPI async_getservbyport(LPVOID arg) fail = WSANO_DATA; #endif LeaveCriticalSection( &csWSgetXXXbyYYY ); - return finish_query( aq, MAKELPARAM( size, fail )); + return finish_query( &aq->query, MAKELPARAM( size, fail )); } @@ -630,17 +633,17 @@ static HANDLE16 __WSAsyncDBQuery( HWND hWnd, UINT uMsg, LPTHREAD_START_ROUTINE f case AQ_DUPLOWPTR2: pfm = ptr2; ptr2 = pto; do *pto++ = tolower(*pfm); while (*pfm++); break; } - aq->hWnd = HWND_16(hWnd); - aq->uMsg = uMsg; + aq->query.hWnd = hWnd; + aq->query.uMsg = uMsg; aq->int1 = int1; aq->ptr1 = ptr1; aq->int2 = int2; aq->ptr2 = ptr2; /* avoid async_handle = 0 */ - aq->async_handle = (++__ws_async_handle ? __ws_async_handle : ++__ws_async_handle); - aq->flags = flags; - aq->sbuf = (SEGPTR)sbuf; - aq->sbuflen = sbuflen; + aq->query.handle = UlongToHandle(++__ws_async_handle ? __ws_async_handle : ++__ws_async_handle); + aq->query.flags = flags; + aq->query.sbuf = sbuf; + aq->query.sbuflen = sbuflen; thread = CreateThread( NULL, 0, func, aq, 0, NULL ); if (!thread)

1 0

Alexandre Julliard : ws2_32: Split the async function callback by type of query.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 9c2abfc503126c629f9b75c7f39e4477a4d78d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2abfc503126c629f9b75c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 18:22:52 2009 +0200 ws2_32: Split the async function callback by type of query. --- dlls/ws2_32/async.c | 481 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 281 insertions(+), 200 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c2abfc503126c629f9b7…

1 0

Alexandre Julliard : ws2_32: Use the standard winsock functions to implement the async versions.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 3b6b1c87fef8e31ab945454e4924a386c8d20ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6b1c87fef8e31ab945454e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 19:32:27 2009 +0200 ws2_32: Use the standard winsock functions to implement the async versions. --- dlls/ws2_32/async.c | 240 ++++++++++---------------------------------------- 1 files changed, 48 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b6b1c87fef8e31ab9454…

1 0

Alexandre Julliard : ws2_32: Define a specific structure for each query type.
by Alexandre Julliard Sept. 30, 2009

Sept. 30, 2009

Module: wine Branch: master Commit: 8dcb6f3f3c338748dfaec6368ed04c08f00985db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcb6f3f3c338748dfaec6368… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 29 19:30:05 2009 +0200 ws2_32: Define a specific structure for each query type. --- dlls/ws2_32/async.c | 398 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 239 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8dcb6f3f3c338748dfaec…

1 0