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

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_arb_compile().
by Alexandre Julliard 14 Mar '23

14 Mar '23

Module: wine Branch: master Commit: 0fb1020965b54d8644d2c5b034f058c5b659de5a URL: https://gitlab.winehq.org/wine/wine/-/commit/0fb1020965b54d8644d2c5b034f058… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:59 2023 +0100 wined3d: Use wined3d_get_line() in shader_arb_compile(). --- dlls/wined3d/arb_program_shader.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b799e6c1e38..592216051c2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -46,22 +46,6 @@ static BOOL shader_is_vshader_version(enum wined3d_shader_type type) return type == WINED3D_SHADER_TYPE_VERTEX; } -static const char *get_line(const char **ptr) -{ - const char *p, *q; - - p = *ptr; - if (!(q = strstr(p, "\n"))) - { - if (!*p) return NULL; - *ptr += strlen(p); - return p; - } - *ptr = q + 1; - - return p; -} - enum arb_helper_value { ARB_ZERO, @@ -3315,13 +3299,17 @@ static void shader_hw_call(const struct wined3d_shader_instruction *ins) static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum target, const char *src) { - const char *ptr, *line; + const char *ptr, *end, *line; GLint native, pos; if (TRACE_ON(d3d_shader)) { ptr = src; - while ((line = get_line(&ptr))) TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + end = ptr + strlen(ptr); + while ((line = wined3d_get_line(&ptr, end))) + { + TRACE_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } } GL_EXTCALL(glProgramStringARB(target, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(src), src)); @@ -3335,7 +3323,11 @@ static BOOL shader_arb_compile(const struct wined3d_gl_info *gl_info, GLenum tar FIXME_(d3d_shader)("Program error at position %d: %s\n\n", pos, debugstr_a((const char *)gl_info->gl_ops.gl.p_glGetString(GL_PROGRAM_ERROR_STRING_ARB))); ptr = src; - while ((line = get_line(&ptr))) FIXME_(d3d_shader)(" %.*s", (int)(ptr - line), line); + end = ptr + strlen(ptr); + while ((line = wined3d_get_line(&ptr, end))) + { + FIXME_(d3d_shader)(" %.*s", (int)(ptr - line), line); + } FIXME_(d3d_shader)("\n"); return FALSE;

1 0

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_spirv_compile_shader().
by Alexandre Julliard 14 Mar '23

14 Mar '23

