November 2022 - Wine-commits

Francisco Casas : vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2".
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: vkd3d Branch: master Commit: 43631bde4d2851117c1b62329f6a75ddda08321d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/43631bde4d2851117c1b62329f6a7… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 7 12:59:09 2022 -0300 vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2". Unlike compatible_data_types() and implicit_compatible_data_types(), this function is intended to be symmetrical. So it makes sense to preserve the names "t1" and "t2" for the arguments. --- libs/vkd3d-shader/hlsl.y | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index c1fb003d..eedc85bd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1175,34 +1175,34 @@ static unsigned int evaluate_array_dimension(struct hlsl_ir_node *node) } } -static bool expr_compatible_data_types(struct hlsl_type *src, struct hlsl_type *dst) +static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { - if (src->base_type > HLSL_TYPE_LAST_SCALAR || dst->base_type > HLSL_TYPE_LAST_SCALAR) + if (t1->base_type > HLSL_TYPE_LAST_SCALAR || t2->base_type > HLSL_TYPE_LAST_SCALAR) return false; /* Scalar vars can be converted to pretty much everything */ - if ((src->dimx == 1 && src->dimy == 1) || (dst->dimx == 1 && dst->dimy == 1)) + if ((t1->dimx == 1 && t1->dimy == 1) || (t2->dimx == 1 && t2->dimy == 1)) return true; - if (src->type == HLSL_CLASS_VECTOR && dst->type == HLSL_CLASS_VECTOR) + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) return true; - if (src->type == HLSL_CLASS_MATRIX || dst->type == HLSL_CLASS_MATRIX) + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) { /* Matrix-vector conversion is apparently allowed if either they have the same components count or the matrix is nx1 or 1xn */ - if (src->type == HLSL_CLASS_VECTOR || dst->type == HLSL_CLASS_VECTOR) + if (t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) { - if (hlsl_type_component_count(src) == hlsl_type_component_count(dst)) + if (hlsl_type_component_count(t1) == hlsl_type_component_count(t2)) return true; - return (src->type == HLSL_CLASS_MATRIX && (src->dimx == 1 || src->dimy == 1)) - || (dst->type == HLSL_CLASS_MATRIX && (dst->dimx == 1 || dst->dimy == 1)); + return (t1->type == HLSL_CLASS_MATRIX && (t1->dimx == 1 || t1->dimy == 1)) + || (t2->type == HLSL_CLASS_MATRIX && (t2->dimx == 1 || t2->dimy == 1)); } /* Both matrices */ - if ((src->dimx >= dst->dimx && src->dimy >= dst->dimy) - || (src->dimx <= dst->dimx && src->dimy <= dst->dimy)) + if ((t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + || (t1->dimx <= t2->dimx && t1->dimy <= t2->dimy)) return true; }

1 0

Aric Stewart : server: Take into account extra_size in get_rawinput_buffer.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: c937155ff6100c6ec2d8d1873dc7878041856e1a URL: https://gitlab.winehq.org/wine/wine/-/commit/c937155ff6100c6ec2d8d1873dc787… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Nov 17 11:44:52 2022 -0600 server: Take into account extra_size in get_rawinput_buffer. --- server/queue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/queue.c b/server/queue.c index 22f720530b9..07a31b47370 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3362,7 +3362,7 @@ DECL_HANDLER(get_rawinput_buffer) free_message( msg ); size += next_size; - pos += sizeof(*data); + pos += sizeof(*data) + extra_size; count++; }

1 0

