December 2021 - Wine-Commits

Huw Davies : winemac: Include missing dlfcn.h.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 3016a34f3e50f2f65a603e495b5b34ec08b9368c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3016a34f3e50f2f65a603e49… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 2 07:55:55 2021 +0000 winemac: Include missing dlfcn.h. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 3665e0023b7..ca70db7a689 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdio.h> +#include <dlfcn.h> #include "macdrv.h" #include "wine/debug.h"

1 0

Alexandre Julliard : makefiles: Support per-platform values for EXTRADLLFLAGS.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: a041075cd2c26874757e0b6e1449c23c1326241c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a041075cd2c26874757e0b6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:49 2021 +0100 makefiles: Support per-platform values for EXTRADLLFLAGS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + tools/makedep.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 7e823208840..185bc563e68 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -7,6 +7,7 @@ EXTRAINCL = $(UNWIND_CFLAGS) EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000 +x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000 C_SRCS = \ actctx.c \ diff --git a/tools/makedep.c b/tools/makedep.c index 2301ecf191e..e69dc3ce0a4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4131,6 +4131,12 @@ static void load_sources( struct makefile *make ) if (make->extlib) make->staticlib = make->extlib; if (make->staticlib) make->module = make->staticlib; + if (host_cpu) + { + value = get_expanded_file_local_var( make, host_cpu, "EXTRADLLFLAGS" ); + if (value.count) make->extradllflags = value; + } + make->disabled = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir ); make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); make->use_msvcrt = (make->module || make->testdll || make->is_win16) &&

1 0

Henri Verbeet : wined3d: Map OpenGL adapter BOs persistently on 64-bit architectures.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 537e20e041bd3b36553e45fe83671a92fdfd7735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=537e20e041bd3b36553e45fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 17:52:16 2021 -0600 wined3d: Map OpenGL adapter BOs persistently on 64-bit architectures. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index dcb4ab7a0af..6391f6788e9 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2705,10 +2705,22 @@ static void *wined3d_bo_gl_map(struct wined3d_bo_gl *bo, struct wined3d_context_ wined3d_context_gl_wait_command_fence(context_gl, bo->command_fence_id); map: + if (bo->b.map_ptr) + return (uint8_t *)bo->b.map_ptr; + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (gl_info->supported[ARB_BUFFER_STORAGE]) + { + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, + GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT | wined3d_resource_gl_map_flags(bo, flags))))) + { + if (wined3d_map_persistent()) + bo->b.map_ptr = map_ptr; + } + } + else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, wined3d_resource_gl_map_flags(bo, flags))); } @@ -2791,6 +2803,9 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, flush_bo_ranges(context_gl, wined3d_const_bo_address(data), range_count, ranges); + if (bo->b.map_ptr) + return; + gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); GL_EXTCALL(glUnmapBuffer(bo->binding)); @@ -2908,9 +2923,15 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei } if (gl_info->supported[ARB_BUFFER_STORAGE]) + { + if (flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) + flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; GL_EXTCALL(glBufferStorage(binding, size, NULL, flags | GL_DYNAMIC_STORAGE_BIT)); + } else + { GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + } wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("buffer object creation");

1 0

Alexandre Julliard : ntdll: Set the TEB offset for Wow64 mode also in 64-bit.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 1b447409cb83e1ebc6037fadbca309c304055ade URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b447409cb83e1ebc6037fad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 11:23:16 2021 +0100 ntdll: Set the TEB offset for Wow64 mode also in 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index ca3e0a9dc81..30d8ac1553c 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2128,6 +2128,15 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; +#ifdef _WIN64 + if (main_image_info.Machine != current_machine) + { + NtCurrentTeb()->WowTebOffset = teb_offset; + NtCurrentTeb()->Tib.ExceptionList = (void *)((char *)NtCurrentTeb() + teb_offset); + set_thread_id( NtCurrentTeb(), GetCurrentProcessId(), GetCurrentThreadId() ); + } +#endif + load_global_options( &params->ImagePathName ); if (NtCurrentTeb()->WowTebOffset)

