- Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_spirv_scan_shader().
by Alexandre Julliard March 14, 2023

March 14, 2023

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

Henri Verbeet : wined3d: Don't bother explicitly terminating the GLSL info log in print_glsl_info_log().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 4144f2e864f1f54bd63fb6fe389a75b6247fd9f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4144f2e864f1f54bd63fb6fe389a75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:58 2023 +0100 wined3d: Don't bother explicitly terminating the GLSL info log in print_glsl_info_log(). --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++++-------- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 594fdf73f46..1c037b78b84 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -518,29 +518,35 @@ void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL * that if there are errors. */ if (length > 1) { - const char *ptr, *line; + const char *ptr, *end, *line; log = heap_alloc(length); - /* The info log is supposed to be zero-terminated, but at least some - * versions of fglrx don't terminate the string properly. The reported - * length does include the terminator, so explicitly set it to zero - * here. */ - log[length - 1] = 0; if (program) GL_EXTCALL(glGetProgramInfoLog(id, length, NULL, log)); else GL_EXTCALL(glGetShaderInfoLog(id, length, NULL, log)); ptr = log; + /* The info log is supposed to be zero-terminated. Note that at least + * some versions of fglrx don't terminate the string properly. The + * reported length does include the supposed terminator though, so we + * don't care here. */ + end = &ptr[length - 1]; if (gl_info->quirks & WINED3D_QUIRK_INFO_LOG_SPAM) { WARN("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) WARN(" %.*s", (int)(ptr - line), line); + while ((line = wined3d_get_line(&ptr, end))) + { + WARN(" %.*s", (int)(ptr - line), line); + } } else { FIXME("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); + while ((line = wined3d_get_line(&ptr, end))) + { + FIXME(" %.*s", (int)(ptr - line), line); + } } heap_free(log); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 425261a195e..0c8cc03738a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -74,6 +74,20 @@ static inline float int_to_float(uint32_t i) return u.f; } +static inline const char *wined3d_get_line(const char **ptr, const char *end) +{ + const char *p, *q; + + if ((p = *ptr) >= end) + return NULL; + + if (!(q = memchr(p, '\n', end - p))) + *ptr = end; + else + *ptr = q + 1; + return p; +} + #define MAKEDWORD_VERSION(maj, min) (((maj & 0xffffu) << 16) | (min & 0xffffu)) /* Driver quirks */

1 0

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_glsl_dump_program_source().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: eb31dcf04d25d3f40326fb8dde0630e7a6a6cd3b URL: https://gitlab.winehq.org/wine/wine/-/commit/eb31dcf04d25d3f40326fb8dde0630… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:59 2023 +0100 wined3d: Use wined3d_get_line() in shader_glsl_dump_program_source(). Thereby removing the last user of get_info_log_line(). --- dlls/wined3d/glsl_shader.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 69b15c7421d..451e023d5fb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -484,22 +484,6 @@ static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, shader_addline(buffer, ")"); } -static const char *get_info_log_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; -} - /* Context activation is done by the caller. */ void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL program) { @@ -593,7 +577,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetAttachedShaders(program, shader_count, NULL, shaders)); for (i = 0; i < shader_count; ++i) { - const char *ptr, *line; + const char *ptr, *end, *line; GLint tmp; GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_SOURCE_LENGTH, &tmp)); @@ -602,7 +586,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf { heap_free(source); - if (!(source = heap_alloc_zero(tmp))) + if (!(source = heap_alloc(tmp))) { ERR("Failed to allocate %d bytes for shader source.\n", tmp); heap_free(shaders); @@ -611,16 +595,20 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf source_size = tmp; } + GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); + ptr = source; + end = &ptr[tmp - 1]; + FIXME("Shader %u:\n", shaders[i]); GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_TYPE, &tmp)); FIXME(" GL_SHADER_TYPE: %s.\n", debug_gl_shader_type(tmp)); GL_EXTCALL(glGetShaderiv(shaders[i], GL_COMPILE_STATUS, &tmp)); FIXME(" GL_COMPILE_STATUS: %d.\n", tmp); FIXME("\n"); - - ptr = source; - GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); - while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); + while ((line = wined3d_get_line(&ptr, end))) + { + FIXME(" %.*s", (int)(ptr - line), line); + } FIXME("\n"); }

1 0

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_spirv_compile_shader().
by Alexandre Julliard March 14, 2023

March 14, 2023

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_glsl_compile().
by Alexandre Julliard March 14, 2023

March 14, 2023

Module: wine Branch: master Commit: 294518092758281ddb536ba444c06f684f785ff1 URL: https://gitlab.winehq.org/wine/wine/-/commit/294518092758281ddb536ba444c06f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 13 11:46:59 2023 +0100 wined3d: Use wined3d_get_line() in shader_glsl_compile(). --- dlls/wined3d/glsl_shader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1c037b78b84..69b15c7421d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -555,14 +555,18 @@ void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id, BOOL /* Context activation is done by the caller. */ static void shader_glsl_compile(const struct wined3d_gl_info *gl_info, GLuint shader, const char *src) { - const char *ptr, *line; + const char *ptr, *end, *line; TRACE("Compiling shader object %u.\n", shader); if (TRACE_ON(d3d_shader)) { ptr = src; - while ((line = get_info_log_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(glShaderSource(shader, 1, &src, NULL));

1 0

Henri Verbeet : wined3d: Use wined3d_get_line() in shader_arb_compile().
by Alexandre Julliard March 14, 2023

March 14, 2023

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

Gabriel Ivăncescu : jscript: Fix jsstr leak after changing variant type to BSTR.
by Alexandre Julliard March 13, 2023

March 13, 2023

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

Florian Will : comdlg32/tests: Fix itemdlg tests on Windows.
by Alexandre Julliard March 13, 2023

March 13, 2023

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

Jacek Caban : winedump: Print static lib EC symbols.
by Alexandre Julliard March 13, 2023

March 13, 2023

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

Francois Gouget : vbscript/tests: Fix the testChrError() tests in the mixed locale case.
by Alexandre Julliard March 13, 2023

March 13, 2023

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