Zebediah Figura : ntoskrnl/tests: Test retrieving SPDRP_CONFIGFLAGS.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 3a254079b9b609dd0b626a106240acb2aba5f814 URL: https://gitlab.winehq.org/wine/wine/-/commit/3a254079b9b609dd0b626a106240ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:42:22 2022 -0600 ntoskrnl/tests: Test retrieving SPDRP_CONFIGFLAGS. --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 6d8513ffa35..948253608ae 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1631,6 +1631,15 @@ static void test_pnp_devices(void) if (ret) ok(GetLastError() == ERROR_INVALID_DATA, "got error %#lx\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, + &type, (BYTE *)&dword, sizeof(dword), NULL); + todo_wine ok(ret, "got error %#lx\n", GetLastError()); + if (ret) + { + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); + } + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVTYPE, &type, (BYTE *)&dword, sizeof(dword), NULL); ok(!ret, "expected failure\n"); @@ -1740,6 +1749,7 @@ static void test_pnp_driver(struct testsign_context *ctx) SC_HANDLE manager, service; BOOL ret, need_reboot; HANDLE catalog, file; + DWORD dword, type; unsigned int i; HDEVINFO set; FILE *f; @@ -1798,11 +1808,25 @@ static void test_pnp_driver(struct testsign_context *ctx) ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(ret, "failed to register device, error %#lx\n", GetLastError()); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, + &type, (BYTE *)&dword, sizeof(dword), NULL); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "got error %#lx\n", GetLastError()); + GetFullPathNameA("winetest.inf", sizeof(path), path, NULL); ret = UpdateDriverForPlugAndPlayDevicesA(NULL, hardware_id, path, INSTALLFLAG_FORCE, &need_reboot); ok(ret, "failed to install device, error %#lx\n", GetLastError()); ok(!need_reboot, "expected no reboot necessary\n"); + ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, + &type, (BYTE *)&dword, sizeof(dword), NULL); + todo_wine ok(ret, "got error %#lx\n", GetLastError()); + if (ret) + { + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); + } + /* Tests. */ test_pnp_devices();

1 0

Zebediah Figura : setupapi: Set SPDRP_CONFIGFLAGS in SetupDiInstallDevice().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: b682102db4f685a818bbc9203f1f591c17e0a897 URL: https://gitlab.winehq.org/wine/wine/-/commit/b682102db4f685a818bbc9203f1f59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:50:46 2022 -0600 setupapi: Set SPDRP_CONFIGFLAGS in SetupDiInstallDevice(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53387 --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 +++------ dlls/setupapi/devinst.c | 5 +++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 948253608ae..d2e02c7c130 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1820,12 +1820,9 @@ static void test_pnp_driver(struct testsign_context *ctx) ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, &type, (BYTE *)&dword, sizeof(dword), NULL); - todo_wine ok(ret, "got error %#lx\n", GetLastError()); - if (ret) - { - ok(!dword, "got flags %#lx\n", dword); - ok(type == REG_DWORD, "got type %lu\n", type); - } + ok(ret, "got error %#lx\n", GetLastError()); + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); /* Tests. */ diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 896e77d9b38..ef7b4dccf0d 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -5163,6 +5163,7 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) static const WCHAR addserviceW[] = {'A','d','d','S','e','r','v','i','c','e',0}; static const WCHAR rootW[] = {'r','o','o','t','\\',0}; WCHAR section_ext[LINE_LEN], subsection[LINE_LEN], inf_path[MAX_PATH], *extptr, *filepart; + static const DWORD config_flags = 0; UINT install_flags = SPINST_ALL; HKEY driver_key, device_key; SC_HANDLE manager, service; @@ -5210,6 +5211,10 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) return FALSE; } + if (!SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CONFIGFLAGS, + (BYTE *)&config_flags, sizeof(config_flags))) + ERR("Failed to set config flags, error %#lx.\n", GetLastError()); + if (device->params.Flags & DI_NOFILECOPY) install_flags &= ~SPINST_FILES;

1 0

