wine-devel August 2016

wine-devel@winehq.org

55 participants
282 discussions

Re: mmdevapi/tests: Make use of todo_wine_if().
by Marvin 04 Aug '16

04 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24728 Your paranoid android. === w7u (32 bit capture) === capture.c:327: Test failed: GCP 11200 vs. BufferSize 21996 === w8 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:261: Test failed: Position 2167 expected 1463 capture.c:323: Test failed: Position 3191 gap 1280 capture.c:327: Test failed: GCP 13440 vs. BufferSize 21996 capture.c:347: Test failed: Position 4279 expected 3639 capture.c:372: Test failed: Position 4727 expected 4087 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:261: Test failed: Position 2167 expected 1527 capture.c:323: Test failed: Position 3191 gap 1216 capture.c:327: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:347: Test failed: Position 4279 expected 3639 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 5303 expected 4087 capture.c:373: Test failed: flags 1 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:261: Test failed: Position 2167 expected 1527 capture.c:323: Test failed: Position 4215 gap 2240 capture.c:327: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:347: Test failed: Position 5303 expected 4663 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 6391 expected 5111 capture.c:373: Test failed: flags 1 === w864 (64 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:261: Test failed: Position 2167 expected 1463 capture.c:323: Test failed: Position 3191 gap 1280 capture.c:327: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:347: Test failed: Position 4343 expected 3639 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 4791 expected 4087 === w1064 (64 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:261: Test failed: Position 2167 expected 1591 capture.c:323: Test failed: Position 4215 gap 2176 capture.c:327: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:347: Test failed: Position 5303 expected 4663 capture.c:348: Test failed: flags 1 capture.c:372: Test failed: Position 6391 expected 5111 capture.c:373: Test failed: flags 1

2 1

Re: user32/tests: Make use of todo_wine_if().
by Marvin 04 Aug '16

04 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24730 Your paranoid android. === w864 (32 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w1064 (32 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different === w864 (64 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:10053: Test failed: SendMessageTimeout succeeded msg.c:10054: Test failed: WmEmptySeq: 0: the msg sequence is not complete: expected 0000 - actual 0400 === w1064 (64 bit msg) === msg.c:6482: Test failed: Update region shouldn't be empty msg.c:6715: Test failed: InvalidateErase: 0: the msg sequence is not complete: expected 0085 - actual 0000 msg.c:6717: Test failed: Paint: 0: the msg sequence is not complete: expected 000f - actual 0000 msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:6488: Test failed: Regions are different msg.c:7437: Test failed: destroy child on thread exit: 3: the msg sequence is not complete: expected 0000 - actual 001a

1 0

Re: [PATCH v4] ntoskrnl.exe: Implement ObReferenceObjectByName for created drivers
by Sebastian Lackner 04 Aug '16

04 Aug '16

On 04.08.2016 18:24, Aric Stewart wrote: > v2: Suggestions from Sebastian Lackner > v3: eliminate duplicated driver_name > v4: use the rb_tree > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > dlls/ntoskrnl.exe/ntoskrnl.c | 30 ++++++++++++++++++++++++++++-- > 1 file changed, 28 insertions(+), 2 deletions(-) > > > > 0001-ntoskrnl.exe-Implement-ObReferenceObjectByName-but-onl.txt > > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c > index 25187d3..883e845 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.c > +++ b/dlls/ntoskrnl.exe/ntoskrnl.c > @@ -2107,8 +2107,34 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, > void *ParseContext, > void **Object) > { > - FIXME("stub\n"); > - return STATUS_NOT_IMPLEMENTED; > + struct wine_driver *driver; > + struct wine_rb_entry *entry; > + > + TRACE("mostly-stub:%s %i %p %i %p %i %p %p\n", debugstr_us(ObjectName), > + Attributes, AccessState, DesiredAccess, ObjectType, AccessMode, > + ParseContext, Object); > + > + if (AccessState) FIXME("Unhandled AccessState\n"); > + if (DesiredAccess) FIXME("Unhandled DesiredAccess\n"); > + if (ParseContext) FIXME("Unhandled ParseContext\n"); > + if (ObjectType) FIXME("Unhandled ObjectType\n"); > + > + if (AccessMode != KernelMode) > + { > + FIXME("UserMode access not implemented\n"); > + return STATUS_NOT_IMPLEMENTED; > + } > + > + entry = wine_rb_get(&wine_drivers, ObjectName); You will have to lock the CS before accessing the tree structure. > + if (!entry) > + { > + FIXME("Object not found, may not be tracked.\n"); For debugging purposes it would make sense to dump the name here. > + return STATUS_NOT_IMPLEMENTED; > + } > + > + driver = WINE_RB_ENTRY_VALUE(entry, struct wine_driver, entry); > + *Object = &driver->driver_obj; > + return STATUS_SUCCESS; > } > > > > >

1 0

Re: RFC: dinput8/tests: Add valid wide string termination to actionName member.
by Huw Davies 04 Aug '16

04 Aug '16

On Tue, Aug 02, 2016 at 11:34:10PM +0200, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=40384 > https://www.winehq.org/pipermail/wine-devel/2016-July/114054.html > > DirectX SDK offers the possibility to increase debug > output via "DirectX Control Panel". > This prints this error: > DINPUT8: ERROR IDirectInput8::EnumDevicesBySemantics: arg 2: invalid UNICODE string > > It looks like ansi version of EnumDevicesBySemantics forwards the string to > the wide variant without conversation. > So the assumption is that with the old compiler version we got > enough valid wide string termination between the ansi string actionName > member and the next invalid memory page. > This is the added test trying to prove by putting the string right before > a memory page with PAGE_NOACCESS. This seems pretty convincing, thanks for tracking this down. We don't actually want to test for this Windows bug, so please resend the patch without the PAGE_NOACCESS stuff - just add a comment explaining the double nul-termination. Huw.

1 0

Re: usp10/tests: Reserve for InClass a byte for every character in teststr. (v2)
by Huw Davies 04 Aug '16

04 Aug '16

On Thu, Aug 04, 2016 at 12:44:58AM +0200, Bernhard Übelacker wrote: > https://bugs.winehq.org/show_bug.cgi?id=40385 > > ScriptStringAnalyse crashes if InClass is just one byte in size > followed by memory marked as PAGE_NOACCESS. > By testing the size it seems it should have the same size as characters > in teststr are given to the function. Hi, Thanks for getting to the bottom of this. I don't think we want to test with the PAGE_NOACCESS stuff; it's pretty clear that MSDN is incorrect and class should indeed be an array. Just fix the bug and perhaps add a comment somewhere. Huw.

1 0

Re: usp10/tests: Reserve for InClass a byte for every character in teststr. (v2)
by Marvin 04 Aug '16

04 Aug '16

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=24709 Your paranoid android. === w1064 (32 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1) === w1064 (64 bit usp10) === usp10.c:1467: Test failed: 0: uJustification incorrect (0) usp10.c:1467: Test failed: 1: uJustification incorrect (0) usp10.c:1467: Test failed: 2: uJustification incorrect (0) usp10.c:1467: Test failed: 3: uJustification incorrect (0) usp10.c:1467: Test failed: 4: uJustification incorrect (0) usp10.c:1467: Test failed: 5: uJustification incorrect (0) usp10.c:1467: Test failed: 6: uJustification incorrect (0) usp10.c:1467: Test failed: 7: uJustification incorrect (0) usp10.c:1467: Test failed: 8: uJustification incorrect (0) usp10.c:1467: Test failed: 9: uJustification incorrect (0) usp10.c:1483: Test failed: 3: uJustification incorrect (0) usp10.c:1483: Test failed: 5: fDiacritic incorrect (1) usp10.c:1483: Test failed: 5: fZeroWidth incorrect (1) usp10.c:1483: Test failed: 15: fDiacritic incorrect (1) usp10.c:1483: Test failed: 15: fZeroWidth incorrect (1)

1 0

Re: [PATCH 2/2] winex11: track glx windows per thread
by Miklós Máté 03 Aug '16

03 Aug '16

On 07/22/2016 03:11 AM, Alexandre Julliard wrote: > Miklós Máté<mtmkls(a)gmail.com> writes: > >> Hmm, you are right. Mesa does set an XCloseDisplay callback to clean >> things up for the display connections it encounters. If I use >> data->display instead of gdi_display for pglXCreateWindow in line 1358 >> of opengl.c, the tests pass, and no zombie glx windows remain. I don't >> know if I should dare to take responsibility for this change, though, >> as I know almost nothing about GDI. > If it works then it's the right thing to do. I did some further testing, and it doesn't work. Mesa glx maintains its state per-display, and creating a drawable with one display connection but makecurrent with an other one can lead to bad things. Unfortunately, wine-csmt likes to do those from separate threads, so the thread-specific display connections cannot be used instead of the global gdi_display. MM

2 2

Re: [PATCH v3 ] programs/winedevice.exe: Use IoCreateDriver and IoDeleteDriver
by Sebastian Lackner 03 Aug '16

03 Aug '16

On 29.07.2016 21:02, Aric Stewart wrote: > v2: Pass a proper driver name to IoCreateDriver and use generated keyname > v3: Remove global driver_name > > The two patches are not longer a set as each is independent of the other > > Signed-off-by: Aric Stewart <aric(a)codeweavers.com> > --- > programs/winedevice/device.c | 179 +++++++++++++++++++++++-------------------- > 1 file changed, 94 insertions(+), 85 deletions(-) > > > > 0002-programs-winedevice.exe-Use-IoCreateDriver-and-IoDelet.txt > > > diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c > index 94132ed..df0fac3 100644 > --- a/programs/winedevice/device.c > +++ b/programs/winedevice/device.c > @@ -40,11 +40,10 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); > > extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); > > -static WCHAR *driver_name; > static SERVICE_STATUS_HANDLE service_handle; > static HANDLE stop_event; > -static DRIVER_OBJECT driver_obj; > -static DRIVER_EXTENSION driver_extension; > +static DRIVER_OBJECT *driver_obj; > +static HMODULE driver_module; How do you plan to adjust this when multiple drivers are loaded? Its still not clear to me, unfortunately. The static variables have to go away sooner or later. ;) > > /* find the LDR_MODULE corresponding to the driver module */ > static LDR_MODULE *find_ldr_module( HMODULE module ) > @@ -132,92 +131,25 @@ error: > return NULL; > } > > -/* call the driver init entry point */ > -static NTSTATUS init_driver( HMODULE module, UNICODE_STRING *keyname ) > -{ > - unsigned int i; > - NTSTATUS status; > - const IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); > - > - if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; > - > - driver_obj.Size = sizeof(driver_obj); > - driver_obj.DriverSection = find_ldr_module( module ); > - driver_obj.DriverInit = (PDRIVER_INITIALIZE)((char *)module + nt->OptionalHeader.AddressOfEntryPoint); > - driver_obj.DriverExtension = &driver_extension; > - > - driver_extension.DriverObject = &driver_obj; > - driver_extension.ServiceKeyName = *keyname; > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), > - driver_obj.DriverInit, &driver_obj, wine_dbgstr_w(keyname->Buffer) ); > - > - status = driver_obj.DriverInit( &driver_obj, keyname ); > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Ret driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(), > - driver_obj.DriverInit, &driver_obj, wine_dbgstr_w(keyname->Buffer), status ); > - > - WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), &driver_obj ); > - WINE_TRACE( "- DriverInit = %p\n", driver_obj.DriverInit ); > - WINE_TRACE( "- DriverStartIo = %p\n", driver_obj.DriverStartIo ); > - WINE_TRACE( "- DriverUnload = %p\n", driver_obj.DriverUnload ); > - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > - WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_obj.MajorFunction[i] ); > - > - return status; > -} > - > -/* call the driver unload function */ > -static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) > -{ > - if (driver_obj->DriverUnload) > - { > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), > - driver_obj->DriverUnload, driver_obj ); > - > - driver_obj->DriverUnload( driver_obj ); > - > - if (WINE_TRACE_ON(relay)) > - WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), > - driver_obj->DriverUnload, driver_obj ); > - } > - FreeLibrary( module ); > -} > - > /* load the .sys module for a device driver */ > -static HMODULE load_driver(void) > +static HMODULE load_driver(const WCHAR *driver_name, UNICODE_STRING * keyname) > { > static const WCHAR driversW[] = {'\\','d','r','i','v','e','r','s','\\',0}; > static const WCHAR systemrootW[] = {'\\','S','y','s','t','e','m','R','o','o','t','\\',0}; > static const WCHAR postfixW[] = {'.','s','y','s',0}; > static const WCHAR ntprefixW[] = {'\\','?','?','\\',0}; > static const WCHAR ImagePathW[] = {'I','m','a','g','e','P','a','t','h',0}; > - static const WCHAR servicesW[] = {'\\','R','e','g','i','s','t','r','y', > - '\\','M','a','c','h','i','n','e', > - '\\','S','y','s','t','e','m', > - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', > - '\\','S','e','r','v','i','c','e','s','\\',0}; > > - UNICODE_STRING keypath; > HKEY driver_hkey; > HMODULE module; > LPWSTR path = NULL, str; > DWORD type, size; > > - str = HeapAlloc( GetProcessHeap(), 0, sizeof(servicesW) + strlenW(driver_name)*sizeof(WCHAR) ); > - lstrcpyW( str, servicesW ); > - lstrcatW( str, driver_name ); > - > - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, str + 18 /* skip \registry\machine */, &driver_hkey )) > + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey )) Currently its hardcoded in ntoskrnl, but it would be better to check the prefix first. > { > - WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(str), GetLastError() ); > - HeapFree( GetProcessHeap(), 0, str); > + WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); > return NULL; > } > - RtlInitUnicodeString( &keypath, str ); > > /* read the executable path from memory */ > size = 0; > @@ -233,7 +165,6 @@ static HMODULE load_driver(void) > HeapFree( GetProcessHeap(), 0, str ); > if (!path) > { > - RtlFreeUnicodeString( &keypath ); > RegCloseKey( driver_hkey ); > return NULL; > } > @@ -276,19 +207,98 @@ static HMODULE load_driver(void) > > module = load_driver_module( str ); > HeapFree( GetProcessHeap(), 0, path ); > - if (!module) > + return module; > +} > + > +/* call the driver init entry point */ > +static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING *keyname ) > +{ > + unsigned int i; > + NTSTATUS status; > + const IMAGE_NT_HEADERS *nt; > + const WCHAR *driver_name; > + > + /* Retrieve driver name from the keyname */ > + driver_name = strrchrW(keyname->Buffer, '\\'); It would be better to test that this actually worked. > + driver_name++; > + > + driver_module = load_driver( driver_name, keyname ); > + if (!driver_module) > { > - RtlFreeUnicodeString( &keypath ); > - return NULL; > + WINE_ERR("Failed to load device\n"); > + return STATUS_DLL_INIT_FAILED; > } > > - init_driver( module, &keypath ); > - return module; > + nt = RtlImageNtHeader( driver_module ); > + > + if (!nt->OptionalHeader.AddressOfEntryPoint) return STATUS_SUCCESS; > + > + driver_obj = driver_object; driver_obj will remain uninitialized when the module has no entry point. You will still need it during the unload step. > + > + driver_object->DriverSection = find_ldr_module( driver_module ); > + driver_object->DriverInit = (PDRIVER_INITIALIZE)((char *)driver_module + nt->OptionalHeader.AddressOfEntryPoint); > + > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Call driver init %p (obj=%p,str=%s)\n", GetCurrentThreadId(), > + driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer) ); > + > + status = driver_object->DriverInit( driver_object, keyname ); > + > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Ret driver init %p (obj=%p,str=%s) retval=%08x\n", GetCurrentThreadId(), > + driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); > + > + WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); > + WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); > + WINE_TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); > + WINE_TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); > + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) > + WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); > + > + return status; > +} > + > +/* call the driver unload function */ > +static void unload_driver( HMODULE module, DRIVER_OBJECT *driver_obj ) > +{ > + if (driver_obj->DriverUnload) > + { > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Call driver unload %p (obj=%p)\n", GetCurrentThreadId(), > + driver_obj->DriverUnload, driver_obj ); > + > + driver_obj->DriverUnload( driver_obj ); > + > + if (WINE_TRACE_ON(relay)) > + WINE_DPRINTF( "%04x:Ret driver unload %p (obj=%p)\n", GetCurrentThreadId(), > + driver_obj->DriverUnload, driver_obj ); > + } > + FreeLibrary( module ); > + IoDeleteDriver( driver_obj ); > +} > + > +static HRESULT create_driver(const WCHAR *driver_name) > +{ This should be a NTSTATUS return value. > + static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; > + UNICODE_STRING drv_name; > + HRESULT status; > + WCHAR *str; > + > + str = HeapAlloc( GetProcessHeap(), 0, sizeof(driverW) + strlenW(driver_name)*sizeof(WCHAR) ); > + lstrcpyW( str, driverW); > + lstrcatW( str, driver_name ); > + RtlInitUnicodeString( &drv_name, str ); > + > + status = IoCreateDriver( &drv_name, init_driver ); > + > + RtlFreeUnicodeString( &drv_name); > + return status; > } > > static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) > { > SERVICE_STATUS status; > + WCHAR* driver_name = (WCHAR*)context; > > status.dwServiceType = SERVICE_WIN32; > status.dwControlsAccepted = SERVICE_ACCEPT_STOP; > @@ -318,13 +328,13 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ > static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) > { > SERVICE_STATUS status; > - HMODULE driver_module; > + const WCHAR* driver_name = argv[0]; > > 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, NULL ); > + service_handle = RegisterServiceCtrlHandlerExW( driver_name, service_handler, (VOID*)driver_name); Usually "void *" is preferred in Wine source. > if (!service_handle) > return; > > @@ -337,15 +347,14 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) > status.dwWaitHint = 10000; > SetServiceStatus( service_handle, &status ); > > - driver_module = load_driver(); > - if (driver_module) > + if (SUCCEEDED(create_driver(driver_name))) After changing the HRESULT -> NTSTATUS return value, this also needs to be adjusted. > { > status.dwCurrentState = SERVICE_RUNNING; > status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; > SetServiceStatus( service_handle, &status ); > > wine_ntoskrnl_main_loop( stop_event ); > - unload_driver( driver_module, &driver_obj ); > + unload_driver( driver_module, driver_obj ); > } > else WINE_ERR( "driver %s failed to load\n", wine_dbgstr_w(driver_name) ); > > @@ -359,7 +368,7 @@ int wmain( int argc, WCHAR *argv[] ) > { > SERVICE_TABLE_ENTRYW service_table[2]; > > - if (!(driver_name = argv[1])) > + if (!(argv[1])) You can also remove the brackets. ;) > { > WINE_ERR( "missing device name, winedevice isn't supposed to be run manually\n" ); > return 1; > > >

2 2

Re: [PATCH 5/5] jscript: More arguments object tests.
by Marvin 03 Aug '16

03 Aug '16

1 0

Re: [PATCH resend 07/10] dxgi/tests: Add tests for IDXGISwapChain_GetFullscreenState() to test_create_swapchain().
by Henri Verbeet 03 Aug '16

03 Aug '16

On 3 August 2016 at 09:41, Józef Kucia <jkucia(a)codeweavers.com> wrote: > + /* When numerator is non-zero and denominator is zero, the windowed mode is used. > + * Additionally, some versions of WARP seem to always fail to change fullscreen state. */ > + if (result_desc.Windowed != creation_desc.Windowed) > + trace("Test %u: Failed to change fullscreen state.\n", i); For what it's worth, I seem to consistently get "device.c:616: Test 1: Failed to change fullscreen state." from this as well on Windows.

1 0

← Newer
1
...
22
23
24
25
26
27
28
29
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-devel August 2016