May 2019 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : comctl32/listbox: Don' t try to paint non-visible items for multi-column listboxes.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: ae425cdfbaf57339ab7ecffcc0be671748a96494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae425cdfbaf57339ab7ecffc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 30 13:42:18 2019 +0300 comctl32/listbox: Don't try to paint non-visible items for multi-column listboxes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e71b34d..8fd556c 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1148,6 +1148,7 @@ static LRESULT LISTBOX_Paint( LB_DESCR *descr, HDC hdc ) rect.right += descr->column_width; rect.top = 0; col_pos = descr->page_size - 1; + if (rect.left >= descr->width) break; } else {

1 0

Jacek Caban : server: Associate create and close IRPs with current thread.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 7f0883ae88a9943155426bba2265eae9efc65744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0883ae88a9943155426bba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 30 13:12:17 2019 +0200 server: Associate create and close IRPs with current thread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++++ server/device.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index b61e970..c08452b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -54,6 +54,7 @@ static int winetest_report_success; static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType; static PEPROCESS *pPsInitialSystemProcess; +static void *create_caller_thread; void WINAPI ObfReferenceObject( void *obj ); @@ -356,6 +357,8 @@ static void test_current_thread(BOOL is_system) ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); ok(PsIsSystemThread((PETHREAD)KeGetCurrentThread()) == is_system, "unexpected system thread\n"); + if (!is_system) + ok(create_caller_thread == KeGetCurrentThread(), "thread is not create caller thread\n"); ret = ObOpenObjectByPointer(current, OBJ_KERNEL_HANDLE, NULL, PROCESS_QUERY_INFORMATION, NULL, KernelMode, &process_handle); ok(!ret, "ObOpenObjectByPointer failed: %#x\n", ret); @@ -1644,6 +1647,7 @@ static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); last_created_file = irpsp->FileObject; + create_caller_thread = KeGetCurrentThread(); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); diff --git a/server/device.c b/server/device.c index bc27108..d3e2a84 100644 --- a/server/device.c +++ b/server/device.c @@ -475,7 +475,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, if ((irp = create_irp( file, &params, NULL ))) { - add_irp_to_queue( device->manager, irp, NULL ); + add_irp_to_queue( device->manager, irp, current ); release_object( irp ); } } @@ -523,7 +523,7 @@ static int device_file_close_handle( struct object *obj, struct process *process if ((irp = create_irp( file, &params, NULL ))) { - add_irp_to_queue( file->device->manager, irp, NULL ); + add_irp_to_queue( file->device->manager, irp, current ); release_object( irp ); } }

1 0

