September 2021 - Wine-devel

[PATCH v2] user32: When converting strings from A->W, ignore handles/resources
by Fabian Maurer 12 Sep '21

12 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/msg.c | 3 +++ dlls/user32/winproc.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9867e319d58..3be5ccfd651 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15981,6 +15981,9 @@ static void test_desktop_winproc(void) DestroyWindow(hwnd); + /* Test invalid text with WM_SETTEXT. This must not crash. */ + SendMessageA(GetDesktopWindow(), WM_SETTEXT, 0, (LPARAM)55); + out_unregister: UnregisterClassA("TestDesktopClass", instance); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 81fbcab928d..00b79b3b006 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -494,6 +494,8 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, case LB_ADDFILE: case EM_REPLACESEL: if (!lParam) ret = callback( hwnd, msg, wParam, lParam, result, arg ); + else if (IS_INTRESOURCE(lParam)) /* Check for handles/IDs similar to DEFWND_SetTextA */ + return 0; else { WCHAR *ptr, buffer[512]; -- 2.33.0

2 1

[PATCH] po: Update on Brazilian Portuguese
by Roberto Pungartnik 12 Sep '21

12 Sep '21

1 0

[PATCH] msvcrt: Improve memset performance on i386 and x86_64 architectures.
by Piotr Caban 12 Sep '21

12 Sep '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 126 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+)

3 4

[PATCH v2] msvcrt: Add an ermsb-based memset for x86/64.
by Guillaume Charifi 12 Sep '21

12 Sep '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/msvcrt/string.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 4d09405094d..6d1500cb194 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2527,6 +2527,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") \ "popq " SRC_REG "\n\t" \ __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + #endif void * __cdecl sse2_memmove(void *dst, const void *src, size_t n); @@ -2732,6 +2733,64 @@ __ASM_GLOBAL_FUNC( sse2_memmove, MEMMOVE_CLEANUP "ret" ) +#undef DEST_REG +#undef SRC_REG +#undef LEN_REG +#undef TMP_REG + +#ifdef __i386__ + +#define DEST_REG "%edi" +#define SRC_REG "%eax" +#define LEN_REG "%ecx" +#define TMP_REG + +#define MEMSET_INIT \ + "pushl " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + "movl 8(%esp), " DEST_REG "\n\t" \ + "movl 12(%esp), " SRC_REG "\n\t" \ + "movl 16(%esp), " LEN_REG "\n\t" + +#define MEMSET_CLEANUP \ + "movl 8(%esp), %eax\n\t" \ + "popl " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + +#else + +#define DEST_REG "%rdi" +#define SRC_REG "%rax" +#define LEN_REG "%rcx" +#define TMP_REG "%r9" + +#define MEMSET_INIT \ + "pushq " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ + "movq %rcx, " DEST_REG "\n\t" \ + "movq %rdx, " SRC_REG "\n\t" \ + "movq %r8, " LEN_REG "\n\t" \ + "movq " DEST_REG ", " TMP_REG "\n\t" + +#define MEMSET_CLEANUP \ + "movq " TMP_REG ", %rax\n\t" \ + "popq " DEST_REG "\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + +#endif + +void * __cdecl ermsb_memset(void *dst, int c, size_t n); +__ASM_GLOBAL_FUNC( ermsb_memset, + MEMSET_INIT + "rep stosb\n\t" + MEMSET_CLEANUP + "ret" ) + +#undef DEST_REG +#undef SRC_REG +#undef LEN_REG +#undef TMP_REG + #endif /********************************************************************* @@ -2860,9 +2919,13 @@ void * __cdecl memcpy(void *dst, const void *src, size_t n) */ void* __cdecl memset(void *dst, int c, size_t n) { +#if defined(__i386__) || defined(__x86_64__) + return ermsb_memset(dst, c, n); +#else volatile unsigned char *d = dst; /* avoid gcc optimizations */ while (n--) *d++ = c; return dst; +#endif } /********************************************************************* -- 2.33.0

5 6

[PATCH] include: Add icodecapi.idl
by Alistair Leslie-Hughes 12 Sep '21

12 Sep '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/Makefile.in | 1 + include/icodecapi.idl | 64 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 include/icodecapi.idl diff --git a/include/Makefile.in b/include/Makefile.in index 43a4fd98a42..eac1c2e0570 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -338,6 +338,7 @@ SOURCES = \ icftypes.idl \ icm.h \ icmpapi.h \ + icodecapi.idl \ idispids.h \ ieautomation.idl \ iextag.idl \ diff --git a/include/icodecapi.idl b/include/icodecapi.idl new file mode 100644 index 00000000000..7954b3fc2f6 --- /dev/null +++ b/include/icodecapi.idl @@ -0,0 +1,64 @@ +/* + * Copyright 2021 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +import "unknwn.idl"; +import "oaidl.idl"; + +interface IStream; + +struct CodecAPIEventData +{ + GUID guid; + DWORD dataLength; + DWORD reserved[3]; +}; + +[ + uuid(901db4c7-31ce-41a2-85dc-8fa0bf41b8da), + local, + object, + pointer_default(unique) +] +interface ICodecAPI : IUnknown +{ + HRESULT IsSupported ([in] const GUID *api); + HRESULT IsModifiable ([in] const GUID *api); + + HRESULT GetParameterRange ([in] const GUID *api, [out] VARIANT *min, [out] VARIANT *max, [out] VARIANT *delta); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetParameterValues ([in] const GUID *api, [out, size_is(,*count)] VARIANT **values, [out] ULONG *count); + HRESULT GetDefaultValue ([in] const GUID *api, [out] VARIANT *value); + + HRESULT GetValue ([in] const GUID *api, [out] VARIANT *value); + HRESULT SetValue ([in] const GUID *api, [in] VARIANT *value); + + HRESULT RegisterForEvent ([in] const GUID *api, [in] LONG_PTR userData); + HRESULT UnregisterForEvent ([in] const GUID *api); + + HRESULT SetAllDefaults(void); + + HRESULT SetValueWithNotify ([in] const GUID *api, [in] VARIANT *value, [out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT SetAllDefaultsWithNotify([out, size_is(,*count)] GUID **param, [out] ULONG *count); + + HRESULT GetAllSettings([in] IStream *stream); + HRESULT SetAllSettings([in] IStream *stream); + + HRESULT SetAllSettingsWithNotify([in] IStream* stream, [out, size_is(,*count)] GUID **param, [out] ULONG *count); +} -- 2.33.0

1 0

[PATCH v2 1/3] msi: Set dialog as parent in subsequent dialog
by Fabian Maurer 11 Sep '21

11 Sep '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msi/dialog.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 703f9d43957..6463c3062ac 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3904,7 +3904,7 @@ static void process_pending_messages( HWND hdlg ) static UINT dialog_run_message_loop( msi_dialog *dialog ) { DWORD style; - HWND hwnd; + HWND hwnd, parent; if( uiThreadId != GetCurrentThreadId() ) return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog ); @@ -3917,9 +3917,11 @@ static UINT dialog_run_message_loop( msi_dialog *dialog ) if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize)) style |= WS_MINIMIZEBOX; + parent = dialog->parent ? dialog->parent->hwnd : 0; + hwnd = CreateWindowW( L"MsiDialogCloseClass", dialog->name, style, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, NULL, dialog ); + parent, NULL, NULL, dialog ); if( !hwnd ) { ERR("Failed to create dialog %s\n", debugstr_w( dialog->name )); -- 2.33.0

1 2

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 11 Sep '21

11 Sep '21

2 1

[PATCH 00/10] Third step for Dwarf 3/4 support in DbgHelp
by Eric Pouech 11 Sep '21

11 Sep '21

Dwarf3/4 adds a couple of structural modifications: - either 32bit or 64bit internal offsets - some attributes size have been changed across version - some section headers evolution (one more field in line section header) - GCC added some FORM extensions This serie adds support for those, and some more code hardening. This serie should finish covering the structural changes in dwarf3/4, and the loading of dwarf4 modules should (shriek) be possible, even it lots of new features of dwarf4 are not supported yet. Expect though lots of FIXME:s and potential non functional stuff. When this serie is committed, I'd appreciate feeback of running debugging stuff with DBGHELP_DWARF_VERSION env variable set to 4. As wine's modules are still compiled with dwarf2, and distros are moving to dwarf5, the loadable dwarf4 modules are a scarse resource ;-) A+ --- Eric Pouech (10): dbghelp{dwarf}: don't recompute location when said location is complex dbghelp{dwarf}: properly parse 32 vs bit 64bit entities dbghelp{dwarf}: correctly handle attributes according to 32bit or 64bit format dbghelp{dwarf}: Added support for FORM_loc_offset, FORM_sec_offset dbghelp{dwarf}: Added support for FORM_exprloc dbghelp{dwarf}: handle errors in dwarf2_fill_attr by returning a boolean dbghelp{dwarf}: added definitions of some GNU extenstions for FORM:s. dbghelp{dwarf}: Validate that a string is in the section boundary before using it dbghelp{dwarf}: Detect auto reference between a dwarf's DIE and its type dbghelp: Properly parse line number header for DWARF4 debug info dlls/dbghelp/dwarf.c | 148 +++++++++++++++++++++++++++++++++---------- dlls/dbghelp/dwarf.h | 5 ++ 2 files changed, 118 insertions(+), 35 deletions(-)

