April 2022 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : msado15: Return valid object in Recordset::Clone.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 8fbc1c1a09c70e865db2d646283a96cba20cbe79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fbc1c1a09c70e865db2d646… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 8 17:33:15 2022 +1000 msado15: Return valid object in Recordset::Clone. This is just to stop a crash when Clone is called. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/recordset.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 3bbb4bd3300..766c17598ce 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1794,8 +1794,12 @@ static HRESULT WINAPI recordset_CompareBookmarks( _Recordset *iface, VARIANT boo static HRESULT WINAPI recordset_Clone( _Recordset *iface, LockTypeEnum lock_type, _Recordset **obj ) { - FIXME( "%p, %d, %p\n", iface, lock_type, obj ); - return E_NOTIMPL; + struct recordset *recordset = impl_from_Recordset( iface ); + FIXME( "%p, %d, %p\n", recordset, lock_type, obj ); + + *obj = iface; + recordset_AddRef( iface ); + return S_OK; } static HRESULT WINAPI recordset_Resync( _Recordset *iface, AffectEnum affect_records, ResyncEnum resync_values )

1 0

Nikolay Sivov : d3dxof/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 360e989d4451d7e2edc8a69bbafbdfc0e52208d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360e989d4451d7e2edc8a69b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 09:21:46 2022 +0300 d3dxof/tests: Build without -DWINE_NO_LONG_TYPES. 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/d3dxof/tests/Makefile.in | 1 - dlls/d3dxof/tests/d3dxof.c | 382 +++++++++++++++++++++--------------------- 2 files changed, 191 insertions(+), 192 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=360e989d4451d7e2edc8…

1 0

Nikolay Sivov : d3dxof/tests: Simplify refcount helper.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 24ccf11739dc0af0861a38da87e04730fba05c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24ccf11739dc0af0861a38da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 13 09:21:47 2022 +0300 d3dxof/tests: Simplify refcount 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/d3dxof/tests/d3dxof.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 05f92bab8cb..edb5d8547e6 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -394,10 +394,11 @@ static void init_function_pointers(void) pDirectXFileCreate = (void *)GetProcAddress(hd3dxof, "DirectXFileCreate"); } -static ULONG getRefcount(IUnknown *iface) +static ULONG get_refcount(void *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); } static void test_refcount(void) @@ -423,7 +424,7 @@ static void test_refcount(void) return; } - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_AddRef(lpDirectXFile); ok(ref == 2, "Unexpected refcount %ld.\n", ref); @@ -437,33 +438,33 @@ static void test_refcount(void) dxflm.dSize = sizeof(object) - 1; hr = IDirectXFile_CreateEnumObject(lpDirectXFile, &dxflm, DXFILELOAD_FROMMEMORY, &lpdxfeo); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); hr = IDirectXFileEnumObject_GetNextDataObject(lpdxfeo, &lpdxfd); ok(hr == DXFILE_OK, "Unexpected hr %#lx.\n", hr); - ref = getRefcount( (IUnknown *) lpDirectXFile); + ref = get_refcount(lpDirectXFile); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); /* Enum object gets references to all top level objects */ - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 2, "Unexpected refcount %ld.\n", ref); ref = IDirectXFile_Release(lpDirectXFile); ok(!ref, "Unexpected refcount %ld.\n", ref); /* Nothing changes for all other objects */ - ref = getRefcount( (IUnknown *) lpdxfeo); + ref = get_refcount(lpdxfeo); ok(ref == 1, "Unexpected refcount %ld.\n", ref); - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 2, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(!ref, "Unexpected refcount %ld.\n", ref); /* Enum object releases references to all top level objects */ - ref = getRefcount( (IUnknown *) lpdxfd); + ref = get_refcount(lpdxfd); ok(ref == 1, "Unexpected refcount %ld.\n", ref); ref = IDirectXFileData_Release(lpdxfd);

1 0

