September 2018 - Wine-commits

Nikolay Sivov : opcservices/tests: Fix uninitialized variable access ( Valgrind).
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: d63a037eacc115747a360ff73dd12ba77d7de3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63a037eacc115747a360ff7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:15 2018 +0300 opcservices/tests: Fix uninitialized variable access (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index f619460..a9c25a5 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -518,7 +518,7 @@ static void test_rel_part_uri(void) IOpcPartUri *rel_uri2; IOpcUri *source_uri2; IUnknown *unk = NULL; - BOOL ret; + BOOL ret = FALSE; BSTR str; hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri);

1 0

Nikolay Sivov : opcservices: Fix uri path leak (Valgrind).
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 397517bee2a9ace0e7216e86b5ef500e520732eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=397517bee2a9ace0e7216e86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:16 2018 +0300 opcservices: Fix uri path leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/uri.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opcservices/uri.c b/dlls/opcservices/uri.c index e461eba..ddb2c05 100644 --- a/dlls/opcservices/uri.c +++ b/dlls/opcservices/uri.c @@ -476,6 +476,7 @@ static IUri *opc_part_uri_get_rels_uri(IUri *uri) if (FAILED(hr = CreateUri(ret, Uri_CREATE_ALLOW_RELATIVE, 0, &rels_uri))) WARN("Failed to create rels uri, hr %#x.\n", hr); heap_free(ret); + SysFreeString(path); return rels_uri; }

1 0

Nikolay Sivov : opcservices: Fix underlying uri object leak (Valgrind).
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 2f2a5a2ea1898780698a8b056c412cd133532b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2a5a2ea1898780698a8b05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:17 2018 +0300 opcservices: Fix underlying uri object leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/factory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 1a98f3f..45e7ad7 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -331,7 +331,9 @@ static HRESULT WINAPI opc_factory_CreatePartUri(IOpcFactory *iface, LPCWSTR uri, return hr; } - return opc_part_uri_create(part_uri, NULL, out); + hr = opc_part_uri_create(part_uri, NULL, out); + IUri_Release(part_uri); + return hr; } static HRESULT WINAPI opc_factory_CreateStreamOnFile(IOpcFactory *iface, LPCWSTR filename,

1 0

Nikolay Sivov : opcservices/tests: Fix some leaks in tests (Valgrind).
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 29f52ac57619cd78f8024b2653490ba94bd02004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29f52ac57619cd78f8024b26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:18 2018 +0300 opcservices/tests: Fix some leaks in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/tests/opcservices.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index a9c25a5..0258bf2 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -75,6 +75,7 @@ static void test_package(void) hr = IOpcPackage_GetPartSet(package, &partset2); ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); ok(partset == partset2, "Expected same part set instance.\n"); + IOpcPartSet_Release(partset2); /* CreatePart */ hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); @@ -161,6 +162,7 @@ todo_wine { IOpcRelationshipSet_Release(relset); IOpcRelationshipSet_Release(relset2); + IOpcPartSet_Release(partset); IOpcPackage_Release(package); /* Root uri */ @@ -322,6 +324,8 @@ static void test_relationship(void) hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri2, OPC_URI_TARGET_MODE_INTERNAL, &rel); todo_wine ok(hr == OPC_E_INVALID_RELATIONSHIP_TARGET, "Unexpected hr %#x.\n", hr); + if (hr == S_OK) + IOpcRelationship_Release(rel); hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr);

1 0

Nikolay Sivov : opcservices: Implement IOpcPartEnumerator.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: bacc74158e9f3f455aefdcc921519c01567ad6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bacc74158e9f3f455aefdcc9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:19 2018 +0300 opcservices: Implement IOpcPartEnumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 187 ++++++++++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 163 ++++++++++++++++++++++++++++++ include/opcbase.idl | 2 + 3 files changed, 350 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bacc74158e9f3f455aef…

1 0

Nikolay Sivov : opcservices: Implement IOpcRelationshipEnumerator.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: b11b9d5a2540e048ce21e8e533abcb56592a3dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b11b9d5a2540e048ce21e8e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 09:21:20 2018 +0300 opcservices: Implement IOpcRelationshipEnumerator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 187 ++++++++++++++++++++++++++++++++++- dlls/opcservices/tests/opcservices.c | 163 ++++++++++++++++++++++++++++++ 2 files changed, 348 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b11b9d5a2540e048ce21…

1 0

Alistair Leslie-Hughes : mfplat: Forward IMFStreamDescriptor to IMFAttributes.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 0deba296ed35999aa8f6f5a5f0bcc468894932f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0deba296ed35999aa8f6f5a5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 23:52:09 2018 +0000 mfplat: Forward IMFStreamDescriptor to IMFAttributes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 164 ++++++++++++----------------------------------------- 1 file changed, 37 insertions(+), 127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0deba296ed35999aa8f6…

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateSample.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: b0826c016142ba669f5836bb34685147fdd4a697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0826c016142ba669f5836bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 12 23:52:11 2018 +0000 mfplat: Implement MFCreateSample. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45617 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 17 ++ include/mfapi.h | 1 + 4 files changed, 462 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0826c016142ba669f58…