Zebediah Figura : winebus.sys: Avoid IoCreateDriver().
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 9af088243c9648aa6685fa757e61a985c8740e39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af088243c9648aa6685fa75… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 23:02:30 2019 -0500 winebus.sys: Avoid IoCreateDriver(). This is not a documented function, and anyway we don't need separate driver objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 6 +++--- dlls/winebus.sys/bus_iohid.c | 6 ++---- dlls/winebus.sys/bus_sdl.c | 5 ++--- dlls/winebus.sys/bus_udev.c | 6 ++---- dlls/winebus.sys/main.c | 12 +++--------- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 4de723f..de8ddf7 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -19,9 +19,9 @@ typedef int(*enum_func)(DEVICE_OBJECT *device, void *context); /* Buses */ -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; +NTSTATUS udev_driver_init(void) DECLSPEC_HIDDEN; +NTSTATUS iohid_driver_init(void) DECLSPEC_HIDDEN; +NTSTATUS sdl_driver_init(void) DECLSPEC_HIDDEN; void udev_driver_unload( void ) DECLSPEC_HIDDEN; void iohid_driver_unload( void ) DECLSPEC_HIDDEN; void sdl_driver_unload( void ) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index dcc0dcf..7933374 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -399,10 +399,8 @@ static DWORD CALLBACK runloop_thread(void *args) } -NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) +NTSTATUS iohid_driver_init(void) { - TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); - hid_manager = IOHIDManagerCreate(kCFAllocatorDefault, 0L); if (!(run_loop_handle = CreateThread(NULL, 0, runloop_thread, NULL, 0, NULL))) { @@ -429,7 +427,7 @@ void iohid_driver_unload( void ) #else -NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) +NTSTATUS iohid_driver_init(void) { WARN("IOHID Support not compiled into Wine.\n"); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 284ff48..1a938aa 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1067,7 +1067,7 @@ void sdl_driver_unload( void ) TRACE("Unload Driver\n"); } -NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) +NTSTATUS sdl_driver_init(void) { static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; @@ -1075,7 +1075,6 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ HANDLE events[2]; DWORD result; - TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); if (sdl_handle == NULL) { sdl_handle = wine_dlopen(SONAME_LIBSDL2, RTLD_NOW, NULL, 0); @@ -1151,7 +1150,7 @@ sym_not_found: #else -NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) +NTSTATUS sdl_driver_init(void) { WARN("compiled without SDL support\n"); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 716a437..a3255df 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1451,7 +1451,7 @@ void udev_driver_unload( void ) TRACE("Unload Driver\n"); } -NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) +NTSTATUS udev_driver_init(void) { HANDLE events[2]; DWORD result; @@ -1460,8 +1460,6 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry static const WCHAR input_disabledW[] = {'D','i','s','a','b','l','e','I','n','p','u','t',0}; static const UNICODE_STRING input_disabled = {sizeof(input_disabledW) - sizeof(WCHAR), sizeof(input_disabledW), (WCHAR*)input_disabledW}; - TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); - if (!(udev_context = udev_new())) { ERR("Can't create udev object\n"); @@ -1504,7 +1502,7 @@ error: #else -NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) +NTSTATUS udev_driver_init(void) { WARN("Wine was compiled without UDEV support\n"); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index f7cdc4d..73e3154 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -778,12 +778,6 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { - static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0}; - static UNICODE_STRING udev = {sizeof(udevW) - sizeof(WCHAR), sizeof(udevW), (WCHAR *)udevW}; - static const WCHAR iohidW[] = {'\\','D','r','i','v','e','r','\\','I','O','H','I','D',0}; - static UNICODE_STRING iohid = {sizeof(iohidW) - sizeof(WCHAR), sizeof(iohidW), (WCHAR *)iohidW}; - static const WCHAR sdlW[] = {'\\','D','r','i','v','e','r','\\','S','D','L','J','O','Y',0}; - static UNICODE_STRING sdl = {sizeof(sdlW) - sizeof(WCHAR), sizeof(sdlW), (WCHAR *)sdlW}; static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; static const UNICODE_STRING SDL_enabled = {sizeof(SDL_enabledW) - sizeof(WCHAR), sizeof(SDL_enabledW), (WCHAR*)SDL_enabledW}; OBJECT_ATTRIBUTES attr = {0}; @@ -805,11 +799,11 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) if (check_bus_option(&SDL_enabled, 1)) { - if (IoCreateDriver(&sdl, sdl_driver_init) == STATUS_SUCCESS) + if (sdl_driver_init() == STATUS_SUCCESS) return STATUS_SUCCESS; } - IoCreateDriver(&udev, udev_driver_init); - IoCreateDriver(&iohid, iohid_driver_init); + udev_driver_init(); + iohid_driver_init(); return STATUS_SUCCESS; }

1 0

