wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Vitaliy Margolen : dinput: Use CALLWINDPROC hook to monitor focus loses away from acquired windows.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 41ce4a01583d552a976cb921d2991a043e0363e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ce4a01583d552a976cb921d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jul 15 10:40:00 2007 -0600 dinput: Use CALLWINDPROC hook to monitor focus loses away from acquired windows. --- dlls/dinput/dinput_main.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/tests/mouse.c | 1 - 2 files changed, 58 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 5052829..4f15c58 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -848,6 +848,41 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) return CallNextHookEx( 0, code, wparam, lparam ); } +static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam ) +{ + CWPSTRUCT *msg = (CWPSTRUCT *)lparam; + IDirectInputImpl *dinput; + HWND foreground; + + if (code != HC_ACTION || msg->message != WM_KILLFOCUS) + return CallNextHookEx( 0, code, wparam, lparam ); + + foreground = GetForegroundWindow(); + + EnterCriticalSection( &dinput_hook_crit ); + + LIST_FOR_EACH_ENTRY( dinput, &direct_input_list, IDirectInputImpl, entry ) + { + IDirectInputDevice2AImpl *dev; + + EnterCriticalSection( &dinput->crit ); + LIST_FOR_EACH_ENTRY( dev, &dinput->devices_list, IDirectInputDevice2AImpl, entry ) + { + if (!dev->acquired) continue; + + if (msg->hwnd == dev->win && msg->hwnd != foreground) + { + TRACE( "%p window is not foreground - unacquiring %p\n", dev->win, dev ); + IDirectInputDevice_Unacquire( (LPDIRECTINPUTDEVICE8A)dev ); + } + } + LeaveCriticalSection( &dinput->crit ); + } + LeaveCriticalSection( &dinput_hook_crit ); + + return CallNextHookEx( 0, code, wparam, lparam ); +} + static DWORD WINAPI hook_thread_proc(void *param) { static HHOOK kbd_hook, mouse_hook; @@ -976,7 +1011,30 @@ static BOOL check_hook_thread(void) void check_dinput_hooks(LPDIRECTINPUTDEVICE8A iface) { + static HHOOK callwndproc_hook; + static ULONG foreground_cnt; + IDirectInputDevice2AImpl *dev = (IDirectInputDevice2AImpl *)iface; + EnterCriticalSection(&dinput_hook_crit); + + if (dev->dwCoopLevel & DISCL_FOREGROUND) + { + if (dev->acquired) + foreground_cnt++; + else + foreground_cnt--; + } + + if (foreground_cnt && !callwndproc_hook) + callwndproc_hook = SetWindowsHookExW( WH_CALLWNDPROC, callwndproc_proc, + DINPUT_instance, GetCurrentThreadId() ); + else if (!foreground_cnt && callwndproc_hook) + { + UnhookWindowsHookEx( callwndproc_hook ); + callwndproc_hook = NULL; + } + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); + LeaveCriticalSection(&dinput_hook_crit); } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 0f9c88b..3ea2147 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -95,7 +95,6 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) SetActiveWindow( 0 ); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); - todo_wine ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %s\n", DXGetErrorString8(hr)); /* Workaround so we can test other things. Remove when Wine is fixed */ IDirectInputDevice_Unacquire(pMouse);

1 0