Zhiyi Zhang : kernel32/tests: Add more CreateActCtx() tests.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 596b64739122d6a23784160faea738a7c3c3a641 URL: https://source.winehq.org/git/wine.git/?a=commit;h=596b64739122d6a23784160f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 13 17:40:27 2022 +0800 kernel32/tests: Add more CreateActCtx() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index ebe1bb86470..71337c0f38e 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2688,9 +2688,12 @@ static void extract_resource(const char *name, const char *type, const char *pat static void test_CreateActCtx(void) { + static const DWORD flags[] = {LOAD_LIBRARY_AS_DATAFILE, LOAD_LIBRARY_AS_IMAGE_RESOURCE, + LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE}; CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; + int i; GetTempPathA(ARRAY_SIZE(path), path); strcat(path, "main_wndcls.manifest"); @@ -2827,6 +2830,34 @@ todo_wine { delete_manifest_file("testdir.manifest"); delete_manifest_file("assembly_dir\\testdir.manifest"); RemoveDirectoryA(dir); + + /* create using lpSource with a DLL relative name */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.lpSource = "shell32.dll"; + actctx.lpResourceName = MAKEINTRESOURCEA(124); + actctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + handle = CreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxA succeeded\n"); + + /* create from module loaded as data file */ + memset(&actctx, 0, sizeof(actctx)); + actctx.cbSize = sizeof(actctx); + actctx.lpResourceName = MAKEINTRESOURCEA(1); + actctx.dwFlags = ACTCTX_FLAG_HMODULE_VALID | ACTCTX_FLAG_RESOURCE_NAME_VALID; + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + winetest_push_context("%lu", flags[i]); + + /* use explorer.exe because using modules already loaded has a different behavior */ + actctx.hModule = LoadLibraryExA("C:\\windows\\explorer.exe", NULL, flags[i]); + ok(actctx.hModule != NULL, "LoadLibraryExA failed, error %lu\n", GetLastError()); + handle = CreateActCtxA(&actctx); + ok(handle == INVALID_HANDLE_VALUE, "CreateActCtxA succeeded\n"); + FreeLibrary(actctx.hModule); + + winetest_pop_context(); + } } static BOOL init_funcs(void)

1 0

Zhiyi Zhang : shell32: Activate context at ID 123 before loading control panel applets.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 765d4c1e77c92f5c978de257aa3f9e8d104b104a URL: https://source.winehq.org/git/wine.git/?a=commit;h=765d4c1e77c92f5c978de257… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Apr 13 17:40:41 2022 +0800 shell32: Activate context at ID 123 before loading control panel applets. This is required to enable common control v6 when running control panel applets using "rundll32.exe shell32.dll,Control_RunDLL". Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/control.c | 25 +++++++++++++++++++++++++ dlls/shell32/cpanel.h | 3 +++ 2 files changed, 28 insertions(+) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index d8a5edd9722..66987ed3192 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -53,6 +53,9 @@ void Control_UnloadApplet(CPlApplet* applet) if (applet->proc) applet->proc(applet->hWnd, CPL_EXIT, 0L, 0L); FreeLibrary(applet->hModule); + if (applet->context_activated) + DeactivateActCtx(0, applet->cookie); + ReleaseActCtx(applet->context); list_remove( &applet->entry ); heap_free(applet->cmd); heap_free(applet); @@ -60,15 +63,19 @@ void Control_UnloadApplet(CPlApplet* applet) CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { + WCHAR path[MAX_PATH]; CPlApplet* applet; DWORD len; unsigned i; CPLINFO info; NEWCPLINFOW newinfo; + ACTCTXW ctx; if (!(applet = heap_alloc_zero(sizeof(*applet)))) return applet; + applet->context = INVALID_HANDLE_VALUE; + len = ExpandEnvironmentStringsW(cmd, NULL, 0); if (len > 0) { @@ -87,6 +94,21 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) applet->hWnd = hWnd; + /* Activate context before DllMain() is called */ + if (SearchPathW(NULL, applet->cmd, NULL, ARRAY_SIZE(path), path, NULL)) + { + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = path; + ctx.lpResourceName = MAKEINTRESOURCEW(123); + ctx.dwFlags = ACTCTX_FLAG_RESOURCE_NAME_VALID; + applet->context = CreateActCtxW(&ctx); + if (applet->context != INVALID_HANDLE_VALUE) + applet->context_activated = ActivateActCtx(applet->context, &applet->cookie); + else + TRACE("No manifest at ID 123 in %s\n", wine_dbgstr_w(path)); + } + if (!(applet->hModule = LoadLibraryW(applet->cmd))) { WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; @@ -177,6 +199,9 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) theError: FreeLibrary(applet->hModule); + if (applet->context_activated) + DeactivateActCtx(0, applet->cookie); + ReleaseActCtx(applet->context); heap_free(applet->cmd); heap_free(applet); return NULL; diff --git a/dlls/shell32/cpanel.h b/dlls/shell32/cpanel.h index 285fa8e1724..8e29b6d3331 100644 --- a/dlls/shell32/cpanel.h +++ b/dlls/shell32/cpanel.h @@ -40,6 +40,9 @@ typedef struct CPlApplet { unsigned count; /* number of subprograms */ HMODULE hModule; /* module of loaded applet */ APPLET_PROC proc; /* entry point address */ + BOOL context_activated; /* whether context is activated */ + HANDLE context; /* activation context handle */ + ULONG_PTR cookie; /* activation context cookie */ struct applet_info info[1]; /* array of count information */ } CPlApplet;

