December 2021 - Wine-Devel - list.winehq.org

[PATCH 2/8] wined3d: Use wined3d_next_cs_packet() in wined3d_cs_exec_execute_command_list().
by Henri Verbeet Dec. 9, 2021

Dec. 9, 2021

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Move this patch earlier in the series. dlls/wined3d/cs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 20019e0260c..da32e1c2804 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3112,14 +3112,14 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_execute_command_list *op = data; - size_t start = 0, end = op->list->data_size; + SIZE_T start = 0, end = op->list->data_size; const BYTE *cs_data = op->list->data; TRACE("Executing command list %p.\n", op->list); while (start < end) { - const struct wined3d_cs_packet *packet = (const struct wined3d_cs_packet *)&cs_data[start]; + const struct wined3d_cs_packet *packet = wined3d_next_cs_packet(cs_data, &start); enum wined3d_cs_op opcode = *(const enum wined3d_cs_op *)packet->data; if (opcode >= WINED3D_CS_OP_STOP) @@ -3127,8 +3127,6 @@ static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const vo else wined3d_cs_op_handlers[opcode](cs, packet->data); TRACE("%s executed.\n", debug_cs_op(opcode)); - - start += offsetof(struct wined3d_cs_packet, data[packet->size]); } } -- 2.30.2

1 0

[PATCH 1/8] wined3d: Introduce a helper function to extract a packet from a command stream.
by Henri Verbeet Dec. 9, 2021

Dec. 9, 2021

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Move this patch earlier in the series. - Move wined3d_next_cs_packet() after the structure definitions. dlls/wined3d/cs.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2c94b7aed76..20019e0260c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -708,6 +708,15 @@ static const char *debug_cs_op(enum wined3d_cs_op op) return wine_dbg_sprintf("UNKNOWN_OP(%#x)", op); } +static struct wined3d_cs_packet *wined3d_next_cs_packet(const uint8_t *data, SIZE_T *offset) +{ + struct wined3d_cs_packet *packet = (struct wined3d_cs_packet *)&data[*offset]; + + *offset += offsetof(struct wined3d_cs_packet, data[packet->size]); + + return packet; +} + static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) { } @@ -3478,7 +3487,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) enum wined3d_cs_op opcode; HMODULE wined3d_module; unsigned int poll = 0; - LONG tail; + SIZE_T tail; TRACE("Started.\n"); @@ -3512,7 +3521,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) spin_count = 0; tail = queue->tail; - packet = (struct wined3d_cs_packet *)&queue->data[tail]; + packet = wined3d_next_cs_packet(queue->data, &tail); if (packet->size) { opcode = *(const enum wined3d_cs_op *)packet->data; @@ -3531,7 +3540,6 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) TRACE("%s executed.\n", debug_cs_op(opcode)); } - tail += FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); tail &= (WINED3D_CS_QUEUE_SIZE - 1); InterlockedExchange(&queue->tail, tail); } -- 2.30.2

1 0

[PATCH v2 1/2] wined3d: Pass a wined3d_device_gl pointer to wined3d_device_delete_opengl_contexts_cs().
by Zebediah Figura Dec. 9, 2021