Vitaliy Margolen : dinput: Use PostMessage instead of SendMessage. Remove message window.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 233cd46a22d9c53e8a7a7306a88756cb78ada47a URL: http://source.winehq.org/git/wine.git/?a=commit;h=233cd46a22d9c53e8a7a7306a… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jul 15 10:38:05 2007 -0600 dinput: Use PostMessage instead of SendMessage. Remove message window. --- dlls/dinput/dinput_main.c | 99 ++++++++++++++++----------------------------- 1 files changed, 35 insertions(+), 64 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index dfa9dbe..5052829 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -848,22 +848,31 @@ static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) return CallNextHookEx( 0, code, wparam, lparam ); } -static LRESULT CALLBACK dinput_hook_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) +static DWORD WINAPI hook_thread_proc(void *param) { static HHOOK kbd_hook, mouse_hook; - UINT kbd_cnt = 0, mice_cnt = 0; + MSG msg; + + /* Force creation of the message queue */ + PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); + SetEvent(*(LPHANDLE)param); - TRACE("got message %x %p %p\n", message, (LPVOID)wParam, (LPVOID)lParam); - switch (message) + while (GetMessageW( &msg, 0, 0, 0 )) { - case WM_USER+0x10: + UINT kbd_cnt = 0, mice_cnt = 0; + + if (msg.message == WM_USER+0x10) { IDirectInputImpl *dinput; - if (!wParam && !lParam) + TRACE( "Processing hook change notification lp:%ld\n", msg.lParam ); + + if (!msg.wParam && !msg.lParam) { - DestroyWindow( hWnd ); - return 0; + if (kbd_hook) UnhookWindowsHookEx( kbd_hook ); + if (mouse_hook) UnhookWindowsHookEx( mouse_hook ); + kbd_hook = mouse_hook = NULL; + break; } EnterCriticalSection( &dinput_hook_crit ); @@ -906,46 +915,15 @@ static LRESULT CALLBACK dinput_hook_WndProc(HWND hWnd, UINT message, WPARAM wPar mouse_hook = NULL; } } - return 0; - - case WM_DESTROY: - if (kbd_hook) UnhookWindowsHookEx(kbd_hook); - if (mouse_hook) UnhookWindowsHookEx(mouse_hook); - kbd_hook = mouse_hook = NULL; - PostQuitMessage(0); + TranslateMessage(&msg); + DispatchMessageW(&msg); } - return DefWindowProcW(hWnd, message, wParam, lParam); -} - -static HWND hook_thread_hwnd; -static HANDLE hook_thread; - -static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0}; - -static DWORD WINAPI hook_thread_proc(void *param) -{ - MSG msg; - HWND hwnd; - - hwnd = CreateWindowExW(0, classW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, 0); - hook_thread_hwnd = hwnd; - SetEvent(*(LPHANDLE)param); - if (hwnd) - { - while (GetMessageW(&msg, 0, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - DestroyWindow(hwnd); - } - else ERR("Error creating message window\n"); - - UnregisterClassW(classW, DINPUT_instance); return 0; } +static DWORD hook_thread_id; + static CRITICAL_SECTION_DEBUG dinput_critsect_debug = { 0, 0, &dinput_hook_crit, @@ -956,26 +934,17 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL check_hook_thread(void) { + static HANDLE hook_thread; + EnterCriticalSection(&dinput_hook_crit); TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { - DWORD tid; HANDLE event; - /* Create window class */ - WNDCLASSEXW wcex; - memset(&wcex, 0, sizeof(wcex)); - wcex.cbSize = sizeof(wcex); - wcex.lpfnWndProc = dinput_hook_WndProc; - wcex.lpszClassName = classW; - wcex.hInstance = DINPUT_instance; - if (!RegisterClassExW(&wcex)) - ERR("Error registering window class\n"); - event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &tid); + hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &hook_thread_id); if (event && hook_thread) { HANDLE handles[2]; @@ -983,29 +952,31 @@ static BOOL check_hook_thread(void) handles[1] = hook_thread; WaitForMultipleObjects(2, handles, FALSE, INFINITE); } + LeaveCriticalSection(&dinput_hook_crit); CloseHandle(event); } else if (list_empty(&direct_input_list) && hook_thread) { - HWND hwnd = hook_thread_hwnd; - hook_thread_hwnd = 0; - SendMessageW(hwnd, WM_USER+0x10, 0, 0); + DWORD tid = hook_thread_id; + + hook_thread_id = 0; + PostThreadMessageW(tid, WM_USER+0x10, 0, 0); + LeaveCriticalSection(&dinput_hook_crit); + /* wait for hook thread to exit */ WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); hook_thread = NULL; } - LeaveCriticalSection(&dinput_hook_crit); + else + LeaveCriticalSection(&dinput_hook_crit); - return hook_thread_hwnd != 0; + return hook_thread_id != 0; } void check_dinput_hooks(LPDIRECTINPUTDEVICE8A iface) { - HWND hwnd; - EnterCriticalSection(&dinput_hook_crit); - hwnd = hook_thread_hwnd; + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); LeaveCriticalSection(&dinput_hook_crit); - SendMessageW(hwnd, WM_USER+0x10, 1, 0); }

1 0

Tim Schwartz : netapi32: Add NetUseAdd() stub.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 894343268c3ea9fc62f6058c37b0af193b94cc25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894343268c3ea9fc62f6058c3… Author: Tim Schwartz <tim(a)sanityinternet.com> Date: Mon Jul 16 09:04:07 2007 -0500 netapi32: Add NetUseAdd() stub. --- dlls/netapi32/access.c | 6 ++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index fb630fc..d7a2eaa 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -832,3 +832,9 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username return NERR_Success; } + +NET_API_STATUS NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) +{ + FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); + return NERR_Success; +} diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index b0d6ebf..e546151 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -197,7 +197,7 @@ @ stub NetShareGetInfo @ stub NetShareSetInfo @ stdcall NetStatisticsGet(wstr wstr long long ptr) -@ stub NetUseAdd +@ stdcall NetUseAdd(wstr long ptr ptr) @ stub NetUseDel @ stub NetUseEnum @ stub NetUseGetInfo

