wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Jacek Caban : win32u: Move NtUserGetProcessWindowStation implementation from user32.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 588dc55e9e089f1939b9ce3fa9caff3cfca1d2ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=588dc55e9e089f1939b9ce3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 13 14:52:53 2021 +0200 win32u: Move NtUserGetProcessWindowStation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 2 +- dlls/user32/winstation.c | 19 +------------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 16 ++++++++++++++++ dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 5 +++++ include/ntuser.h | 3 ++- 11 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7de45376740..183e596dcef 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -95,7 +95,7 @@ static const USER_DRIVER *load_driver(void) USEROBJECTFLAGS flags; HWINSTA winstation; - winstation = GetProcessWindowStation(); + winstation = NtUserGetProcessWindowStation(); if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) || (flags.dwFlags & WSF_VISIBLE)) driver->pCreateWindow = nodrv_CreateWindow; diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 733acd3d3c6..8572b78a484 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4120,7 +4120,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); /* Report physical monitor information only if window station has visible display surfaces */ - winstation = GetProcessWindowStation(); + winstation = NtUserGetProcessWindowStation(); if (GetUserObjectInformationW( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL )) is_winstation_visible = flags.dwFlags & WSF_VISIBLE; diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 21b45c911d1..c50740732e2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -361,7 +361,7 @@ @ stdcall GetPriorityClipboardFormat(ptr long) @ stdcall GetProcessDefaultLayout(ptr) @ stdcall GetProcessDpiAwarenessInternal(long ptr) -@ stdcall GetProcessWindowStation() +@ stdcall GetProcessWindowStation() NtUserGetProcessWindowStation @ stdcall GetProgmanWindow () @ stdcall GetPropA(long str) @ stdcall GetPropW(long wstr) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 30e5d154d3d..f037d1684c4 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -290,7 +290,7 @@ static void winstation_init(void) } /* set winstation if explicitly specified, or if we don't have one yet */ - if (buffer || !GetProcessWindowStation()) + if (buffer || !NtUserGetProcessWindowStation()) { handle = CreateWindowStationW( winstation ? winstation : L"WinSta0", 0, WINSTA_ALL_ACCESS, NULL ); if (handle) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 057f0d75cb8..245cd6c0f40 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -203,23 +203,6 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces } -/****************************************************************************** - * GetProcessWindowStation (USER32.@) - */ -HWINSTA WINAPI GetProcessWindowStation(void) -{ - HWINSTA ret = 0; - - SERVER_START_REQ( get_process_winstation ) - { - if (!wine_server_call_err( req )) - ret = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; -} - - /*********************************************************************** * SetProcessWindowStation (USER32.@) */ @@ -472,7 +455,7 @@ BOOL WINAPI EnumDesktopsW( HWINSTA winsta, DESKTOPENUMPROCW func, LPARAM lparam NTSTATUS status; if (!winsta) - winsta = GetProcessWindowStation(); + winsta = NtUserGetProcessWindowStation(); while (ret) { diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 596ec6bbba3..859dda9780d 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -95,6 +95,7 @@ static void * const syscalls[] = NtGdiSwapBuffers, NtGdiTransformPoints, NtUserCloseWindowStation, + NtUserGetProcessWindowStation, }; static BYTE arguments[ARRAY_SIZE(syscalls)]; diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 92f9a143800..7427c8e10d0 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -979,7 +979,7 @@ @ stub NtUserGetPriorityClipboardFormat @ stub NtUserGetProcessDpiAwarenessContext @ stub NtUserGetProcessUIContextInformation -@ stub NtUserGetProcessWindowStation +@ stdcall -syscall NtUserGetProcessWindowStation() @ stub NtUserGetProp @ stub NtUserGetQueueStatus @ stub NtUserGetQueueStatusReadonly diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index f50464f856d..3a6ef8059b4 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -43,3 +43,19 @@ BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ) SERVER_END_REQ; return ret; } + +/*********************************************************************** + * NtUSerGetProcessWindowStation (win32u.@) + */ +HWINSTA WINAPI NtUserGetProcessWindowStation(void) +{ + HWINSTA ret = 0; + + SERVER_START_REQ( get_process_winstation ) + { + if (!wine_server_call_err( req )) + ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 276c83474fe..0a905e131d8 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -81,6 +81,7 @@ SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \ SYSCALL_ENTRY( NtGdiSwapBuffers ) \ SYSCALL_ENTRY( NtGdiTransformPoints ) \ - SYSCALL_ENTRY( NtUserCloseWindowStation ) + SYSCALL_ENTRY( NtUserCloseWindowStation ) \ + SYSCALL_ENTRY( NtUserGetProcessWindowStation ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7370a3d4940..56156e6fdeb 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -33,3 +33,8 @@ NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args ) return NtUserCloseWindowStation( handle ); } + +NTSTATUS WINAPI wow64_NtUserGetProcessWindowStation( UINT *args ) +{ + return HandleToUlong( NtUserGetProcessWindowStation() ); +} diff --git a/include/ntuser.h b/include/ntuser.h index 8b09f732ecd..7ea4ccd4bdf 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -22,6 +22,7 @@ #include <winuser.h> #include <winternl.h> -BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); +BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); +HWINSTA WINAPI NtUserGetProcessWindowStation(void); #endif /* _NTUSER_ */

1 0

Nikolay Sivov : d3d10/effect: Get rid of linear search for property information.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 1bc3ca71d6108cc7af2bfbb2a23c43298ac57b64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bc3ca71d6108cc7af2bfbb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:36 2021 +0300 d3d10/effect: Get rid of linear search for property information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cd5f6517c54..71ad3f64a05 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -176,7 +176,7 @@ struct d3d10_effect_state_property_info LONG index_offset; }; -static const struct d3d10_effect_state_property_info property_info[] = +static const struct d3d10_effect_state_property_info property_infos[] = { {0x00, "Pass.RasterizerState", D3D10_SVT_RASTERIZER, 1, 1, D3D10_C_PASS, FIELD_OFFSET(struct d3d10_effect_pass, rasterizer) }, {0x01, "Pass.DepthStencilState", D3D10_SVT_DEPTHSTENCIL, 1, 1, D3D10_C_PASS, FIELD_OFFSET(struct d3d10_effect_pass, depth_stencil) }, @@ -1540,19 +1540,6 @@ static HRESULT parse_fx10_anonymous_shader(struct d3d10_effect *e, struct d3d10_ return S_OK; } -static const struct d3d10_effect_state_property_info *get_property_info(UINT id) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(property_info); ++i) - { - if (property_info[i].id == id) - return &property_info[i]; - } - - return NULL; -} - static const struct d3d10_effect_state_storage_info *get_storage_info(D3D_SHADER_VARIABLE_TYPE id) { unsigned int i; @@ -1764,14 +1751,14 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size read_dword(ptr, &operation); read_dword(ptr, &value_offset); - if (!(property_info = get_property_info(id))) + if (id >= ARRAY_SIZE(property_infos)) { - FIXME("Failed to find property info for property %#x.\n", id); + FIXME("Unknown property id %#x.\n", id); return E_FAIL; } + property_info = &property_infos[id]; - TRACE("Property %s[%#x] = value list @ offset %#x.\n", - property_info->name, idx, value_offset); + TRACE("Property %s[%#x] = value list @ offset %#x.\n", property_info->name, idx, value_offset); if (property_info->container_type != container_type) {

1 0

Nikolay Sivov : d3d10/effect: Consolidate state objects and passes property information.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 1050e6c60fdf909c517058504d2c0f5dbe534465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1050e6c60fdf909c51705850… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:35 2021 +0300 d3d10/effect: Consolidate state objects and passes property information. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 572 ++++++++++++++++------------------------------------ 1 file changed, 176 insertions(+), 396 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1050e6c60fdf909c5170…

1 0

Nikolay Sivov : d3d10/effect: Add support for constant index and anonymous shader values in assignment parsing helper.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 99376ade2a89a0c9a41687bb53da29a748fe5bfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=99376ade2a89a0c9a41687bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:34 2021 +0300 d3d10/effect: Add support for constant index and anonymous shader values in assignment parsing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 142 +++++++++++++++++++++++++++++++++++----- dlls/d3d10/tests/effect.c | 161 ++++++++++++++++++++++++++++++---------------- 2 files changed, 233 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99376ade2a89a0c9a416…

1 0

Nikolay Sivov : d3d10/effect: Handle static variable assignments for object fields in state objects.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: e37f781cc2174d3d2a4228098f2b22dcfc573f38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e37f781cc2174d3d2a422809… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:33 2021 +0300 d3d10/effect: Handle static variable assignments for object fields in state objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 95 ++++++++++++++++++++++++++++++++-- dlls/d3d10/tests/effect.c | 128 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 182 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e37f781cc2174d3d2a42…

1 0

Nikolay Sivov : d3d10/effect: Use separate structure for annotations array.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: ab5b335c13a06b62a0e5f260ee1a37709ae9ea65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab5b335c13a06b62a0e5f260… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 08:13:32 2021 +0300 d3d10/effect: Use separate structure for annotations array. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 15 ++-- dlls/d3d10/effect.c | 220 +++++++++++++++++---------------------------- 2 files changed, 92 insertions(+), 143 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab5b335c13a06b62a0e5…

1 0

Nikolay Sivov : d3d10/tests: Add some tests for annotations.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: b56ed5f03f0433b886cde52fdea870c828594b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b56ed5f03f0433b886cde52f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 13 13:43:03 2021 +0200 d3d10/tests: Add some tests for annotations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 219 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 218 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b56ed5f03f0433b886cd…

1 0

Nikolay Sivov : d3d10/effect: Use shader variable directly from pass structure on Apply().
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 63ee26f298d38e16df8b4e69a10db884e26a6542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ee26f298d38e16df8b4e69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 13 13:43:02 2021 +0200 d3d10/effect: Use shader variable directly from pass structure on Apply(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 15 ---- dlls/d3d10/effect.c | 188 ++++++++++++++++----------------------------- dlls/d3d10/tests/effect.c | 22 ++++++ 3 files changed, 89 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63ee26f298d38e16df8b…

1 0

Eduard Permyakov : wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 8257d1efdc6a00bceb994c1a58b0ffd02e2fdf3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8257d1efdc6a00bceb994c1a… Author: Eduard Permyakov <epermyakov(a)codeweavers.com> Date: Wed Oct 13 11:00:03 2021 +0300 wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 442a9015951..d76602f4930 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -286,7 +286,9 @@ static const struct column col_physicalmemory[] = }; static const struct column col_pnpentity[] = { - { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING }, }; static const struct column col_printer[] = { @@ -701,6 +703,8 @@ struct record_physicalmemory struct record_pnpentity { const WCHAR *device_id; + const WCHAR *manufacturer; + const WCHAR *name; }; struct record_printer { @@ -3063,6 +3067,8 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * ARRAY_SIZE(device_id), NULL )) { rec->device_id = heap_strdupW( device_id ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine PnP Device"; table->num_rows++; if (!match_row( table, table->num_rows - 1, cond, &status ))

1 0

Alex Henrie : winemenubuilder: Introduce a reg_enum_keyW helper function.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 5d8aac9cb0810285feff4188bcc6d84107217731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d8aac9cb0810285feff4188… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 12 23:20:36 2021 -0600 winemenubuilder: Introduce a reg_enum_keyW helper function. The helper function reduces code duplication and makes the 'done' variable in the cleanup_associations function unnecessary. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 89 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 45 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5b6fe071916..522e6192b24 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1753,6 +1753,30 @@ static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types return match ? xwcsdup(match) : NULL; } +static WCHAR *reg_enum_keyW(HKEY key, DWORD index) +{ + WCHAR *subkey; + DWORD size = 1024 * sizeof(WCHAR); + LSTATUS ret; + + for (;;) + { + subkey = xmalloc(size); + ret = RegEnumKeyExW(key, index, subkey, &size, NULL, NULL, NULL, NULL); + if (ret == ERROR_SUCCESS) + { + return subkey; + } + if (ret != ERROR_MORE_DATA) + { + heap_free(subkey); + return NULL; + } + size *= 2; + heap_free(subkey); + } +} + static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size; @@ -1857,47 +1881,31 @@ static BOOL cleanup_associations(void) BOOL hasChanged = FALSE; if ((assocKey = open_associations_reg_key())) { - int i; - BOOL done = FALSE; - for (i = 0; !done;) + int i = 0; + for (;;) { - WCHAR *extensionW = NULL; - DWORD size = 1024; - LSTATUS ret; + WCHAR *extensionW; + WCHAR *command; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(assocKey, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(assocKey, i))) + break; - if (ret == ERROR_SUCCESS) + if (!(command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"))) { - WCHAR *command; - command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (command == NULL) + WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); + if (desktopFile) { - WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); - if (desktopFile) - { - WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); - DeleteFileW(desktopFile); - } - RegDeleteKeyW(assocKey, extensionW); - hasChanged = TRUE; - heap_free(desktopFile); + WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); + DeleteFileW(desktopFile); } - else - i++; - heap_free(command); + RegDeleteKeyW(assocKey, extensionW); + hasChanged = TRUE; + heap_free(desktopFile); } else { - if (ret != ERROR_NO_MORE_ITEMS) - WINE_ERR("error %d while reading registry\n", ret); - done = TRUE; + i++; + heap_free(command); } heap_free(extensionW); } @@ -1998,7 +2006,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic { struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare }; struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes); - LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; @@ -2010,18 +2017,12 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic for (i = 0; ; i++) { - WCHAR *extensionW = NULL; - DWORD size = 1024; + WCHAR *extensionW; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(HKEY_CLASSES_ROOT, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(HKEY_CLASSES_ROOT, i))) + break; - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_banned(extensionW)) + if (extensionW[0] == '.' && !is_extension_banned(extensionW)) { WCHAR *commandW = NULL; WCHAR *executableW = NULL; @@ -2129,8 +2130,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic heap_free(progIdW); } heap_free(extensionW); - if (ret != ERROR_SUCCESS) - break; } wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021