August 2016 - Wine-Commits - list.winehq.org

Tag wine-1.9.17 : Alexandre Julliard : Release 1.9.17
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: refs/tags/wine-1.9.17 Tag: 2aa81c7ad0bc6078c0ab753b546aa5d1d890f9e6 URL: http://source.winehq.org/git/wine.git/?a=tag;h=2aa81c7ad0bc6078c0ab753b546a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 22:17:09 2016 +0900 Release 1.9.17

1 0

Daniel Lehman : kernel32: Add GetNumberFormatEx.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: e9e538abff06116165a12851f49dce0dbb2cdc72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e538abff06116165a12851f… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 15 10:54:20 2016 -0700 kernel32: Add GetNumberFormatEx. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 19 +++++ dlls/kernel32/tests/locale.c | 185 ++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 206 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e538abff06116165a12…

1 0

Austin English : wlanapi: Add WlanCloseHandle() stub.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: 4227eb417dd0fabb7a1d6000a49a234b05e37be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4227eb417dd0fabb7a1d6000a… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 19 02:14:19 2016 -0500 wlanapi: Add WlanCloseHandle() stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 6 ++++++ dlls/wlanapi/wlanapi.spec | 2 +- include/wlanapi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 3674f79..c9fbae0 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -34,6 +34,12 @@ DWORD WINAPI WlanEnumInterfaces(HANDLE client, void *reserved, WLAN_INTERFACE_IN return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI WlanCloseHandle(HANDLE client_handle, VOID *reserved) +{ + FIXME("(%p, %p) stub\n", client_handle, reserved); + return ERROR_CALL_NOT_IMPLEMENTED; +} + DWORD WINAPI WlanOpenHandle(DWORD clientVersion, PVOID reserved, PDWORD negotiatedVersion, PHANDLE clientHandle) { diff --git a/dlls/wlanapi/wlanapi.spec b/dlls/wlanapi/wlanapi.spec index e55bf06..59454f4 100644 --- a/dlls/wlanapi/wlanapi.spec +++ b/dlls/wlanapi/wlanapi.spec @@ -1,5 +1,5 @@ @ stub WlanAllocateMemory -@ stub WlanCloseHandle +@ stdcall WlanCloseHandle(ptr ptr) @ stub WlanConnect @ stub WlanDeleteProfile @ stub WlanDisconnect diff --git a/include/wlanapi.h b/include/wlanapi.h index 63922be..73b4583 100644 --- a/include/wlanapi.h +++ b/include/wlanapi.h @@ -45,6 +45,7 @@ typedef struct _WLAN_INTERFACE_INFO_LIST WLAN_INTERFACE_INFO InterfaceInfo[1]; } WLAN_INTERFACE_INFO_LIST, *PWLAN_INTERFACE_INFO_LIST; +DWORD WINAPI WlanCloseHandle(HANDLE, void *); DWORD WINAPI WlanEnumInterfaces(HANDLE, void *, WLAN_INTERFACE_INFO_LIST **); DWORD WINAPI WlanOpenHandle(DWORD, void *, DWORD *, HANDLE *);

1 0

Sebastian Lackner : ntdll: Convert an ERR to a WARN when wait is triggered while destroying threadpool object.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: d085042ab95c62d98276893db16ce16508fc518a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d085042ab95c62d98276893db… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 19 01:03:31 2016 +0200 ntdll: Convert an ERR to a WARN when wait is triggered while destroying threadpool object. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 799245c..5d5b49d 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1432,7 +1432,7 @@ static void CALLBACK waitqueue_thread_proc( void *param ) tp_object_submit( wait, TRUE ); } else - ERR("wait object %p triggered while object was destroyed\n", wait); + WARN("wait object %p triggered while object was destroyed\n", wait); } /* Release temporary references to wait objects. */

1 0

