- Wine-Devel - list.winehq.org

[PATCH 2/4] win32u: Don't use CDECL for font backend functions.
by Jacek Caban Oct. 18, 2021

Oct. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/freetype.c | 44 ++++++++++++++++++------------------- dlls/win32u/ntgdi_private.h | 40 ++++++++++++++++----------------- 2 files changed, 42 insertions(+), 42 deletions(-)

2 1

[PATCH 1/4] win32u: Use syscall interface for some D3DKMT functions.
by Jacek Caban Oct. 18, 2021

Oct. 18, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 7 --- dlls/win32u/syscall.c | 7 +++ dlls/win32u/win32u.spec | 14 ++--- dlls/win32u/win32u_private.h | 7 --- dlls/win32u/wrappers.c | 35 ------------ dlls/wow64win/gdi.c | 105 +++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 7 +++ 7 files changed, 126 insertions(+), 56 deletions(-)

2 1

[PATCH] wineps: Use void* instead of typeof
by Alex Henrie Oct. 18, 2021

Oct. 18, 2021

MSVC does not support typeof, and void* is cleaner anyway. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/wineps.drv/download.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index dc77cf11703..8374610c644 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -78,7 +78,7 @@ static void get_download_name(PHYSDEV dev, LPOUTLINETEXTMETRICA potm, char **str GetFontData(dev->hdc, MS_MAKE_TAG('n','a','m','e'), 0, name, size); count = GET_BE_WORD(name + 2); strings = name + GET_BE_WORD(name + 4); - name_record = (typeof(name_record))(name + 6); + name_record = (void*)(name + 6); for(i = 0; i < count; i++, name_record++) { name_record->platform_id = GET_BE_WORD(&name_record->platform_id); @@ -703,7 +703,7 @@ void get_glyph_name(HDC hdc, WORD index, char *name) size = GetFontData(hdc, MS_MAKE_TAG('p','o','s','t'), 0, post, size); if(size < sizeof(*post_header) || size == GDI_ERROR) goto cleanup; - post_header = (typeof(post_header))(post); + post_header = (void*)post; /* note: only interested in the format for obtaining glyph names */ post_header->format = GET_BE_DWORD(&post_header->format); -- 2.33.1

2 1

[PATCH] Revert "winevdm: Enable visual styles.".
by Zhiyi Zhang Oct. 18, 2021

Oct. 18, 2021

This reverts commit f304b2ae23bb537029fe51983f060f680de66a12. 16-bit applications don't use themed controls even if theming is on. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51802 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winevdm/Makefile.in | 2 +- programs/winevdm/winevdm.c | 3 --- programs/winevdm/winevdm.manifest | 12 ------------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in index cc3dddb09c6..67420b81759 100644 --- a/programs/winevdm/Makefile.in +++ b/programs/winevdm/Makefile.in @@ -1,5 +1,5 @@ MODULE = winevdm.exe -IMPORTS = user32 kernel comctl32 +IMPORTS = user32 kernel EXTRADLLFLAGS = -mwindows diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 19f3c778513..5b5f72db253 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -29,7 +29,6 @@ #include "wine/winbase16.h" #include "winuser.h" #include "wincon.h" -#include "commctrl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winevdm); @@ -448,8 +447,6 @@ int main( int argc, char *argv[] ) char *cmdline, *appname, **first_arg; char *p; - InitCommonControls(); - if (!argv[1]) usage(); if (!strcmp( argv[1], "--app-name" )) diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest index 6547ce24206..98bc91bd786 100644 --- a/programs/winevdm/winevdm.manifest +++ b/programs/winevdm/winevdm.manifest @@ -1,18 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity type="win32" name="Wine.Winevdm" version="0.0.0.0"/> -<dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="*" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> -</dependency> <application xmlns="urn:schemas-microsoft-com:asm.v3"> <windowsSettings> <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> -- 2.32.0

1 0

[PATCH v2 1/2] winemenubuilder: Skip desktop integration for certain associations
by Alex Henrie Oct. 18, 2021

Oct. 18, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41275 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: - Exclude all associations for the given program - Identify programs by short substrings --- loader/wine.inf.in | 6 +++ programs/winemenubuilder/winemenubuilder.c | 43 +++++++++++++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d023701c04b..1f35c7728a1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -507,6 +507,12 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +HKCU,Software\Wine\FileOpenNoIntegration,"ieframe",,"ieframe.dll" +HKCU,Software\Wine\FileOpenNoIntegration,"iexplore",,"iexplore.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"notepad",,"notepad.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"winebrowser",,"winebrowser.exe" +HKCU,Software\Wine\FileOpenNoIntegration,"wordpad",,"wordpad.exe" + [ContentIndex] HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 522e6192b24..4e9aa86038b 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1956,6 +1956,35 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } +static BOOL on_exclude_list(const WCHAR *command) +{ + static const WCHAR FileOpenNoIntegrationW[] = L"Software\\Wine\\FileOpenNoIntegration"; + HKEY key; + WCHAR program_name[MAX_PATH], *pattern_to_exclude; + DWORD len = ARRAY_SIZE(program_name); + DWORD i = 0; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, 0, KEY_QUERY_VALUE, &key) != ERROR_SUCCESS) + return FALSE; + + while (RegEnumValueW(key, i, program_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + pattern_to_exclude = reg_get_valW(HKEY_CURRENT_USER, FileOpenNoIntegrationW, program_name); + if (wcsstr(command, pattern_to_exclude)) + { + heap_free(pattern_to_exclude); + RegCloseKey(key); + return TRUE; + } + heap_free(pattern_to_exclude); + len = ARRAY_SIZE(program_name); + i++; + } + + RegCloseKey(key); + return FALSE; +} + static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) @@ -2036,6 +2065,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; + commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); + if (commandW == NULL) + /* no command => no application is associated */ + goto end; + + if (on_exclude_list(commandW)) + /* command is on the exclude list => desktop integration is not desirable */ + goto end; + wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); @@ -2075,11 +2113,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } - commandW = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (commandW == NULL) - /* no command => no application is associated */ - goto end; - executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, L"open"); if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL); -- 2.33.1