1 0

Alexandre Julliard : ntdll: Don't try to convert binaries to 64-bit in Wow64 mode.
by Alexandre Julliard Dec. 2, 2021

Dec. 2, 2021

Module: wine Branch: master Commit: 679a2f531bdba5a1abbf9db44f1d0defd8a945a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=679a2f531bdba5a1abbf9db4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 2 09:59:13 2021 +0100 ntdll: Don't try to convert binaries to 64-bit in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 86aec79dbfc..665c4480ad4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2118,6 +2118,7 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in ULONG i, old_prot; if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return TRUE; /* already 64-bit */ + if (NtCurrentTeb()->WowTebOffset) return TRUE; /* no need to convert */ if (!info->ImageContainsCode) return TRUE; /* no need to convert */ TRACE( "%p\n", module ); @@ -2207,6 +2208,7 @@ static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info #else if (info->Machine == IMAGE_FILE_MACHINE_ARM64) return TRUE; #endif + if (NtCurrentTeb()->WowTebOffset) return TRUE; if (!info->ImageContainsCode) return TRUE; if (!(info->u.s.ComPlusNativeReady)) {

1 0

André Zwing : gameux/tests: Skip gamestatistic tests on win10 >= 1803.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 6282718c73bdf1648f18764c51671a57cef3c526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6282718c73bdf1648f18764c… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Dec 1 18:17:03 2021 +0100 gameux/tests: Skip gamestatistic tests on win10 >= 1803. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51716 Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gamestatistics.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index c29c6b44470..aa10156f1ab 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -158,6 +158,12 @@ static void test_gamestatisticsmgr( void ) /* this should fail, because statistics don't exist yet */ gs = (void *)0xdeadbeef; hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENONLY, &dwOpenResult, &gs); + if (hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + { + /* With win10 1803 game explorer functionality was removed and gameux became a stub */ + win_skip("gameux is partially stubbed, skipping tests\n"); + return; + } ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "GetGameStatistics returned unexpected value: 0x%08x\n", hr); ok(gs == NULL, "Expected output pointer to be NULL, got %s\n", (gs == (void *)0xdeadbeef ? "deadbeef" : "neither NULL nor deadbeef"));

1 0