Alexandre Julliard : mf/tests: Initialize variable to avoid spurious test failure.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 838965a75b77cd0cfa6721ec2cf15653cf7dd496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=838965a75b77cd0cfa6721ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 15:04:34 2019 +0200 mf/tests: Initialize variable to avoid spurious test failure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 18aafe2..f37ac7c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1237,6 +1237,7 @@ todo_wine { ok(hr == S_OK, "Failed to get attribute key, hr %#x.\n", hr); ok(IsEqualGUID(&guid, &MF_TOPOLOGY_RESOLUTION_STATUS), "Unexpected key %s.\n", wine_dbgstr_guid(&guid)); } + value = 0xdeadbeef; hr = IMFTopology_GetUINT32(full_topology, &MF_TOPOLOGY_RESOLUTION_STATUS, &value); todo_wine { ok(hr == S_OK, "Failed to get attribute, hr %#x.\n", hr);

1 0

Zebediah Figura : strmbase: Reimplement BaseFilterImpl_QueryInterface() using a callback.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 4b839bdd6aa02abe8dcf2565f59900e9f199a5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b839bdd6aa02abe8dcf2565… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:56 2019 -0500 strmbase: Reimplement BaseFilterImpl_QueryInterface() using a callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 24 ++++++++++++++++++------ include/wine/strmbase.h | 1 + 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index cf8000f..1af955f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -27,20 +27,32 @@ static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface) return CONTAINING_RECORD(iface, BaseFilter, IBaseFilter_iface); } -HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) +HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter *iface, REFIID iid, void **out) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + BaseFilter *filter = impl_from_IBaseFilter(iface); + HRESULT hr; + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - *ppv = NULL; + *out = NULL; + + if (filter->pFuncsTable->filter_query_interface + && SUCCEEDED(hr = filter->pFuncsTable->filter_query_interface(filter, iid, out))) + { + return hr; + } - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPersist) || - IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter)) + if (IsEqualIID(iid, &IID_IUnknown) + || IsEqualIID(iid, &IID_IPersist) + || IsEqualIID(iid, &IID_IMediaFilter) + || IsEqualIID(iid, &IID_IBaseFilter)) { - *ppv = iface; + *out = iface; IBaseFilter_AddRef(iface); return S_OK; } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); return E_NOINTERFACE; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9bc13de..1d36f13 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -172,6 +172,7 @@ typedef struct BaseFilterFuncTable { IPin *(*filter_get_pin)(BaseFilter *iface, unsigned int index); void (*filter_destroy)(BaseFilter *iface); + HRESULT (*filter_query_interface)(BaseFilter *iface, REFIID iid, void **out); } BaseFilterFuncTable; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : qcap/audiorecord: Fix aggregation support.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: e19235f12bc1afdec7271ba45b1985f1dd2d5596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e19235f12bc1afdec7271ba4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:54 2019 -0500 qcap/audiorecord: Fix aggregation support. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index bc1b452..f789da2 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -68,7 +68,7 @@ static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, LPVOI AudioRecord *This = impl_from_IUnknown(iface); if (IsEqualIID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown, %p)\n", This, ppv); - *ppv = &This->filter.IBaseFilter_iface; + *ppv = &This->IUnknown_iface; } else if (IsEqualIID(riid, &IID_IPersist)) { TRACE("(%p)->(IID_IPersist, %p)\n", This, ppv); *ppv = &This->filter.IBaseFilter_iface; @@ -275,5 +275,5 @@ IUnknown* WINAPI QCAP_createAudioCaptureFilter(IUnknown *outer, HRESULT *phr) (DWORD_PTR)(__FILE__ ": AudioRecord.csFilter"), &AudioRecordFuncs); *phr = S_OK; - return (IUnknown*)&This->filter.IBaseFilter_iface; + return &This->IUnknown_iface; }

1 0

Zebediah Figura : quartz/tests: Add more tests for aggregation.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 09f59571a6b24125c15f5bba5ab5b179f33414f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f59571a6b24125c15f5bba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:53 2019 -0500 quartz/tests: Add more tests for aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/acmwrapper.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avidec.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/avisplit.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/dsoundrender.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/filesource.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/mpegsplit.c | 96 ++++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/waveparser.c | 96 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 672 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09f59571a6b24125c15f…

1 0