Module: wine Branch: master Commit: ca8b05e9cd8f2ed975af11f808eb93bac025bd22 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca8b05e9cd8f2ed975af11f808eb93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:59 2023 +0100 wined3d: Use wined3d_get_line() in shader_spirv_compile_shader(). --- dlls/wined3d/shader_spirv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 60ef2c022aa..7c8351453a1 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -279,11 +279,12 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con ret = vkd3d_shader_compile(&info, &spirv, &messages); if (messages && *messages && FIXME_ON(d3d_shader)) { - const char *ptr = messages; - const char *line; + const char *ptr, *end, *line; FIXME("Shader log:\n"); - while ((line = get_line(&ptr))) + ptr = messages; + end = ptr + strlen(ptr); + while ((line = wined3d_get_line(&ptr, end))) { FIXME(" %.*s", (int)(ptr - line), line); }

1 0

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_spirv_scan_shader().
by Alexandre Julliard 14 Mar '23

14 Mar '23

Module: wine Branch: master Commit: 5925c1d1bb19e8ddd641bbcbe9a0e0a399f8ca90 URL: https://gitlab.winehq.org/wine/wine/-/commit/5925c1d1bb19e8ddd641bbcbe9a0e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:59 2023 +0100 wined3d: Use wined3d_get_line() in shader_spirv_scan_shader(). --- dlls/wined3d/shader_spirv.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 7c8351453a1..1dff25cc6a6 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -202,22 +202,6 @@ static void shader_spirv_init_compile_args(struct wined3d_shader_spirv_compile_a } } -static const char *get_line(const char **ptr) -{ - const char *p, *q; - - p = *ptr; - if (!(q = strstr(p, "\n"))) - { - if (!*p) return NULL; - *ptr += strlen(p); - return p; - } - *ptr = q + 1; - - return p; -} - static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_shader_interface *iface, const struct shader_spirv_resource_bindings *b, const struct wined3d_stream_output_desc *so_desc) { @@ -720,11 +704,12 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader, ERR("Failed to scan shader, ret %d.\n", ret); if (messages && *messages && FIXME_ON(d3d_shader)) { - const char *ptr = messages; - const char *line; + const char *ptr, *end, *line; FIXME("Shader log:\n"); - while ((line = get_line(&ptr))) + ptr = messages; + end = ptr + strlen(ptr); + while ((line = wined3d_get_line(&ptr, end))) { FIXME(" %.*s", (int)(ptr - line), line); }

1 0

Francois Gouget : vbscript/tests: Fix the testChrError() tests in the mixed locale case.
by Alexandre Julliard 13 Mar '23

13 Mar '23

Module: wine Branch: master Commit: 1d9de16091a048cf37485001bf9f9af9089edadb URL: https://gitlab.winehq.org/wine/wine/-/commit/1d9de16091a048cf37485001bf9f9a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 12 20:26:29 2023 +0100 vbscript/tests: Fix the testChrError() tests in the mixed locale case. VBscript actually uses the default code page of the user default locale which may not be the same as CP_THREAD_ACP. Also for locales that don't have an ANSI code page, such as Hindi, it falls back to UTF-8. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54003 --- dlls/vbscript/tests/run.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 294b635ea41..65459711061 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -231,6 +231,7 @@ static const char *vt2a(VARIANT *v) */ static void detect_locale(void) { + UINT cp; CPINFOEXA cpinfo; HMODULE kernel32 = GetModuleHandleA("kernel32.dll"); LANGID (WINAPI *pGetThreadUILanguage)(void) = (void*)GetProcAddress(kernel32, "GetThreadUILanguage"); @@ -239,8 +240,17 @@ static void detect_locale(void) PRIMARYLANGID(GetUserDefaultUILanguage()) == LANG_ENGLISH && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH); - GetCPInfoExA( CP_THREAD_ACP, 0, &cpinfo ); - MaxCharSize = cpinfo.MaxCharSize; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR*)&cp, sizeof(cp)); + if (cp) + { + GetCPInfoExA( cp, 0, &cpinfo ); + MaxCharSize = cpinfo.MaxCharSize; + } + else + { + /* No ANSI code page for that locale -> the fallback is UTF-8 */ + MaxCharSize = 4; + } GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK | LOCALE_RETURN_NUMBER, (void*)&first_day_of_week, sizeof(first_day_of_week));

1 0

Florian Will : comdlg32/tests: Fix itemdlg tests on Windows.
by Alexandre Julliard 13 Mar '23

13 Mar '23

Module: wine Branch: master Commit: 4e167e7e1e09d4c8b1261120162d77e98962dacf URL: https://gitlab.winehq.org/wine/wine/-/commit/4e167e7e1e09d4c8b1261120162d77… Author: Florian Will <florian.will(a)gmail.com> Date: Sat Mar 11 00:17:31 2023 +0100 comdlg32/tests: Fix itemdlg tests on Windows. The wine testbot runs tests with C:\Users\Public\Documents as the working directory. Itemdlg tests create test files in the working directory and then try to select them for opening in an IFileOpenDialog. The dialog has its SetFolder method called to point it to the current working directory before showing the dialog, in order for the test code to find the test files it had created there just before opening the dialog. On Windows, this failed because calling the dialog's SetFolder method with C:\Users\Public\Documents doesn't work as expected. The dialog points to the C:\Users\[CURRENT_USER]\Documents directory instead. Subsequently, the test would be unable to select the test file because it doesn't exist in that directory. So the dialog wouldn't accept the file and close itself to finish the test, but show an error message instead, resulting in a test timeout. To fix this, set the current working directory to the temporary directory before calling individual itemdlg test_* functions. --- dlls/comdlg32/tests/itemdlg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index bba869ad091..9b4560fced8 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -2467,6 +2467,16 @@ START_TEST(itemdlg) if(test_instantiation()) { + DWORD result_tmpdir; + BOOL result_set_dir; + WCHAR tmpdir[MAX_PATH]; + + /* Windows refuses to open a dialog for C:\Users\Public\Documents, so change to tmp */ + result_tmpdir = GetTempPathW(MAX_PATH, tmpdir); + ok(result_tmpdir != 0, "got %ld\n", result_tmpdir); + result_set_dir = SetCurrentDirectoryW(tmpdir); + ok(result_set_dir, "failed to set dir\n"); + test_basics(); test_advise(); test_events();

1 0

Gabriel Ivăncescu : jscript: Fix jsstr leak after changing variant type to BSTR.
by Alexandre Julliard 13 Mar '23

13 Mar '23

Module: wine Branch: master Commit: 5ddeae6ac1ed0713166d6ea01b37fb0bac4f2c03 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ddeae6ac1ed0713166d6ea01b37fb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 13 22:31:54 2023 +0200 jscript: Fix jsstr leak after changing variant type to BSTR. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a26b63833ee..80e068fc529 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -947,6 +947,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY break; hres = jsstr_to_bstr(str, &V_BSTR(dst)); + jsstr_release(str); break; } case VT_EMPTY:

1 0

Jacek Caban : winedump: Print static lib EC symbols.
by Alexandre Julliard 13 Mar '23

13 Mar '23

Module: wine Branch: master Commit: 67c67703311f75540896f29ec576fb8fac427121 URL: https://gitlab.winehq.org/wine/wine/-/commit/67c67703311f75540896f29ec576fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 13 21:43:15 2023 +0100 winedump: Print static lib EC symbols. --- tools/winedump/lib.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index 86b1e86ca37..ce2ccab184d 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -231,6 +231,20 @@ void lib_dump(void) printf("\n"); } } + else if (!strncmp((const char *)iamh->Name, "/<ECSYMBOLS>/ ", sizeof(iamh->Name))) + { + unsigned int i, *count = (unsigned int *)ioh; + unsigned short *offsets = (unsigned short *)(count + 1); + const char *name = (const char *)(offsets + *count); + + printf("%u EC symbols\n", *count); + for (i = 0; i < *count; i++) + { + printf("%8x %s\n", offsets[i], name); + name += strlen(name) + 1; + } + printf("\n"); + } else if (!strncmp((const char *)iamh->Name, IMAGE_ARCHIVE_LONGNAMES_MEMBER, sizeof(iamh->Name))) { long_names = PRD(cur_file_pos, size);

1 0

Henri Verbeet : vkd3d-shader/glsl: Update the current source location in vkd3d_glsl_generator_generate().
by Alexandre Julliard 13 Mar '23

13 Mar '23

Module: vkd3d Branch: master Commit: 0a73c75db80ab1b4e27b3526bd02cd4118f890c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a73c75db80ab1b4e27b3526bd02c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 26 04:04:58 2023 +0100 vkd3d-shader/glsl: Update the current source location in vkd3d_glsl_generator_generate(). Since the introduction of instruction arrays, the parser location no longer matches the location of the current instruction. Ultimately we'll likely want to add some kind of explicit location information to struct vkd3d_shader_instruction_array, because we might do transformations that change the order of the original instructions. --- libs/vkd3d-shader/glsl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 1fe3f258..f8d68b5a 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -22,7 +22,7 @@ struct vkd3d_glsl_generator { struct vkd3d_shader_version version; struct vkd3d_string_buffer buffer; - const struct vkd3d_shader_location *location; + struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; bool failed; }; @@ -38,7 +38,7 @@ struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shad memset(generator, 0, sizeof(*generator)); generator->version = *version; vkd3d_string_buffer_init(&generator->buffer); - generator->location = location; + generator->location = *location; generator->message_context = message_context; return generator; } @@ -50,7 +50,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_glsl_compiler_error( va_list args; va_start(args, fmt); - vkd3d_shader_verror(generator->message_context, generator->location, error, fmt, args); + vkd3d_shader_verror(generator->message_context, &generator->location, error, fmt, args); va_end(args); generator->failed = true; } @@ -99,8 +99,10 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); + generator->location.column = 0; for (i = 0; i < parser->instructions.count; ++i) { + generator->location.line = i + 1; vkd3d_glsl_handle_instruction(generator, &parser->instructions.elements[i]); }

1 0

Henri Verbeet : vkd3d-shader/spirv: Update the current source location in spirv_compiler_generate_spirv().
by Alexandre Julliard 13 Mar '23

13 Mar '23