1 0

Kirill K. Smirnov : programs/start: use SEE_MASK_NO_CONSOLE flag as default .
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 72d5e7cd36af48418436deca83e308d55b0ae3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d5e7cd36af48418436deca8… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Jul 16 19:19:06 2007 +0400 programs/start: use SEE_MASK_NO_CONSOLE flag as default. Allows to start console applications in a new window (as Windows does). --- programs/start/start.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index b3a8f1c..773544f 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -136,7 +136,9 @@ int main(int argc, char *argv[]) sei.lpVerb = "open"; sei.nShow = SW_SHOWNORMAL; /* Dunno what these mean, but it looks like winMe's start uses them */ - sei.fMask = SEE_MASK_FLAG_DDEWAIT|SEE_MASK_FLAG_NO_UI; + sei.fMask = SEE_MASK_FLAG_DDEWAIT| + SEE_MASK_FLAG_NO_UI| + SEE_MASK_NO_CONSOLE; /* Canonical Microsoft commandline flag processing: * flags start with /, are case insensitive,

1 0

Kirill K. Smirnov : shell32: Add support for SEE_MASK_NO_CONSOLE flag.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 728bfd6d58472c86dd45a8627da016d2452e27f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=728bfd6d58472c86dd45a8627… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Jul 16 19:14:07 2007 +0400 shell32: Add support for SEE_MASK_NO_CONSOLE flag. --- dlls/shell32/shlexec.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 45f7621..3e2f623 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -305,6 +305,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, UINT_PTR retval = SE_ERR_NOASSOC; UINT gcdret = 0; WCHAR curdir[MAX_PATH]; + DWORD dwCreationFlags; TRACE("Execute %s from directory %s\n", debugstr_w(lpCmd), debugstr_w(psei->lpDirectory)); /* ShellExecute specifies the command from psei->lpDirectory @@ -317,7 +318,10 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = psei->nShow; - if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, + dwCreationFlags = CREATE_UNICODE_ENVIRONMENT; + if (psei->fMask & SEE_MASK_NO_CONSOLE) + dwCreationFlags |= CREATE_NEW_CONSOLE; + if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, psei->lpDirectory && *psei->lpDirectory ? psei->lpDirectory : NULL, &startup, &info)) { @@ -1289,8 +1293,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) static const DWORD unsupportedFlags = SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY | SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI | - SEE_MASK_UNICODE | SEE_MASK_NO_CONSOLE | SEE_MASK_ASYNCOK | - SEE_MASK_HMONITOR; + SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; WCHAR *wszApplicationName, wszParameters[1024], wszDir[MAX_PATH]; DWORD dwApplicationNameLen = MAX_PATH+2;

1 0

Michael Stefaniuc : shell32: Fix missing unlock on an error path. Found by Smatch.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: b6ce3de8e7d93ad847310764c3636dd4ae676a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ce3de8e7d93ad847310764c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 16 22:10:02 2007 +0200 shell32: Fix missing unlock on an error path. Found by Smatch. --- dlls/shell32/shlfolder.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index e198ba9..cbbd12f 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -248,7 +248,11 @@ static void add_iface_to_cache(REFCLSID clsid, LPVOID pv) sf_cls_cache_entry = HeapReAlloc(GetProcessHeap(), 0, sf_cls_cache.sf_cls_cache_entry, allocated * sizeof(*sf_cls_cache_entry)); } - if (!sf_cls_cache_entry) return; + if (!sf_cls_cache_entry) + { + LeaveCriticalSection(&SHELL32_SF_ClassCacheCS); + return; + } sf_cls_cache.allocated = allocated; sf_cls_cache.sf_cls_cache_entry = sf_cls_cache_entry;

1 0

Paul Vriens : advapi32/service: Check combination of service-type and start-type.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 6c63fa627e55b3d39c743013021bebb753e89908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c63fa627e55b3d39c7430130… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Jul 15 12:14:55 2007 +0200 advapi32/service: Check combination of service-type and start-type. --- dlls/advapi32/service.c | 8 ++++++++ dlls/advapi32/tests/service.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 93f96a8..3fbd242 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1377,6 +1377,14 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + /* SERVICE_BOOT_START and SERVICE_SYSTEM_START or only allowed for driver services */ + if (((dwStartType == SERVICE_BOOT_START) || (dwStartType == SERVICE_SYSTEM_START)) && + ((dwServiceType & SERVICE_WIN32_OWN_PROCESS) || (dwServiceType & SERVICE_WIN32_SHARE_PROCESS))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + r = RegCreateKeyExW(hscm->hkey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dp); if (r!=ERROR_SUCCESS) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index dc5087a..9157dea 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -142,7 +142,7 @@ static void test_create_delete_svc(void) static const CHAR servicename [] = "Winetest"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; - static const CHAR spooler [] = "Spooler"; + static const CHAR spooler [] = "Spooler"; /* Should be available on all platforms */ static const CHAR password [] = "secret"; /* Get the username and turn it into an account to be used in some tests */ @@ -267,9 +267,11 @@ static void test_create_delete_svc(void) ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* TODO: Add check for illegal combination of service-type and start-type */ - - /* TODO: Add check for displayname, it must be unique (or NULL/empty) */ + /* Illegal (SERVICE_BOOT_START and SERVICE_SYSTEM_START or only allowed for driver services) */ + SetLastError(0xdeadbeef); + svc_handle1 = CreateServiceA(scm_handle, servicename, NULL, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_BOOT_START, 0, pathname, NULL, NULL, NULL, NULL, NULL); + ok(!svc_handle1, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* The service already exists (check first, just in case) */ svc_handle1 = OpenServiceA(scm_handle, spooler, GENERIC_READ); @@ -284,6 +286,8 @@ static void test_create_delete_svc(void) else skip("Spooler service doesn't exist\n"); + /* TODO: Add check for displayname, it must be unique (or NULL/empty) */ + CloseServiceHandle(scm_handle); }

1 0

Rob Shearman : rpcrt4: Never allocate memory for the discriminant in union_arm_unmarshall as the memory is part of the union and has already been allocated .
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 27030599337d3617a1bd14662b6ea6d6ff2e6979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27030599337d3617a1bd14662… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jul 16 15:03:15 2007 +0100 rpcrt4: Never allocate memory for the discriminant in union_arm_unmarshall as the memory is part of the union and has already been allocated. --- dlls/rpcrt4/ndr_marshall.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index dd5a991..26a55b1 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -4556,7 +4556,7 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg, if((type & 0xff00) == 0x8000) { unsigned char basetype = LOBYTE(type); - return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, fMustAlloc); + return NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &basetype, FALSE); } else {

1 0

Rob Shearman : rpcrt4: Check to make sure there is enough data in the buffer during unmarshalling , so that the code doesn't try to read beyound the end of the buffer.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: b44c16cc8d7ffaf4da9767ab562c5be1f45a0dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=b44c16cc8d7ffaf4da9767ab5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jul 16 15:02:38 2007 +0100 rpcrt4: Check to make sure there is enough data in the buffer during unmarshalling, so that the code doesn't try to read beyound the end of the buffer. --- dlls/rpcrt4/ndr_marshall.c | 102 +++++++++++++++++++++++++++++--------------- 1 files changed, 67 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b44c16cc8d7ffaf4da976…

1 0

Rob Shearman : rpcrt4: Even though FC_ENUM16 is an unsigned type, the highest allowable value that can be marshalled is SHRT_MAX, not USHRT_MAX.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 686c0f094cdec400c41f6337748a73d40d0924dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=686c0f094cdec400c41f63377… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Jul 16 15:00:59 2007 +0100 rpcrt4: Even though FC_ENUM16 is an unsigned type, the highest allowable value that can be marshalled is SHRT_MAX, not USHRT_MAX. --- dlls/rpcrt4/ndr_marshall.c | 2 +- dlls/rpcrt4/tests/ndr_marshall.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d8395b8..7ff77e9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -5354,7 +5354,7 @@ static unsigned char *WINAPI NdrBaseTypeMarshall( break; case RPC_FC_ENUM16: /* only 16-bits on the wire, so do a sanity check */ - if (*(UINT *)pMemory > USHRT_MAX) + if (*(UINT *)pMemory > SHRT_MAX) RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); *(USHORT *)pStubMsg->Buffer = *(UINT *)pMemory; diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ec12983..f64c766 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -418,8 +418,9 @@ static void test_simple_types(void) test_pointer_marshal(fmtstr_up_short, &s, 2, wiredata, 6, NULL, 0, "up_short"); test_pointer_marshal(fmtstr_up_ushort, &s, 2, wiredata, 6, NULL, 0, "up_ushort"); - i = s; + i = 0x7fff; *(void**)wiredata = &i; + *(unsigned short*)(wiredata + sizeof(void*)) = i; test_pointer_marshal(fmtstr_up_enum16, &i, 2, wiredata, 6, NULL, 0, "up_enum16"); l = 0xcafebabe;

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2007