July 2020 - Wine-commits - list.winehq.org

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleWindowInfo.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 07194e9287eb2e2adbc2d1bdff204b4f8dec3ef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07194e9287eb2e2adbc2d1bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:07:50 2020 +0200 kernelbase: Use IOCTL_CONDRV_SET_OUTPUT_INFO in SetConsoleWindowInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 85854851ce..cc30a11d68 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1406,8 +1406,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTitleW( LPCWSTR title ) */ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute, SMALL_RECT *window ) { + struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW }; SMALL_RECT rect = *window; - BOOL ret; TRACE( "(%p,%d,(%d,%d-%d,%d))\n", handle, absolute, rect.Left, rect.Top, rect.Right, rect.Bottom ); @@ -1421,19 +1421,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute rect.Right += info.srWindow.Right; rect.Bottom += info.srWindow.Bottom; } - SERVER_START_REQ( set_console_output_info ) - { - req->handle = console_handle_unmap( handle ); - req->win_left = rect.Left; - req->win_top = rect.Top; - req->win_right = rect.Right; - req->win_bottom = rect.Bottom; - req->mask = SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + params.info.win_left = rect.Left; + params.info.win_top = rect.Top; + params.info.win_right = rect.Right; + params.info.win_bottom = rect.Bottom; + return console_ioctl( handle, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetConfig.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 6695ca86a29c4ba3844445480d5591c0dd75a824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6695ca86a29c4ba384444548… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:08:04 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetConfig. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 88c9ca400a..41710057ea 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -454,23 +454,24 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_pitch_family != cfg->font_pitch_family || data->curcfg.font_weight != cfg->font_weight) { + struct condrv_output_info_params *params; + size_t len = lstrlenW(cfg->face_name); RECT r; data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); SystemParametersInfoW(SPI_GETWORKAREA, 0, &r, 0); - SERVER_START_REQ(set_console_output_info) + if ((params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params) + len * sizeof(WCHAR)))) { - req->handle = wine_server_obj_handle( data->hConOut ); - req->mask = SET_CONSOLE_OUTPUT_INFO_MAX_SIZE | SET_CONSOLE_OUTPUT_INFO_FONT; - req->max_width = (r.right - r.left) / cfg->cell_width; - req->max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height; - req->font_width = cfg->cell_width; - req->font_height = cfg->cell_height; - req->font_weight = cfg->font_weight; - req->font_pitch_family = cfg->font_pitch_family; - wine_server_add_data( req, cfg->face_name, lstrlenW(cfg->face_name) * sizeof(WCHAR) ); - wine_server_call( req ); + params->mask = SET_CONSOLE_OUTPUT_INFO_MAX_SIZE | SET_CONSOLE_OUTPUT_INFO_FONT; + params->info.max_width = (r.right - r.left) / cfg->cell_width; + params->info.max_height = (r.bottom - r.top - GetSystemMetrics(SM_CYCAPTION)) / cfg->cell_height; + params->info.font_width = cfg->cell_width; + params->info.font_height = cfg->cell_height; + params->info.font_weight = cfg->font_weight; + params->info.font_pitch_family = cfg->font_pitch_family; + memcpy(params + 1, cfg->face_name, len * sizeof(WCHAR)); + DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), + NULL, 0, NULL, NULL); } - SERVER_END_REQ; } if (data->curcfg.def_attr != cfg->def_attr) {

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetColors.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 9c6d0f6eeab8eb58a9cfc4ba3c1d3c9145b1d8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c6d0f6eeab8eb58a9cfc4ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:08:15 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_OUTPUT_INFO in WINECON_SetColors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 41710057ea..94ef6c3dec 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -218,20 +218,15 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) */ static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) { - size_t color_map_size = sizeof(data->curcfg.color_map); + struct condrv_output_info_params params = + { SET_CONSOLE_OUTPUT_INFO_COLORTABLE | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR }; - memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + memcpy(data->curcfg.color_map, cfg->color_map, sizeof(data->curcfg.color_map)); data->curcfg.popup_attr = cfg->popup_attr; - SERVER_START_REQ( set_console_output_info ) - { - req->handle = wine_server_obj_handle( data->hConOut ); - req->mask = SET_CONSOLE_OUTPUT_INFO_COLORTABLE | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR; - req->popup_attr = cfg->popup_attr; - wine_server_add_data( req, cfg->color_map, color_map_size ); - wine_server_call( req ); - } - SERVER_END_REQ; + params.info.popup_attr = cfg->popup_attr; + memcpy(params.info.color_map, cfg->color_map, sizeof(cfg->color_map)); + DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /******************************************************************

1 0

Jacek Caban : server: Remove no longer used set_console_output_info request.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 4d57e8f937fc866d092539ceafb989d740462d2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d57e8f937fc866d092539ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 10 17:08:23 2020 +0200 server: Remove no longer used set_console_output_info request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 10 +++ include/wine/server_protocol.h | 47 +--------- server/console.c | 191 ----------------------------------------- server/protocol.def | 36 -------- server/request.h | 23 ----- server/trace.c | 29 ------- 6 files changed, 11 insertions(+), 325 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d57e8f937fc866d0925…

1 0

Zebediah Figura : msdmo: Remove dead code associated with an older registry format.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: fb64420673012b4b26d126b3ebf8fcecff719fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb64420673012b4b26d126b3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:46 2020 -0500 msdmo: Remove dead code associated with an older registry format. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 113 +++------------------------------------------------- 1 file changed, 6 insertions(+), 107 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 1a35b41f46..ffe64782d1 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -32,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdmo); -#define MSDMO_MAJOR_VERSION 6 - static const WCHAR szDMORootKey[] = { 'D','i','r','e','c','t','S','h','o','w','\\', @@ -139,40 +137,8 @@ static BOOL IsMediaTypeEqual(const DMO_PARTIAL_MEDIATYPE* mt1, const DMO_PARTIAL static HRESULT write_types(HKEY hkey, LPCWSTR name, const DMO_PARTIAL_MEDIATYPE* types, DWORD count) { - LONG ret; - - if (MSDMO_MAJOR_VERSION > 5) - { - ret = RegSetValueExW(hkey, name, 0, REG_BINARY, (const BYTE*) types, - count* sizeof(DMO_PARTIAL_MEDIATYPE)); - } - else - { - HKEY skey1,skey2,skey3; - DWORD index = 0; - WCHAR szGuidKey[64]; - - ret = RegCreateKeyExW(hkey, name, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_WRITE, NULL, &skey1, NULL); - if (ret) - return HRESULT_FROM_WIN32(ret); - - while (index < count) - { - GUIDToString(szGuidKey,&types[index].type); - ret = RegCreateKeyExW(skey1, szGuidKey, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey2, NULL); - GUIDToString(szGuidKey,&types[index].subtype); - ret = RegCreateKeyExW(skey2, szGuidKey, 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &skey3, NULL); - RegCloseKey(skey3); - RegCloseKey(skey2); - index ++; - } - RegCloseKey(skey1); - } - - return HRESULT_FROM_WIN32(ret); + return HRESULT_FROM_WIN32(RegSetValueExW(hkey, name, 0, REG_BINARY, + (const BYTE *)types, count * sizeof(DMO_PARTIAL_MEDIATYPE))); } /*************************************************************** @@ -766,78 +732,11 @@ static const IEnumDMOVtbl edmovt = HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types ) { - HRESULT ret = S_OK; + DWORD len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); + LONG ret = RegQueryValueExW(root, key, NULL, NULL, (BYTE *)types, &len); - if (MSDMO_MAJOR_VERSION > 5) - { - DWORD len; - LONG rc; - - len = requested * sizeof(DMO_PARTIAL_MEDIATYPE); - rc = RegQueryValueExW(root, key, NULL, NULL, (LPBYTE) types, &len); - ret = HRESULT_FROM_WIN32(rc); - - *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); - } - else - { - HKEY hkey; - WCHAR szGuidKey[64]; - - *supplied = 0; - if (ERROR_SUCCESS == RegOpenKeyExW(root, key, 0, KEY_READ, &hkey)) - { - int index = 0; - WCHAR szNextKey[MAX_PATH]; - DWORD len; - LONG rc = ERROR_SUCCESS; - - while (rc == ERROR_SUCCESS) - { - len = MAX_PATH; - rc = RegEnumKeyExW(hkey, index, szNextKey, &len, NULL, NULL, NULL, NULL); - if (rc == ERROR_SUCCESS) - { - HKEY subk; - int sub_index = 0; - LONG rcs = ERROR_SUCCESS; - WCHAR szSubKey[MAX_PATH]; - - RegOpenKeyExW(hkey, szNextKey, 0, KEY_READ, &subk); - while (rcs == ERROR_SUCCESS) - { - len = MAX_PATH; - rcs = RegEnumKeyExW(subk, sub_index, szSubKey, &len, NULL, NULL, NULL, NULL); - if (rcs == ERROR_SUCCESS) - { - if (*supplied >= requested) - { - /* Bailing */ - ret = S_FALSE; - rc = ERROR_MORE_DATA; - rcs = ERROR_MORE_DATA; - break; - } - - wsprintfW(szGuidKey,szToGuidFmt,szNextKey); - CLSIDFromString(szGuidKey, &types[*supplied].type); - wsprintfW(szGuidKey,szToGuidFmt,szSubKey); - CLSIDFromString(szGuidKey, &types[*supplied].subtype); - TRACE("Adding type %s subtype %s at index %i\n", - debugstr_guid(&types[*supplied].type), - debugstr_guid(&types[*supplied].subtype), - *supplied); - (*supplied)++; - } - sub_index++; - } - index++; - } - } - RegCloseKey(hkey); - } - } - return ret; + *supplied = len / sizeof(DMO_PARTIAL_MEDIATYPE); + return HRESULT_FROM_WIN32(ret); } /***************************************************************

1 0

Zebediah Figura : msdmo: Avoid a redundant string -> GUID conversion.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 42a8f382ed07595ab093a4da6452814099275e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a8f382ed07595ab093a4da… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:47 2020 -0500 msdmo: Avoid a redundant string -> GUID conversion. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ffe64782d1..3143cfc5e2 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -75,12 +75,6 @@ static const WCHAR szCat2Fmt[] = '%','s','\\','%','s',0 }; -static const WCHAR szToGuidFmt[] = -{ - '{','%','s','}',0 -}; - - typedef struct { IEnumDMO IEnumDMO_iface; @@ -482,7 +476,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( { HKEY hkey; WCHAR szNextKey[MAX_PATH]; - WCHAR szGuidKey[64]; WCHAR szKey[MAX_PATH]; WCHAR szValue[MAX_PATH]; DMO_PARTIAL_MEDIATYPE types[100]; @@ -490,7 +483,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( UINT count = 0; HRESULT hres = S_OK; LONG ret; - GUID guid; IEnumDMOImpl *This = impl_from_IEnumDMO(iface); @@ -514,7 +506,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( break; } - if (string_to_guid(szNextKey, &guid) != S_OK) + if (string_to_guid(szNextKey, &pCLSID[count]) != S_OK) continue; TRACE("found %s\n", debugstr_w(szNextKey)); @@ -622,8 +614,6 @@ static HRESULT WINAPI IEnumDMO_fnNext( lstrcpyW(Names[count], szValue); } } - wsprintfW(szGuidKey,szToGuidFmt,szNextKey); - CLSIDFromString(szGuidKey, &pCLSID[count]); TRACE("found match %s %s\n", debugstr_w(szValue), debugstr_w(szNextKey)); RegCloseKey(hkey);

1 0

Zebediah Figura : msdmo: Use wide character string literals.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: 3a708d4722eba242758a43b83bc4ff6a7ca391ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a708d4722eba242758a43b8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:48 2020 -0500 msdmo: Use wide character string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 115 +++++++++++++++------------------------------------- 1 file changed, 33 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a708d4722eba242758a…

1 0

Zebediah Figura : msdmo: Factor out any_types_match().
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: aa2406ecea33e511255ee3ae2d43b6cbc7dbd9cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2406ecea33e511255ee3ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:49 2020 -0500 msdmo: Factor out any_types_match(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 7e7f0c0fb8..ab3fda743c 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -417,6 +417,21 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) return refCount; } +static BOOL any_types_match(const DMO_PARTIAL_MEDIATYPE *a, unsigned int a_count, + const DMO_PARTIAL_MEDIATYPE *b, unsigned int b_count) +{ + unsigned int i, j; + + for (i = 0; i < a_count; ++i) + { + for (j = 0; j < b_count; ++j) + { + if (IsMediaTypeEqual(&a[i], &b[j])) + return TRUE; + } + } + return FALSE; +} /****************************************************************************** * IEnumDMO_fnNext @@ -483,8 +498,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pInTypes) { - UINT i, j; - DWORD cInTypes; + DWORD cInTypes, i; hres = read_types(hkey, L"InputTypes", &cInTypes, ARRAY_SIZE(types), types); if (FAILED(hres)) @@ -498,19 +512,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( debugstr_guid(&types[i].subtype)); } - for (i = 0; i < This->cInTypes; i++) - { - for (j = 0; j < cInTypes; j++) - { - if (IsMediaTypeEqual(&types[j], &This->pInTypes[i])) - break; - } - - if (j >= cInTypes) - break; - } - - if (i < This->cInTypes) + if (!any_types_match(types, cInTypes, This->pInTypes, This->cInTypes)) { RegCloseKey(hkey); continue; @@ -519,8 +521,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pOutTypes) { - UINT i, j; - DWORD cOutTypes; + DWORD cOutTypes, i; hres = read_types(hkey, L"OutputTypes", &cOutTypes, ARRAY_SIZE(types), types); if (FAILED(hres)) @@ -534,19 +535,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( debugstr_guid(&types[i].subtype)); } - for (i = 0; i < This->cOutTypes; i++) - { - for (j = 0; j < cOutTypes; j++) - { - if (IsMediaTypeEqual(&types[j], &This->pOutTypes[i])) - break; - } - - if (j >= cOutTypes) - break; - } - - if (i < This->cOutTypes) + if (!any_types_match(types, cOutTypes, This->pOutTypes, This->cOutTypes)) { RegCloseKey(hkey); continue;

1 0

Zebediah Figura : msdmo: Use a dynamically allocated buffer in IEnumDMO::Next().
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: caa41d4917a84dbbeb4aa14f18cfecfd17efe71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=caa41d4917a84dbbeb4aa14f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 10 11:42:50 2020 -0500 msdmo: Use a dynamically allocated buffer in IEnumDMO::Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdmo/dmoreg.c | 76 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 61 insertions(+), 15 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ab3fda743c..a23bd95512 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -32,6 +32,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(msdmo); +BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) +{ + unsigned int max_capacity, new_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~0u / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(8, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = count; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + { + ERR("Failed to allocate memory.\n"); + return FALSE; + } + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + typedef struct { IEnumDMO IEnumDMO_iface; @@ -51,8 +80,6 @@ static inline IEnumDMOImpl *impl_from_IEnumDMO(IEnumDMO *iface) return CONTAINING_RECORD(iface, IEnumDMOImpl, IEnumDMO_iface); } -static HRESULT read_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types); - static const IEnumDMOVtbl edmovt; static const WCHAR *GUIDToString(WCHAR *string, const GUID *guid) @@ -443,11 +470,12 @@ static HRESULT WINAPI IEnumDMO_fnNext( WCHAR ** Names, DWORD * pcItemsFetched) { + DMO_PARTIAL_MEDIATYPE *types = NULL; + unsigned int types_size = 0; HKEY hkey; WCHAR szNextKey[MAX_PATH]; WCHAR path[MAX_PATH]; WCHAR szValue[MAX_PATH]; - DMO_PARTIAL_MEDIATYPE types[100]; DWORD len; UINT count = 0; HRESULT hres = S_OK; @@ -498,21 +526,29 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pInTypes) { - DWORD cInTypes, i; + DWORD size = types_size, i; - hres = read_types(hkey, L"InputTypes", &cInTypes, ARRAY_SIZE(types), types); - if (FAILED(hres)) + while ((ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, + (BYTE *)types, &size)) == ERROR_MORE_DATA) + { + if (!array_reserve((void **)&types, &types_size, size, 1)) + { + RegCloseKey(hkey); + free(types); + return E_OUTOFMEMORY; + } + } + if (ret) { RegCloseKey(hkey); continue; } - for (i = 0; i < cInTypes; i++) { + for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i) TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), debugstr_guid(&types[i].subtype)); - } - if (!any_types_match(types, cInTypes, This->pInTypes, This->cInTypes)) + if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pInTypes, This->cInTypes)) { RegCloseKey(hkey); continue; @@ -521,21 +557,29 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pOutTypes) { - DWORD cOutTypes, i; + DWORD size = types_size, i; - hres = read_types(hkey, L"OutputTypes", &cOutTypes, ARRAY_SIZE(types), types); - if (FAILED(hres)) + while ((ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, + (BYTE *)types, &size)) == ERROR_MORE_DATA) + { + if (!array_reserve((void **)&types, &types_size, size, 1)) + { + RegCloseKey(hkey); + free(types); + return E_OUTOFMEMORY; + } + } + if (ret) { RegCloseKey(hkey); continue; } - for (i = 0; i < cOutTypes; i++) { + for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i) TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type), debugstr_guid(&types[i].subtype)); - } - if (!any_types_match(types, cOutTypes, This->pOutTypes, This->cOutTypes)) + if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pOutTypes, This->cOutTypes)) { RegCloseKey(hkey); continue; @@ -561,6 +605,8 @@ static HRESULT WINAPI IEnumDMO_fnNext( count++; } + free(types); + if (pcItemsFetched) *pcItemsFetched = count; if (count < cItemsToFetch) hres = S_FALSE;

1 0

Alexandre Julliard : ntdll: Silence a noisy error.
by Alexandre Julliard 10 Jul '20

10 Jul '20

Module: wine Branch: master Commit: a2e77268f2007f2819c2e3e8bd736a056f309a4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e77268f2007f2819c2e3e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 07:55:28 2020 +0200 ntdll: Silence a noisy error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 7cdfc911db..78da6ae638 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -806,7 +806,7 @@ BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LA sprintf( buf, "/proc/%u/task/%u/stat", unix_pid, unix_tid ); if (!(f = fopen( buf, "r" ))) { - ERR("Failed to open %s: %s\n", buf, strerror(errno)); + WARN("Failed to open %s: %s\n", buf, strerror(errno)); return FALSE; }

1 0