1 0

Alexandre Julliard : kernelbase: Move codepage initialization to ntdll.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: e81327358a26b160740b3421a4c7f300b4d2f06f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e81327358a26b160740b3421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 15:13:16 2022 +0200 kernelbase: Move codepage initialization to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 28 +++++++--------------------- dlls/ntdll/locale.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 25d6d76c0c4..42dcfff50e0 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -285,7 +285,6 @@ struct norm_table static NLSTABLEINFO nls_info; static UINT unix_cp = CP_UTF8; -static UINT mac_cp = 10000; static LCID system_lcid; static LCID user_lcid; static HKEY intl_key; @@ -1752,7 +1751,7 @@ static void update_locale_registry(void) */ void init_locale( HMODULE module ) { - UINT ansi_cp = 0, oem_cp = 0; + USHORT utf8[2] = { 0, CP_UTF8 }; USHORT *ansi_ptr, *oem_ptr; void *sort_ptr; WCHAR bufferW[LOCALE_NAME_MAX_LENGTH]; @@ -1781,26 +1780,13 @@ void init_locale( HMODULE module ) if (GetEnvironmentVariableW( L"WINEUNIXCP", bufferW, ARRAY_SIZE(bufferW) )) unix_cp = wcstoul( bufferW, NULL, 10 ); - GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&ansi_cp, sizeof(ansi_cp)/sizeof(WCHAR) ); - GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTMACCODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&mac_cp, sizeof(mac_cp)/sizeof(WCHAR) ); - GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, - (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR) ); - NtGetNlsSectionPtr( 9, 0, NULL, &sort_ptr, &size ); NtGetNlsSectionPtr( 12, NormalizationC, NULL, (void **)&norm_info, &size ); init_sortkeys( sort_ptr ); - if (!ansi_cp || NtGetNlsSectionPtr( 11, ansi_cp, NULL, (void **)&ansi_ptr, &size )) - NtGetNlsSectionPtr( 11, 1252, NULL, (void **)&ansi_ptr, &size ); - if (!oem_cp || NtGetNlsSectionPtr( 11, oem_cp, 0, (void **)&oem_ptr, &size )) - NtGetNlsSectionPtr( 11, 437, NULL, (void **)&oem_ptr, &size ); - NtCurrentTeb()->Peb->AnsiCodePageData = ansi_ptr; - NtCurrentTeb()->Peb->OemCodePageData = oem_ptr; - NtCurrentTeb()->Peb->UnicodeCaseTableData = sort.casemap; + ansi_ptr = NtCurrentTeb()->Peb->AnsiCodePageData ? NtCurrentTeb()->Peb->AnsiCodePageData : utf8; + oem_ptr = NtCurrentTeb()->Peb->OemCodePageData ? NtCurrentTeb()->Peb->OemCodePageData : utf8; RtlInitNlsTables( ansi_ptr, oem_ptr, sort.casemap, &nls_info ); - RtlResetRtlTranslations( &nls_info ); RegCreateKeyExW( HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Nls", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &nls_key, NULL ); @@ -1840,11 +1826,11 @@ void init_locale( HMODULE module ) if (!RegCreateKeyExW( nls_key, L"Codepage", 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) { - count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", ansi_cp ); + count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", GetACP() ); RegSetValueExW( hkey, L"ACP", 0, REG_SZ, (BYTE *)bufferW, (count + 1) * sizeof(WCHAR) ); - count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", oem_cp ); + count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", GetOEMCP() ); RegSetValueExW( hkey, L"OEMCP", 0, REG_SZ, (BYTE *)bufferW, (count + 1) * sizeof(WCHAR) ); - count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", mac_cp ); + count = swprintf( bufferW, ARRAY_SIZE(bufferW), L"%03d", system_locale->idefaultmaccodepage ); RegSetValueExW( hkey, L"MACCP", 0, REG_SZ, (BYTE *)bufferW, (count + 1) * sizeof(WCHAR) ); RegCloseKey( hkey ); } @@ -1989,7 +1975,7 @@ static const CPTABLEINFO *get_codepage_table( UINT codepage ) case CP_OEMCP: return &nls_info.OemTableInfo; case CP_MACCP: - codepage = mac_cp; + codepage = system_locale->idefaultmaccodepage; break; case CP_THREAD_ACP: codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale, 0 ); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 597910e5639..3c96a742e4e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -153,10 +153,14 @@ static const NLS_LOCALE_DATA *get_locale_data( UINT idx ) void locale_init(void) { + USHORT utf8[2] = { 0, CP_UTF8 }; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; UNICODE_STRING name, value; LARGE_INTEGER unused; + SIZE_T size; LCID system_lcid, user_lcid = 0; + UINT ansi_cp = 1252, oem_cp = 437; + void *ansi_ptr = utf8, *oem_ptr = utf8, *case_ptr; NTSTATUS status; struct { @@ -189,10 +193,38 @@ void locale_init(void) const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); if (entry) user_lcid = get_locale_data( entry->idx )->idefaultlanguage; } - if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); if (!user_lcid) user_lcid = system_lcid; NtSetDefaultUILanguage( user_lcid ); NtSetDefaultLocale( TRUE, user_lcid ); + + if (system_lcid == LOCALE_CUSTOM_UNSPECIFIED) + { + system_lcid = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + ansi_cp = oem_cp = CP_UTF8; + } + else + { + const NLS_LOCALE_LCID_INDEX *entry = find_lcid_entry( system_lcid ); + ansi_cp = get_locale_data( entry->idx )->idefaultansicodepage; + oem_cp = get_locale_data( entry->idx )->idefaultcodepage; + } + + NtGetNlsSectionPtr( 10, 0, NULL, &case_ptr, &size ); + NtCurrentTeb()->Peb->UnicodeCaseTableData = case_ptr; + if (ansi_cp != CP_UTF8) + { + NtGetNlsSectionPtr( 11, ansi_cp, NULL, &ansi_ptr, &size ); + NtCurrentTeb()->Peb->AnsiCodePageData = ansi_ptr; + } + if (oem_cp != CP_UTF8) + { + NtGetNlsSectionPtr( 11, oem_cp, NULL, &oem_ptr, &size ); + NtCurrentTeb()->Peb->OemCodePageData = oem_ptr; + } + RtlInitNlsTables( ansi_ptr, oem_ptr, case_ptr, &nls_info ); + NlsAnsiCodePage = nls_info.AnsiTableInfo.CodePage; + NlsMbCodePageTag = nls_info.AnsiTableInfo.DBCSCodePage; + NlsMbOemCodePageTag = nls_info.OemTableInfo.DBCSCodePage; }