Gabriel Ivăncescu : mshtml: Fix style attribute removal in IE8 mode.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: f807f74194a3d0ca01953418f16e2e24ad95db50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f807f74194a3d0ca01953418… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Dec 1 15:41:53 2021 +0200 mshtml: Fix style attribute removal in IE8 mode. put_cssText implicitly sets the attribute, which must be removed since IE8 specially checks it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 3 +++ dlls/mshtml/tests/documentmode.js | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6d99e657ff8..a205728e280 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1277,6 +1277,9 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA if(FAILED(hres)) return hres; + if(compat_mode >= COMPAT_MODE_IE8) + element_remove_attribute(This, strAttributeName); + *pfSuccess = VARIANT_TRUE; return S_OK; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index cf3fdfa617e..256418679bb 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1257,7 +1257,6 @@ sync_test("elem_attr", function() { r = elem.style; ok(r === style, "removed elem.style = " + r); r = elem.getAttribute("style"); - todo_wine_if(v === 8). ok(r === (v < 8 ? style : null), "style attr after removal = " + r); elem.setAttribute("style", "opacity: 1.0"); r = elem.getAttribute("style");

1 0

Eric Pouech : winedbg: Properly handle escaped characters inside strings.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: d331d9cb936f047fd94c4b30b16f81d549c131ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d331d9cb936f047fd94c4b30… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:23 2021 +0100 winedbg: Properly handle escaped characters inside strings. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debug.l | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index a497f34e6b0..280dcbfbc6b 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -60,6 +60,34 @@ void lexeme_flush(void) next_lexeme = 0; } +/* called with quoted string, unescape all elements inside the quotes */ +static char* unescape_string(const char* str) +{ + size_t len = strlen(str) - 2; + char* ret = lexeme_alloc_size(len + 1); + char* dst = ret; + const char* ptr; + for (ptr = str + 1; ptr < str + 1 + len; ptr++) + { + if (*ptr == '\\') + { + switch (*++ptr) + { + case 't': *dst++ = '\t'; break; + case 'r': *dst++ = '\r'; break; + case 'n': *dst++ = '\n'; break; + case '\\': *dst++ = '\\'; break; + case '"': *dst++ = '"'; break; + default: *dst++ = '\\'; *dst++ = *ptr; /* not handled, don't change */ + } + } + else + *dst++ = *ptr; + } + *dst = '\0'; + return ret; +} + #define YY_INPUT(buf,result,max_size) \ (result = input_lex_read_buffer(buf, max_size)) @@ -72,7 +100,7 @@ HEXDIGIT [0-9a-fA-F] FORMAT [ubcdgiswxa] IDENTIFIER [_a-zA-Z~?][_a-zA-Z0-9~?@]* PATHNAME [\\/_a-zA-Z0-9\.~@][\\/\-_a-zA-Z0-9\.~@]* -STRING \"[^\n"]+\" +STRING \"(\\[^\n]|[^\\"\n])*\" %s FORMAT_EXPECTED %s INFO_CMD @@ -125,7 +153,7 @@ STRING \"[^\n"]+\" <FORMAT_EXPECTED>"/"{FORMAT} { dbg_lval.integer = (1 << 8) | yytext[1]; return tFORMAT; } -{STRING} { dbg_lval.string = lexeme_alloc(yytext + 1); dbg_lval.string[strlen(dbg_lval.string) - 1] = '\0'; return tSTRING; } +{STRING} { dbg_lval.string = unescape_string(yytext); return tSTRING;} <ASTRING_EXPECTED>[^\n]+ { char* p = yytext; while (*p == ' ' || *p == '\t') p++; dbg_lval.string = lexeme_alloc(p); return tSTRING; }

1 0

Eric Pouech : winedbg: When enumerating symbols, only search for locals when name doesn't refer to a module.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 0c474b9fc2d04336ee0f3ac48efbe5a02b4a1380 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c474b9fc2d04336ee0f3ac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:35 2021 +0100 winedbg: When enumerating symbols, only search for locals when name doesn't refer to a module. Fixed listing twice the same symbol in some commands like 'break foo!bar'. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index a3b9cb38995..13a61774c4b 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -421,7 +421,7 @@ enum sym_get_lval symbol_get_lvalue(const char* name, const int lineno, SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); /* now grab local symbols */ - if ((frm = stack_get_curr_frame()) && sgv.num < NUMDBGV) + if ((frm = stack_get_curr_frame()) && sgv.num < NUMDBGV && !strchr(name, '!')) { sgv.frame_offset = frm->linear_frame; SymEnumSymbols(dbg_curr_process->handle, 0, name, sgv_cb, (void*)&sgv);

1 0

Eric Pouech : winedbg: In print_hex, don't print bits not included in size.
by Alexandre Julliard Dec. 1, 2021

Dec. 1, 2021

Module: wine Branch: master Commit: 24eb754af6991ca45f141b5ba5e6bbf7c03456cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=24eb754af6991ca45f141b5b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 1 15:30:53 2021 +0100 winedbg: In print_hex, don't print bits not included in size. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index f7baf3e6381..1653736e919 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -337,7 +337,8 @@ static void dbg_print_hex(DWORD size, ULONGLONG sv) if (!sv) dbg_printf("0"); else - dbg_printf("%#I64x", sv); + /* clear unneeded high bits, esp. sign extension */ + dbg_printf("%#I64x", sv & (~0LLU >> (64 - 8 * size))); } static void print_typed_basic(const struct dbg_lvalue* lvalue)

1 0