1 0

Alex Henrie : wine.inf: Add TCP/IP DataBasePath value.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: bfe48889aeda69cac81e46b1d57beb0ed04b897c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe48889aeda69cac81e46b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 12 22:26:50 2018 -0600 wine.inf: Add TCP/IP DataBasePath value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45821 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f10284b..5767b29 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3416,7 +3416,7 @@ HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" -HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",2,"%11%\drivers" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16

1 0

Aric Stewart : winebus.sys: Improve unloading the winebus driver.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: db6c5b59b67f92dcfd06fefb6c04866b45205ebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6c5b59b67f92dcfd06fefb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 12 11:22:09 2018 -0500 winebus.sys: Improve unloading the winebus driver. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 3 +++ dlls/winebus.sys/bus_iohid.c | 34 +++++++++++++++++++++++++--------- dlls/winebus.sys/bus_sdl.c | 10 ++++++++++ dlls/winebus.sys/bus_udev.c | 10 ++++++++++ dlls/winebus.sys/main.c | 9 +++++++++ 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index bf93c04..16e9bf7 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -22,6 +22,9 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) DECLSPEC_HIDDEN; +void udev_driver_unload( void ) DECLSPEC_HIDDEN; +void iohid_driver_unload( void ) DECLSPEC_HIDDEN; +void sdl_driver_unload( void ) DECLSPEC_HIDDEN; /* Native device function table */ typedef struct diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index ac706f5..95077ac 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -98,6 +98,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static DRIVER_OBJECT *iohid_driver_obj = NULL; static IOHIDManagerRef hid_manager; +static CFRunLoopRef run_loop; +static HANDLE run_loop_handle; static const WCHAR busidW[] = {'I','O','H','I','D',0}; @@ -372,7 +374,7 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, /* This puts the relevant run loop for event handling into a WINE thread */ static DWORD CALLBACK runloop_thread(void *args) { - CFRunLoopRef run_loop = CFRunLoopGetCurrent(); + run_loop = CFRunLoopGetCurrent(); IOHIDManagerSetDeviceMatching(hid_manager, NULL); IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); @@ -388,18 +390,12 @@ static DWORD CALLBACK runloop_thread(void *args) CFRunLoopRun(); TRACE("Run Loop exiting\n"); - - IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); - IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); - IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - CFRelease(hid_manager); return 1; + } NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { - HANDLE run_loop_handle; - TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); iohid_driver_obj = driver; @@ -414,10 +410,25 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_UNSUCCESSFUL; } - CloseHandle(run_loop_handle); return STATUS_SUCCESS; } +void iohid_driver_unload( void ) +{ + TRACE("Unloading Driver\n"); + if (iohid_driver_obj != NULL) + { + IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); + CFRunLoopStop(run_loop); + WaitForSingleObject(run_loop_handle, INFINITE); + CloseHandle(run_loop_handle); + IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL); + IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL); + CFRelease(hid_manager); + } + TRACE("Driver Unloaded\n"); +} + #else NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) @@ -426,4 +437,9 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_NOT_IMPLEMENTED; } +void iohid_driver_unload( void ) +{ + TRACE("Stub: Unload Driver\n"); +} + #endif /* HAVE_IOHIDMANAGERCREATE */ diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 159727f..6b2b28e 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -927,6 +927,11 @@ static DWORD CALLBACK deviceloop_thread(void *args) return 0; } +void sdl_driver_unload( void ) +{ + TRACE("Unload Driver\n"); +} + NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; @@ -1023,4 +1028,9 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ return STATUS_NOT_IMPLEMENTED; } +void sdl_driver_unload( void ) +{ + TRACE("Stub: Unload Driver\n"); +} + #endif /* SONAME_LIBSDL2 */ diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 788b564..dabda6a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1418,6 +1418,11 @@ static DWORD CALLBACK deviceloop_thread(void *args) return 0; } +void udev_driver_unload( void ) +{ + TRACE("Unload Driver\n"); +} + NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { HANDLE events[2]; @@ -1482,4 +1487,9 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry return STATUS_NOT_IMPLEMENTED; } +void udev_driver_unload( void ) +{ + TRACE("Stub: Unload Driver\n"); +} + #endif /* HAVE_UDEV */ diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ce68e4a..fd795f1 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -699,6 +699,13 @@ BOOL is_xbox_gamepad(WORD vid, WORD pid) return FALSE; } +static void WINAPI driver_unload(DRIVER_OBJECT *driver) +{ + udev_driver_unload(); + iohid_driver_unload(); + sdl_driver_unload(); +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0}; @@ -720,5 +727,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) IoCreateDriver(&udev, udev_driver_init); IoCreateDriver(&iohid, iohid_driver_init); + driver->DriverUnload = driver_unload; + return STATUS_SUCCESS; }

1 0