1 0

Alexandre Julliard : ntdll: Add support for 2019 and 2020 WindowsSettings namespaces.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 1326687feb2b66d8013034387cfb47ea1bb99e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1326687feb2b66d801303438… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 16:54:20 2022 +0200 ntdll: Add support for 2019 and 2020 WindowsSettings namespaces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 92f2f0148b2..be003b7c267 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -615,6 +615,8 @@ static const WCHAR windowsSettings2005NSW[] = L"http://schemas.microsoft.com/SMI static const WCHAR windowsSettings2011NSW[] = L"http://schemas.microsoft.com/SMI/2011/WindowsSettings"; static const WCHAR windowsSettings2016NSW[] = L"http://schemas.microsoft.com/SMI/2016/WindowsSettings"; static const WCHAR windowsSettings2017NSW[] = L"http://schemas.microsoft.com/SMI/2017/WindowsSettings"; +static const WCHAR windowsSettings2019NSW[] = L"http://schemas.microsoft.com/SMI/2019/WindowsSettings"; +static const WCHAR windowsSettings2020NSW[] = L"http://schemas.microsoft.com/SMI/2020/WindowsSettings"; struct olemisc_entry { @@ -2535,12 +2537,14 @@ static void parse_windows_settings_elem( xmlbuf_t *xmlbuf, struct assembly *asse while (next_xml_elem( xmlbuf, &elem, parent )) { - if (xml_elem_cmp( &elem, L"autoElevate", windowsSettings2005NSW ) || + if (xml_elem_cmp( &elem, L"activeCodePage", windowsSettings2019NSW ) || + xml_elem_cmp( &elem, L"autoElevate", windowsSettings2005NSW ) || xml_elem_cmp( &elem, L"disableTheming", windowsSettings2005NSW ) || xml_elem_cmp( &elem, L"disableWindowFiltering", windowsSettings2011NSW ) || xml_elem_cmp( &elem, L"dpiAware", windowsSettings2005NSW ) || xml_elem_cmp( &elem, L"dpiAwareness", windowsSettings2016NSW ) || xml_elem_cmp( &elem, L"gdiScaling", windowsSettings2017NSW ) || + xml_elem_cmp( &elem, L"heapType", windowsSettings2020NSW ) || xml_elem_cmp( &elem, L"highResolutionScrollingAware", windowsSettings2017NSW ) || xml_elem_cmp( &elem, L"longPathAware", windowsSettings2016NSW ) || xml_elem_cmp( &elem, L"magicFutureSetting", windowsSettings2017NSW ) || @@ -2564,7 +2568,7 @@ static void parse_application_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, while (next_xml_elem( xmlbuf, &elem, parent )) { - if (xml_elem_cmp( &elem, L"windowsSettings", asmv3W )) + if (xml_elem_cmp( &elem, L"windowsSettings", asmv1W )) { parse_windows_settings_elem( xmlbuf, assembly, acl, &elem ); } @@ -2783,7 +2787,7 @@ static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly, { parse_compatibility_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, L"application", asmv3W)) + else if (xml_elem_cmp(&elem, L"application", asmv1W)) { parse_application_elem(xmlbuf, assembly, acl, &elem); } @@ -5845,7 +5849,9 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL if (wcscmp( ns, windowsSettings2005NSW ) && wcscmp( ns, windowsSettings2011NSW ) && wcscmp( ns, windowsSettings2016NSW ) && - wcscmp( ns, windowsSettings2017NSW )) + wcscmp( ns, windowsSettings2017NSW ) && + wcscmp( ns, windowsSettings2019NSW ) && + wcscmp( ns, windowsSettings2020NSW )) return STATUS_INVALID_PARAMETER; } else ns = windowsSettings2005NSW;