Module: vkd3d Branch: master Commit: 8509ec1e72cbd987a5809cf86bcc1baa64023d81 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8509ec1e72cbd987a5809cf86bcc1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 16:32:16 2023 +0100 vkd3d-shader/spirv: Update the current source location in spirv_compiler_generate_spirv(). --- libs/vkd3d-shader/spirv.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index beee1548..982aabf9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2223,7 +2223,7 @@ struct spirv_compiler struct vkd3d_spirv_builder spirv_builder; struct vkd3d_shader_message_context *message_context; - const struct vkd3d_shader_location *location; + struct vkd3d_shader_location location; bool failed; bool strip_debug; @@ -2323,7 +2323,7 @@ struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version * memset(compiler, 0, sizeof(*compiler)); compiler->message_context = message_context; - compiler->location = location; + compiler->location = *location; if ((target_info = vkd3d_find_struct(compile_info->next, SPIRV_TARGET_INFO))) { @@ -2566,7 +2566,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) spirv_compiler_error(struct spirv_compiler * va_list args; va_start(args, format); - vkd3d_shader_verror(compiler->message_context, compiler->location, error, format, args); + vkd3d_shader_verror(compiler->message_context, &compiler->location, error, format, args); va_end(args); compiler->failed = true; } @@ -9959,8 +9959,10 @@ int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, enum vkd3d_result result = VKD3D_OK; unsigned int i; + compiler->location.column = 0; for (i = 0; i < instructions->count; ++i) { + compiler->location.line = i + 1; if ((result = spirv_compiler_handle_instruction(compiler, &instructions->elements[i])) < 0) return result; }

1 0

Rémi Bernon : imm32: Move IMM_FreeThreadData helper around.
by Alexandre Julliard 13 Mar '23

13 Mar '23

Module: wine Branch: master Commit: 0b34236dfdc41f71b52398a15dc7e457bbf451ff URL: https://gitlab.winehq.org/wine/wine/-/commit/0b34236dfdc41f71b52398a15dc7e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 21 17:03:45 2023 +0100 imm32: Move IMM_FreeThreadData helper around. --- dlls/imm32/imm.c | 63 +++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c09e51e9d6a..3b793b8e69d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -421,39 +421,6 @@ static InputContextData *query_imc_data(HIMC handle) return ret && ret->handle == handle ? ret : NULL; } -static BOOL free_input_context_data(HIMC hIMC) -{ - InputContextData *data = query_imc_data(hIMC); - - if (!data) - return FALSE; - - TRACE("Destroying %p\n", hIMC); - - data->immKbd->uSelected--; - data->immKbd->pImeSelect(hIMC, FALSE); - SendMessageW(data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)data->immKbd); - - ImmDestroyIMCC(data->IMC.hCompStr); - ImmDestroyIMCC(data->IMC.hCandInfo); - ImmDestroyIMCC(data->IMC.hGuideLine); - ImmDestroyIMCC(data->IMC.hPrivate); - ImmDestroyIMCC(data->IMC.hMsgBuf); - - HeapFree(GetProcessHeap(), 0, data); - - return TRUE; -} - -static void IMM_FreeThreadData(void) -{ - struct coinit_spy *spy; - - free_input_context_data(UlongToHandle(NtUserGetThreadInfo()->default_imc)); - if ((spy = get_thread_coinit_spy())) - IInitializeSpy_Release(&spy->IInitializeSpy_iface); -} - static HMODULE load_graphics_driver(void) { static const WCHAR key_pathW[] = L"System\\CurrentControlSet\\Control\\Video\\{"; @@ -556,6 +523,36 @@ failed: return NULL; } +static BOOL free_input_context_data( HIMC hIMC ) +{ + InputContextData *data = query_imc_data( hIMC ); + + if (!data) return FALSE; + + TRACE( "Destroying %p\n", hIMC ); + + data->immKbd->uSelected--; + data->immKbd->pImeSelect( hIMC, FALSE ); + SendMessageW( data->IMC.hWnd, WM_IME_SELECT, FALSE, (LPARAM)data->immKbd ); + + ImmDestroyIMCC( data->IMC.hCompStr ); + ImmDestroyIMCC( data->IMC.hCandInfo ); + ImmDestroyIMCC( data->IMC.hGuideLine ); + ImmDestroyIMCC( data->IMC.hPrivate ); + ImmDestroyIMCC( data->IMC.hMsgBuf ); + + HeapFree( GetProcessHeap(), 0, data ); + + return TRUE; +} + +static void IMM_FreeThreadData(void) +{ + struct coinit_spy *spy; + + free_input_context_data( UlongToHandle( NtUserGetThreadInfo()->default_imc ) ); + if ((spy = get_thread_coinit_spy())) IInitializeSpy_Release( &spy->IInitializeSpy_iface ); +} static void IMM_FreeAllImmHkl(void) {

1 0