July 2007 - Wine-commits - list.winehq.org

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

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

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

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

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

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

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

Alexandre Julliard : server: Merge APC processing into the select request.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: fec5117e9144f7c8b6204f447ddedd6de9735093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec5117e9144f7c8b6204f447… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 16:14:45 2007 +0200 server: Merge APC processing into the select request. This is needed to return the correct value when one of the handles being waited on is set to signaled state by the APC. --- dlls/kernel32/tests/pipe.c | 5 +-- dlls/ntdll/sync.c | 69 +++++++++--------------- include/wine/server_protocol.h | 25 ++------- server/protocol.def | 15 ++---- server/request.h | 2 - server/thread.c | 114 +++++++++++++++++++++------------------- server/trace.c | 38 +++++++------ 7 files changed, 115 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fec5117e9144f7c8b6204…

1 0

Alexandre Julliard : kernel32: Always clear the I/ O status block count before calling ntdll functions.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: cd33692fa176bfa5e64cd91d229f547949bdb21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd33692fa176bfa5e64cd91d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 16:20:29 2007 +0200 kernel32: Always clear the I/O status block count before calling ntdll functions. --- dlls/kernel32/file.c | 2 ++ dlls/kernel32/sync.c | 3 +++ dlls/kernel32/vxd.c | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 1472893..90280ad 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -376,6 +376,7 @@ BOOL WINAPI ReadFileEx(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, offset.u.HighPart = overlapped->u.s.OffsetHigh; io_status = (PIO_STATUS_BLOCK)overlapped; io_status->u.Status = STATUS_PENDING; + io_status->Information = 0; status = NtReadFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToRead, &offset, NULL); @@ -465,6 +466,7 @@ BOOL WINAPI WriteFileEx(HANDLE hFile, LPCVOID buffer, DWORD bytesToWrite, io_status = (PIO_STATUS_BLOCK)overlapped; io_status->u.Status = STATUS_PENDING; + io_status->Information = 0; status = NtWriteFile(hFile, NULL, FILE_ReadWriteApc, lpCompletionRoutine, io_status, buffer, bytesToWrite, &offset, NULL); diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 7b67948..d53ab38 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1332,7 +1332,10 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped) TRACE("(%p,%p)\n", hPipe, overlapped); if(overlapped) + { overlapped->Internal = STATUS_PENDING; + overlapped->InternalHigh = 0; + } status = NtFsControlFile(hPipe, overlapped ? overlapped->hEvent : NULL, NULL, NULL, overlapped ? (IO_STATUS_BLOCK *)overlapped : &status_block, diff --git a/dlls/kernel32/vxd.c b/dlls/kernel32/vxd.c index 106b086..0a4e771 100644 --- a/dlls/kernel32/vxd.c +++ b/dlls/kernel32/vxd.c @@ -351,6 +351,8 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, if (lpOverlapped) { + lpOverlapped->Internal = STATUS_PENDING; + lpOverlapped->InternalHigh = 0; if (HIWORD(dwIoControlCode) == FILE_DEVICE_FILE_SYSTEM) status = NtFsControlFile(hDevice, lpOverlapped->hEvent, NULL, NULL, (PIO_STATUS_BLOCK)lpOverlapped,

1 0

Vitaliy Margolen : pdh: Forward PdhOpenQuery to PdhOpenQueryW.
by Alexandre Julliard 16 Jul '07

16 Jul '07

Module: wine Branch: master Commit: 0b33ef26851c643a52a291a709a6471a9038807e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b33ef26851c643a52a291a70… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon Jul 16 07:28:36 2007 -0600 pdh: Forward PdhOpenQuery to PdhOpenQueryW. --- dlls/pdh/pdh.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 2f575f8..28386ae 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -80,7 +80,7 @@ @ stub PdhMakeCounterPathW @ stub PdhOpenLogA @ stub PdhOpenLogW -@ stub PdhOpenQuery +@ stdcall PdhOpenQuery(wstr long ptr) PdhOpenQueryW @ stdcall PdhOpenQueryA(str long ptr) @ stub PdhOpenQueryH @ stdcall PdhOpenQueryW(wstr long ptr)

1 0