1 1

cross compilation
by Eric Pouech Oct. 18, 2021

Oct. 18, 2021

i'm currently fixing a couple of bugs introduced when linking winedbg with msvcrt (cough cough) a couple of items strike me (for cross compiling only): - why is cross compilation done with -Wno-format flag? what's the rationale behind it (it hides a couple of errors ;-) - when linked with msvcrt, are we fine with using MS extensions (%Id %I32d %I64d and friends?) (read uppercase i) - could we foresee to use no longer the wine_dbgstr_longlong helper ? A+

4 8

[PATCH 1/2] d3dx10/tests: Add tests for D3DX10CreateTextureFromFile{A, W}.
by Ziqing Hui Oct. 18, 2021

Oct. 18, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 47 +++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 70827056f5f..277b747be6d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1974,8 +1974,10 @@ static void test_get_image_info(void) static void test_create_texture(void) { + static const WCHAR test_filename[] = L"image.data"; ID3D10Resource *resource; ID3D10Device *device; + WCHAR path[MAX_PATH]; unsigned int i; HRESULT hr; @@ -2028,6 +2030,51 @@ static void test_create_texture(void) winetest_pop_context(); } + /* D3DX10CreateTextureFromFile tests */ + + todo_wine + { + hr = D3DX10CreateTextureFromFileW(device, NULL, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileW(device, L"deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileA(device, NULL, NULL, NULL, &resource, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10CreateTextureFromFileA(device, "deadbeef", NULL, NULL, &resource, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + } + + for (i = 0; i < ARRAY_SIZE(test_image); ++i) + { + winetest_push_context("Test %u", i); + create_file(test_filename, test_image[i].data, test_image[i].size, path); + + hr = D3DX10CreateTextureFromFileW(device, path, NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + hr = D3DX10CreateTextureFromFileA(device, get_str_a(path), NULL, NULL, &resource, NULL); + todo_wine + ok(hr == S_OK || (hr == E_FAIL && test_image[i].expected_info.ImageFileFormat == D3DX10_IFF_WMP), + "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + { + check_resource_info(resource, test_image + i, __LINE__); + check_resource_data(resource, test_image + i, __LINE__); + ID3D10Resource_Release(resource); + } + + delete_file(test_filename); + winetest_pop_context(); + } + CoUninitialize(); ID3D10Device_Release(device); -- 2.25.1

1 1

[PATCH 1/2] ws2_32: Validate pointers in select().
by Torge Matthies Oct. 17, 2021

Oct. 17, 2021

The documentation says that SOCKET_ERROR is returned and the error is set to WSAEFAULT if any of the input pointers point to unmapped memory. Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/ws2_32/socket.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b3dab22ae6e..1238f34aa1c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2384,6 +2384,15 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, TRACE( "read %p, write %p, except %p, timeout %p\n", read_ptr, write_ptr, except_ptr, timeout ); + if ((read_ptr && IsBadWritePtr(read_ptr, sizeof(*read_ptr))) + || (write_ptr && IsBadWritePtr(write_ptr, sizeof(*write_ptr))) + || (except_ptr && IsBadWritePtr(except_ptr, sizeof(*except_ptr))) + || (timeout && IsBadReadPtr(timeout, sizeof(*timeout)))) + { + SetLastError( WSAEFAULT ); + return -1; + } + FD_ZERO( &read ); FD_ZERO( &write ); FD_ZERO( &except ); -- 2.33.1

2 3

[PATCH] winedbg: use heap allocation for module filenames in handle_debug_event.
by Jinoh Kang Oct. 17, 2021

Oct. 17, 2021

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/winedbg/gdbproxy.c | 41 ++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..ae1bfac8826 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -396,10 +396,8 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load DEBUG_EVENT *de = &gdbctx->de; struct dbg_thread *thread; - union { - char bufferA[256]; - WCHAR buffer[256]; - } u; + char bufferA[512]; + LPWSTR name; DWORD size; gdbctx->exec_tid = de->dwThreadId; @@ -414,44 +412,55 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load if (!gdbctx->process) return TRUE; - size = ARRAY_SIZE(u.buffer); - QueryFullProcessImageNameW( gdbctx->process->handle, 0, u.buffer, &size ); - dbg_set_process_name(gdbctx->process, u.buffer); + size = UNICODE_STRING_MAX_CHARS + 1UL; + name = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(WCHAR) * size); + if (!QueryFullProcessImageNameW( gdbctx->process->handle, 0, name, &size )) + { + size = 0; + name[size] = L'\0'; + } + + dbg_set_process_name(gdbctx->process, name); fprintf(stderr, "%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + dbg_W2A(name, -1), de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.lpStartAddress, de->u.CreateProcessInfo.dwDebugInfoFileOffset, de->u.CreateProcessInfo.nDebugInfoSize); /* de->u.CreateProcessInfo.lpStartAddress; */ - if (!dbg_init(gdbctx->process->handle, u.buffer, TRUE)) + if (!dbg_init(gdbctx->process->handle, name, TRUE)) ERR("Couldn't initiate DbgHelp\n"); fprintf(stderr, "%04x:%04x: create thread I @%p\n", de->dwProcessId, de->dwThreadId, de->u.CreateProcessInfo.lpStartAddress); - dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, u.buffer, + dbg_load_module(gdbctx->process->handle, de->u.CreateProcessInfo.hFile, name, (DWORD_PTR)de->u.CreateProcessInfo.lpBaseOfImage, 0); dbg_add_thread(gdbctx->process, de->dwThreadId, de->u.CreateProcessInfo.hThread, de->u.CreateProcessInfo.lpThreadLocalBase); + + HeapFree(GetProcessHeap(), 0, name); + return TRUE; case LOAD_DLL_DEBUG_EVENT: - fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, - u.buffer, ARRAY_SIZE(u.buffer) ); + size = UNICODE_STRING_MAX_CHARS + 1UL; + name = HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, sizeof(WCHAR) * size); + fetch_module_name( de->u.LoadDll.lpImageName, de->u.LoadDll.lpBaseOfDll, name, size ); fprintf(stderr, "%04x:%04x: loads DLL %s @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, - dbg_W2A(u.buffer, -1), + dbg_W2A(name, size), de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, de->u.LoadDll.nDebugInfoSize); - dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, u.buffer, + dbg_load_module(gdbctx->process->handle, de->u.LoadDll.hFile, name, (DWORD_PTR)de->u.LoadDll.lpBaseOfDll, 0); + HeapFree(GetProcessHeap(), 0, name); if (stop_on_dll_load_unload) break; return TRUE; @@ -501,9 +510,9 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load case OUTPUT_DEBUG_STRING_EVENT: memory_get_string(gdbctx->process, de->u.DebugString.lpDebugStringData, TRUE, - de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); + de->u.DebugString.fUnicode, bufferA, sizeof(bufferA)); fprintf(stderr, "%08x:%08x: output debug string (%s)\n", - de->dwProcessId, de->dwThreadId, debugstr_a(u.bufferA)); + de->dwProcessId, de->dwThreadId, debugstr_a(bufferA)); return TRUE; case RIP_EVENT: -- 2.31.1

1 0

[PATCH] winedbg: set reuseaddr flag for gdb remote socket.
by Jinoh Kang Oct. 17, 2021

Oct. 17, 2021

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- programs/winedbg/gdbproxy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 522e4fdb506..71076204de3 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2146,6 +2146,7 @@ static BOOL gdb_exec(unsigned port, unsigned flags) static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned port) { SOCKET sock; + int reuseaddr = 1; struct sockaddr_in s_addrs = {0}; int s_len = sizeof(s_addrs); fd_set read_fds; @@ -2161,6 +2162,8 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, unsigned flags, unsigned por return FALSE; } + setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&reuseaddr, sizeof(reuseaddr)); + s_addrs.sin_family = AF_INET; s_addrs.sin_addr.S_un.S_addr = INADDR_ANY; s_addrs.sin_port = htons(port); -- 2.31.1

1 0