Dec. 9, 2021

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Retain the trace... dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/device.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index fc7a8964923..6cc2f0cd9a8 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4577,7 +4577,7 @@ static void adapter_gl_uninit_3d(struct wined3d_device *device) TRACE("device %p.\n", device); wined3d_device_destroy_default_samplers(device); - wined3d_cs_destroy_object(device->cs, wined3d_device_delete_opengl_contexts_cs, device); + wined3d_cs_destroy_object(device->cs, wined3d_device_gl_delete_opengl_contexts_cs, wined3d_device_gl(device)); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 067d54d58e3..93c738ad955 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -955,18 +955,18 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); } -void wined3d_device_delete_opengl_contexts_cs(void *object) +void wined3d_device_gl_delete_opengl_contexts_cs(void *object) { + struct wined3d_device_gl *device_gl = object; struct wined3d_swapchain_gl *swapchain_gl; - struct wined3d_device *device = object; struct wined3d_context_gl *context_gl; - struct wined3d_device_gl *device_gl; struct wined3d_context *context; + struct wined3d_device *device; struct wined3d_shader *shader; - TRACE("device %p.\n", device); + TRACE("device %p.\n", device_gl); - device_gl = wined3d_device_gl(device); + device = &device_gl->d; LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c8f24c41fd5..ecb5182eb13 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3920,7 +3920,6 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, @@ -3964,6 +3963,7 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device } void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; +void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; struct wined3d_null_resources_vk { -- 2.34.1

3 5

[PATCH] wined3d: Trace CS packet pointers.
by Zebediah Figura Dec. 9, 2021

Dec. 9, 2021

This makes it easier to "unwind" through the CS thread when debugging. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2c94b7aed76..a149de8d628 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3303,6 +3303,7 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined size_t packet_size; packet = (struct wined3d_cs_packet *)&queue->data[queue->head]; + TRACE("Queuing op %s at %p.\n", debug_cs_op(*(const enum wined3d_cs_op *)packet->data), packet); packet_size = FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); InterlockedExchange(&queue->head, (queue->head + packet_size) & (WINED3D_CS_QUEUE_SIZE - 1)); @@ -3517,7 +3518,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) { opcode = *(const enum wined3d_cs_op *)packet->data; - TRACE("Executing %s.\n", debug_cs_op(opcode)); + TRACE("Executing %s at %p.\n", debug_cs_op(opcode), packet); if (opcode >= WINED3D_CS_OP_STOP) { if (opcode > WINED3D_CS_OP_STOP) @@ -3528,7 +3529,7 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) wined3d_cs_command_lock(cs); wined3d_cs_op_handlers[opcode](cs, packet->data); wined3d_cs_command_unlock(cs); - TRACE("%s executed.\n", debug_cs_op(opcode)); + TRACE("%s at %p executed.\n", debug_cs_op(opcode), packet); } tail += FIELD_OFFSET(struct wined3d_cs_packet, data[packet->size]); -- 2.34.1

1 0

[PATCH 1/4] wined3d: Pass a wined3d_device_gl pointer to wined3d_device_create_primary_opengl_context_cs().
by Zebediah Figura Dec. 9, 2021