1 0

Alexandre Julliard : ntdll: Support overriding the codepage from the manifest.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 967ef0bf41fc6742398313ebdebd681c1b33dbc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=967ef0bf41fc6742398313eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 15:58:59 2022 +0200 ntdll: Support overriding the codepage from the manifest. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52223 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/locale.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b6cc53763af..d750f7a7579 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4126,8 +4126,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR RtlInitAnsiString( &func_name, "CtrlRoutine" ); LdrGetProcedureAddress( kernel32->ldr.DllBase, &func_name, 0, (void **)&pCtrlRoutine ); - locale_init(); actctx_init(); + locale_init(); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry ); else diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 3c96a742e4e..b95b3522fce 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -209,6 +209,27 @@ void locale_init(void) oem_cp = get_locale_data( entry->idx )->idefaultcodepage; } + if (!RtlQueryActivationContextApplicationSettings( 0, NULL, L"http://schemas.microsoft.com/SMI/2019/WindowsSettings", + L"activeCodePage", locale, ARRAY_SIZE(locale), NULL )) + { + const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); + + if (!wcsicmp( locale, L"utf-8" )) + { + ansi_cp = oem_cp = CP_UTF8; + } + else if (!wcsicmp( locale, L"legacy" )) + { + if (ansi_cp == CP_UTF8) ansi_cp = 1252; + if (oem_cp == CP_UTF8) oem_cp = 437; + } + else if ((entry = find_lcname_entry( locale ))) + { + ansi_cp = get_locale_data( entry->idx )->idefaultansicodepage; + oem_cp = get_locale_data( entry->idx )->idefaultcodepage; + } + } + NtGetNlsSectionPtr( 10, 0, NULL, &case_ptr, &size ); NtCurrentTeb()->Peb->UnicodeCaseTableData = case_ptr; if (ansi_cp != CP_UTF8)

