September 2021 - Wine-Commits

Alexandre Julliard : shell32: Add a helper to retrieve trash item data without copying it.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 0cdb12ae37de187858d99e80204c32969d99a07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdb12ae37de187858d99e80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 17:14:58 2021 +0200 shell32: Add a helper to retrieve trash item data without copying it. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/recyclebin.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 807cae3d81d..d77e4f54b65 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -68,6 +68,13 @@ static const shvheader RecycleBinColumns[] = #define COLUMNS_COUNT 6 +static const WIN32_FIND_DATAW *get_trash_item_data( LPCITEMIDLIST id ) +{ + if (id->mkid.cb < 2 + 1 + sizeof(WIN32_FIND_DATAW) + 2) return NULL; + if (id->mkid.abID[0] != 0) return NULL; + return (const WIN32_FIND_DATAW *)(id->mkid.abID + 1); +} + static HRESULT FormatDateTime(LPWSTR buffer, int size, FILETIME ft) { FILETIME lft; @@ -183,11 +190,11 @@ static void DoRestore(RecycleBinMenu *This) UINT i; for(i=0;i<This->cidl;i++) { - WIN32_FIND_DATAW data; - TRASH_UnpackItemID(&((This->apidl[i])->mkid),&data); - if(PathFileExistsW(data.cFileName)) + const WIN32_FIND_DATAW *data = get_trash_item_data( This->apidl[i] ); + + if(PathFileExistsW(data->cFileName)) { - PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data.cFileName); + PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data->cFileName); WCHAR message[100]; WCHAR caption[50]; if(_ILIsFolder(ILFindLastID(dest_pidl))) @@ -198,14 +205,14 @@ static void DoRestore(RecycleBinMenu *This) if(ShellMessageBoxW(shell32_hInstance,GetActiveWindow(),message, caption,MB_YESNO|MB_ICONEXCLAMATION, - data.cFileName)!=IDYES) + data->cFileName)!=IDYES) continue; } if(SUCCEEDED(TRASH_RestoreItem(This->apidl[i]))) { IPersistFolder2 *persist; LPITEMIDLIST root_pidl; - PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data.cFileName); + PIDLIST_ABSOLUTE dest_pidl = ILCreateFromPathW(data->cFileName); BOOL is_folder = _ILIsFolder(ILFindLastID(dest_pidl)); IShellFolder2_QueryInterface(This->folder,&IID_IPersistFolder2, (void**)&persist); @@ -513,12 +520,11 @@ static HRESULT WINAPI RecycleBin_GetUIObjectOf(IShellFolder2 *iface, HWND hwndOw static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMIDLIST pidl, SHGDNF uFlags, STRRET *pName) { - WIN32_FIND_DATAW data; + const WIN32_FIND_DATAW *data = get_trash_item_data( pidl ); TRACE("(%p, %p, %x, %p)\n", This, pidl, uFlags, pName); - TRASH_UnpackItemID(&pidl->mkid, &data); pName->uType = STRRET_WSTR; - return SHStrDupW(PathFindFileNameW(data.cFileName), &pName->u.pOleStr); + return SHStrDupW(PathFindFileNameW(data->cFileName), &pName->u.pOleStr); } static HRESULT WINAPI RecycleBin_SetNameOf(IShellFolder2 *This, HWND hwnd, LPCITEMIDLIST pidl, LPCOLESTR pszName, @@ -598,7 +604,7 @@ static HRESULT WINAPI RecycleBin_GetDetailsEx(IShellFolder2 *iface, LPCITEMIDLIS static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIST pidl, UINT iColumn, LPSHELLDETAILS pDetails) { RecycleBin *This = impl_from_IShellFolder2(iface); - WIN32_FIND_DATAW data; + const WIN32_FIND_DATAW *data; WCHAR buffer[MAX_PATH]; TRACE("(%p, %p, %d, %p)\n", This, pidl, iColumn, pDetails); @@ -610,21 +616,21 @@ static HRESULT WINAPI RecycleBin_GetDetailsOf(IShellFolder2 *iface, LPCITEMIDLIS if (iColumn == COLUMN_NAME) return RecycleBin_GetDisplayNameOf(iface, pidl, SHGDN_NORMAL, &pDetails->str); - TRASH_UnpackItemID(&pidl->mkid, &data); + data = get_trash_item_data( pidl ); switch (iColumn) { case COLUMN_DATEDEL: - FormatDateTime(buffer, MAX_PATH, data.ftLastAccessTime); + FormatDateTime(buffer, MAX_PATH, data->ftLastAccessTime); break; case COLUMN_DELFROM: - lstrcpyW(buffer, data.cFileName); + lstrcpyW(buffer, data->cFileName); PathRemoveFileSpecW(buffer); break; case COLUMN_SIZE: - StrFormatKBSizeW(((LONGLONG)data.nFileSizeHigh<<32)|data.nFileSizeLow, buffer, MAX_PATH); + StrFormatKBSizeW(((LONGLONG)data->nFileSizeHigh<<32)|data->nFileSizeLow, buffer, MAX_PATH); break; case COLUMN_MTIME: - FormatDateTime(buffer, MAX_PATH, data.ftLastWriteTime); + FormatDateTime(buffer, MAX_PATH, data->ftLastWriteTime); break; case COLUMN_TYPE: /* TODO */ @@ -767,9 +773,8 @@ static HRESULT erase_items(HWND parent,const LPCITEMIDLIST * apidl, UINT cidl, B return S_OK; case 1: { - WIN32_FIND_DATAW data; - TRASH_UnpackItemID(&((*apidl)->mkid),&data); - lstrcpynW(arg,data.cFileName,MAX_PATH); + const WIN32_FIND_DATAW *data = get_trash_item_data( apidl[0] ); + lstrcpynW(arg,data->cFileName,MAX_PATH); LoadStringW(shell32_hInstance, IDS_RECYCLEBIN_ERASEITEM, message, ARRAY_SIZE(message)); break; } @@ -847,9 +852,8 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR pSHQueryRBInfo->i64Size = 0; for (; i<cidl; i++) { - WIN32_FIND_DATAW data; - TRASH_UnpackItemID(&((apidl[i])->mkid),&data); - pSHQueryRBInfo->i64Size += ((DWORDLONG)data.nFileSizeHigh << 32) + data.nFileSizeLow; + const WIN32_FIND_DATAW *data = get_trash_item_data( apidl[i] ); + pSHQueryRBInfo->i64Size += ((DWORDLONG)data->nFileSizeHigh << 32) + data->nFileSizeLow; ILFree(apidl[i]); } SHFree(apidl);

