January 2006 - Wine-Commits

Robert Shearman : rpcrt4: Implement callback conformance.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 03060551d6c720919656ab1aa8c80f784fc65f91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03060551d6c720919656ab1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 3 12:07:17 2006 +0100 rpcrt4: Implement callback conformance. --- dlls/rpcrt4/ndr_marshall.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index adf330f..af90ff3 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -375,9 +375,17 @@ PFORMAT_STRING ComputeConformanceOrVaria ptr = *(LPVOID*)ptr; break; case RPC_FC_CALLBACK: + { + unsigned char *old_stack_top = pStubMsg->StackTop; + pStubMsg->StackTop = ptr; + /* ofs is index into StubDesc->apfnExprEval */ - FIXME("handle callback\n"); + TRACE("callback conformance into apfnExprEval[%d]\n", ofs); + pStubMsg->StubDesc->apfnExprEval[ofs](pStubMsg); + + pStubMsg->StackTop = old_stack_top; goto finish_conf; + } default: break; }

1 0

Robert Shearman : rpcrt4: Fix race condition in RpcServerListen.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 196829663aeea7c67cd9d7c7d9a39ee428acc8a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=196829663aeea7c67cd9d7c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 3 12:07:04 2006 +0100 rpcrt4: Fix race condition in RpcServerListen. The DontWait parameter is used for forcing the function not to wait for the server to finish. --- dlls/rpcrt4/rpc_server.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 0408bca..87171f5 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -977,6 +977,9 @@ RPC_STATUS WINAPI RpcServerListen( UINT status = RPCRT4_start_listen(FALSE); + if (status == RPC_S_OK) + RPCRT4_sync_with_server_thread(); + if (DontWait || (status != RPC_S_OK)) return status; return RpcMgmtWaitServerListen(); @@ -998,8 +1001,6 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListe LeaveCriticalSection(&listen_cs); - RPCRT4_sync_with_server_thread(); - return RPC_S_OK; }

1 0

Thomas Weidenmueller : comctrl32: ReAlloc should be able to move memory blocks if necessary.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: e1fd79bb8947258b335113aca8a36e2589a036f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1fd79bb8947258b335113a… Author: Thomas Weidenmueller <wine-patches(a)reactsoft.com> Date: Tue Jan 3 12:06:40 2006 +0100 comctrl32: ReAlloc should be able to move memory blocks if necessary. --- dlls/comctl32/comctl32undoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl32undoc.c b/dlls/comctl32/comctl32undoc.c index 2bd0a14..aa79f88 100644 --- a/dlls/comctl32/comctl32undoc.c +++ b/dlls/comctl32/comctl32undoc.c @@ -96,7 +96,7 @@ LPVOID WINAPI Alloc (DWORD dwSize) LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize) { if (lpSrc) - return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT ); + return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT | LMEM_MOVEABLE ); else return LocalAlloc( LMEM_ZEROINIT, dwSize); }

1 0

Kai Blin : secur32: Rewrote NTLM tests in a more flexible way.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 49943c9cf4879abf5eace716623b6e860f6f353e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=49943c9cf4879abf5eace71… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Jan 3 12:06:21 2006 +0100 secur32: Rewrote NTLM tests in a more flexible way. --- dlls/secur32/tests/main.c | 548 ++++++++++++++++++++++++++++++++------------- 1 files changed, 387 insertions(+), 161 deletions(-)

1 0

Vitaliy Margolen : server: Fix va_list compile error.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 4fabe112d76b309064f4ceab8bd42c240fabbd8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fabe112d76b309064f4cea… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Jan 3 12:06:03 2006 +0100 server: Fix va_list compile error. --- server/snapshot.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/snapshot.c b/server/snapshot.c index 0ef5370..ccbbe72 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -26,6 +26,7 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Vitaliy Margolen : gdi: Device name returned from EnumDisplayDevices is valid for CreateDC.
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: 9561d6e29cf781c9395aa58d1315ff1f1c9f6388 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9561d6e29cf781c9395aa58… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Jan 3 12:05:54 2006 +0100 gdi: Device name returned from EnumDisplayDevices is valid for CreateDC. --- dlls/gdi/driver.c | 4 +++- dlls/user/tests/monitor.c | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/driver.c b/dlls/gdi/driver.c index 29c1f47..c9ac552 100644 --- a/dlls/gdi/driver.c +++ b/dlls/gdi/driver.c @@ -263,11 +263,13 @@ const DC_FUNCTIONS *DRIVER_load_driver( HMODULE module; struct graphics_driver *driver; static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 }; + static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; EnterCriticalSection( &driver_section ); /* display driver is a special case */ - if (!strcmpiW( name, displayW )) + if (!strcmpiW( name, displayW ) || + !strcmpiW( name, display1W )) { driver = load_display_driver(); LeaveCriticalSection( &driver_section ); diff --git a/dlls/user/tests/monitor.c b/dlls/user/tests/monitor.c index 3fdd5c7..f98ba0b 100644 --- a/dlls/user/tests/monitor.c +++ b/dlls/user/tests/monitor.c @@ -67,6 +67,7 @@ static void test_enumdisplaydevices(void while(1) { BOOL ret; + HDC dc; ret = pEnumDisplayDevicesA(NULL, num, &dd, 0); ok(ret || num != 0, "EnumDisplayDevices fails with num == 0\n"); if(!ret) break; @@ -75,6 +76,13 @@ static void test_enumdisplaydevices(void strcpy(primary_device_name, dd.DeviceName); primary_num = num; } + if(dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) + { + /* test creating DC */ + dc = CreateDCA(dd.DeviceName, NULL, NULL, NULL); + ok(dc != NULL, "Failed to CreateDC(\"%s\") err=%ld\n", dd.DeviceName, GetLastError()); + DeleteDC(dc); + } num++; } ok(primary_num != -1, "Didn't get the primary device\n");

1 0

Vitaliy Margolen : advapi32: Don't allocate memory for empty argument string and pass
by Alexandre Julliard Jan. 3, 2006

Jan. 3, 2006

Module: wine Branch: refs/heads/master Commit: e74bda9d958fdf416c0453cf9b363e96aef6a02a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e74bda9d958fdf416c0453c… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Jan 3 12:05:32 2006 +0100 advapi32: Don't allocate memory for empty argument string and pass NULL instead. --- dlls/advapi32/service.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index cc6a36c..60d0f8d 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -359,6 +359,15 @@ static DWORD WINAPI service_thread(LPVOI len += strlenW(&str[len]) + 1; argc++; } + + if (!argc) + { + if (info->unicode) + info->proc.w(0, NULL); + else + info->proc.a(0, NULL); + return 0; + } if (info->unicode) {

1 0