1 0

Zebediah Figura : ntdll: Return the required length from NtQueryDirectoryObject().
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 0c7dcd9088c139a41d210baac5edf148e3bde23d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7dcd9088c139a41d210baa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 12 22:00:48 2022 -0500 ntdll: Return the required length from NtQueryDirectoryObject(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/unix/sync.c | 6 +++--- include/wine/server_protocol.h | 4 ++-- server/directory.c | 6 ++++-- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 3 ++- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 91eb2919cb6..7d7b4b09e73 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2638,7 +2638,7 @@ static void test_query_directory(void) memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, needed_size - 1, TRUE, TRUE, &context, &size ); ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); - todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, NULL ); ok( !status, "got %#lx\n", status ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index e1cc2d818b4..46facdd2b0e 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1125,10 +1125,10 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; *context = index + 1; - - if (ret_size) - *ret_size = buffer->ObjectName.MaximumLength + buffer->ObjectTypeName.MaximumLength + sizeof(*buffer); } + + if (ret_size && (!ret || ret == STATUS_BUFFER_TOO_SMALL)) + *ret_size = sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); } SERVER_END_REQ; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6cd901f1e56..8f883b2d97e 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4646,10 +4646,10 @@ struct get_directory_entry_request struct get_directory_entry_reply { struct reply_header __header; + data_size_t total_len; data_size_t name_len; /* VARARG(name,unicode_str,name_len); */ /* VARARG(type,unicode_str); */ - char __pad_12[4]; }; @@ -6286,7 +6286,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 749 +#define SERVER_PROTOCOL_VERSION 750 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index caaf8c43d33..23d7eb0a2b7 100644 --- a/server/directory.c +++ b/server/directory.c @@ -546,9 +546,11 @@ DECL_HANDLER(get_directory_entry) const struct unicode_str *type_name = &obj->ops->type->name; const WCHAR *name = get_object_name( obj, &name_len ); - if (name_len + type_name->len <= get_reply_max_size()) + reply->total_len = name_len + type_name->len; + + if (reply->total_len <= get_reply_max_size()) { - void *ptr = set_reply_data_size( name_len + type_name->len ); + void *ptr = set_reply_data_size( reply->total_len ); if (ptr) { reply->name_len = name_len; diff --git a/server/protocol.def b/server/protocol.def index d9bed6855e9..9b7b99ae86a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3275,6 +3275,7 @@ struct handle_info obj_handle_t handle; /* handle to the directory */ unsigned int index; /* entry index */ @REPLY + data_size_t total_len; /* total length needed for strings */ data_size_t name_len; /* length of the entry name in bytes */ VARARG(name,unicode_str,name_len); /* entry name */ VARARG(type,unicode_str); /* entry type */ diff --git a/server/request.h b/server/request.h index ca99acbdbf6..9ed2f898e6d 100644 --- a/server/request.h +++ b/server/request.h @@ -2011,7 +2011,8 @@ C_ASSERT( sizeof(struct open_directory_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_directory_entry_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_directory_entry_request, index) == 16 ); C_ASSERT( sizeof(struct get_directory_entry_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_directory_entry_reply, name_len) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_directory_entry_reply, total_len) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_directory_entry_reply, name_len) == 12 ); C_ASSERT( sizeof(struct get_directory_entry_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_symlink_request, access) == 12 ); C_ASSERT( sizeof(struct create_symlink_request) == 16 ); diff --git a/server/trace.c b/server/trace.c index a792b74dc05..d71561e1247 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3978,7 +3978,8 @@ static void dump_get_directory_entry_request( const struct get_directory_entry_r static void dump_get_directory_entry_reply( const struct get_directory_entry_reply *req ) { - fprintf( stderr, " name_len=%u", req->name_len ); + fprintf( stderr, " total_len=%u", req->total_len ); + fprintf( stderr, ", name_len=%u", req->name_len ); dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) ); dump_varargs_unicode_str( ", type=", cur_size ); }

