February 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Embed the HTMLLocation into the outer window.
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 9a8e628d7057fd3ff1bc872a2ff4d326c31d3655 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a8e628d7057fd3ff1bc872a2ff4d3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Feb 1 19:26:28 2023 +0200 mshtml: Embed the HTMLLocation into the outer window. Gets rid of the issues with the cyclic dependency or detached location. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmllocation.c | 80 +++++++------------------------------------- dlls/mshtml/htmlwindow.c | 36 ++++++-------------- dlls/mshtml/mshtml_private.h | 8 ++--- 3 files changed, 25 insertions(+), 99 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 5c31ee02e04..d9e458d9c5f 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -36,28 +36,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -static HRESULT get_url(HTMLLocation *This, const WCHAR **ret) +static inline HTMLOuterWindow *get_window(HTMLLocation *This) { - if(!This->window || !This->window->url) - *ret = L"about:blank"; - else - *ret = This->window->url; - return S_OK; + return CONTAINING_RECORD(This, HTMLOuterWindow, location); } static IUri *get_uri(HTMLLocation *This) { - return This->window ? This->window->uri : NULL; + return get_window(This)->uri; } static HRESULT get_url_components(HTMLLocation *This, URL_COMPONENTSW *url) { - const WCHAR *doc_url; - HRESULT hres; - - hres = get_url(This, &doc_url); - if(FAILED(hres)) - return hres; + const WCHAR *doc_url = get_window(This)->url ? get_window(This)->url : L"about:blank"; if(!InternetCrackUrlW(doc_url, 0, 0, url)) { FIXME("InternetCrackUrlW failed: 0x%08lx\n", GetLastError()); @@ -102,28 +93,13 @@ static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID r static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%ld\n", This, ref); - - return ref; + return IHTMLWindow2_AddRef(&get_window(This)->base.IHTMLWindow2_iface); } static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%ld\n", This, ref); - - if(!ref) { - if(This->window) - This->window->location = NULL; - release_dispex(&This->dispex); - free(This); - } - - return ref; + return IHTMLWindow2_Release(&get_window(This)->base.IHTMLWindow2_iface); } static HRESULT WINAPI HTMLLocation_GetTypeInfoCount(IHTMLLocation *iface, UINT *pctinfo) @@ -163,12 +139,7 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - - return navigate_url(This->window, v, This->window->uri, BINDING_NAVIGATED); + return navigate_url(get_window(This), v, get_uri(This), BINDING_NAVIGATED); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -521,11 +492,6 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - if(hash[0] != '#') { unsigned size = (1 /* # */ + wcslen(v) + 1) * sizeof(WCHAR); if(!(hash = malloc(size))) @@ -534,7 +500,7 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) memcpy(hash + 1, v, size - sizeof(WCHAR)); } - hres = navigate_url(This->window, hash, This->window->uri, BINDING_NAVIGATED); + hres = navigate_url(get_window(This), hash, get_uri(This), BINDING_NAVIGATED); if(hash != v) free(hash); @@ -577,18 +543,13 @@ static HRESULT WINAPI HTMLLocation_reload(IHTMLLocation *iface, VARIANT_BOOL fla TRACE("(%p)->(%x)\n", This, flag); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - /* reload is supposed to fail if called from a script with different origin, but IE doesn't care */ - if(!is_main_content_window(This->window)) { + if(!is_main_content_window(get_window(This))) { FIXME("Unsupported on iframe\n"); return E_NOTIMPL; } - return reload_page(This->window); + return reload_page(get_window(This)); } static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) @@ -597,12 +558,7 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) TRACE("(%p)->(%s)\n", This, debugstr_w(bstr)); - if(!This->window) { - FIXME("No window available\n"); - return E_FAIL; - } - - return navigate_url(This->window, bstr, This->window->uri, BINDING_NAVIGATED | BINDING_REPLACE); + return navigate_url(get_window(This), bstr, get_uri(This), BINDING_NAVIGATED | BINDING_REPLACE); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) @@ -662,22 +618,10 @@ static dispex_static_data_t HTMLLocation_dispex = { HTMLLocation_iface_tids }; - -HRESULT HTMLLocation_Create(HTMLOuterWindow *window, HTMLLocation **ret) +void HTMLLocation_Init(HTMLLocation *location) { - HTMLLocation *location; - - location = malloc(sizeof(*location)); - if(!location) - return E_OUTOFMEMORY; - location->IHTMLLocation_iface.lpVtbl = &HTMLLocationVtbl; - location->ref = 1; - location->window = window; init_dispatch(&location->dispex, (IUnknown*)&location->IHTMLLocation_iface, &HTMLLocation_dispex, COMPAT_MODE_QUIRKS); - - *ret = location; - return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e678c9f99e0..ed497eacf4e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -67,19 +67,13 @@ static inline BOOL is_outer_window(HTMLWindow *window) return &window->outer_window->base == window; } -static HRESULT get_location(HTMLOuterWindow *This, HTMLLocation **ret) +static void get_location(HTMLOuterWindow *This, HTMLLocation **ret) { - if(!This->location) { - HRESULT hres; + if(!This->location.dispex.outer) + HTMLLocation_Init(&This->location); - hres = HTMLLocation_Create(This, &This->location); - if(FAILED(hres)) - return hres; - } - - IHTMLLocation_AddRef(&This->location->IHTMLLocation_iface); - *ret = This->location; - return S_OK; + IHTMLLocation_AddRef(&This->location.IHTMLLocation_iface); + *ret = &This->location; } void get_top_window(HTMLOuterWindow *window, HTMLOuterWindow **ret) @@ -133,8 +127,8 @@ static void detach_inner_window(HTMLInnerWindow *window) if(doc) detach_document_node(doc); - if(outer_window && outer_window->location) - dispex_unlink(&outer_window->location->dispex); + if(outer_window && outer_window->location.dispex.outer) + dispex_unlink(&outer_window->location.dispex); abort_window_bindings(window); remove_target_tasks(window->task_magic); @@ -240,10 +234,8 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->base.inner_window) detach_inner_window(This->base.inner_window); - if(This->location) { - This->location->window = NULL; - IHTMLLocation_Release(&This->location->IHTMLLocation_iface); - } + if(This->location.dispex.outer) + release_dispex(&This->location.dispex); if(This->frame_element) This->frame_element->content_window = NULL; @@ -808,14 +800,10 @@ static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocatio { HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLLocation *location; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = get_location(This->outer_window, &location); - if(FAILED(hres)) - return hres; - + get_location(This->outer_window, &location); *p = &location->IHTMLLocation_iface; return S_OK; } @@ -3925,9 +3913,7 @@ static HRESULT IHTMLWindow2_location_hook(DispatchEx *dispex, WORD flags, DISPPA TRACE("forwarding to location.href\n"); - hres = get_location(This->base.outer_window, &location); - if(FAILED(hres)) - return hres; + get_location(This->base.outer_window, &location); hres = IDispatchEx_InvokeEx(&location->dispex.IDispatchEx_iface, DISPID_VALUE, 0, flags, dp, res, ei, caller); IHTMLLocation_Release(&location->IHTMLLocation_iface); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 1ce25d5c862..bec982a75fc 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -490,10 +490,6 @@ typedef struct { struct HTMLLocation { DispatchEx dispex; IHTMLLocation IHTMLLocation_iface; - - LONG ref; - - HTMLOuterWindow *window; }; typedef struct { @@ -576,7 +572,7 @@ struct HTMLOuterWindow { unsigned readystate_pending; HTMLInnerWindow *pending_window; - HTMLLocation *location; + HTMLLocation location; IMoniker *mon; IUri *uri; IUri *uri_nofrag; @@ -993,7 +989,7 @@ void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory**) DECLSPEC_HIDDEN; HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**) DECLSPEC_HIDDEN; -HRESULT HTMLLocation_Create(HTMLOuterWindow*,HTMLLocation**) DECLSPEC_HIDDEN; +void HTMLLocation_Init(HTMLLocation*) DECLSPEC_HIDDEN; HRESULT create_navigator(compat_mode_t,IOmNavigator**) DECLSPEC_HIDDEN; HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_performance(HTMLInnerWindow*,IHTMLPerformance**) DECLSPEC_HIDDEN;

1 0

Alex Henrie : appwiz: Fix memory leak on realloc failure in install_from_registered_dir (cppcheck).
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: e7ba00c7ca848c4bb1a7a32ad5df8b77aed330bc URL: https://gitlab.winehq.org/wine/wine/-/commit/e7ba00c7ca848c4bb1a7a32ad5df8b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 22:05:13 2022 -0700 appwiz: Fix memory leak on realloc failure in install_from_registered_dir (cppcheck). --- dlls/appwiz.cpl/addons.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index c63106de95b..a5fdda3e81f 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -255,7 +255,7 @@ static HKEY open_config_key(void) static enum install_res install_from_registered_dir(void) { - char *package_dir; + char *package_dir, *new_package_dir; HKEY hkey; DWORD res, type, size = MAX_PATH; enum install_res ret; @@ -267,8 +267,11 @@ static enum install_res install_from_registered_dir(void) package_dir = malloc(size); res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); if(res == ERROR_MORE_DATA) { - package_dir = realloc(package_dir, size); - res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); + new_package_dir = realloc(package_dir, size); + if(new_package_dir) { + package_dir = new_package_dir; + res = RegGetValueA(hkey, NULL, addon->dir_config_key, RRF_RT_ANY, &type, (PBYTE)package_dir, &size); + } } RegCloseKey(hkey); if(res == ERROR_FILE_NOT_FOUND) {

1 0

Alex Henrie : winex11: Fix memory leak on realloc failure in import_xdnd_selection (cppcheck).
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 4aac4e7c67ace84ca3bd732cb292eca54502ddb4 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aac4e7c67ace84ca3bd732cb292ec… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 22:22:45 2022 -0700 winex11: Fix memory leak on realloc failure in import_xdnd_selection (cppcheck). --- dlls/winex11.drv/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index e91368d69e7..959b59825e1 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1285,7 +1285,7 @@ struct format_entry *import_xdnd_selection( Display *display, Window win, Atom s UINT i; void *data; struct clipboard_format *format; - struct format_entry *ret = NULL, *entry; + struct format_entry *ret = NULL, *tmp, *entry; BOOL have_hdrop = FALSE; register_x11_formats( targets, count ); @@ -1310,7 +1310,8 @@ struct format_entry *import_xdnd_selection( Display *display, Window win, Atom s entry_size = (FIELD_OFFSET( struct format_entry, data[size] ) + 7) & ~7; if (buf_size < size + entry_size) { - if (!(ret = realloc( ret, *ret_size + entry_size + 1024 ))) continue; + if (!(tmp = realloc( ret, *ret_size + entry_size + 1024 ))) continue; + ret = tmp; buf_size = *ret_size + entry_size + 1024; /* extra space for following entries */ } entry = (struct format_entry *)((char *)ret + *ret_size);

1 0

Alex Henrie : server: Fix buffer overrun in map_view handler.
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 94d6e616e2cbade844fdc2306514690bf629f675 URL: https://gitlab.winehq.org/wine/wine/-/commit/94d6e616e2cbade844fdc230651469… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 23:34:58 2022 -0700 server: Fix buffer overrun in map_view handler. Because of padding at the end of the struct, sizeof(*view) is greater than offsetof(struct memory_view, name[0]). Change the allocation to overallocate slightly instead of underallocating slightly. --- server/mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/mapping.c b/server/mapping.c index 8d4332d240f..ed81a718bbe 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -1212,7 +1212,7 @@ DECL_HANDLER(map_view) if (!req->mapping) /* image mapping for a .so dll */ { if (get_req_data_size() > sizeof(view->image)) namelen = get_req_data_size() - sizeof(view->image); - if (!(view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) return; + if (!(view = mem_alloc( sizeof(struct memory_view) + namelen * sizeof(WCHAR) ))) return; memset( view, 0, sizeof(*view) ); view->base = req->base; view->size = req->size;

1 0

Hans Leidekker : ntdll: Add Windows 11 version.
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 2ccc2a42d7e257b7f6f1a9035e44a30f551e2643 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ccc2a42d7e257b7f6f1a9035e44a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 23 13:01:08 2023 +0100 ntdll: Add Windows 11 version. --- dlls/ntdll/version.c | 8 +++++++- programs/winecfg/appdefaults.c | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 02544173096..30480d06fa6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -55,6 +55,7 @@ typedef enum WIN8, /* Windows 8 */ WIN81, /* Windows 8.1 */ WIN10, /* Windows 10 */ + WIN11, /* Windows 11 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -170,7 +171,11 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, - + /* WIN11 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 22000, VER_PLATFORM_WIN32_NT, + L"", 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; static const struct { WCHAR name[12]; WINDOWS_VERSION ver; } version_names[] = @@ -201,6 +206,7 @@ static const struct { WCHAR name[12]; WINDOWS_VERSION ver; } version_names[] = { L"win8", WIN8 }, { L"win81", WIN81 }, { L"win10", WIN10 }, + { L"win11", WIN11 }, }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 9e43eeb51c8..3f6b424fed6 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -49,6 +49,7 @@ struct win_version static const struct win_version win_versions[] = { + { L"win11", L"Windows 11", 10, 0, 22000, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win10", L"Windows 10", 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win81", L"Windows 8.1", 6, 3, 9600, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, { L"win8", L"Windows 8", 6, 2, 9200, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"},

1 0

Hans Leidekker : ntdll: Default to Windows 10.
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 69154f0329aec4fb64886a0689da198b5323dcde URL: https://gitlab.winehq.org/wine/wine/-/commit/69154f0329aec4fb64886a0689da19… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 23 13:15:07 2023 +0100 ntdll: Default to Windows 10. --- dlls/msi/tests/package.c | 66 +++++++++++++++++++++--------------------- dlls/ntdll/version.c | 2 +- loader/wine.inf.in | 32 ++++++++++---------- programs/winecfg/appdefaults.c | 2 +- 4 files changed, 51 insertions(+), 51 deletions(-)

1 0

Hans Leidekker : winecfg: Fix CurrentVersion registry string for Windows 10 and up.
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 3a819255f57e54917c598e66e60efb875162f8a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a819255f57e54917c598e66e60efb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 23 15:09:58 2023 +0100 winecfg: Fix CurrentVersion registry string for Windows 10 and up. It no longer reflects the real OS major and minor version numbers. --- programs/winecfg/appdefaults.c | 88 ++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 33 deletions(-) diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 0e18d5d2c69..b7a2dc44038 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -37,6 +37,7 @@ struct win_version { const WCHAR *szVersion; const WCHAR *szDescription; + const WCHAR *szCurrentVersion; DWORD dwMajorVersion; DWORD dwMinorVersion; DWORD dwBuildNumber; @@ -49,28 +50,28 @@ struct win_version static const struct win_version win_versions[] = { - { L"win11", L"Windows 11", 10, 0, 22000, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win10", L"Windows 10", 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win81", L"Windows 8.1", 6, 3, 9600, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win8", L"Windows 8", 6, 2, 9200, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, - { L"win2008r2", L"Windows 2008 R2", 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"ServerNT"}, - { L"win7", L"Windows 7", 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"WinNT"}, - { L"win2008", L"Windows 2008", 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, - { L"vista", L"Windows Vista", 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, - { L"win2003", L"Windows 2003", 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, + { L"win11", L"Windows 11", L"6.3", 10, 0, 22000, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win10", L"Windows 10", L"6.3", 10, 0, 18362, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win81", L"Windows 8.1", NULL, 6, 3, 9600, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win8", L"Windows 8", NULL, 6, 2, 9200, VER_PLATFORM_WIN32_NT, L"", 0, 0, L"WinNT"}, + { L"win2008r2", L"Windows 2008 R2", NULL, 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"ServerNT"}, + { L"win7", L"Windows 7", NULL, 6, 1, 7601, VER_PLATFORM_WIN32_NT, L"Service Pack 1", 1, 0, L"WinNT"}, + { L"win2008", L"Windows 2008", NULL, 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, + { L"vista", L"Windows Vista", NULL, 6, 0, 6002, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, + { L"win2003", L"Windows 2003", NULL, 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"ServerNT"}, #ifdef _WIN64 - { L"winxp64", L"Windows XP", 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, + { L"winxp64", L"Windows XP", NULL, 5, 2, 3790, VER_PLATFORM_WIN32_NT, L"Service Pack 2", 2, 0, L"WinNT"}, #else - { L"winxp", L"Windows XP", 5, 1, 2600, VER_PLATFORM_WIN32_NT, L"Service Pack 3", 3, 0, L"WinNT"}, - { L"win2k", L"Windows 2000", 5, 0, 2195, VER_PLATFORM_WIN32_NT, L"Service Pack 4", 4, 0, L"WinNT"}, - { L"winme", L"Windows ME", 4, 90, 3000, VER_PLATFORM_WIN32_WINDOWS, L" ", 0, 0, L""}, - { L"win98", L"Windows 98", 4, 10, 2222, VER_PLATFORM_WIN32_WINDOWS, L" A ", 0, 0, L""}, - { L"win95", L"Windows 95", 4, 0, 950, VER_PLATFORM_WIN32_WINDOWS, L"", 0, 0, L""}, - { L"nt40", L"Windows NT 4.0", 4, 0, 1381, VER_PLATFORM_WIN32_NT, L"Service Pack 6a", 6, 0, L"WinNT"}, - { L"nt351", L"Windows NT 3.51", 3, 51, 1057, VER_PLATFORM_WIN32_NT, L"Service Pack 5", 5, 0, L"WinNT"}, - { L"win31", L"Windows 3.1", 3, 10, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, - { L"win30", L"Windows 3.0", 3, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, - { L"win20", L"Windows 2.0", 2, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""} + { L"winxp", L"Windows XP", NULL, 5, 1, 2600, VER_PLATFORM_WIN32_NT, L"Service Pack 3", 3, 0, L"WinNT"}, + { L"win2k", L"Windows 2000", NULL, 5, 0, 2195, VER_PLATFORM_WIN32_NT, L"Service Pack 4", 4, 0, L"WinNT"}, + { L"winme", L"Windows ME", NULL, 4, 90, 3000, VER_PLATFORM_WIN32_WINDOWS, L" ", 0, 0, L""}, + { L"win98", L"Windows 98", NULL, 4, 10, 2222, VER_PLATFORM_WIN32_WINDOWS, L" A ", 0, 0, L""}, + { L"win95", L"Windows 95", NULL, 4, 0, 950, VER_PLATFORM_WIN32_WINDOWS, L"", 0, 0, L""}, + { L"nt40", L"Windows NT 4.0", NULL, 4, 0, 1381, VER_PLATFORM_WIN32_NT, L"Service Pack 6a", 6, 0, L"WinNT"}, + { L"nt351", L"Windows NT 3.51", NULL, 3, 51, 1057, VER_PLATFORM_WIN32_NT, L"Service Pack 5", 5, 0, L"WinNT"}, + { L"win31", L"Windows 3.1", NULL, 3, 10, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, + { L"win30", L"Windows 3.0", NULL, 3, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""}, + { L"win20", L"Windows 2.0", NULL, 2, 0, 0, VER_PLATFORM_WIN32s, L"Win32s 1.3", 0, 0, L""} #endif }; @@ -80,9 +81,20 @@ static const WCHAR szKey9x[] = L"Software\\Microsoft\\Windows\\CurrentVersion"; static const WCHAR szKeyNT[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion"; static const WCHAR szKeyProdNT[] = L"System\\CurrentControlSet\\Control\\ProductOptions"; +static DWORD get_reg_dword( HKEY root, const WCHAR *subkey, const WCHAR *value ) +{ + HKEY hkey; + DWORD ret, len = sizeof(ret), type; + + if (RegOpenKeyExW( root, subkey, 0, KEY_QUERY_VALUE, &hkey )) return 0; + if (RegQueryValueExW( hkey, value, NULL, &type, (BYTE *)&ret, &len ) || type != REG_DWORD) ret = 0; + RegCloseKey( hkey ); + return ret; +} + static int get_registry_version(void) { - int i, best = -1, platform, major, minor = 0, build = 0; + int i, best = -1, platform, major = 0, minor = 0, build = 0; WCHAR *p, *ver, *type = NULL; if ((ver = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentVersion", NULL ))) @@ -91,6 +103,9 @@ static int get_registry_version(void) platform = VER_PLATFORM_WIN32_NT; + major = get_reg_dword( HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentMajorVersionNumber" ); + minor = get_reg_dword( HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentMinorVersionNumber" ); + build_str = get_reg_key( HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentBuildNumber", NULL ); build = wcstol(build_str, NULL, 10); @@ -101,19 +116,22 @@ static int get_registry_version(void) else return -1; - if ((p = wcschr( ver, '.' ))) + if (!major) { - WCHAR *minor_str = p; - *minor_str++ = 0; - if ((p = wcschr( minor_str, '.' ))) + if ((p = wcschr( ver, '.' ))) { - WCHAR *build_str = p; - *build_str++ = 0; - build = wcstol(build_str, NULL, 10); + WCHAR *minor_str = p; + *minor_str++ = 0; + if ((p = wcschr( minor_str, '.' ))) + { + WCHAR *build_str = p; + *build_str++ = 0; + build = wcstol(build_str, NULL, 10); + } + minor = wcstol(minor_str, NULL, 10); } - minor = wcstol(minor_str, NULL, 10); + major = wcstol(ver, NULL, 10); } - major = wcstol(ver, NULL, 10); for (i = 0; i < ARRAY_SIZE(win_versions); i++) { @@ -428,9 +446,13 @@ static void set_winver(const struct win_version *version) break; case VER_PLATFORM_WIN32_NT: - swprintf(buffer, ARRAY_SIZE(buffer), L"%d.%d", version->dwMajorVersion, - version->dwMinorVersion); - set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentVersion", buffer); + if (version->szCurrentVersion) + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentVersion", version->szCurrentVersion); + else + { + swprintf(buffer, ARRAY_SIZE(buffer), L"%d.%d", version->dwMajorVersion, version->dwMinorVersion); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentVersion", buffer); + } set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentMajorVersionNumber", version->dwMajorVersion); set_reg_key_dword(HKEY_LOCAL_MACHINE, szKeyNT, L"CurrentMinorVersionNumber", version->dwMinorVersion); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, L"CSDVersion", version->szCSDVersion);

1 0

Hans Leidekker : msi/tests: Avoid test failures when running with insufficient rights.
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 79ec3d9fb8551e84e9ff71dcf18861430246278a URL: https://gitlab.winehq.org/wine/wine/-/commit/79ec3d9fb8551e84e9ff71dcf18861… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 31 16:34:06 2023 +0100 msi/tests: Avoid test failures when running with insufficient rights. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51040 --- dlls/msi/tests/package.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index cad396aa05a..43ee28fdc21 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5066,6 +5066,7 @@ static void test_appsearch_inilocator(void) } ok(r == ERROR_SUCCESS, "Expected a valid package handle %u\n", r); + MsiCloseHandle( hdb ); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiDoActionA(hpkg, "AppSearch"); @@ -5074,6 +5075,12 @@ static void test_appsearch_inilocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP1", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (!prop[0]) + { + win_skip("broken result\n"); + MsiCloseHandle(hpkg); + goto error; + } ok(!lstrcmpA(prop, "keydata"), "Expected \"keydata\", got \"%s\"\n", prop); size = MAX_PATH; @@ -5628,7 +5635,12 @@ static void test_installprops(void) ok( !lstrcmpA(buf, path), "Expected %s, got %s\n", path, buf); RegOpenKeyA(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\MS Setup (ACME)\\User Info", &hkey1); - RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey2); + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey2); + if (res == ERROR_ACCESS_DENIED) + { + win_skip("no access\n"); + goto done; + } RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion", 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &pathkey); @@ -5800,6 +5812,7 @@ static void test_installprops(void) check_prop(hpkg, "CommonFiles64Dir", "", 0, 0); } +done: CloseHandle(hkey1); CloseHandle(hkey2); RegCloseKey(pathkey);

1 0

Paul Gofman : ws2_32: Provide same address order from gethostbyname() on consequent calls.
by Alexandre Julliard 01 Feb '23

01 Feb '23

Module: wine Branch: master Commit: 9c5e380cfe7b9d44d86dac539398c04cd22b8282 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c5e380cfe7b9d44d86dac539398c0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 11 19:19:17 2023 -0600 ws2_32: Provide same address order from gethostbyname() on consequent calls. --- dlls/ws2_32/Makefile.in | 1 + dlls/ws2_32/unixlib.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 13937dc6ee7..fc13323b930 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -3,6 +3,7 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 DELAYIMPORTS = dnsapi advapi32 iphlpapi user32 +UNIX_LIBS = $(PTHREAD_LIBS) C_SRCS = \ async.c \ diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 0625c5c72ce..f013e1ac3d0 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -167,6 +167,51 @@ static const int ip_protocol_map[][2] = #undef MAP +static pthread_once_t hash_init_once = PTHREAD_ONCE_INIT; +static BYTE byte_hash[256]; + +static void init_hash(void) +{ + unsigned i, index; + NTSTATUS status; + BYTE *buf, tmp; + ULONG buf_len; + + for (i = 0; i < sizeof(byte_hash); ++i) + byte_hash[i] = i; + + buf_len = sizeof(SYSTEM_INTERRUPT_INFORMATION) * NtCurrentTeb()->Peb->NumberOfProcessors; + if (!(buf = malloc( buf_len ))) + { + ERR( "No memory.\n" ); + return; + } + + for (i = 0; i < sizeof(byte_hash) - 1; ++i) + { + if (!(i % buf_len) && (status = NtQuerySystemInformation( SystemInterruptInformation, buf, + buf_len, &buf_len ))) + { + ERR( "Failed to get random bytes.\n" ); + free( buf ); + return; + } + index = i + buf[i % buf_len] % (sizeof(byte_hash) - i); + tmp = byte_hash[index]; + byte_hash[index] = byte_hash[i]; + byte_hash[i] = tmp; + } + free( buf ); +} + +static void hash_random( BYTE *d, const BYTE *s, unsigned int len ) +{ + unsigned int i; + + for (i = 0; i < len; ++i) + d[i] = byte_hash[s[i]]; +} + static int addrinfo_flags_from_unix( int flags ) { int ws_flags = 0; @@ -889,6 +934,44 @@ static NTSTATUS unix_gethostbyaddr( void *args ) #endif } +static int compare_addrs_hashed( const void *a1, const void *a2, int addr_len ) +{ + char a1_hashed[16], a2_hashed[16]; + + assert( addr_len <= sizeof(a1_hashed) ); + hash_random( (BYTE *)a1_hashed, a1, addr_len ); + hash_random( (BYTE *)a2_hashed, a2, addr_len ); + return memcmp( a1_hashed, a2_hashed, addr_len ); +} + +static void sort_addrs_hashed( struct hostent *host ) +{ + /* On Unix gethostbyname() may return IP addresses in random order on each call. On Windows the order of + * IP addresses is not determined as well but it is the same on consequent calls (changes after network + * resets and probably DNS timeout expiration). + * Life is Strange Remastered depends on gethostbyname() returning IP addresses in the same order to reuse + * the established TLS connection and avoid timeouts that happen in game when establishing multiple extra TLS + * connections. + * Just sorting the addresses would break server load balancing provided by gethostbyname(), so randomize the + * sort once per process. */ + unsigned int i, j; + char *tmp; + + pthread_once( &hash_init_once, init_hash ); + + for (i = 0; host->h_addr_list[i]; ++i) + { + for (j = i + 1; host->h_addr_list[j]; ++j) + { + if (compare_addrs_hashed( host->h_addr_list[j], host->h_addr_list[i], host->h_length ) < 0) + { + tmp = host->h_addr_list[j]; + host->h_addr_list[j] = host->h_addr_list[i]; + host->h_addr_list[i] = tmp; + } + } + } +} #ifdef HAVE_LINUX_GETHOSTBYNAME_R_6 static NTSTATUS unix_gethostbyname( void *args ) @@ -915,9 +998,14 @@ static NTSTATUS unix_gethostbyname( void *args ) } if (!unix_host) + { ret = (locerr < 0 ? errno_from_unix( errno ) : host_errno_from_unix( locerr )); + } else + { + sort_addrs_hashed( unix_host ); ret = hostent_from_unix( unix_host, params->host, params->size ); + } free( unix_buffer ); return ret; @@ -938,6 +1026,7 @@ static NTSTATUS unix_gethostbyname( void *args ) return ret; } + sort_addrs_hashed( unix_host ); ret = hostent_from_unix( unix_host, params->host, params->size ); pthread_mutex_unlock( &host_mutex );

1 0