Alexandre Julliard : user32/tests: Disable custom GDI clipboard formats tests on 64-bit.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: e3a8c3a8694f7bb5cbb57e58d231ca7fa452d71f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a8c3a8694f7bb5cbb57e58d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 19 16:06:03 2016 +0900 user32/tests: Disable custom GDI clipboard formats tests on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 60 ++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 4fac7c6..f51c162 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -28,6 +28,7 @@ static BOOL (WINAPI *pAddClipboardFormatListener)(HWND hwnd); static DWORD (WINAPI *pGetClipboardSequenceNumber)(void); +static const BOOL is_win64 = sizeof(void *) > sizeof(int); static int thread_from_line; static char *argv0; @@ -792,12 +793,16 @@ static void test_handles( HWND hwnd ) h = SetClipboardData( CF_PALETTE, palette ); ok( h == palette, "got %p\n", h ); ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); - ok( h == bitmap2, "got %p\n", h ); - ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); - ok( h == pen, "got %p\n", h ); - ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + /* setting custom GDI formats crashes on 64-bit Windows */ + if (!is_win64) + { + h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); + ok( h == bitmap2, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); + ok( h == pen, "got %p\n", h ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + } data = GetClipboardData( CF_TEXT ); ok( data == htext, "wrong data %p\n", data ); @@ -853,10 +858,13 @@ static void test_handles( HWND hwnd ) ok( data == bitmap, "expected bitmap %p\n", data ); data = GetClipboardData( CF_PALETTE ); ok( data == palette, "expected palette %p\n", data ); - data = GetClipboardData( CF_GDIOBJFIRST + 1 ); - ok( data == bitmap2, "expected bitmap2 %p\n", data ); - data = GetClipboardData( CF_GDIOBJFIRST + 2 ); - ok( data == pen, "expected pen %p\n", data ); + if (!is_win64) + { + data = GetClipboardData( CF_GDIOBJFIRST + 1 ); + ok( data == bitmap2, "expected bitmap2 %p\n", data ); + data = GetClipboardData( CF_GDIOBJFIRST + 2 ); + ok( data == pen, "expected pen %p\n", data ); + } data = GetClipboardData( CF_DIB ); ok( is_fixed( data ), "expected fixed mem %p\n", data ); data = GetClipboardData( CF_DIBV5 ); @@ -915,14 +923,17 @@ static DWORD WINAPI test_handles_thread2( void *arg ) ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); ok( h == palette, "different palette %p / %p\n", h, palette ); trace( "palette %p\n", h ); - h = GetClipboardData( CF_GDIOBJFIRST + 1 ); - ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - ok( h == bitmap2, "different bitmap %p / %p\n", h, bitmap2 ); - trace( "bitmap2 %p\n", h ); - h = GetClipboardData( CF_GDIOBJFIRST + 2 ); - ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); - ok( h == pen, "different pen %p / %p\n", h, pen ); - trace( "pen %p\n", h ); + if (!is_win64) + { + h = GetClipboardData( CF_GDIOBJFIRST + 1 ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + ok( h == bitmap2, "different bitmap %p / %p\n", h, bitmap2 ); + trace( "bitmap2 %p\n", h ); + h = GetClipboardData( CF_GDIOBJFIRST + 2 ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + ok( h == pen, "different pen %p / %p\n", h, pen ); + trace( "pen %p\n", h ); + } h = GetClipboardData( CF_DIB ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); h = GetClipboardData( CF_DIBV5 ); @@ -942,7 +953,7 @@ static void test_handles_process( const char *str ) r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); h = GetClipboardData( CF_TEXT ); - ok( is_fixed( h ), "expected fixed mem %p\n", h ); + todo_wine_if( !h ) ok( is_fixed( h ), "expected fixed mem %p\n", h ); ptr = GlobalLock( h ); if (ptr) todo_wine ok( !strcmp( str, ptr ), "wrong data '%.5s'\n", ptr ); GlobalUnlock( h ); @@ -1001,10 +1012,13 @@ static void test_data_handles(void) ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); h = SetClipboardData( CF_PALETTE, palette ); ok( GetObjectType( h ) == OBJ_PAL, "expected palette %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); - ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); - h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); - ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + if (!is_win64) + { + h = SetClipboardData( CF_GDIOBJFIRST + 1, bitmap2 ); + ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h ); + h = SetClipboardData( CF_GDIOBJFIRST + 2, pen ); + ok( GetObjectType( h ) == OBJ_PEN, "expected pen %p\n", h ); + } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() );

1 0

Bruno Jesus : dinput: Implement DIPROP_PRODUCTNAME in GetProperty.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: 44303b6625983534342fb44b06d558ba7d4934fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=44303b6625983534342fb44b0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 16:40:22 2016 -0300 dinput: Implement DIPROP_PRODUCTNAME in GetProperty. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick.c | 6 +++++- dlls/dinput/tests/joystick.c | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 46ea316..52ff925 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -583,6 +583,7 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF } break; } + case (DWORD_PTR) DIPROP_PRODUCTNAME: case (DWORD_PTR) DIPROP_INSTANCENAME: { DIPROPSTRING *ps = (DIPROPSTRING*) pdiph; DIDEVICEINSTANCEW didev; @@ -590,7 +591,10 @@ HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF didev.dwSize = sizeof(didev); IDirectInputDevice_GetDeviceInfo(iface, &didev); - lstrcpynW(ps->wsz, didev.tszInstanceName, MAX_PATH); + if (LOWORD(rguid) == (DWORD_PTR) DIPROP_PRODUCTNAME) + lstrcpynW(ps->wsz, didev.tszProductName, MAX_PATH); + else + lstrcpynW(ps->wsz, didev.tszInstanceName, MAX_PATH); return DI_OK; } diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 00d3b60..77bb729 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -253,6 +253,14 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) ok(!lstrcmpW(nameBuffer, dps.wsz), "DIPROP_INSTANCENAME returned is wrong. Expected: %s Got: %s\n", wine_dbgstr_w(nameBuffer), wine_dbgstr_w(dps.wsz)); + hr = IDirectInputDevice_GetProperty(pJoystick, DIPROP_PRODUCTNAME, &dps.diph); + ok(SUCCEEDED(hr), "IDirectInput_GetProperty() for DIPROP_PRODUCTNAME failed: %08x\n", hr); + + /* Test if product name is the same as present in DIDEVICEINSTANCE */ + MultiByteToWideChar(CP_ACP, 0, lpddi->tszProductName, -1, nameBuffer, MAX_PATH); + ok(!lstrcmpW(nameBuffer, dps.wsz), "DIPROP_PRODUCTNAME returned is wrong. Expected: %s Got: %s\n", + wine_dbgstr_w(nameBuffer), wine_dbgstr_w(dps.wsz)); + /* Test for GUIDPATH properties */ memset(&dpg, 0, sizeof(dpg)); dpg.diph.dwSize = sizeof(DIPROPGUIDANDPATH);

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRMViewport*::Clear.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: 7297d4a863bd5a0d9a57f254f84f3c01e236ba47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7297d4a863bd5a0d9a57f254f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 18 00:16:41 2016 +0530 d3drm: Implement IDirect3DRMViewport*::Clear. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 672 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3drm/viewport.c | 79 ++++-- 2 files changed, 734 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7297d4a863bd5a0d9a57f…

