March 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Fix some memory leaks in the function call rule.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: vkd3d Branch: master Commit: da2435707b82ac4dc1f8f4784e89f1b1b7eaf0f1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/da2435707b82ac4dc1f8f4784e89f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 10 19:28:13 2022 -0600 vkd3d-shader/hlsl: Fix some memory leaks in the function call rule. --- libs/vkd3d-shader/hlsl.y | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 882597e9..fd1eaf6e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5300,7 +5300,11 @@ primary_expr: | var_identifier '(' func_arguments ')' { if (!($$ = add_call(ctx, $1, &$3, &@1))) + { + vkd3d_free($1); YYABORT; + } + vkd3d_free($1); } | NEW_IDENTIFIER {

1 0

Henri Verbeet : build: Fix the order of some .shader_test files.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: vkd3d Branch: master Commit: d405295bc73ab8b22ddf83e76518c7c0e067fa59 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d405295bc73ab8b22ddf83e76518c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 9 18:01:46 2023 +0100 build: Fix the order of some .shader_test files. --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index c1606cec..22a1065a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,8 +53,8 @@ vkd3d_shader_tests = \ tests/asuint.shader_test \ tests/bitwise.shader_test \ tests/cast-broadcast.shader_test \ - tests/cast-componentwise-equal.shader_test \ tests/cast-componentwise-compatible.shader_test \ + tests/cast-componentwise-equal.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -83,13 +83,13 @@ vkd3d_shader_tests = \ tests/hlsl-gather-offset.shader_test \ tests/hlsl-gather.shader_test \ tests/hlsl-initializer-flatten.shader_test \ - tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-implicit-array.shader_test \ + tests/hlsl-initializer-invalid-arg-count.shader_test \ tests/hlsl-initializer-local-array.shader_test \ - tests/hlsl-initializer-objects.shader_test \ + tests/hlsl-initializer-matrix.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-numeric.shader_test \ - tests/hlsl-initializer-matrix.shader_test \ + tests/hlsl-initializer-objects.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \

1 0

Evan Tang : ntdll/tests: Move TlsIndex test to kernel32:loader.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: a8fa80cfb4a1819be12ece459753bc07d4ea8be6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8fa80cfb4a1819be12ece459753bc… Author: Evan Tang <etang(a)codeweavers.com> Date: Thu Mar 9 11:16:53 2023 -0600 ntdll/tests: Move TlsIndex test to kernel32:loader. Gets us access to a dll with tls to verify. --- dlls/kernel32/tests/loader.c | 31 +++++++++++++++++++++++++++++++ dlls/ntdll/tests/rtl.c | 26 -------------------------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ef9c68a7c3a..90e6d09740a 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2117,6 +2117,33 @@ nt4_is_broken: } } +static void check_tls_index(HANDLE dll, BOOL tls_initialized) +{ + BOOL found_dll = FALSE; + LIST_ENTRY *root = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; + for (LIST_ENTRY *entry = root->Flink; entry != root; entry = entry->Flink) + { + LDR_DATA_TABLE_ENTRY *mod = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + if (wcsicmp(L"ntdll.dll", mod->BaseDllName.Buffer) == 0) + { + /* Pick ntdll as a dll that definitely won't have TLS */ + ok(mod->TlsIndex == 0, "ntdll.dll TlsIndex: %d instead of 0\n", mod->TlsIndex); + } + else if (mod->DllBase == dll) + { + SHORT expected = tls_initialized ? -1 : 0; + ok(mod->TlsIndex == expected, "Test exe TlsIndex: %d instead of %d\n", mod->TlsIndex, expected); + found_dll = TRUE; + } + else + { + ok(mod->TlsIndex == 0 || mod->TlsIndex == -1, "%s TlsIndex: %d\n", + debugstr_w(mod->BaseDllName.Buffer), mod->TlsIndex); + } + } + ok(found_dll, "Couldn't find dll %p in module list\n", dll); +} + static void test_import_resolution(void) { char temp_path[MAX_PATH]; @@ -2251,6 +2278,7 @@ static void test_import_resolution(void) ok( !strcmp( str, "hello world" ), "wrong tls data '%s' at %p\n", str, str ); ok(ptr->tls_index_hi == 0, "TLS Index written as a short, high half: %d\n", ptr->tls_index_hi); } + check_tls_index(mod, ptr->tls_index != 9999); FreeLibrary( mod ); break; case 1: /* load with DONT_RESOLVE_DLL_REFERENCES doesn't resolve imports */ @@ -2267,6 +2295,7 @@ static void test_import_resolution(void) ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); + check_tls_index(mod, ptr->tls_index != 9999); FreeLibrary( mod2 ); FreeLibrary( mod ); break; @@ -2278,6 +2307,7 @@ static void test_import_resolution(void) ok( ptr->thunks[0].u1.Function == 0xdeadbeef, "thunk resolved to %p for %s.%s\n", (void *)ptr->thunks[0].u1.Function, data.module, data.function.name ); ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); + check_tls_index(mod, ptr->tls_index != 9999); FreeLibrary( mod ); break; case 3: /* load with tls init function */ @@ -2293,6 +2323,7 @@ static void test_import_resolution(void) str = ((char **)NtCurrentTeb()->ThreadLocalStoragePointer)[ptr->tls_index]; ok( !strcmp( str, "hello!world" ), "wrong tls data '%s' at %p\n", str, str ); } + check_tls_index(mod, ptr->tls_index != 9999); FreeLibrary( mod ); } DeleteFileA( dll_name ); diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 493cdc92cac..3a5564fc6b8 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3608,31 +3608,6 @@ static void test_RtlFirstFreeAce(void) HeapFree(GetProcessHeap(), 0, acl); } -static void test_TlsIndex(void) -{ - LIST_ENTRY *root = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - for (LIST_ENTRY *entry = root->Flink; entry != root; entry = entry->Flink) - { - LDR_DATA_TABLE_ENTRY *mod = CONTAINING_RECORD(entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - if (lstrcmpiW(L"ntdll.dll", mod->BaseDllName.Buffer) == 0) - { - /* Pick ntdll as a dll that definitely won't have TLS */ - ok(mod->TlsIndex == 0, "ntdll.dll TlsIndex: %d instead of 0\n", mod->TlsIndex); - } - else if (mod->DllBase == GetModuleHandleA(NULL)) - { - /* mingw gcc doesn't support MSVC-style TLS */ - /* If we do get a way to add tls to this exe, uncomment the following test: */ - /* ok(mod->TlsIndex == -1, "Test exe TlsIndex: %d instead of -1\n", mod->TlsIndex); */ - } - else - { - ok(mod->TlsIndex == 0 || mod->TlsIndex == -1, "%s TlsIndex: %d\n", - debugstr_w(mod->BaseDllName.Buffer), mod->TlsIndex); - } - } -} - START_TEST(rtl) { InitFunctionPtrs(); @@ -3677,5 +3652,4 @@ START_TEST(rtl) test_DbgPrint(); test_RtlDestroyHeap(); test_RtlFirstFreeAce(); - test_TlsIndex(); }

1 0

Francois Gouget : windows.perception.stub/tests: Skip some tests when ISpatialSurfaceObserverStatics2 is not supported.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: b7ae278f2b936841c9cb820ffe5ca15ac8fb5068 URL: https://gitlab.winehq.org/wine/wine/-/commit/b7ae278f2b936841c9cb820ffe5ca1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 9 13:54:04 2023 +0100 windows.perception.stub/tests: Skip some tests when ISpatialSurfaceObserverStatics2 is not supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54649 --- dlls/windows.perception.stub/tests/perception.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index 3e11f5ea8e7..c83986f4b6c 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -73,15 +73,20 @@ static void test_ObserverStatics(void) check_interface( factory, &IID_ISpatialSurfaceObserverStatics ); hr = IActivationFactory_QueryInterface( factory, &IID_ISpatialSurfaceObserverStatics2, (void **)&observer_statics2 ); - ok( hr == S_OK, "got hr %#lx.\n", hr ); + if (hr == E_NOINTERFACE /* win1607 */) + win_skip("ISpatialSurfaceObserverStatics2 is not supported\n"); + else + { + ok( hr == S_OK, "got hr %#lx.\n", hr ); - value = TRUE; - hr = ISpatialSurfaceObserverStatics2_IsSupported( observer_statics2, &value ); - ok( hr == S_OK, "got hr %#lx.\n", hr ); - ok( !value, "got %d.\n", value ); + value = TRUE; + hr = ISpatialSurfaceObserverStatics2_IsSupported( observer_statics2, &value ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( !value, "got %d.\n", value ); - ref = ISpatialSurfaceObserverStatics2_Release( observer_statics2 ); - ok( ref == 2, "got ref %ld.\n", ref ); + ref = ISpatialSurfaceObserverStatics2_Release( observer_statics2 ); + ok( ref == 2, "got ref %ld.\n", ref ); + } ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Hugh McMaster : regedit: Append '.reg' file extension if necessary.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 1a61a4e1a66f24b3c8fb2090e85f006af703741e URL: https://gitlab.winehq.org/wine/wine/-/commit/1a61a4e1a66f24b3c8fb2090e85f00… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 9 21:30:26 2023 +1100 regedit: Append '.reg' file extension if necessary. --- programs/regedit/framewnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 3bc60ee0f75..c2af414d268 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -493,6 +493,7 @@ static BOOL ExportRegistryFile(HWND hWnd) InitOpenFileName(hWnd, &ofn); LoadStringW(hInst, IDS_FILEDIALOG_EXPORT_TITLE, title, ARRAY_SIZE(title)); ofn.lpstrTitle = title; + ofn.lpstrDefExt = L"reg"; ofn.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; ofn.lpfnHook = ExportRegistryFile_OFNHookProc; ofn.lpTemplateName = MAKEINTRESOURCEW(IDD_EXPORT_TEMPLATE);

1 0

Evan Tang : kernel32/tests: Add test verifying that tls init functions are called.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 2203a8564c5faba383a3512f8244dba12d79da16 URL: https://gitlab.winehq.org/wine/wine/-/commit/2203a8564c5faba383a3512f8244db… Author: Evan Tang <etang(a)codeweavers.com> Date: Wed Mar 8 16:57:43 2023 -0600 kernel32/tests: Add test verifying that tls init functions are called. --- dlls/kernel32/tests/loader.c | 51 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 365f4465fc7..ef9c68a7c3a 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2134,14 +2134,38 @@ static void test_import_resolution(void) char module[16]; struct { WORD hint; char name[32]; } function; IMAGE_TLS_DIRECTORY tls; + UINT_PTR tls_init_fn_list[2]; char tls_data[16]; SHORT tls_index; + SHORT tls_index_hi; + UCHAR tls_init_fn[64]; /* Note: Uses rip-relative address of tls_index, don't separate */ } data, *ptr; IMAGE_NT_HEADERS nt; IMAGE_SECTION_HEADER section; int test; +#if defined(__i386__) + static const UCHAR tls_init_code[] = { + 0xE8, 0x00, 0x00, 0x00, 0x00, /* call 1f */ + 0x59, /* 1: pop ecx */ + 0x8B, 0x49, 0xF7, /* mov ecx, [ecx - 9] ; mov ecx, [tls_index] */ + 0x64, 0x8B, 0x15, 0x2C, 0x00, 0x00, 0x00, /* mov edx, fs:0x2c */ + 0x8B, 0x14, 0x8A, /* mov edx, [edx + edx * 4] */ + 0xC6, 0x42, 0x05, 0x21, /* mov byte [edx + 5], 0x21 */ + 0xC2, 0x0C, 0x00, /* ret 12 */ + }; +#elif defined(__x86_64__) + static const UCHAR tls_init_code[] = { + 0x8B, 0x0D, 0xF6, 0xFF, 0xFF, 0xFF, /* mov ecx, [rip + tls_index] */ + 0x65, 0x48, 0x8B, 0x14, 0x25, 0x58, 0x00, 0x00, 0x00, /* mov rdx, gs:0x58 */ + 0x48, 0x8B, 0x14, 0xCA, /* mov rdx, [rdx + rcx * 8] */ + 0xC6, 0x42, 0x05, 0x21, /* mov byte [rdx + 5], 0x21 */ + 0xC3, /* ret */ + }; +#else + static const UCHAR tls_init_code[] = { 0x00 }; +#endif - for (test = 0; test < 3; test++) + for (test = 0; test < 4; test++) { #define DATA_RVA(ptr) (page_size + ((char *)(ptr) - (char *)&data)) nt = nt_header_template; @@ -2175,6 +2199,15 @@ static void test_import_resolution(void) data.tls.AddressOfIndex = nt.OptionalHeader.ImageBase + DATA_RVA( &data.tls_index ); strcpy( data.tls_data, "hello world" ); data.tls_index = 9999; + data.tls_index_hi = 9999; + + if (test == 3 && sizeof(tls_init_code) > 1) + { + assert(sizeof(tls_init_code) <= sizeof(data.tls_init_fn)); + memcpy(data.tls_init_fn, tls_init_code, sizeof(tls_init_code)); + data.tls_init_fn_list[0] = nt.OptionalHeader.ImageBase + DATA_RVA(&data.tls_init_fn); + data.tls.AddressOfCallBacks = nt.OptionalHeader.ImageBase + DATA_RVA(&data.tls_init_fn_list); + } GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "ldr", 0, dll_name); @@ -2189,6 +2222,7 @@ static void test_import_resolution(void) section.Misc.VirtualSize = sizeof(data); section.SizeOfRawData = sizeof(data); section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE; + if (test == 3) section.Characteristics |= IMAGE_SCN_MEM_EXECUTE; WriteFile(hfile, &dos_header, sizeof(dos_header), &dummy, NULL); WriteFile(hfile, &nt, sizeof(nt), &dummy, NULL); @@ -2215,6 +2249,7 @@ static void test_import_resolution(void) { str = ((char **)NtCurrentTeb()->ThreadLocalStoragePointer)[ptr->tls_index]; ok( !strcmp( str, "hello world" ), "wrong tls data '%s' at %p\n", str, str ); + ok(ptr->tls_index_hi == 0, "TLS Index written as a short, high half: %d\n", ptr->tls_index_hi); } FreeLibrary( mod ); break; @@ -2245,6 +2280,20 @@ static void test_import_resolution(void) ok( ptr->tls_index == 9999, "wrong tls index %d\n", ptr->tls_index ); FreeLibrary( mod ); break; + case 3: /* load with tls init function */ + mod = LoadLibraryA( dll_name ); + ok( mod != NULL, "failed to load err %lu\n", GetLastError() ); + if (!mod) break; + ptr = (struct imports *)((char *)mod + page_size); + ok( ptr->tls_index < 32 || broken(ptr->tls_index == 9999), /* before vista */ + "wrong tls index %d\n", ptr->tls_index ); + if (ptr->tls_index != 9999 && sizeof(tls_init_code) > 1) + { + /* tls init function will write an '!' over the space in "hello world" */ + str = ((char **)NtCurrentTeb()->ThreadLocalStoragePointer)[ptr->tls_index]; + ok( !strcmp( str, "hello!world" ), "wrong tls data '%s' at %p\n", str, str ); + } + FreeLibrary( mod ); } DeleteFileA( dll_name ); #undef DATA_RVA

1 0

Evan Tang : ntdll: Fix inverted TlsIndex check.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 1833887428f7539681ebbc1c893a4ec85cc1ea88 URL: https://gitlab.winehq.org/wine/wine/-/commit/1833887428f7539681ebbc1c893a4e… Author: Evan Tang <etang(a)codeweavers.com> Date: Tue Mar 7 17:13:33 2023 -0600 ntdll: Fix inverted TlsIndex check. Fixes: a30a5287f06ccf56a1d7184e8c22ea9e79e9efaf Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54539 --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a0ac61d8156..f05cd1b4fd9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1573,7 +1573,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved /* Skip calls for modules loaded with special load flags */ if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; - if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.DllBase, reason ); + if (wm->ldr.TlsIndex == -1) call_tls_callbacks( wm->ldr.DllBase, reason ); if (!entry) return STATUS_SUCCESS; if (TRACE_ON(relay))

1 0

Hugh McMaster : regedit: Allow export_key() to return TRUE.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: f5fe9a6cf9121004ecdf5c0b285fcd88ec8a0d94 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5fe9a6cf9121004ecdf5c0b285fcd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 9 21:22:48 2023 +1100 regedit: Allow export_key() to return TRUE. We don't handle errors in export_registry_data() anyway. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54491 --- programs/regedit/framewnd.c | 2 +- programs/regedit/regproc.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d821d4dad77..3bc60ee0f75 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -500,7 +500,7 @@ static BOOL ExportRegistryFile(HWND hWnd) BOOL result; result = export_registry_key(ofn.lpstrFile, (LPWSTR)ofn.lCustData, ofn.nFilterIndex); if (!result) { - /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ + FIXME("Registry export failed.\n"); return FALSE; } } else { diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4f84c5883be..30106380241 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1328,7 +1328,7 @@ static void export_key_name(FILE *fp, WCHAR *name, BOOL unicode) #define MAX_SUBKEY_LEN 257 -static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) +static void export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) { LONG rc; DWORD max_value_len = 256, value_len; @@ -1398,7 +1398,6 @@ static int export_registry_data(FILE *fp, HKEY key, WCHAR *path, BOOL unicode) } free(subkey_name); - return 0; } static FILE *REGPROC_open_export_file(WCHAR *file_name, BOOL unicode) @@ -1450,7 +1449,6 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) HKEY key_class, key; WCHAR *subkey; FILE *fp; - BOOL ret; if (!(key_class = parse_key_name(path, &subkey))) { @@ -1463,12 +1461,12 @@ static BOOL export_key(WCHAR *file_name, WCHAR *path, BOOL unicode) return FALSE; fp = REGPROC_open_export_file(file_name, unicode); - ret = export_registry_data(fp, key, path, unicode); + export_registry_data(fp, key, path, unicode); export_newline(fp, unicode); fclose(fp); RegCloseKey(key); - return ret; + return TRUE; } static BOOL export_all(WCHAR *file_name, WCHAR *path, BOOL unicode)

1 0

Piotr Caban : gdi32: Improve EMR_CREATEDIBPATTERNBRUSHPT playback.
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 065fbd206df31a2fd975460d0da4923645c43049 URL: https://gitlab.winehq.org/wine/wine/-/commit/065fbd206df31a2fd975460d0da492… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 9 14:34:58 2023 +0100 gdi32: Improve EMR_CREATEDIBPATTERNBRUSHPT playback. It makes the lbHatch data available after PlayEnhMetaFileRecord returns. --- dlls/gdi32/enhmetafile.c | 20 +++----------------- dlls/gdi32/tests/metafile.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 336f2d389fd..178f7b0e132 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1825,7 +1825,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_CREATEDIBPATTERNBRUSHPT: { const EMRCREATEDIBPATTERNBRUSHPT *lpCreate = (const EMRCREATEDIBPATTERNBRUSHPT *)mr; - LPVOID lpPackedStruct; /* Check that offsets and data are contained within the record * (including checking for wrap-arounds). @@ -1839,28 +1838,15 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } - /* This is a BITMAPINFO struct followed directly by bitmap bits */ - lpPackedStruct = HeapAlloc( GetProcessHeap(), 0, - lpCreate->cbBmi + lpCreate->cbBits ); - if(!lpPackedStruct) + if (lpCreate->offBmi + lpCreate->cbBmi != lpCreate->offBits) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + ERR("Invalid data in EMR_CREATEDIBPATTERNBRUSHPT record\n"); break; } - /* Now pack this structure */ - memcpy( lpPackedStruct, - ((const BYTE *)lpCreate) + lpCreate->offBmi, - lpCreate->cbBmi ); - memcpy( ((BYTE*)lpPackedStruct) + lpCreate->cbBmi, - ((const BYTE *)lpCreate) + lpCreate->offBits, - lpCreate->cbBits ); - (handletable->objectHandle)[lpCreate->ihBrush] = - CreateDIBPatternBrushPt( lpPackedStruct, + CreateDIBPatternBrushPt( (const BYTE *)lpCreate + lpCreate->offBmi, (UINT)lpCreate->iUsage ); - - HeapFree(GetProcessHeap(), 0, lpPackedStruct); break; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 004ad98d949..2b7e53b2529 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -4183,6 +4183,38 @@ static void test_mf_PatternBrush(void) HeapFree (GetProcessHeap(), 0, orig_lb); } +static int CALLBACK pattern_brush_emf_enum_proc(HDC hdc, HANDLETABLE *htable, + const ENHMETARECORD *rec, int n, LPARAM arg) +{ + LOGBRUSH brush; + BOOL ret; + + switch (rec->iType) + { + case EMR_HEADER: + case EMR_SELECTOBJECT: + case EMR_EOF: + case EMR_CREATEMONOBRUSH: + return 1; + case EMR_CREATEDIBPATTERNBRUSHPT: + ok(!htable->objectHandle[2], "objectHandle[2] already used\n"); + ret = PlayEnhMetaFileRecord(hdc, htable, rec, n); + ok(ret, "PlayEnhMetaFileRecord failed\n"); + ok(htable->objectHandle[2] != NULL, "objectHandle[2] not created\n"); + + ret = GetObjectW(htable->objectHandle[2], sizeof(brush), &brush); + ok(ret, "GetObjectW failed\n"); + ok(brush.lbStyle == BS_DIBPATTERN, "brush.lbStyle = %d\n", brush.lbStyle); + ok(brush.lbHatch > (ULONG_PTR)rec && brush.lbHatch < (ULONG_PTR)rec + rec->nSize, + "brush.lbHatch = %p, not in %p-%p range\n", + (void *)brush.lbHatch, rec, (const BYTE *)rec + rec->nSize); + return 1; + default: + ok(0, "unexpected record %lu\n", rec->iType); + return 0; + } +} + static void test_emf_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + (2 + 32 * 32 / 8) * sizeof(RGBQUAD)]; @@ -4237,8 +4269,6 @@ static void test_emf_pattern_brush(void) dump_emf_records(emf, "emf_pattern_brush"); } - ret = DeleteEnhMetaFile(emf); - ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); ret = DeleteObject(bitmap_brush); ok(ret, "DeleteObject failed\n"); ret = DeleteObject(dib_brush); @@ -4246,6 +4276,11 @@ static void test_emf_pattern_brush(void) ret = DeleteObject((HBITMAP)orig_lb->lbHatch); ok(ret, "DeleteObject failed\n"); HeapFree(GetProcessHeap(), 0, orig_lb); + + ret = EnumEnhMetaFile(NULL, emf, pattern_brush_emf_enum_proc, NULL, NULL); + ok(ret, "EnumEnhMetaFile error %ld\n", GetLastError()); + ret = DeleteEnhMetaFile(emf); + ok(ret, "DeleteMetaFile error %ld\n", GetLastError()); } static void test_mf_palette_brush(void)

1 0

Alexandre Julliard : wow64: Implement Wow64RaiseException().
by Alexandre Julliard March 9, 2023

March 9, 2023

Module: wine Branch: master Commit: 37628a77324f4393e92e8fbd007e5a2e132a9bbe URL: https://gitlab.winehq.org/wine/wine/-/commit/37628a77324f4393e92e8fbd007e5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 9 17:28:12 2023 +0100 wow64: Implement Wow64RaiseException(). --- dlls/wow64/syscall.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++---- dlls/wow64/wow64.spec | 2 +- include/winternl.h | 1 + 3 files changed, 117 insertions(+), 11 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index b6b3c0c2830..d1c7421fabd 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -151,6 +151,20 @@ static EXCEPTION_RECORD *exception_record_32to64( const EXCEPTION_RECORD32 *rec3 } +static void exception_record_64to32( EXCEPTION_RECORD32 *rec32, const EXCEPTION_RECORD *rec ) +{ + unsigned int i; + + rec32->ExceptionCode = rec->ExceptionCode; + rec32->ExceptionFlags = rec->ExceptionFlags; + rec32->ExceptionRecord = PtrToUlong( rec->ExceptionRecord ); + rec32->ExceptionAddress = PtrToUlong( rec->ExceptionAddress ); + rec32->NumberParameters = rec->NumberParameters; + for (i = 0; i < rec->NumberParameters; i++) + rec32->ExceptionInformation[i] = rec->ExceptionInformation[i]; +} + + static NTSTATUS get_context_return_value( void *wow_context ) { switch (current_machine) @@ -1185,17 +1199,108 @@ void WINAPI Wow64PrepareForException( EXCEPTION_RECORD *rec, CONTEXT *context ) */ void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ) { - EXCEPTION_RECORD *rec = ptrs->ExceptionRecord; EXCEPTION_RECORD32 rec32; - ULONG i; - - rec32.ExceptionCode = rec->ExceptionCode; - rec32.ExceptionFlags = rec->ExceptionFlags; - rec32.ExceptionRecord = PtrToUlong( rec->ExceptionRecord ); - rec32.ExceptionAddress = PtrToUlong( rec->ExceptionAddress ); - rec32.NumberParameters = rec->NumberParameters; - for (i = 0; i < rec->NumberParameters; i++) - rec32.ExceptionInformation[i] = rec->ExceptionInformation[i]; + exception_record_64to32( &rec32, ptrs->ExceptionRecord ); call_user_exception_dispatcher( &rec32, NULL, ptrs->ContextRecord ); } + + +/********************************************************************** + * Wow64RaiseException (wow64.@) + */ +NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) +{ + EXCEPTION_RECORD32 rec32; + CONTEXT context; + BOOL first_chance = TRUE; + union + { + I386_CONTEXT i386; + ARM_CONTEXT arm; + } ctx32 = { 0 }; + + switch (current_machine) + { + case IMAGE_FILE_MACHINE_I386: + { + EXCEPTION_RECORD int_rec = { 0 }; + + ctx32.i386.ContextFlags = CONTEXT_I386_ALL; + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + if (code == -1) break; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + switch (code) + { + case 0x00: /* division by zero */ + int_rec.ExceptionCode = EXCEPTION_INT_DIVIDE_BY_ZERO; + break; + case 0x01: /* single-step */ + int_rec.ExceptionCode = EXCEPTION_SINGLE_STEP; + break; + case 0x03: /* breakpoint */ + int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)(ctx32.i386.Eip + 1); + int_rec.NumberParameters = 1; + break; + case 0x04: /* overflow */ + int_rec.ExceptionCode = EXCEPTION_INT_OVERFLOW; + break; + case 0x05: /* array bounds */ + int_rec.ExceptionCode = EXCEPTION_ARRAY_BOUNDS_EXCEEDED; + break; + case 0x06: /* invalid opcode */ + int_rec.ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; + break; + case 0x09: /* coprocessor segment overrun */ + int_rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; + break; + case 0x0c: /* stack fault */ + int_rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW; + break; + case 0x29: /* __fastfail */ + int_rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + int_rec.ExceptionFlags = EH_NONCONTINUABLE; + int_rec.NumberParameters = 1; + int_rec.ExceptionInformation[0] = ctx32.i386.Ecx; + first_chance = FALSE; + break; + case 0x2d: /* debug service */ + ctx32.i386.Eip++; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + int_rec.ExceptionCode = EXCEPTION_BREAKPOINT; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + int_rec.NumberParameters = 1; + int_rec.ExceptionInformation[0] = ctx32.i386.Eax; + break; + default: + ctx32.i386.Eip -= 2; + pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.i386 ); + int_rec.ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + int_rec.ExceptionAddress = (void *)(ULONG_PTR)ctx32.i386.Eip; + int_rec.NumberParameters = 2; + int_rec.ExceptionInformation[1] = 0xffffffff; + break; + } + *rec = int_rec; + break; + } + + case IMAGE_FILE_MACHINE_ARMNT: + ctx32.arm.ContextFlags = CONTEXT_ARM_ALL; + pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx32.arm ); + break; + } + + exception_record_64to32( &rec32, rec ); + __TRY + { + raise_exception( rec, &context, first_chance ); + } + __EXCEPT_ALL + { + call_user_exception_dispatcher( &rec32, &ctx32, NULL ); + } + __ENDTRY + return STATUS_SUCCESS; +} diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index e05a608d319..1f09e1411bb 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -16,7 +16,7 @@ @ stdcall Wow64PassExceptionToGuest(ptr) @ stub Wow64PrepareForDebuggerAttach @ stdcall Wow64PrepareForException(ptr ptr) -@ stub Wow64RaiseException +@ stdcall Wow64RaiseException(long ptr) @ stub Wow64ShallowThunkAllocObjectAttributes32TO64_FNC @ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC @ stub Wow64ShallowThunkSIZE_T32TO64 diff --git a/include/winternl.h b/include/winternl.h index 6fd0694b4ce..f59fcec05dd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3875,6 +3875,7 @@ void WINAPI Wow64ApcRoutine(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*); NTSTATUS WINAPI Wow64KiUserCallbackDispatcher(ULONG,void*,ULONG,void**,ULONG*); void WINAPI Wow64PassExceptionToGuest(EXCEPTION_POINTERS*); void WINAPI Wow64PrepareForException(EXCEPTION_RECORD*,CONTEXT*); +NTSTATUS WINAPI Wow64RaiseException(int,EXCEPTION_RECORD*); NTSTATUS WINAPI Wow64SystemServiceEx(UINT,UINT*); #ifdef __WINESRC__

1 0