1 0

Alexandre Julliard : shell32: Reimplement trash support using Win32 APIs.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 5803b168ac6203acd0f99fd40ab206fe489e4cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=5803b168ac6203acd0f99fd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 17:16:57 2021 +0200 shell32: Reimplement trash support using Win32 APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 4 +- dlls/shell32/recyclebin.c | 404 +++++++++++++++++++++- dlls/shell32/shfldr.h | 3 + dlls/shell32/shlfileop.c | 8 +- dlls/shell32/trash.c | 854 ---------------------------------------------- dlls/shell32/xdg.c | 743 ---------------------------------------- dlls/shell32/xdg.h | 47 --- 7 files changed, 405 insertions(+), 1658 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5803b168ac6203acd0f9…

1 0

Rémi Bernon : winebus.sys: Pass a unix_device pointer in every bus event.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 421a6f53ad9682696f6c4116cadc7cb1bfd15963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=421a6f53ad9682696f6c4116… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:52 2021 +0200 winebus.sys: Pass a unix_device pointer in every bus event. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 38 +++++++++++++++++++++++++++-- dlls/winebus.sys/bus_sdl.c | 4 +++- dlls/winebus.sys/bus_udev.c | 25 ++++++++++++------- dlls/winebus.sys/main.c | 53 +++++++---------------------------------- dlls/winebus.sys/unix_private.h | 2 +- dlls/winebus.sys/unixlib.c | 17 +++++++------ dlls/winebus.sys/unixlib.h | 9 +------ 7 files changed, 75 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=421a6f53ad9682696f6c…

1 0