1 0

Zebediah Figura : ntdll: Don't return STATUS_BUFFER_OVERFLOW if the buffer is too small to hold one entry.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 4b57ae1674f5ff9ee9380c2c02e43472ba7320c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b57ae1674f5ff9ee9380c2c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 12 22:00:49 2022 -0500 ntdll: Don't return STATUS_BUFFER_OVERFLOW if the buffer is too small to hold one entry. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 6 +++--- dlls/ntdll/unix/sync.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 7d7b4b09e73..89cd2b8e3f4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2530,7 +2530,7 @@ static void test_query_directory(void) context = 0xdeadbeef; size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); @@ -2630,9 +2630,9 @@ static void test_query_directory(void) size = 0xdeadbeef; context = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); size = 0xdeadbeef; memset( buffer, 0xcc, sizeof(buffer) ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 46facdd2b0e..efbe363c210 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1104,13 +1104,12 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI if (single_entry) { - if (size <= sizeof(*buffer) + 2 * sizeof(WCHAR)) return STATUS_BUFFER_OVERFLOW; - SERVER_START_REQ( get_directory_entry ) { req->handle = wine_server_obj_handle( handle ); req->index = index; - wine_server_set_reply( req, buffer + 1, size - sizeof(*buffer) - 2*sizeof(WCHAR) ); + if (size >= sizeof(*buffer) + 2 * sizeof(WCHAR)) + wine_server_set_reply( req, buffer + 1, size - sizeof(*buffer) - 2 * sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { buffer->ObjectName.Buffer = (WCHAR *)(buffer + 1);

1 0