Zebediah Figura : ntoskrnl: Set SPDRP_CONFIGFLAGS in install_device_driver().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: f801ac97fbcbef5618eadf1fb922a2d0f0873c4d URL: https://gitlab.winehq.org/wine/wine/-/commit/f801ac97fbcbef5618eadf1fb922a2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 16 19:53:54 2022 -0600 ntoskrnl: Set SPDRP_CONFIGFLAGS in install_device_driver(). --- dlls/ntoskrnl.exe/pnp.c | 9 +++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 9 +++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index a70190db7ce..7c77a9a7145 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -256,6 +256,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN DIF_INSTALLDEVICE, DIF_NEWDEVICEWIZARD_FINISHINSTALL, }; + static const DWORD config_flags = 0; NTSTATUS status; unsigned int i; @@ -281,6 +282,14 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN sizeof_multiszW( ids ) * sizeof(WCHAR) ); ExFreePool( ids ); + /* Set the config flags. setupapi won't do this for us if we couldn't find + * a driver to install, but raw devices should still have this key + * populated. */ + + if (!SetupDiSetDeviceRegistryPropertyW( set, sp_device, SPDRP_CONFIGFLAGS, + (BYTE *)&config_flags, sizeof(config_flags) )) + ERR("Failed to set config flags, error %#lx.\n", GetLastError()); + if (!SetupDiBuildDriverInfoList( set, sp_device, SPDIT_COMPATDRIVER )) { ERR("Failed to build compatible driver list, error %#lx.\n", GetLastError()); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index d2e02c7c130..02af7ca230b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1633,12 +1633,9 @@ static void test_pnp_devices(void) ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_CONFIGFLAGS, &type, (BYTE *)&dword, sizeof(dword), NULL); - todo_wine ok(ret, "got error %#lx\n", GetLastError()); - if (ret) - { - ok(!dword, "got flags %#lx\n", dword); - ok(type == REG_DWORD, "got type %lu\n", type); - } + ok(ret, "got error %#lx\n", GetLastError()); + ok(!dword, "got flags %#lx\n", dword); + ok(type == REG_DWORD, "got type %lu\n", type); ret = SetupDiGetDeviceRegistryPropertyA(set, &device, SPDRP_DEVTYPE, &type, (BYTE *)&dword, sizeof(dword), NULL);

1 0

Zebediah Figura : d3dcompiler: Print message output with ERR() in D3DCompile2().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: cee21cf3b8cf46233cfabf7556316cacf6b5a0ac URL: https://gitlab.winehq.org/wine/wine/-/commit/cee21cf3b8cf46233cfabf7556316c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 4 19:34:05 2022 -0500 d3dcompiler: Print message output with ERR() in D3DCompile2(). --- dlls/d3dcompiler_43/compiler.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index bb9b7ce54eb..ef7bde9aa7f 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -173,6 +173,23 @@ static void close_include(const struct vkd3d_shader_code *code, void *context) ID3DInclude_Close(iface, code->code); } +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 HRESULT preprocess_shader(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **shader_blob, ID3DBlob **messages_blob) @@ -486,8 +503,25 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen } ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); + + if (ret) + ERR("Failed to compile shader, vkd3d result %d.\n", ret); + if (messages) { + if (*messages && ERR_ON(d3dcompiler)) + { + const char *ptr = messages; + const char *line; + + ERR("Shader log:\n"); + while ((line = get_line(&ptr))) + { + ERR(" %.*s", (int)(ptr - line), line); + } + ERR("\n"); + } + if (messages_blob) { size_t size = strlen(messages);

1 0

Zebediah Figura : d3dcompiler: Print message output with ERR() in D3DPreprocess().
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 7926253d821855db6312b5a8405260c115fa7dcd URL: https://gitlab.winehq.org/wine/wine/-/commit/7926253d821855db6312b5a8405260… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Nov 4 19:35:15 2022 -0500 d3dcompiler: Print message output with ERR() in D3DPreprocess(). --- dlls/d3dcompiler_43/compiler.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index ef7bde9aa7f..174fbc98280 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -235,8 +235,25 @@ static HRESULT preprocess_shader(const void *data, SIZE_T data_size, const char preprocess_info.include_context = include; ret = vkd3d_shader_preprocess(&compile_info, &byte_code, &messages); + + if (ret) + ERR("Failed to preprocess shader, vkd3d result %d.\n", ret); + if (messages) { + if (*messages && ERR_ON(d3dcompiler)) + { + const char *ptr = messages; + const char *line; + + ERR("Shader log:\n"); + while ((line = get_line(&ptr))) + { + ERR(" %.*s", (int)(ptr - line), line); + } + ERR("\n"); + } + if (messages_blob) { size_t size = strlen(messages);