Dec. 9, 2021

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 9864093c999..fc7a8964923 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4564,7 +4564,7 @@ static HRESULT adapter_gl_init_3d(struct wined3d_device *device) { TRACE("device %p.\n", device); - wined3d_cs_init_object(device->cs, wined3d_device_create_primary_opengl_context_cs, device); + wined3d_cs_init_object(device->cs, wined3d_device_gl_create_primary_opengl_context_cs, wined3d_device_gl(device)); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); if (!wined3d_swapchain_gl(device->swapchains[0])->context_count) return E_FAIL; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c516594c269..067d54d58e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -989,17 +989,19 @@ void wined3d_device_delete_opengl_contexts_cs(void *object) } } -void wined3d_device_create_primary_opengl_context_cs(void *object) +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) { - struct wined3d_device *device = object; + struct wined3d_device_gl *device_gl = object; struct wined3d_context_gl *context_gl; struct wined3d_swapchain *swapchain; struct wined3d_context *context; struct wined3d_texture *target; + struct wined3d_device *device; HRESULT hr; - TRACE("device %p.\n", device); + TRACE("device %p.\n", device_gl); + device = &device_gl->d; swapchain = device->swapchains[0]; target = swapchain->back_buffers ? swapchain->back_buffers[0] : swapchain->front_buffer; if (!(context = context_acquire(device, target, 0))) @@ -1032,7 +1034,7 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); + wined3d_device_gl_create_dummy_textures(device_gl, context_gl); wined3d_device_create_default_samplers(device, context); context_release(context); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b30a4108b0b..c8f24c41fd5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3920,7 +3920,6 @@ BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *c void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_device_create_default_samplers(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -void wined3d_device_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_destroy_default_samplers(struct wined3d_device *device) DECLSPEC_HIDDEN; HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, @@ -3964,6 +3963,8 @@ static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_gl, d); } +void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; + struct wined3d_null_resources_vk { struct wined3d_bo_vk bo; -- 2.34.1

3 8

[PATCH] server: Avoid reqeuests with null pointer but invalid size.
by Bernhard Übelacker Dec. 9, 2021

Dec. 9, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51770 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/kernel32/tests/volume.c | 16 ++++++++++++++++ dlls/ntdll/unix/file.c | 2 ++ include/wine/server.h | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 723dfabb817..6934ea3044e 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -618,6 +618,7 @@ static void test_disk_query_property(void) STORAGE_PROPERTY_QUERY query = {0}; STORAGE_DESCRIPTOR_HEADER header = {0}; STORAGE_DEVICE_DESCRIPTOR descriptor = {0}; + STORAGE_DEVICE_NUMBER device_number = {0}; HANDLE handle; DWORD error; DWORD size; @@ -654,6 +655,21 @@ static void test_disk_query_property(void) ok(descriptor.Version == sizeof(descriptor), "got descriptor.Version %d\n", descriptor.Version); ok(descriptor.Size >= sizeof(descriptor), "got descriptor.Size %d\n", descriptor.Size); + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 0, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + + /* unclean call with correctly in_buffer=NULL but incorrectly in_size=4 */ + SetLastError(0xdeadbeef); + ret = DeviceIoControl(handle, IOCTL_STORAGE_GET_DEVICE_NUMBER, NULL, 4, &device_number, sizeof(device_number), &size, NULL); + error = GetLastError(); + ok(ret, "expect ret %#x, got %#x\n", TRUE, ret); + ok(error == 0xdeadbeef, "expect err %#x, got err %#x\n", 0xdeadbeef, error); + ok(size == sizeof(device_number), "got size %d\n", size); + CloseHandle(handle); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 10d8f3de4a3..a47a371cb82 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4921,6 +4921,8 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (status != STATUS_PENDING) free( async ); + if (wait_handle && status == STATUS_ACCESS_VIOLATION) + ERR("Sending request failed but wait requested. Expect the application to hang.\n"); if (wait_handle) status = wait_async( wait_handle, (options & FILE_SYNCHRONOUS_IO_ALERT) ); return status; } diff --git a/include/wine/server.h b/include/wine/server.h index 57bcdbbb00d..d0cc2a98874 100644 --- a/include/wine/server.h +++ b/include/wine/server.h @@ -71,7 +71,7 @@ static inline data_size_t wine_server_reply_size( const void *reply ) 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; - if (size) + if (size && ptr != NULL) { req->data[req->data_count].ptr = ptr; req->data[req->data_count++].size = size; -- 2.33.0

1 0

[PATCH v2 01/10] winmm: Correctly check parameters in joyGetDevCaps(A|W).
by Rémi Bernon Dec. 9, 2021

Dec. 9, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Pass a size to joyGetDevCapsW matching the one passed to joyGetDevCapsA, fixing some tests, as the winejoystick.drv isn't accepting JOYCAPS2W sizes for the moment. dlls/winmm/joystick.c | 99 ++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 2b1811d3778..bb8142a29a9 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -167,64 +167,77 @@ UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) /************************************************************************** * joyGetDevCapsW [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW(UINT_PTR wID, LPJOYCAPSW lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, UINT size ) { - if (wID >= MAXJOYSTICK) return JOYERR_PARMS; - if (!JOY_LoadDriver(wID)) return MMSYSERR_NODRIVER; + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); - lpCaps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ - lpCaps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSW) && size != sizeof(JOYCAPS2W)) return JOYERR_PARMS; - return SendDriverMessage(JOY_Sticks[wID].hDriver, JDD_GETDEVCAPS, (LPARAM)lpCaps, wSize); + if (id >= MAXJOYSTICK) return JOYERR_PARMS; + if (!JOY_LoadDriver( id )) return MMSYSERR_NODRIVER; + + caps->wPeriodMin = JOY_PERIOD_MIN; /* FIXME */ + caps->wPeriodMax = JOY_PERIOD_MAX; /* FIXME (same as MS Joystick Driver) */ + + return SendDriverMessage( JOY_Sticks[id].hDriver, JDD_GETDEVCAPS, (LPARAM)caps, size ); } /************************************************************************** * joyGetDevCapsA [WINMM.@] */ -MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA(UINT_PTR wID, LPJOYCAPSA lpCaps, UINT wSize) +MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA( UINT_PTR id, JOYCAPSA *caps, UINT size ) { - JOYCAPSW jcw; - MMRESULT ret; + UINT size_w = sizeof(JOYCAPS2W); + JOYCAPS2W caps_w; + MMRESULT res; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; + TRACE( "id %d, caps %p, size %u.\n", (int)id, caps, size ); - ret = joyGetDevCapsW(wID, &jcw, sizeof(jcw)); + if (!caps) return MMSYSERR_INVALPARAM; + if (size != sizeof(JOYCAPSA) && size != sizeof(JOYCAPS2A)) return JOYERR_PARMS; - if (ret == JOYERR_NOERROR) + if (size == sizeof(JOYCAPSA)) size_w = sizeof(JOYCAPSW); + res = joyGetDevCapsW( id, (JOYCAPSW *)&caps_w, size_w ); + if (res) return res; + + caps->wMid = caps_w.wMid; + caps->wPid = caps_w.wPid; + WideCharToMultiByte( CP_ACP, 0, caps_w.szPname, -1, caps->szPname, + sizeof(caps->szPname), NULL, NULL ); + caps->wXmin = caps_w.wXmin; + caps->wXmax = caps_w.wXmax; + caps->wYmin = caps_w.wYmin; + caps->wYmax = caps_w.wYmax; + caps->wZmin = caps_w.wZmin; + caps->wZmax = caps_w.wZmax; + caps->wNumButtons = caps_w.wNumButtons; + caps->wPeriodMin = caps_w.wPeriodMin; + caps->wPeriodMax = caps_w.wPeriodMax; + caps->wRmin = caps_w.wRmin; + caps->wRmax = caps_w.wRmax; + caps->wUmin = caps_w.wUmin; + caps->wUmax = caps_w.wUmax; + caps->wVmin = caps_w.wVmin; + caps->wVmax = caps_w.wVmax; + caps->wCaps = caps_w.wCaps; + caps->wMaxAxes = caps_w.wMaxAxes; + caps->wNumAxes = caps_w.wNumAxes; + caps->wMaxButtons = caps_w.wMaxButtons; + WideCharToMultiByte( CP_ACP, 0, caps_w.szRegKey, -1, caps->szRegKey, + sizeof(caps->szRegKey), NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, caps_w.szOEMVxD, -1, caps->szOEMVxD, + sizeof(caps->szOEMVxD), NULL, NULL ); + + if (size == sizeof(JOYCAPS2A)) { - lpCaps->wMid = jcw.wMid; - lpCaps->wPid = jcw.wPid; - WideCharToMultiByte( CP_ACP, 0, jcw.szPname, -1, lpCaps->szPname, - sizeof(lpCaps->szPname), NULL, NULL ); - lpCaps->wXmin = jcw.wXmin; - lpCaps->wXmax = jcw.wXmax; - lpCaps->wYmin = jcw.wYmin; - lpCaps->wYmax = jcw.wYmax; - lpCaps->wZmin = jcw.wZmin; - lpCaps->wZmax = jcw.wZmax; - lpCaps->wNumButtons = jcw.wNumButtons; - lpCaps->wPeriodMin = jcw.wPeriodMin; - lpCaps->wPeriodMax = jcw.wPeriodMax; - - if (wSize >= sizeof(JOYCAPSA)) { /* Win95 extensions ? */ - lpCaps->wRmin = jcw.wRmin; - lpCaps->wRmax = jcw.wRmax; - lpCaps->wUmin = jcw.wUmin; - lpCaps->wUmax = jcw.wUmax; - lpCaps->wVmin = jcw.wVmin; - lpCaps->wVmax = jcw.wVmax; - lpCaps->wCaps = jcw.wCaps; - lpCaps->wMaxAxes = jcw.wMaxAxes; - lpCaps->wNumAxes = jcw.wNumAxes; - lpCaps->wMaxButtons = jcw.wMaxButtons; - WideCharToMultiByte( CP_ACP, 0, jcw.szRegKey, -1, lpCaps->szRegKey, - sizeof(lpCaps->szRegKey), NULL, NULL ); - WideCharToMultiByte( CP_ACP, 0, jcw.szOEMVxD, -1, lpCaps->szOEMVxD, - sizeof(lpCaps->szOEMVxD), NULL, NULL ); - } + JOYCAPS2A *caps2_a = (JOYCAPS2A *)caps; + caps2_a->ManufacturerGuid = caps_w.ManufacturerGuid; + caps2_a->ProductGuid = caps_w.ProductGuid; + caps2_a->NameGuid = caps_w.NameGuid; } - return ret; + return JOYERR_NOERROR; } /************************************************************************** -- 2.34.0

3 21

[PATCH v4 1/5] include: Define fast fail codes and the __fastfail() intrinsic.
by Jinoh Kang Dec. 9, 2021

Dec. 9, 2021

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..e80c10bd49c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -915,6 +915,122 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +#if defined(__GNUC__) +#if defined(__x86_64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("rcx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__i386__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("ecx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__aarch64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("x0") = code; + __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__arm__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("r0") = code; + __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#endif /* __x86_64__ */ +#elif defined(_MSC_VER) && (_MSC_VER >= 1610) +DECLSPEC_NORETURN void __fastfail(unsigned int); +#pragma intrinsic(__fastfail) +#endif /* __GNUC__ */ + + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 -- 2.34.1

3 6

[PATCH 2/2] d3d11: Handle D3D11_FEATURE_D3D9_OPTIONS in d3d11_device_CheckFeatureSupport().
by Henri Verbeet Dec. 9, 2021

Dec. 9, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Just implement the feature query. dlls/d3d11/device.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 417638bf314..546449037ce 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3941,6 +3941,28 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_D3D9_OPTIONS: + { + D3D11_FEATURE_DATA_D3D9_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); + wined3d_mutex_unlock(); + if (FAILED(hr)) + { + WARN("Failed to get device caps, hr %#x.\n", hr); + return hr; + } + + options->FullNonPow2TextureSupport = !(wined3d_caps.TextureCaps & WINED3DPTEXTURECAPS_POW2); + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; -- 2.30.2

1 0

[PATCH 1/2] wined3d: Use the access flags used to create the bo for persistent maps in wined3d_bo_gl_map().
by Henri Verbeet Dec. 9, 2021

Dec. 9, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 6391f6788e9..c08e44ce372 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2711,14 +2711,24 @@ map: gl_info = context_gl->gl_info; wined3d_context_gl_bind_bo(context_gl, bo->binding, bo->id); - 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; - } + if (gl_info->supported[ARB_BUFFER_STORAGE] && wined3d_map_persistent()) + { + GLbitfield gl_flags; + + /* When mapping the bo persistently, we need to use the access flags + * used to create the bo, instead of the access flags passed to the + * map call. Otherwise, if for example the initial map call that + * caused the bo to be persistently mapped was a read-only map, + * subsequent write access to the bo would be undefined. */ + gl_flags = bo->flags & ~GL_CLIENT_STORAGE_BIT; + gl_flags |= GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + if (!(gl_flags & GL_MAP_READ_BIT)) + gl_flags |= GL_MAP_UNSYNCHRONIZED_BIT; + if (gl_flags & GL_MAP_WRITE_BIT) + gl_flags |= GL_MAP_FLUSH_EXPLICIT_BIT; + + if ((map_ptr = GL_EXTCALL(glMapBufferRange(bo->binding, 0, bo->size, gl_flags)))) + bo->b.map_ptr = map_ptr; } else if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) { -- 2.30.2

1 0