Zebediah Figura : winebus.sys: Move udev configuration values to the winebus service key.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: d525c736b9fd7d805fcae6cd0f18557dfa0058b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d525c736b9fd7d805fcae6cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 23:02:29 2019 -0500 winebus.sys: Move udev configuration values to the winebus service key. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 +++- dlls/winebus.sys/bus_sdl.c | 30 ++++++++---------------------- dlls/winebus.sys/bus_udev.c | 4 ++-- dlls/winebus.sys/main.c | 40 ++++++++++++++++++++-------------------- 4 files changed, 33 insertions(+), 45 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index c74221b..4de723f 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -50,5 +50,7 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLS DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func function, void* context) DECLSPEC_HIDDEN; /* General Bus Functions */ -DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; +DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; + +HANDLE driver_key DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index c53402d..284ff48 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -993,14 +993,9 @@ static void process_device_event(SDL_Event *event) set_mapped_report_from_event(event); } -typedef struct _thread_args { - HANDLE event; - UNICODE_STRING *registry_path; -} thread_arguments; - static DWORD CALLBACK deviceloop_thread(void *args) { - thread_arguments *thread_args = args; + HANDLE init_done = args; SDL_Event event; if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) @@ -1015,16 +1010,10 @@ static DWORD CALLBACK deviceloop_thread(void *args) /* Process mappings */ if (pSDL_GameControllerAddMapping != NULL) { - HANDLE key; - OBJECT_ATTRIBUTES attr; - WCHAR buffer[MAX_PATH]; - UNICODE_STRING regpath = {0, sizeof(buffer), buffer}; - static const WCHAR szPath[] = {'\\','m','a','p',0}; - - RtlCopyUnicodeString(&regpath, thread_args->registry_path); - RtlAppendUnicodeToString(&regpath, szPath); - InitializeObjectAttributes(&attr, &regpath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - if (NtOpenKey(&key, KEY_ALL_ACCESS, &attr) == STATUS_SUCCESS) + HKEY key; + static const WCHAR szPath[] = {'m','a','p',0}; + + if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_ENUMERATE_SUB_KEYS, &key)) { DWORD index = 0; CHAR *buffer = NULL; @@ -1063,7 +1052,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) } } - SetEvent(thread_args->event); + SetEvent(init_done); while (1) while (pSDL_WaitEvent(&event) != 0) @@ -1085,7 +1074,6 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ HANDLE events[2]; DWORD result; - thread_arguments args; TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); if (sdl_handle == NULL) @@ -1136,13 +1124,11 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ pSDL_JoystickGetVendor = wine_dlsym(sdl_handle, "SDL_JoystickGetVendor", NULL, 0); } - map_controllers = check_bus_option(registry_path, &controller_mode, 1); + map_controllers = check_bus_option(&controller_mode, 1); if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) return STATUS_UNSUCCESSFUL; - args.event = events[0]; - args.registry_path = registry_path; - if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, &args, 0, NULL))) + if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) { CloseHandle(events[0]); return STATUS_UNSUCCESSFUL; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1f45f8c..716a437 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1468,12 +1468,12 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry return STATUS_UNSUCCESSFUL; } - disable_hidraw = check_bus_option(registry_path, &hidraw_disabled, 0); + disable_hidraw = check_bus_option(&hidraw_disabled, 0); if (disable_hidraw) TRACE("UDEV hidraw devices disabled in registry\n"); #ifdef HAS_PROPER_INPUT_HEADER - disable_input = check_bus_option(registry_path, &input_disabled, 0); + disable_input = check_bus_option(&input_disabled, 0); if (disable_input) TRACE("UDEV input devices disabled in registry\n"); #endif diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index bf13d2f..f7cdc4d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -63,6 +63,8 @@ static const WORD PID_XBOX_CONTROLLERS[] = { static DRIVER_OBJECT *driver_obj; +HANDLE driver_key; + struct pnp_device { struct list entry; @@ -738,30 +740,19 @@ void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) LeaveCriticalSection(&ext->report_cs); } -DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option, DWORD default_value) +DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) { - OBJECT_ATTRIBUTES attr; - HANDLE key; - DWORD output = default_value; + char buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; + KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION*)buffer; + DWORD size; - InitializeObjectAttributes(&attr, registry_path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); - if (NtOpenKey(&key, KEY_ALL_ACCESS, &attr) == STATUS_SUCCESS) + if (NtQueryValueKey(driver_key, option, KeyValuePartialInformation, info, sizeof(buffer), &size) == STATUS_SUCCESS) { - DWORD size; - char buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; - - KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION*)buffer; - - if (NtQueryValueKey(key, option, KeyValuePartialInformation, info, sizeof(buffer), &size) == STATUS_SUCCESS) - { - if (info->Type == REG_DWORD) - output = *(DWORD*)info->Data; - } - - NtClose(key); + if (info->Type == REG_DWORD) + return *(DWORD*)info->Data; } - return output; + return default_value; } BOOL is_xbox_gamepad(WORD vid, WORD pid) @@ -782,6 +773,7 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) udev_driver_unload(); iohid_driver_unload(); sdl_driver_unload(); + NtClose(driver_key); } NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) @@ -794,16 +786,24 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) static UNICODE_STRING sdl = {sizeof(sdlW) - sizeof(WCHAR), sizeof(sdlW), (WCHAR *)sdlW}; static const WCHAR SDL_enabledW[] = {'E','n','a','b','l','e',' ','S','D','L',0}; static const UNICODE_STRING SDL_enabled = {sizeof(SDL_enabledW) - sizeof(WCHAR), sizeof(SDL_enabledW), (WCHAR*)SDL_enabledW}; + OBJECT_ATTRIBUTES attr = {0}; + NTSTATUS ret; TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + attr.Length = sizeof(attr); + attr.ObjectName = path; + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE; + if ((ret = NtOpenKey(&driver_key, KEY_ALL_ACCESS, &attr)) != STATUS_SUCCESS) + ERR("Failed to open driver key, status %#x.\n", ret); + driver_obj = driver; driver->MajorFunction[IRP_MJ_PNP] = common_pnp_dispatch; driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; driver->DriverUnload = driver_unload; - if (check_bus_option(path, &SDL_enabled, 1)) + if (check_bus_option(&SDL_enabled, 1)) { if (IoCreateDriver(&sdl, sdl_driver_init) == STATUS_SUCCESS) return STATUS_SUCCESS;