1 10

[PATCH] ntdll: resolve drive symlink for mapped filename
by Matias Zuniga 11 Sep '21

11 Sep '21

Applications expect a path starting with a drive like '\Device\Harddisk1\' instead of a drive letter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51687 Signed-off-by: Matias Zuniga <matias.nicolas.zc(a)gmail.com> --- dlls/ntdll/unix/virtual.c | 76 ++++++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 5 +-- 2 files changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8a1e35b6387..04eddf0e6f1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -133,6 +133,8 @@ struct file_view } \ } while (0); +#define SYMBOLIC_LINK_QUERY 0x0001 + /* per-page protection flags */ #define VPROT_READ 0x01 #define VPROT_WRITE 0x02 @@ -4273,34 +4275,96 @@ static NTSTATUS get_working_set_ex( HANDLE process, LPCVOID addr, return STATUS_SUCCESS; } +static NTSTATUS read_nt_symlink( UNICODE_STRING *name, WCHAR *target, DWORD size ) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + HANDLE handle; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + if (!(status = NtOpenSymbolicLinkObject( &handle, SYMBOLIC_LINK_QUERY, &attr ))) + { + UNICODE_STRING targetW; + targetW.Buffer = target; + targetW.MaximumLength = (size - 1) * sizeof(WCHAR); + status = NtQuerySymbolicLinkObject( handle, &targetW, NULL ); + if (!status) target[targetW.Length / sizeof(WCHAR)] = 0; + NtClose( handle ); + } + return status; +} + +static NTSTATUS follow_device_symlink( WCHAR *buffer, SIZE_T max_path_len, WCHAR *name, SIZE_T *current_path_len ) +{ + WCHAR *p = buffer; + NTSTATUS status = STATUS_SUCCESS; + SIZE_T devname_len = 6; // e.g. \??\C: + UNICODE_STRING devname; + DWORD target_len; + + if (*current_path_len >= devname_len * sizeof(WCHAR) && name[devname_len - 1] == ':') { + devname.Buffer = name; + devname.Length = devname_len * sizeof(WCHAR); + if (!(status = read_nt_symlink( &devname, p, (max_path_len - *current_path_len) / sizeof(WCHAR) + devname_len + 1 ))) + { + target_len = lstrlenW(p); + *current_path_len -= devname_len * sizeof(WCHAR); // skip the device name + p += target_len; + + memcpy( p, name + devname_len, *current_path_len ); + *current_path_len += target_len * sizeof(WCHAR); + } + } + else memcpy( p, name, *current_path_len ); + + return status; +} + static NTSTATUS get_memory_section_name( HANDLE process, LPCVOID addr, MEMORY_SECTION_NAME *info, SIZE_T len, SIZE_T *ret_len ) { + SIZE_T current_path_len, max_path_len; + WCHAR *name; NTSTATUS status; if (!info) return STATUS_ACCESS_VIOLATION; + max_path_len = len - sizeof(*info) - sizeof(WCHAR); // dont count null char + if (!(name = malloc( max_path_len ))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_mapping_filename ) { req->process = wine_server_obj_handle( process ); req->addr = wine_server_client_ptr( addr ); if (len > sizeof(*info) + sizeof(WCHAR)) - wine_server_set_reply( req, info + 1, len - sizeof(*info) - sizeof(WCHAR) ); + wine_server_set_reply( req, name, max_path_len ); status = wine_server_call( req ); if (!status || status == STATUS_BUFFER_OVERFLOW) { - if (ret_len) *ret_len = sizeof(*info) + reply->len + sizeof(WCHAR); - if (len < sizeof(*info)) status = STATUS_INFO_LENGTH_MISMATCH; + current_path_len = reply->len; + if (len < sizeof(*info)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + } + else if (!status) status = follow_device_symlink( (WCHAR *)(info + 1), max_path_len, name, &current_path_len); + + if (ret_len) *ret_len = sizeof(*info) + current_path_len + sizeof(WCHAR); if (!status) { info->SectionFileName.Buffer = (WCHAR *)(info + 1); - info->SectionFileName.Length = reply->len; - info->SectionFileName.MaximumLength = reply->len + sizeof(WCHAR); - info->SectionFileName.Buffer[reply->len / sizeof(WCHAR)] = 0; + info->SectionFileName.Length = current_path_len; + info->SectionFileName.MaximumLength = current_path_len + sizeof(WCHAR); + info->SectionFileName.Buffer[current_path_len / sizeof(WCHAR)] = 0; } } } SERVER_END_REQ; + free(name); return status; } diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4a740310a4..d6fb8e69384 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -471,7 +471,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -482,7 +481,6 @@ static void test_GetMappedFileName(void) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); } @@ -490,7 +488,6 @@ static void test_GetMappedFileName(void) ret = GetMappedFileNameA(GetCurrentProcess(), base + 0x2000, map_name, sizeof(map_name)); ok(ret, "GetMappedFileName error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); - todo_wine ok(memcmp(map_name, device_name, strlen(device_name)) == 0, "map name does not start with a device name: %s\n", map_name); SetLastError(0xdeadbeef); @@ -566,7 +563,7 @@ static void test_GetProcessImageFileName(void) { /* Windows returns 2*strlen-1 */ ok(ret >= strlen(szImgPath), "szImgPath=\"%s\" ret=%d\n", szImgPath, ret); - todo_wine ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); + ok(!strcmp(szImgPath, szMapPath), "szImgPath=\"%s\" szMapPath=\"%s\"\n", szImgPath, szMapPath); } SetLastError(0xdeadbeef); -- 2.31.1

2 1

Bug 47486 - Monochrome icons with {white, black} color table
by Fabian Maurer 11 Sep '21

11 Sep '21

Hello, this is about https://bugs.winehq.org/show_bug.cgi?id=47486 The program has a monochrome icon with white as the first entry in its color table, which is forbidden according to the comment in the code: > * Note : If the first color in the color table is white followed by > * black, we can't convert it to a monochrome DDB with > * SetDIBits, because black and white would be inverted. But when the bitmap is loaded as color bitmap instead of monochrome icon, the background is rendered white instead of transparent. Is that comment still up to date, and if so, how should we deal with that case? Regards, Fabian Maurer

1 0