1 0

Bruno Jesus : dinput: Cope with NULL flags in LinuxInputEffectImpl_GetEffectStatus.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: e8273ae497ff3c3e28674281127be17ddaacaffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8273ae497ff3c3e286742811… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 22:50:13 2016 -0300 dinput: Cope with NULL flags in LinuxInputEffectImpl_GetEffectStatus. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 3 +++ dlls/dinput/tests/joystick.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index ad7d3ad..dc12aa6 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -131,6 +131,9 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetEffectStatus( { TRACE("(this=%p,%p)\n", iface, pdwFlags); + if (!pdwFlags) + return E_POINTER; + /* linux sends the effect status through an event. * that event is trapped by our parent joystick driver * and there is no clean way to pass it back to us. */ diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 77bb729..af36e6d 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -473,6 +473,9 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) * - effects are preserved (Download + Start doesn't complain * about incomplete effect) */ + hr = IDirectInputEffect_GetEffectStatus(effect, NULL); + ok(hr==E_POINTER,"IDirectInputEffect_GetEffectStatus() must fail with E_POINTER, got: %08x\n", hr); + effect_status = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus(effect, &effect_status); ok(hr==DI_OK,"IDirectInputEffect_GetEffectStatus() failed: %08x\n", hr); ok(effect_status==0,"IDirectInputEffect_GetEffectStatus() reported effect as started\n");

1 0

Sebastian Lackner : winedevice: Track loaded drivers and update their status on load/unload.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: aab54da6695553f3c15bbc57325429a076ae7c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aab54da6695553f3c15bbc573… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 19 08:02:09 2016 +0200 winedevice: Track loaded drivers and update their status on load/unload. Based on a patch by Aric Stewart. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 179 +++++++++++++++++++++++++++++++------------ 1 file changed, 130 insertions(+), 49 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 771a0c1..ac368c8 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -32,6 +32,8 @@ #include "winnls.h" #include "winsvc.h" #include "ddk/wdm.h" +#include "wine/rbtree.h" +#include "wine/svcctl.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -41,8 +43,49 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static SERVICE_STATUS_HANDLE service_handle; +static SC_HANDLE manager_handle; static HANDLE stop_event; +struct wine_driver +{ + struct wine_rb_entry entry; + + SERVICE_STATUS_HANDLE handle; + DRIVER_OBJECT *driver_obj; + WCHAR name[1]; +}; + +static struct wine_rb_tree wine_drivers; + +static void *wine_drivers_rb_alloc( size_t size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static void *wine_drivers_rb_realloc( void *ptr, size_t size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, ptr, size ); +} + +static void wine_drivers_rb_free( void *ptr ) +{ + HeapFree( GetProcessHeap(), 0, ptr ); +} + +static int wine_drivers_rb_compare( const void *key, const struct wine_rb_entry *entry ) +{ + const struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, const struct wine_driver, entry ); + return strcmpW( (const WCHAR *)key, driver->name ); +} + +static const struct wine_rb_functions wine_drivers_rb_functions = +{ + wine_drivers_rb_alloc, + wine_drivers_rb_realloc, + wine_drivers_rb_free, + wine_drivers_rb_compare, +}; + /* find the LDR_MODULE corresponding to the driver module */ static LDR_MODULE *find_ldr_module( HMODULE module ) { @@ -250,11 +293,30 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING return status; } +/* helper function to update service status */ +static void set_service_status( SERVICE_STATUS_HANDLE handle, DWORD state, DWORD accepted ) +{ + SERVICE_STATUS status; + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = state; + status.dwControlsAccepted = accepted; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = (state == SERVICE_START_PENDING) ? 10000 : 0; + SetServiceStatus( handle, &status ); +} + /* call the driver unload function */ -static void unload_driver( DRIVER_OBJECT *driver_obj ) +static void unload_driver( struct wine_rb_entry *entry, void *context ) { + struct wine_driver *driver = WINE_RB_ENTRY_VALUE( entry, struct wine_driver, entry ); + DRIVER_OBJECT *driver_obj = driver->driver_obj; LDR_MODULE *ldr = driver_obj->DriverSection; + TRACE( "stopping driver %s\n", wine_dbgstr_w(driver->name) ); + set_service_status( driver->handle, SERVICE_STOP_PENDING, 0 ); + if (driver_obj->DriverUnload) { if (WINE_TRACE_ON(relay)) @@ -271,26 +333,60 @@ static void unload_driver( DRIVER_OBJECT *driver_obj ) FreeLibrary( ldr->BaseAddress ); IoDeleteDriver( driver_obj ); ObDereferenceObject( driver_obj ); + + set_service_status( driver->handle, SERVICE_STOPPED, 0 ); + CloseServiceHandle( (void *)driver->handle ); + HeapFree( GetProcessHeap(), 0, driver ); } -static NTSTATUS create_driver(const WCHAR *driver_name, DRIVER_OBJECT **driver_obj) +/* load a driver and notify services.exe about the status change */ +static NTSTATUS create_driver( const WCHAR *driver_name ) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; + struct wine_driver *driver; UNICODE_STRING drv_name; NTSTATUS status; + DWORD length; WCHAR *str; - str = HeapAlloc( GetProcessHeap(), 0, sizeof(driverW) + strlenW(driver_name)*sizeof(WCHAR) ); + length = FIELD_OFFSET( struct wine_driver, name[strlenW(driver_name) + 1] ); + if (!(driver = HeapAlloc( GetProcessHeap(), 0, length ))) + return STATUS_NO_MEMORY; + + strcpyW( driver->name, driver_name ); + driver->driver_obj = NULL; + + if (!(driver->handle = (void *)OpenServiceW( manager_handle, driver_name, SERVICE_SET_STATUS ))) + { + HeapFree( GetProcessHeap(), 0, driver ); + return STATUS_UNSUCCESSFUL; + } + + if (wine_rb_put( &wine_drivers, driver_name, &driver->entry )) + { + CloseServiceHandle( (void *)driver->handle ); + HeapFree( GetProcessHeap(), 0, driver ); + return STATUS_UNSUCCESSFUL; + } + + if (!(str = HeapAlloc( GetProcessHeap(), 0, sizeof(driverW) + strlenW(driver_name)*sizeof(WCHAR) ))) + { + status = STATUS_NO_MEMORY; + goto error; + } + + TRACE( "starting driver %s\n", wine_dbgstr_w(driver_name) ); + set_service_status( driver->handle, SERVICE_START_PENDING, 0 ); + lstrcpyW( str, driverW); lstrcatW( str, driver_name ); RtlInitUnicodeString( &drv_name, str ); status = IoCreateDriver( &drv_name, init_driver ); - if (status == STATUS_SUCCESS) { status = ObReferenceObjectByName( &drv_name, OBJ_CASE_INSENSITIVE, NULL, - 0, NULL, KernelMode, NULL, (void **)driver_obj ); + 0, NULL, KernelMode, NULL, (void **)&driver->driver_obj ); if (status != STATUS_SUCCESS) { ERR("Failed to locate loaded driver (%s)\n", wine_dbgstr_w(driver_name)); @@ -298,77 +394,62 @@ static NTSTATUS create_driver(const WCHAR *driver_name, DRIVER_OBJECT **driver_o } RtlFreeUnicodeString( &drv_name ); + + if (status == STATUS_SUCCESS) + { + set_service_status( driver->handle, SERVICE_RUNNING, + SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); + return STATUS_SUCCESS; + } + +error: + set_service_status( driver->handle, SERVICE_STOPPED, 0 ); + CloseServiceHandle( (void *)driver->handle ); + wine_rb_remove( &wine_drivers, driver_name ); + HeapFree( GetProcessHeap(), 0, driver ); return status; } static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) { - SERVICE_STATUS status; const WCHAR *driver_name = context; - status.dwServiceType = SERVICE_WIN32; - status.dwControlsAccepted = SERVICE_ACCEPT_STOP; - status.dwWin32ExitCode = 0; - status.dwServiceSpecificExitCode = 0; - status.dwCheckPoint = 0; - status.dwWaitHint = 0; - - switch(ctrl) + switch (ctrl) { case SERVICE_CONTROL_STOP: case SERVICE_CONTROL_SHUTDOWN: WINE_TRACE( "shutting down %s\n", wine_dbgstr_w(driver_name) ); - status.dwCurrentState = SERVICE_STOP_PENDING; - status.dwControlsAccepted = 0; - SetServiceStatus( service_handle, &status ); + set_service_status( service_handle, SERVICE_STOP_PENDING, 0 ); SetEvent( stop_event ); return NO_ERROR; default: WINE_FIXME( "got service ctrl %x for %s\n", ctrl, wine_dbgstr_w(driver_name) ); - status.dwCurrentState = SERVICE_RUNNING; - SetServiceStatus( service_handle, &status ); + set_service_status( service_handle, SERVICE_RUNNING, + SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN ); return NO_ERROR; } } static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { - SERVICE_STATUS status; const WCHAR *driver_name = argv[0]; - DRIVER_OBJECT *driver_obj; - - WINE_TRACE( "starting service %s\n", wine_dbgstr_w(driver_name) ); - stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); - - service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, (void *)driver_name ); - if (!service_handle) + if (wine_rb_init( &wine_drivers, &wine_drivers_rb_functions )) + return; + if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) + return; + if (!(manager_handle = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ))) + return; + if (!(service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, (void *)driver_name ))) return; - status.dwServiceType = SERVICE_WIN32; - status.dwCurrentState = SERVICE_START_PENDING; - status.dwControlsAccepted = 0; - status.dwWin32ExitCode = 0; - status.dwServiceSpecificExitCode = 0; - status.dwCheckPoint = 0; - status.dwWaitHint = 10000; - SetServiceStatus( service_handle, &status ); - - if (create_driver( driver_name, &driver_obj ) == STATUS_SUCCESS) - { - status.dwCurrentState = SERVICE_RUNNING; - status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; - SetServiceStatus( service_handle, &status ); - + if (create_driver( driver_name ) == STATUS_SUCCESS) wine_ntoskrnl_main_loop( stop_event ); - unload_driver( driver_obj ); - } - else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) ); - status.dwCurrentState = SERVICE_STOPPED; - status.dwControlsAccepted = 0; - SetServiceStatus( service_handle, &status ); - WINE_TRACE( "service %s stopped\n", wine_dbgstr_w(driver_name) ); + wine_rb_destroy( &wine_drivers, unload_driver, NULL ); + set_service_status( service_handle, SERVICE_STOPPED, 0 ); + CloseServiceHandle( manager_handle ); + CloseHandle( stop_event ); } int wmain( int argc, WCHAR *argv[] )

1 0

Hugh McMaster : reg: Simplify help handling by removing an if-else if-else block.
by Alexandre Julliard Aug. 19, 2016

Aug. 19, 2016

Module: wine Branch: master Commit: 68c1765a5d281bb51e0eff6bea2d97286176c122 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c1765a5d281bb51e0eff6be… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Aug 18 11:54:27 2016 +0000 reg: Simplify help handling by removing an if-else if-else block. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 6522fe6..0975acd 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -902,23 +902,32 @@ static const WCHAR addW[] = {'a','d','d',0}; static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR queryW[] = {'q','u','e','r','y',0}; -static enum operations get_operation(const WCHAR *str) +static enum operations get_operation(const WCHAR *str, int *op_help) { if (!lstrcmpiW(str, addW)) + { + *op_help = STRING_ADD_USAGE; return REG_ADD; + } if (!lstrcmpiW(str, deleteW)) + { + *op_help = STRING_DELETE_USAGE; return REG_DELETE; + } if (!lstrcmpiW(str, queryW)) + { + *op_help = STRING_QUERY_USAGE; return REG_QUERY; + } return REG_INVALID; } int wmain(int argc, WCHAR *argvW[]) { - int i, op, ret; + int i, op, op_help, ret; BOOL show_op_help = FALSE; static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; @@ -939,7 +948,7 @@ int wmain(int argc, WCHAR *argvW[]) return 0; } - op = get_operation(argvW[1]); + op = get_operation(argvW[1], &op_help); if (op == REG_INVALID) { @@ -959,12 +968,7 @@ int wmain(int argc, WCHAR *argvW[]) } else if (show_op_help) { - if (op == REG_ADD) - output_message(STRING_ADD_USAGE); - else if (op == REG_DELETE) - output_message(STRING_DELETE_USAGE); - else - output_message(STRING_QUERY_USAGE); + output_message(op_help); return 0; }

1 0