1 0

Zebediah Figura : quartz/filesource: Use BaseFilterImpl_QueryInterface().
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: ca8b7cf3bf26481572c972c260f99e027ec167ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca8b7cf3bf26481572c972c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 29 20:52:57 2019 -0500 quartz/filesource: Use BaseFilterImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 51 +++++++++++++++--------------------------------- 1 file changed, 16 insertions(+), 35 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index bb0f162..11fdbdc 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -425,10 +425,25 @@ static void async_reader_destroy(BaseFilter *iface) CoTaskMemFree(filter); } +static HRESULT async_reader_query_interface(BaseFilter *iface, REFIID iid, void **out) +{ + AsyncReader *filter = impl_from_BaseFilter(iface); + + if (IsEqualGUID(iid, &IID_IFileSourceFilter)) + { + *out = &filter->IFileSourceFilter_iface; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; + } + + return E_NOINTERFACE; +} + static const BaseFilterFuncTable BaseFuncTable = { .filter_get_pin = async_reader_get_pin, .filter_destroy = async_reader_destroy, + .filter_query_interface = async_reader_query_interface, }; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) @@ -458,40 +473,6 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) return S_OK; } -/** IUnknown methods **/ - -static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) -{ - AsyncReader *This = impl_from_IBaseFilter(iface); - - TRACE("%p->(%s, %p)\n", This, qzdebugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = &This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = &This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = &This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = &This->filter.IBaseFilter_iface; - else if (IsEqualIID(riid, &IID_IFileSourceFilter)) - *ppv = &This->IFileSourceFilter_iface; - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && - !IsEqualIID(riid, &IID_IVideoWindow) && !IsEqualIID(riid, &IID_IBasicAudio)) - FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); - - return E_NOINTERFACE; -} - /** IMediaFilter methods **/ static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) @@ -529,7 +510,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart static const IBaseFilterVtbl AsyncReader_Vtbl = { - AsyncReader_QueryInterface, + BaseFilterImpl_QueryInterface, BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID,

1 0

Alexandre Julliard : d3dxof: Build with msvcrt.
by Alexandre Julliard May 30, 2019

May 30, 2019

Module: wine Branch: master Commit: 4def57920c5f48294238df42edb4859bedae001c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4def57920c5f48294238df42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 30 09:18:25 2019 +0200 d3dxof: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/Makefile.in | 2 ++ dlls/d3dxof/d3dxof.c | 1 - dlls/d3dxof/parsing.c | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/Makefile.in b/dlls/d3dxof/Makefile.in index 93032ad..b7a97be 100644 --- a/dlls/d3dxof/Makefile.in +++ b/dlls/d3dxof/Makefile.in @@ -2,6 +2,8 @@ MODULE = d3dxof.dll IMPORTLIB = d3dxof IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ d3dxof.c \ main.c \ diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 90c9192..e16b0d8 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include "wine/debug.h" #define COBJMACROS diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f1e0982..7d31627 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include "wine/debug.h" #define COBJMACROS

1 0