- Wine-devel - list.winehq.org

Re: [PATCH v2 0/1] MR188: wow64: Fix NtQueryDirectoryObject wrapper. - approved
by Alexandre Julliard (＠julliard) 06 Jun '22

06 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/188

1 0

Re: [PATCH v2 0/1] MR189: windows.gaming.input: Fix a leak on error path (Coverity). - approved
by Alexandre Julliard (＠julliard) 06 Jun '22

06 Jun '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/189

1 0

[PATCH] wined3d: Parse the eval_centroid opcode.
by Zebediah Figura 06 Jun '22

06 Jun '22

This fixes rendering of trees and other objects in SnowRunner with the Vulkan renderer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5c45df8e6fa..dcdee479e17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5080,6 +5080,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDREP */ shader_hw_endrep, /* WINED3DSIH_ENDSWITCH */ NULL, /* WINED3DSIH_EQ */ NULL, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c9822a95aa..40b5442ed04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11323,6 +11323,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ shader_glsl_interpolate, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c02f82b4d7b..c2e77021bb3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDREP */ "endrep", /* WINED3DSIH_ENDSWITCH */ "endswitch", /* WINED3DSIH_EQ */ "eq", + /* WINED3DSIH_EVAL_CENTROID */ "eval_centroid", /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 266b54d1d15..e60eb9b2fc4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -305,6 +305,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, WINED3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, + WINED3D_SM5_OP_EVAL_CENTROID = 0xcd, WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; @@ -1124,6 +1125,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, {WINED3D_SM5_OP_EVAL_SAMPLE_INDEX, WINED3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, + {WINED3D_SM5_OP_EVAL_CENTROID, WINED3DSIH_EVAL_CENTROID, "f", "f"}, {WINED3D_SM5_OP_DCL_GS_INSTANCES, WINED3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2c8c3804db..affef24d353 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -917,6 +917,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDREP, WINED3DSIH_ENDSWITCH, WINED3DSIH_EQ, + WINED3DSIH_EVAL_CENTROID, WINED3DSIH_EVAL_SAMPLE_INDEX, WINED3DSIH_EXP, WINED3DSIH_EXPP, -- 2.36.1

1 0

[PATCH 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Zebediah Figura 06 Jun '22

06 Jun '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 14 ++++++++++++++ include/ddk/hidclass.h | 5 +++++ 2 files changed, 19 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..db645495987 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,20 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + status = STATUS_BUFFER_OVERFLOW; + } + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/ddk/hidclass.h b/include/ddk/hidclass.h index f5439ac8e95..253f309474d 100644 --- a/include/ddk/hidclass.h +++ b/include/ddk/hidclass.h @@ -58,6 +58,11 @@ DEFINE_GUID (GUID_DEVINTERFACE_HID, \ #define IOCTL_HID_SET_DRIVER_CONFIG HID_BUFFER_CTL_CODE(101) #define IOCTL_HID_GET_MS_GENRE_DESCRIPTOR HID_OUT_CTL_CODE(121) +/* Wine extension */ +#ifdef __WINESRC__ +#define IOCTL_HID_GET_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) +#endif + typedef struct _HID_COLLECTION_INFORMATION { ULONG DescriptorSize; BOOLEAN Polled; -- 2.35.1

2 4

[PATCH v2 0/9] MR180: misc: Fixes and workarounds for UAF warnings. (GCC12)
by Rémi Bernon 06 Jun '22

06 Jun '22

The mscoree one is a genuine UAF bug, other are more arguably false positive but GCC doesn't like freed pointer value to be used in any way. -- v2: server: Avoid using pointer value after realloc. d3drm: Avoid using pointer value after free. dsound: Avoid using pointer value after free. notepad: Avoid using pointer value after free. msi: Avoid using pointer value after free. user32/tests: Workaround use after free warnings. oleaut32/tests: Workaround use after free warnings. mshtml/tests: Avoid using pointer value after free. mscoree: Avoid using pointer after free. https://gitlab.winehq.org/wine/wine/-/merge_requests/180

4 13

[PATCH] include: Allow making Wine Server requests from C++ code
by Mahdi Tayarani 06 Jun '22

06 Jun '22

Using SERVER_START_REQ/SERVER_END_REQ in C++ code calls helper methods which need an explicit cast from a void* to __server_request_info*. Signed-off-by: Mahdi Tayarani <tayarani(a)google.com> --- include/wine/server.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/server.h b/include/wine/server.h index b05271b7522..477868c5854 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -70,7 +70,7 @@ static inline data_size_t wine_server_reply_size( const void *reply ) /* add some data to be sent along with the request */ static inline void wine_server_add_data( void *req_ptr, const void *ptr, data_size_t size ) { - struct __server_request_info * const req = req_ptr; + struct __server_request_info * const req = (struct __server_request_info *)req_ptr; if (size) { req->data[req->data_count].ptr = ptr; @@ -82,7 +82,7 @@ static inline void wine_server_add_data( void *req_ptr, const void *ptr, data_si /* set the pointer and max size for the reply var data */ static inline void wine_server_set_reply( void *req_ptr, void *ptr, data_size_t max_size ) { - struct __server_request_info * const req = req_ptr; + struct __server_request_info * const req = (struct __server_request_info *)req_ptr; req->reply_data = ptr; req->u.req.request_header.reply_size = max_size; } -- 2.36.1.255.ge46751e96f-goog

4 7

TestBot News
by Francois Gouget 06 Jun '22

06 Jun '22

New hardware ------------ The TestBot is getting two new VM hosts, gpu1 and gpu2. * Thanks to their i9-12900K processor they have much better multi-threaded performance: compiling Wine from scratch went from about 920 seconds on the old boxes to 220 seconds with 16 threads, and 190 seconds with 24 threads [1] (all numbers include the configure step). That should help with patches that touch Wine headers. * They also have much better single-thread performance. The first results indicate that they can run WineTest in Wine in about 20 minutes instead of 36 minutes. * They should support PCI-passthrough and each has an AMD RX 6600 and an Nvidia RTX 3050 graphics card. That means it should be possible to test every patch against these graphics cards (unlike the cw-rx460 and cw-gtx560 machines which only ran WineTest and were not fully part of the TestBot). * They should also be able to run Windows 11 in a VM. The sad news is that they literally replace cw-rx460 and cw-gtx560 so those two are no more. So PCI-passthrough is needed to provide continued tests against real GPUs. The current status: * gpu1 is in place and part of the TestBot but only runs 'vanilla' VMs. * gpu2 has now replaced cw-gtx560 but is not set up yet. I will first use it as a testbed to set up the PCI-passthrough and Windows 11 VMs. That way I'll be able to reboot gpu2 without impacting the TestBot. I will also document the result on the WineTestBot VMs page [2] in case anyone wants to do the same at home. VM updates ---------- * I updated debian11 and installed the fonts-arphic-uming package for the Chinese tests. I suspect the debian11 update caused a lot of new ddraw[12] failures. (950 failures / crash instead of 1 failure, qualitatively it makes no difference but it still needs to be investigated...) * I did a Windows Update on the w8 and w864 VMs. They are now fully updated and while going through the check list [2] I found items that probably were missing (e.g. not disabling defragmentation). * I changed the w8 CPU from kvm32 to core2duo because Windows would not boot otherwise; seemingly due to the lack of support for the NX bit. I suspect that's because the host CPU went from AMD to Intel and QEmu failed to insulate the guest from that despite the kvm32 virtual CPU type. w864 was already running with the QEmu CPU set to core2duo so that should be ok. VM reshuffling -------------- I moved the VMs around to take advantage of the new gpu1 box. * vm3 and vm4 are now dedicated to running w1064* and w10pro64* respectively (before they had one additional VM each). This should help reduce the period of time during which the TestBot is less responsive due to the nightly WineTest runs. * I moved debian11 and debiant to gpu1 so they benefit from the faster compilations and faster WineTest runs. (WineTest is much slower in Wine than on Windows so maximum benefit there) * I moved w864 to gpu1. The good thing is that this confirmed the old VMs work on the new boxes too (see the kvm32 issue above). * I moved all the other Windows VMs to vm1. * Next the plan is to move the build VM somewhere and to retire the vm2 host. There will be one more reshuffling once gpu2 is in place but what happens then will depend very much on how many test configurations use the PCI-passthrough, Windows 11, and GitLab. [1] Note: when building a Wine build server it seems one needs between 350 and 400 MB per compilation thread. For now I have allocated 16 threads to the VMs but, given that they currently still only run one VM at a time, giving them access to all 24 thread may make more sense. There is also the issue of performance vs efficiency cores. But making sure the VMs only use performance cores would require CPU-pinning and I don't want to go there unless proven necessary. [2] https://wiki.winehq.org/Wine_TestBot_VMs#Windows_configuration -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

[PATCH v2] vbscript: Implement IsDate().
by Robert Wilhelm 06 Jun '22

06 Jun '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 90cfd557038..731a062dea2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -935,8 +935,13 @@ static HRESULT Global_VarType(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("%s\n", debugstr_variant(arg)); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_VT(arg) == VT_DATE ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index be1d4a806c0..b9c2149aa56 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -181,6 +181,20 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isDate(new EmptyClass), "isDate(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isDate(x), "isDate(x) is true?") +x = CDate(1) +Call ok(isDate(x), "isDate(x) is not true?") +Call ok(isDate(#1/1/2000#), "isDate(#1/1/2000#) is not true?") +Call ok(not isDate(empty), "isDate(empty) is true?") +Call ok(not isDate(Nothing), "isDate(Nothing) is true?") +Call ok(not isDate(true), "isDate(true) is true?") +Call ok(not isDate(4), "isDate(4) is true?") +Call ok(not isDate("4"), "isDate(""4"") is true?") +Call ok(not isDate("x"), "isDate(""x"") is true?") +Call ok(not isDate(Null), "isDate(Null) is true?") + Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") Set x = new EmptyClass Call ok(not isEmpty(x), "isEmpty(x) is true?") -- 2.36.1

2 1

[PATCH 1/2] jscript: Only remove one reference to each entry when clearing the Map.
by Gabriel Ivăncescu 06 Jun '22

06 Jun '22

Checking for list_empty doesn't stop until all entries have been removed, no matter their ref count. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/set.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index d1ea663..951c5ba 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -223,6 +223,7 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *map; HRESULT hres; @@ -232,10 +233,8 @@ static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", map); - while(!list_empty(&map->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &map->entries, struct jsval_map_entry, list_entry) delete_map_entry(map, entry); - } if(r) *r = jsval_undefined(); return S_OK; -- 2.34.1

1 1

[PATCH v2 0/6] MR173: preparation for sharing code in d3dx10/d3dx11
by Piotr Caban (＠piotr) 06 Jun '22

06 Jun '22

- use CRT allocators - share data loading code - implement D3DX10CreateAsyncTextureInfoProcessor -- v2: d3dx10/tests: Add D3DX10CreateAsyncTextureInfoProcessor tests. d3dx10: Add D3DX10CreateAsyncTextureInfoProcessor implementation. d3dx10: Share code for resource data loading. d3dx10: Share code for file data loading. d3dx11: Use CRT memory allocators. d3dx10: Use CRT memory allocators. https://gitlab.winehq.org/wine/wine/-/merge_requests/173

3 7