1 0

Zebediah Figura : winex11: Print a winediag err if XComposite is missing.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: 6d8241c80bd0af120f16ccb78fa08a5411fe93be URL: https://gitlab.winehq.org/wine/wine/-/commit/6d8241c80bd0af120f16ccb78fa08a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Oct 20 18:08:37 2022 -0500 winex11: Print a winediag err if XComposite is missing. --- dlls/winex11.drv/opengl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 2acf9db5372..c74c317f6ff 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1350,7 +1350,11 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel #endif else { - WARN("XComposite is not available, using GLXPixmap hack\n"); + static unsigned int once; + + if (!once++) + ERR_(winediag)("XComposite is not available, using GLXPixmap hack.\n"); + WARN("XComposite is not available, using GLXPixmap hack.\n"); gl->type = DC_GL_PIXMAP_WIN; gl->pixmap = XCreatePixmap( gdi_display, root_window, width, height, visual->depth );

1 0

Eric Pouech : dbghelp: Fix handling of BA_OP_ChangeCodeLength (PDB).
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: de3a836629dbce1324c1bc35894ca4756197cbe7 URL: https://gitlab.winehq.org/wine/wine/-/commit/de3a836629dbce1324c1bc35894ca4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Nov 17 10:49:35 2022 +0100 dbghelp: Fix handling of BA_OP_ChangeCodeLength (PDB). This op is heavily used by clang with PDB debug info, while MSVC barely uses it. This fixes a bunch of problems when loading PDB files generated by clang (eg. the PDB files from wine-gecko). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 85d12063076..5e7a1badadf 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2199,8 +2199,9 @@ static struct symt_function* codeview_create_inline_site(const struct msc_debug_ inlined->ranges[index++].high = top_func->ranges[0].low + offset; break; case BA_OP_ChangeCodeLength: - /* this op doesn't seem widely used... */ - inline_site_update_last_range(inlined, index, inlined->ranges[index - 1].low + cvba.arg1); + /* this op isn't widely used by MSVC, but clang uses it a lot... */ + offset += cvba.arg1; + inline_site_update_last_range(inlined, index, top_func->ranges[0].low + offset); break; case BA_OP_ChangeFile: chksms = CV_RECORD_GAP(hdr_files, cvba.arg1);

1 0

Alexandre Julliard : winecrt0: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 17 Nov '22

17 Nov '22

Module: wine Branch: master Commit: e85f5aa6de9779aa3e61b958ee569da30e8adc37 URL: https://gitlab.winehq.org/wine/wine/-/commit/e85f5aa6de9779aa3e61b958ee569d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 17 10:23:26 2022 +0100 winecrt0: Build without -DWINE_NO_LONG_TYPES. --- dlls/winecrt0/Makefile.in | 1 - dlls/winecrt0/debug.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 6915e69eb4b..17da4da29c6 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES STATICLIB = libwinecrt0.a C_SRCS = \ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index 918fb67b140..2ac4505fb85 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -191,11 +191,11 @@ static int __cdecl fallback__wine_dbg_header( enum __wine_debug_class cls, if (TRACE_ON(timestamp)) { - ULONG ticks = GetTickCount(); + UINT ticks = GetTickCount(); pos += sprintf( pos, "%3u.%03u:", ticks / 1000, ticks % 1000 ); } - if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", GetCurrentProcessId() ); - pos += sprintf( pos, "%04x:", GetCurrentThreadId() ); + if (TRACE_ON(pid)) pos += sprintf( pos, "%04x:", (UINT)GetCurrentProcessId() ); + pos += sprintf( pos, "%04x:", (UINT)GetCurrentThreadId() ); if (function && cls < ARRAY_SIZE( debug_classes )) snprintf( pos, sizeof(buffer) - (pos - buffer), "%s:%s:%s ", debug_classes[cls], channel->name, function );

1 0