Rémi Bernon : winebus.sys: Remove the now useless device_compare callback.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 2a2fc11d8cef6cac96b1348e51c9e623b96c31b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2fc11d8cef6cac96b1348e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:53 2021 +0200 winebus.sys: Remove the now useless device_compare callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 11 ----------- dlls/winebus.sys/bus_sdl.c | 6 ------ dlls/winebus.sys/bus_udev.c | 9 --------- dlls/winebus.sys/unix_private.h | 1 - dlls/winebus.sys/unixlib.c | 20 -------------------- dlls/winebus.sys/unixlib.h | 7 ------- 6 files changed, 54 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 492d5a70ddb..f3b55cc0f70 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -161,16 +161,6 @@ static void iohid_device_destroy(struct unix_device *iface) { } -static int iohid_device_compare(struct unix_device *iface, void *context) -{ - struct platform_private *private = impl_from_unix_device(iface); - IOHIDDeviceRef dev2 = (IOHIDDeviceRef)context; - if (private->device != dev2) - return 1; - else - return 0; -} - static NTSTATUS iohid_device_start(struct unix_device *iface) { DWORD length; @@ -273,7 +263,6 @@ static void iohid_device_set_feature_report(struct unix_device *iface, HID_XFER_ static const struct unix_device_vtbl iohid_device_vtbl = { iohid_device_destroy, - iohid_device_compare, iohid_device_start, iohid_device_stop, iohid_device_get_report_descriptor, diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d48f9507abb..bc7abcb933b 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -497,11 +497,6 @@ static void sdl_device_destroy(struct unix_device *iface) { } -static int sdl_device_compare(struct unix_device *iface, void *context) -{ - return impl_from_unix_device(iface)->id - PtrToUlong(context); -} - static NTSTATUS sdl_device_start(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); @@ -596,7 +591,6 @@ static void sdl_device_set_feature_report(struct unix_device *iface, HID_XFER_PA static const struct unix_device_vtbl sdl_device_vtbl = { sdl_device_destroy, - sdl_device_compare, sdl_device_start, sdl_device_stop, sdl_device_get_reportdescriptor, diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 8cbcabf25e8..bfeb7bfc09b 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -619,13 +619,6 @@ static void hidraw_device_destroy(struct unix_device *iface) udev_device_unref(private->udev_device); } -static int udev_device_compare(struct unix_device *iface, void *platform_dev) -{ - struct udev_device *dev1 = impl_from_unix_device(iface)->udev_device; - struct udev_device *dev2 = platform_dev; - return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); -} - static NTSTATUS hidraw_device_start(struct unix_device *iface) { EnterCriticalSection(&udev_cs); @@ -796,7 +789,6 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER static const struct unix_device_vtbl hidraw_device_vtbl = { hidraw_device_destroy, - udev_device_compare, hidraw_device_start, hidraw_device_stop, hidraw_device_get_report_descriptor, @@ -898,7 +890,6 @@ static void lnxev_device_set_feature_report(struct unix_device *iface, HID_XFER_ static const struct unix_device_vtbl lnxev_device_vtbl = { lnxev_device_destroy, - udev_device_compare, lnxev_device_start, lnxev_device_stop, lnxev_device_get_report_descriptor, diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 9b2c6d81fa2..f2af846473a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -32,7 +32,6 @@ struct unix_device_vtbl { void (*destroy)(struct unix_device *iface); - int (*compare)(struct unix_device *iface, void *platform_dev); NTSTATUS (*start)(struct unix_device *iface); void (*stop)(struct unix_device *iface); NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 008fb6e77a2..b6fcdf18ffe 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -51,11 +51,6 @@ static void mouse_destroy(struct unix_device *iface) hid_descriptor_free(&impl->desc); } -static int mouse_compare(struct unix_device *iface, void *context) -{ - return 0; -} - static NTSTATUS mouse_start(struct unix_device *iface) { struct mouse_device *impl = mouse_from_unix_device(iface); @@ -111,7 +106,6 @@ static void mouse_set_feature_report(struct unix_device *iface, HID_XFER_PACKET static const struct unix_device_vtbl mouse_vtbl = { mouse_destroy, - mouse_compare, mouse_start, mouse_stop, mouse_get_report_descriptor, @@ -155,11 +149,6 @@ static void keyboard_destroy(struct unix_device *iface) hid_descriptor_free(&impl->desc); } -static int keyboard_compare(struct unix_device *iface, void *context) -{ - return 0; -} - static NTSTATUS keyboard_start(struct unix_device *iface) { struct keyboard_device *impl = keyboard_from_unix_device(iface); @@ -215,7 +204,6 @@ static void keyboard_set_feature_report(struct unix_device *iface, HID_XFER_PACK static const struct unix_device_vtbl keyboard_vtbl = { keyboard_destroy, - keyboard_compare, keyboard_start, keyboard_stop, keyboard_get_report_descriptor, @@ -275,13 +263,6 @@ static NTSTATUS unix_device_remove(void *args) return STATUS_SUCCESS; } -static NTSTATUS unix_device_compare(void *args) -{ - struct device_compare_params *params = args; - struct unix_device *iface = params->iface; - return iface->vtbl->compare(iface, params->context); -} - static NTSTATUS unix_device_start(void *args) { struct unix_device *iface = args; @@ -333,7 +314,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = mouse_device_create, keyboard_device_create, unix_device_remove, - unix_device_compare, unix_device_start, unix_device_get_report_descriptor, unix_device_set_output_report, diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index cd5f64cbb51..ccca8d12e8b 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -98,12 +98,6 @@ struct device_create_params struct unix_device *device; }; -struct device_compare_params -{ - struct unix_device *iface; - void *context; -}; - struct device_descriptor_params { struct unix_device *iface; @@ -133,7 +127,6 @@ enum unix_funcs mouse_create, keyboard_create, device_remove, - device_compare, device_start, device_get_report_descriptor, device_set_output_report,

1 0

Rémi Bernon : winebus.sys: Move is_xbox_gamepad to unixlib.c.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 7032b41747a1f75d3d200d7dad06754d78106a8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7032b41747a1f75d3d200d7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:54 2021 +0200 winebus.sys: Move is_xbox_gamepad to unixlib.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 3 --- dlls/winebus.sys/main.c | 38 -------------------------------------- dlls/winebus.sys/unix_private.h | 2 ++ dlls/winebus.sys/unixlib.c | 19 +++++++++++++++++++ 4 files changed, 21 insertions(+), 41 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index df53508d2c0..96503a8267f 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -27,7 +27,4 @@ #include "unixlib.h" -/* General Bus Functions */ -BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; - extern HANDLE driver_key DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a80bd8a186e..f1b0430509a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -57,31 +57,6 @@ __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, #endif -struct product_desc -{ - WORD vid; - WORD pid; -}; - -#define VID_MICROSOFT 0x045e - -static const struct product_desc XBOX_CONTROLLERS[] = -{ - {VID_MICROSOFT, 0x0202}, /* Xbox Controller */ - {VID_MICROSOFT, 0x0285}, /* Xbox Controller S */ - {VID_MICROSOFT, 0x0289}, /* Xbox Controller S */ - {VID_MICROSOFT, 0x028e}, /* Xbox360 Controller */ - {VID_MICROSOFT, 0x028f}, /* Xbox360 Wireless Controller */ - {VID_MICROSOFT, 0x02d1}, /* Xbox One Controller */ - {VID_MICROSOFT, 0x02dd}, /* Xbox One Controller (Covert Forces/Firmware 2015) */ - {VID_MICROSOFT, 0x02e0}, /* Xbox One X Controller */ - {VID_MICROSOFT, 0x02e3}, /* Xbox One Elite Controller */ - {VID_MICROSOFT, 0x02e6}, /* Wireless XBox Controller Dongle */ - {VID_MICROSOFT, 0x02ea}, /* Xbox One S Controller */ - {VID_MICROSOFT, 0x02fd}, /* Xbox One S Controller (Firmware 2017) */ - {VID_MICROSOFT, 0x0719}, /* Xbox 360 Wireless Adapter */ -}; - static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; @@ -1021,19 +996,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } -BOOL is_xbox_gamepad(WORD vid, WORD pid) -{ - int i; - - if (vid != VID_MICROSOFT) - return FALSE; - - for (i = 0; i < ARRAY_SIZE(XBOX_CONTROLLERS); i++) - if (pid == XBOX_CONTROLLERS[i].pid) return TRUE; - - return FALSE; -} - static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *pdo) { NTSTATUS ret; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index f2af846473a..cdc2be9b318 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -89,4 +89,6 @@ extern BOOL hid_descriptor_add_axes(struct hid_descriptor *desc, BYTE count, USA extern BOOL hid_descriptor_add_haptics(struct hid_descriptor *desc) DECLSPEC_HIDDEN; +BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; + #endif /* __WINEBUS_UNIX_PRIVATE_H */ diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index b6fcdf18ffe..57e81d3cba8 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -34,6 +34,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +BOOL is_xbox_gamepad(WORD vid, WORD pid) +{ + if (vid != 0x045e) return FALSE; + if (pid == 0x0202) return TRUE; /* Xbox Controller */ + if (pid == 0x0285) return TRUE; /* Xbox Controller S */ + if (pid == 0x0289) return TRUE; /* Xbox Controller S */ + if (pid == 0x028e) return TRUE; /* Xbox360 Controller */ + if (pid == 0x028f) return TRUE; /* Xbox360 Wireless Controller */ + if (pid == 0x02d1) return TRUE; /* Xbox One Controller */ + if (pid == 0x02dd) return TRUE; /* Xbox One Controller (Covert Forces/Firmware 2015) */ + if (pid == 0x02e0) return TRUE; /* Xbox One X Controller */ + if (pid == 0x02e3) return TRUE; /* Xbox One Elite Controller */ + if (pid == 0x02e6) return TRUE; /* Wireless XBox Controller Dongle */ + if (pid == 0x02ea) return TRUE; /* Xbox One S Controller */ + if (pid == 0x02fd) return TRUE; /* Xbox One S Controller (Firmware 2017) */ + if (pid == 0x0719) return TRUE; /* Xbox 360 Wireless Adapter */ + return FALSE; +} + struct mouse_device { struct unix_device unix_device;

1 0

Rémi Bernon : winebus.sys: Load SDL bus mappings before calling bus_init.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 0017b5eb636ee4963636eaf83ae34f6077d695fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0017b5eb636ee4963636eaf8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:55 2021 +0200 winebus.sys: Load SDL bus mappings before calling bus_init. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 30 --------------- dlls/winebus.sys/bus_iohid.c | 1 - dlls/winebus.sys/bus_sdl.c | 69 +++++++++------------------------- dlls/winebus.sys/bus_udev.c | 1 - dlls/winebus.sys/main.c | 88 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/unixlib.h | 3 ++ 6 files changed, 105 insertions(+), 87 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h deleted file mode 100644 index 96503a8267f..00000000000 --- a/dlls/winebus.sys/bus.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2016 Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winternl.h> -#include <ddk/wdm.h> -#include <ddk/hidclass.h> -#include <hidusage.h> - -#include "unixlib.h" - -extern HANDLE driver_key DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index f3b55cc0f70..6d3f621a15a 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -89,7 +89,6 @@ #include "ddk/hidtypes.h" #include "wine/debug.h" -#include "bus.h" #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index bc7abcb933b..ff3a7ca09d8 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -50,7 +50,6 @@ # define LE_WORD(x) (x) #endif -#include "bus.h" #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); @@ -815,59 +814,11 @@ static void process_device_event(SDL_Event *event) LeaveCriticalSection(&sdl_cs); } -static void sdl_load_mappings(void) +NTSTATUS sdl_bus_init(void *args) { - HKEY key; - static const WCHAR szPath[] = {'m','a','p',0}; const char *mapping; + int i; - if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) - { - TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); - if (pSDL_GameControllerAddMapping(mapping) < 0) - WARN("Failed to add environment mapping %s\n", pSDL_GetError()); - } - else if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) - { - DWORD index = 0; - CHAR *buffer = NULL; - DWORD buffer_len = 0; - LSTATUS rc; - - do - { - CHAR name[255]; - DWORD name_len; - DWORD type; - DWORD data_len = buffer_len; - - name_len = sizeof(name); - rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); - if (rc == ERROR_MORE_DATA || buffer == NULL) - { - if (buffer) buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, data_len); - else buffer = HeapAlloc(GetProcessHeap(), 0, data_len); - buffer_len = data_len; - - name_len = sizeof(name); - rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); - } - - if (rc == STATUS_SUCCESS) - { - TRACE("Setting registry mapping %s\n", debugstr_a(buffer)); - if (pSDL_GameControllerAddMapping(buffer) < 0) - WARN("Failed to add registry mapping %s\n", pSDL_GetError()); - index++; - } - } while (rc == STATUS_SUCCESS); - HeapFree(GetProcessHeap(), 0, buffer); - NtClose(key); - } -} - -NTSTATUS sdl_bus_init(void *args) -{ TRACE("args %p\n", args); options = *(struct sdl_bus_options *)args; @@ -942,7 +893,21 @@ NTSTATUS sdl_bus_init(void *args) pSDL_GameControllerEventState(SDL_ENABLE); /* Process mappings */ - if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); + if (pSDL_GameControllerAddMapping) + { + if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) + { + TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); + if (pSDL_GameControllerAddMapping(mapping) < 0) + WARN("Failed to add environment mapping %s\n", pSDL_GetError()); + } + else for (i = 0; i < options.mappings_count; ++i) + { + TRACE("Setting registry mapping %s\n", debugstr_a(options.mappings[i])); + if (pSDL_GameControllerAddMapping(options.mappings[i]) < 0) + WARN("Failed to add registry mapping %s\n", pSDL_GetError()); + } + } return STATUS_SUCCESS; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index bfeb7bfc09b..b8b3a0f0a84 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -79,7 +79,6 @@ #define LE_DWORD(x) (x) #endif -#include "bus.h" #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index f1b0430509a..4528673f880 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -34,7 +34,6 @@ #include "wine/list.h" #include "wine/unixlib.h" -#include "bus.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); @@ -66,7 +65,7 @@ static DEVICE_OBJECT *keyboard_obj; static DEVICE_OBJECT *bus_pdo; static DEVICE_OBJECT *bus_fdo; -HANDLE driver_key; +static HANDLE driver_key; enum device_state { @@ -630,6 +629,85 @@ static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) return STATUS_SUCCESS; } +static void sdl_bus_free_mappings(struct sdl_bus_options *options) +{ + DWORD count = options->mappings_count; + char **mappings = options->mappings; + + while (count) HeapFree(GetProcessHeap(), 0, mappings[--count]); + HeapFree(GetProcessHeap(), 0, mappings); +} + +static void sdl_bus_load_mappings(struct sdl_bus_options *options) +{ + static const WCHAR szPath[] = {'m','a','p',0}; + + ULONG idx = 0, len, count = 0, capacity, info_size, info_max_size; + KEY_VALUE_FULL_INFORMATION *info; + OBJECT_ATTRIBUTES attr = {0}; + char **mappings = NULL; + UNICODE_STRING path; + NTSTATUS status; + HANDLE key; + + options->mappings_count = 0; + options->mappings = NULL; + + RtlInitUnicodeString(&path, szPath); + InitializeObjectAttributes(&attr, &path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, driver_key, NULL); + status = NtOpenKey(&key, KEY_ALL_ACCESS, &attr); + if (status) return; + + capacity = 1024; + mappings = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(*mappings)); + info_max_size = offsetof(KEY_VALUE_FULL_INFORMATION, Name) + 512; + info = HeapAlloc(GetProcessHeap(), 0, info_max_size); + + while (!status && info && mappings) + { + status = NtEnumerateValueKey(key, idx, KeyValueFullInformation, info, info_max_size, &info_size); + while (status == STATUS_BUFFER_OVERFLOW) + { + info_max_size = info_size; + if (!(info = HeapReAlloc(GetProcessHeap(), 0, info, info_max_size))) break; + status = NtEnumerateValueKey(key, idx, KeyValueFullInformation, info, info_max_size, &info_size); + } + + if (status == STATUS_NO_MORE_ENTRIES) + { + options->mappings_count = count; + options->mappings = mappings; + goto done; + } + + idx++; + if (status) break; + if (info->Type != REG_SZ) continue; + + RtlUnicodeToMultiByteSize(&len, (WCHAR *)((char *)info + info->DataOffset), info_size - info->DataOffset); + if (!len) continue; + + if (!(mappings[count++] = HeapAlloc(GetProcessHeap(), 0, len + 1))) break; + if (count > capacity) + { + capacity = capacity * 3 / 2; + if (!(mappings = HeapReAlloc(GetProcessHeap(), 0, mappings, capacity * sizeof(*mappings)))) + break; + } + + RtlUnicodeToMultiByteN(mappings[count], len, NULL, (WCHAR *)((char *)info + info->DataOffset), + info_size - info->DataOffset); + if (mappings[len - 1]) mappings[len] = 0; + } + + if (mappings) while (count) HeapFree(GetProcessHeap(), 0, mappings[--count]); + HeapFree(GetProcessHeap(), 0, mappings); + +done: + HeapFree(GetProcessHeap(), 0, info); + NtClose(key); +} + static NTSTATUS sdl_driver_init(void) { static const WCHAR bus_name[] = {'S','D','L',0}; @@ -643,11 +721,15 @@ static NTSTATUS sdl_driver_init(void) .init_code = sdl_init, .wait_code = sdl_wait, }; + NTSTATUS status; bus_options.map_controllers = check_bus_option(&controller_mode, 1); if (!bus_options.map_controllers) TRACE("SDL controller to XInput HID gamepad mapping disabled\n"); + sdl_bus_load_mappings(&bus_options); - return bus_main_thread_start(&bus); + status = bus_main_thread_start(&bus); + sdl_bus_free_mappings(&bus_options); + return status; } static NTSTATUS udev_driver_init(void) diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index ccca8d12e8b..55ba42500cf 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -49,6 +49,9 @@ struct device_desc struct sdl_bus_options { BOOL map_controllers; + /* freed after bus_init */ + DWORD mappings_count; + char **mappings; }; struct udev_bus_options

1 0

Rémi Bernon : winebus.sys: Use Rtl CS functions.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 39ca4de66553135df796b2329832af0ead0d5012 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39ca4de66553135df796b232… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:57 2021 +0200 winebus.sys: Use Rtl CS functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 8 ++++---- dlls/winebus.sys/bus_sdl.c | 8 ++++---- dlls/winebus.sys/bus_udev.c | 24 +++++++++++------------ dlls/winebus.sys/main.c | 46 ++++++++++++++++++++++---------------------- 4 files changed, 43 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39ca4de66553135df796…

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_SetEventNotification tests.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 7da842a738234bd5f3222610892498ddea4c5954 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da842a738234bd5f3222610… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:41 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_SetEventNotification tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2bbf7a9e978..fbf1b894fd1 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3405,6 +3405,7 @@ static void test_simple_joystick(void) IDirectInputDevice8W *device; DIDEVCAPS caps = {0}; IDirectInput8W *di; + HANDLE event; HRESULT hr; WCHAR *tmp; ULONG ref; @@ -3691,9 +3692,19 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); + todo_wine + ok( hr == E_HANDLE, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + event = CreateEventW( NULL, FALSE, FALSE, NULL ); + ok( event != NULL, "CreateEventW failed, last error %u\n", GetLastError() ); + hr = IDirectInputDevice8_SetEventNotification( device, event ); + ok( hr == DI_OK, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + CloseHandle( event ); + ref = IDirectInput8_Release( di ); ok( ref == 0, "IDirectInput8_Release returned %d\n", ref );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_(Un)Acquire tests.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: f9486e98472e42cc400088b86835d2467ffbb387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9486e98472e42cc400088b8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:43 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_(Un)Acquire tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 2cfa8f2e09e..c0690bac868 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3721,11 +3721,31 @@ static void test_simple_joystick(void) ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); + todo_wine + ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + DestroyWindow( hwnd ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + + /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ + Sleep( 100 ); + ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref );

1 0

Derek Lesho : winegstreamer: Duplicate source shutdown path into constructor with leak fixes.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 67734bfce31d6032cee1a8980a9022665e9e18fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=67734bfce31d6032cee1a898… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 15 18:00:08 2021 -0500 winegstreamer: Duplicate source shutdown path into constructor with leak fixes. Instead of having mixing together IMFMediaSource::Shutdown() and the constructors' failure paths, creating confusion about what should be released where, designate ::Shutdown/::Release to shutting down fully initialized objects without checks, and keep the partially-created object cleanup code in the constructor. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/media_source.c | 102 ++++++++++++++++++++++++-------------- 2 files changed, 66 insertions(+), 37 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index c6c99b1dd55..c29fc4a2437 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -22,6 +22,7 @@ #define __GST_PRIVATE_INCLUDED__ #include <assert.h> +#include <limits.h> #include <stdarg.h> #include <stdbool.h> #include <stdint.h> diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 01ab626254a..95bdb9b488e 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -733,6 +733,12 @@ static HRESULT new_media_stream(struct media_source *source, object->IMFMediaStream_iface.lpVtbl = &media_stream_vtbl; object->ref = 1; + if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) + { + free(object); + return hr; + } + IMFMediaSource_AddRef(&source->IMFMediaSource_iface); object->parent_source = source; object->stream_id = stream_id; @@ -741,20 +747,11 @@ static HRESULT new_media_stream(struct media_source *source, object->eos = FALSE; object->wg_stream = wg_stream; - if (FAILED(hr = MFCreateEventQueue(&object->event_queue))) - goto fail; - TRACE("Created stream object %p.\n", object); *out_stream = object; return S_OK; - -fail: - WARN("Failed to construct media stream, hr %#x.\n", hr); - - IMFMediaStream_Release(&object->IMFMediaStream_iface); - return hr; } static HRESULT media_stream_init_desc(struct media_stream *stream) @@ -847,10 +844,16 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) goto done; if (FAILED(hr = IMFStreamDescriptor_GetMediaTypeHandler(stream->descriptor, &type_handler))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } if (FAILED(hr = IMFMediaTypeHandler_SetCurrentMediaType(type_handler, stream_types[0]))) + { + IMFStreamDescriptor_Release(stream->descriptor); goto done; + } done: if (type_handler) @@ -1213,19 +1216,13 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) unix_funcs->wg_parser_disconnect(source->wg_parser); - if (source->read_thread) - { - source->read_thread_shutdown = true; - WaitForSingleObject(source->read_thread, INFINITE); - CloseHandle(source->read_thread); - } + source->read_thread_shutdown = true; + WaitForSingleObject(source->read_thread, INFINITE); + CloseHandle(source->read_thread); - if (source->pres_desc) - IMFPresentationDescriptor_Release(source->pres_desc); - if (source->event_queue) - IMFMediaEventQueue_Shutdown(source->event_queue); - if (source->byte_stream) - IMFByteStream_Release(source->byte_stream); + IMFPresentationDescriptor_Release(source->pres_desc); + IMFMediaEventQueue_Shutdown(source->event_queue); + IMFByteStream_Release(source->byte_stream); for (i = 0; i < source->stream_count; i++) { @@ -1233,23 +1230,18 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) stream->state = STREAM_SHUTDOWN; - if (stream->event_queue) - IMFMediaEventQueue_Shutdown(stream->event_queue); - if (stream->descriptor) - IMFStreamDescriptor_Release(stream->descriptor); - if (stream->parent_source) - IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); IMFMediaStream_Release(&stream->IMFMediaStream_iface); } unix_funcs->wg_parser_destroy(source->wg_parser); - if (source->stream_count) - free(source->streams); + free(source->streams); - if (source->async_commands_queue) - MFUnlockWorkQueue(source->async_commands_queue); + MFUnlockWorkQueue(source->async_commands_queue); return S_OK; } @@ -1274,6 +1266,7 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) { IMFStreamDescriptor **descriptors = NULL; + unsigned int stream_count = UINT_MAX; struct media_source *object; UINT64 total_pres_time = 0; struct wg_parser *parser; @@ -1337,15 +1330,15 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ * leak occurs with native. */ unix_funcs->wg_parser_set_unlimited_buffering(parser); - object->stream_count = unix_funcs->wg_parser_get_stream_count(parser); + stream_count = unix_funcs->wg_parser_get_stream_count(parser); - if (!(object->streams = calloc(object->stream_count, sizeof(*object->streams)))) + if (!(object->streams = calloc(stream_count, sizeof(*object->streams)))) { hr = E_OUTOFMEMORY; goto fail; } - for (i = 0; i < object->stream_count; ++i) + for (i = 0; i < stream_count; ++i) { if (FAILED(hr = new_media_stream(object, unix_funcs->wg_parser_get_stream(parser, i), i, &object->streams[i]))) goto fail; @@ -1353,9 +1346,13 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (FAILED(hr = media_stream_init_desc(object->streams[i]))) { ERR("Failed to finish initialization of media stream %p, hr %x.\n", object->streams[i], hr); - IMFMediaStream_Release(&object->streams[i]->IMFMediaStream_iface); + IMFMediaSource_Release(&object->streams[i]->parent_source->IMFMediaSource_iface); + IMFMediaEventQueue_Release(object->streams[i]->event_queue); + free(object->streams[i]); goto fail; } + + object->stream_count++; } /* init presentation descriptor */ @@ -1392,8 +1389,39 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ fail: WARN("Failed to construct MFMediaSource, hr %#x.\n", hr); - free(descriptors); - IMFMediaSource_Release(&object->IMFMediaSource_iface); + if (descriptors) + { + for (i = 0; i < object->stream_count; i++) + IMFStreamDescriptor_Release(descriptors[i]); + free(descriptors); + } + for (i = 0; i < object->stream_count; i++) + { + struct media_stream *stream = object->streams[i]; + + IMFMediaEventQueue_Release(stream->event_queue); + IMFStreamDescriptor_Release(stream->descriptor); + IMFMediaSource_Release(&stream->parent_source->IMFMediaSource_iface); + + free(stream); + } + free(object->streams); + if (stream_count != UINT_MAX) + unix_funcs->wg_parser_disconnect(object->wg_parser); + if (object->read_thread) + { + object->read_thread_shutdown = true; + WaitForSingleObject(object->read_thread, INFINITE); + CloseHandle(object->read_thread); + } + if (object->wg_parser) + unix_funcs->wg_parser_destroy(object->wg_parser); + if (object->async_commands_queue) + MFUnlockWorkQueue(object->async_commands_queue); + if (object->event_queue) + IMFMediaEventQueue_Release(object->event_queue); + IMFByteStream_Release(object->byte_stream); + free(object); return hr; }

1 0