- Wine-Commits - list.winehq.org

Conor McCarthy : tests/d3d12: Do not test a typed UAV in test_atomic_instructions().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: bb2a79a8fb25bb737e23aa8bd4f92abdd656223f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bb2a79a8fb25bb737e23aa8bd4f92… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Apr 21 14:19:33 2024 +1000 tests/d3d12: Do not test a typed UAV in test_atomic_instructions(). A shader typed UAV declaration must not map to a root descriptor UAV. We now have shader runner tests for typed UAV atomics, so there is no need to modify this test to use a descriptor heap. --- tests/d3d12.c | 136 +++++++++++++++++++--------------------------------------- 1 file changed, 45 insertions(+), 91 deletions(-)

1 0

Alexandros Frantzis : server: Fix handling of KEYEVENTF_UNICODE inputs with a non-zero vkey.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 85f1ad64c42a057d6f3fad30ed745ec63b9039ab URL: https://gitlab.winehq.org/wine/wine/-/commit/85f1ad64c42a057d6f3fad30ed745e… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue May 21 11:08:21 2024 +0300 server: Fix handling of KEYEVENTF_UNICODE inputs with a non-zero vkey. --- dlls/user32/tests/input.c | 4 ++-- server/queue.c | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f332aeddd08..c123f8fa439 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1163,9 +1163,9 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W struct send_input_keyboard_test unicode_vkey[] = { {.scan = 0x3c0, .vkey = vkey, .flags = KEYEVENTF_UNICODE, .expect_state = {/*[vkey] = 0x80*/}, - .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0xc0, vkey, .todo_value = TRUE), WIN_MSG(WM_CHAR, wch, MAKELONG(1, 0xc0), .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, vkey), KEY_MSG(WM_KEYDOWN, 0xc0, vkey), WIN_MSG(WM_CHAR, wch, MAKELONG(1, 0xc0)), {0}}}, {.scan = 0x3c0, .vkey = vkey, .flags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP, - .expect = {KEY_HOOK(WM_KEYUP, 0xc0, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0xc0, vkey, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, 0xc0, vkey), KEY_MSG(WM_KEYUP, 0xc0, vkey), {0}}}, {0}, }; diff --git a/server/queue.c b/server/queue.c index 629042feb93..6d4396234f2 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2098,6 +2098,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c unsigned char vkey = input->kbd.vkey, hook_vkey = vkey; unsigned int message_code, time; lparam_t lparam = input->kbd.scan << 16; + unsigned int flags = 0; int wait; if (!(time = input->kbd.time)) time = get_tick_count(); @@ -2213,29 +2214,25 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg->win = get_user_full_handle( win ); msg->msg = message_code; - msg->lparam = lparam | 1u; /* repeat count */ if (origin == IMO_INJECTED) msg_data->flags = LLKHF_INJECTED; if (input->kbd.flags & KEYEVENTF_UNICODE && !vkey) { - msg->wparam = VK_PACKET; + vkey = hook_vkey = VK_PACKET; } else { - unsigned int flags = 0; if (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED; /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ if (input->kbd.flags & KEYEVENTF_KEYUP) flags |= KF_REPEAT | KF_UP; else if (desktop->keystate[vkey] & 0x80) flags |= KF_REPEAT; - msg->wparam = vkey; - msg->lparam |= flags << 16; + lparam &= 0xff0000; /* mask off scan code high bits for non-unicode input */ msg_data->flags |= (flags & (KF_EXTENDED | KF_ALTDOWN | KF_UP)) >> 8; } - /* TODO: The following is incorrect (we also need to check for not !vkey), - * but we do it to temporarily retain existing behavior */ - if (input->kbd.flags & KEYEVENTF_UNICODE) hook_vkey = VK_PACKET; + msg->wparam = vkey; + msg->lparam = (flags << 16) | lparam | 1u /* repeat count */; if (!(wait = send_hook_ll_message( desktop, msg, WH_KEYBOARD_LL, lparam | hook_vkey, sender ))) queue_hardware_message( desktop, msg, 1 );

1 0

Rémi Bernon : server: Pass the adjusted vkey to send_hook_ll_message.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: d18bd43ba2c1b6d416c09f61cbbff8a3b85aca8e URL: https://gitlab.winehq.org/wine/wine/-/commit/d18bd43ba2c1b6d416c09f61cbbff8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 17:37:33 2024 +0200 server: Pass the adjusted vkey to send_hook_ll_message. --- server/queue.c | 57 +++++++++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/server/queue.c b/server/queue.c index c4b9389695f..629042feb93 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1738,13 +1738,12 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg /* send the low-level hook message for a given hardware message */ static int send_hook_ll_message( struct desktop *desktop, struct message *hardware_msg, - const hw_input_t *input, struct msg_queue *sender ) + int id, lparam_t lparam, struct msg_queue *sender ) { struct thread *hook_thread; struct msg_queue *queue; struct message *msg; timeout_t timeout = 2000 * -10000; /* FIXME: load from registry */ - int id = (input->type == INPUT_MOUSE) ? WH_MOUSE_LL : WH_KEYBOARD_LL; if (!(hook_thread = get_first_global_hook( id ))) return 0; if (!(queue = hook_thread->queue)) return 0; @@ -1756,20 +1755,13 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa msg->win = 0; msg->msg = id; msg->wparam = hardware_msg->msg; + msg->lparam = lparam; msg->x = hardware_msg->x; msg->y = hardware_msg->y; msg->time = hardware_msg->time; msg->data_size = hardware_msg->data_size; msg->result = NULL; - if (input->type == INPUT_KEYBOARD) - { - unsigned short vkey = input->kbd.vkey & 0xff; - if (input->kbd.flags & KEYEVENTF_UNICODE) vkey = VK_PACKET; - msg->lparam = (input->kbd.scan << 16) | vkey; - } - else msg->lparam = input->mouse.data << 16; - if (!(msg->data = memdup( hardware_msg->data, hardware_msg->data_size )) || !(msg->result = alloc_message_result( sender, queue, msg, timeout ))) { @@ -1996,6 +1988,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons struct thread *foreground; unsigned int i, time, flags; struct hw_msg_source source = { IMDT_MOUSE, origin }; + lparam_t wparam = input->mouse.data << 16; int wait = 0, x, y; static const unsigned int messages[] = @@ -2060,7 +2053,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if ((device = current->process->rawinput_mouse) && (device->flags & RIDEV_NOLEGACY)) { if (flags & MOUSEEVENTF_MOVE) update_desktop_cursor_pos( desktop, win, x, y ); - update_desktop_mouse_state( desktop, flags, input->mouse.data << 16 ); + update_desktop_mouse_state( desktop, flags, wparam ); return 0; } @@ -2075,7 +2068,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg->win = get_user_full_handle( win ); msg->msg = messages[i]; - msg->wparam = input->mouse.data << 16; + msg->wparam = wparam; msg->lparam = 0; msg->x = x; msg->y = y; @@ -2084,10 +2077,10 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons /* specify a sender only when sending the last message */ if (!(flags & ((1 << ARRAY_SIZE( messages )) - 1))) { - if (!(wait = send_hook_ll_message( desktop, msg, input, sender ))) + if (!(wait = send_hook_ll_message( desktop, msg, WH_MOUSE_LL, wparam, sender ))) queue_hardware_message( desktop, msg, 0 ); } - else if (!send_hook_ll_message( desktop, msg, input, NULL )) + else if (!send_hook_ll_message( desktop, msg, WH_MOUSE_LL, wparam, NULL )) queue_hardware_message( desktop, msg, 0 ); } return wait; @@ -2102,9 +2095,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c struct hardware_msg_data *msg_data; struct message *msg; struct thread *foreground; - unsigned char vkey = input->kbd.vkey; - hw_input_t hook_input = *input; + unsigned char vkey = input->kbd.vkey, hook_vkey = vkey; unsigned int message_code, time; + lparam_t lparam = input->kbd.scan << 16; int wait; if (!(time = input->kbd.time)) time = get_tick_count(); @@ -2179,17 +2172,17 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c { switch (vkey) { - case VK_INSERT: hook_input.kbd.vkey = vkey = VK_NUMPAD0; break; - case VK_END: hook_input.kbd.vkey = vkey = VK_NUMPAD1; break; - case VK_DOWN: hook_input.kbd.vkey = vkey = VK_NUMPAD2; break; - case VK_NEXT: hook_input.kbd.vkey = vkey = VK_NUMPAD3; break; - case VK_LEFT: hook_input.kbd.vkey = vkey = VK_NUMPAD4; break; - case VK_CLEAR: hook_input.kbd.vkey = vkey = VK_NUMPAD5; break; - case VK_RIGHT: hook_input.kbd.vkey = vkey = VK_NUMPAD6; break; - case VK_HOME: hook_input.kbd.vkey = vkey = VK_NUMPAD7; break; - case VK_UP: hook_input.kbd.vkey = vkey = VK_NUMPAD8; break; - case VK_PRIOR: hook_input.kbd.vkey = vkey = VK_NUMPAD9; break; - case VK_DELETE: hook_input.kbd.vkey = vkey = VK_DECIMAL; break; + case VK_INSERT: hook_vkey = vkey = VK_NUMPAD0; break; + case VK_END: hook_vkey = vkey = VK_NUMPAD1; break; + case VK_DOWN: hook_vkey = vkey = VK_NUMPAD2; break; + case VK_NEXT: hook_vkey = vkey = VK_NUMPAD3; break; + case VK_LEFT: hook_vkey = vkey = VK_NUMPAD4; break; + case VK_CLEAR: hook_vkey = vkey = VK_NUMPAD5; break; + case VK_RIGHT: hook_vkey = vkey = VK_NUMPAD6; break; + case VK_HOME: hook_vkey = vkey = VK_NUMPAD7; break; + case VK_UP: hook_vkey = vkey = VK_NUMPAD8; break; + case VK_PRIOR: hook_vkey = vkey = VK_NUMPAD9; break; + case VK_DELETE: hook_vkey = vkey = VK_DECIMAL; break; default: break; } } @@ -2220,7 +2213,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg->win = get_user_full_handle( win ); msg->msg = message_code; - msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */ + msg->lparam = lparam | 1u; /* repeat count */ if (origin == IMO_INJECTED) msg_data->flags = LLKHF_INJECTED; if (input->kbd.flags & KEYEVENTF_UNICODE && !vkey) @@ -2240,7 +2233,11 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data->flags |= (flags & (KF_EXTENDED | KF_ALTDOWN | KF_UP)) >> 8; } - if (!(wait = send_hook_ll_message( desktop, msg, &hook_input, sender ))) + /* TODO: The following is incorrect (we also need to check for not !vkey), + * but we do it to temporarily retain existing behavior */ + if (input->kbd.flags & KEYEVENTF_UNICODE) hook_vkey = VK_PACKET; + + if (!(wait = send_hook_ll_message( desktop, msg, WH_KEYBOARD_LL, lparam | hook_vkey, sender ))) queue_hardware_message( desktop, msg, 1 ); return wait; @@ -2315,7 +2312,7 @@ static void queue_pointer_message( struct pointer *pointer, int repeated ) msg->x = x; msg->y = y; - if (!send_hook_ll_message( desktop, msg, input, NULL )) + if (!send_hook_ll_message( desktop, msg, WH_MOUSE_LL, 0, NULL )) queue_hardware_message( desktop, msg, 0 ); }

1 0

Anton Baskanov : quartz: Use the correct stride when calculating image size in AVIDec.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: e6a6e6545b718de9f04536629b3e58fae0073c68 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6a6e6545b718de9f04536629b3e58… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 16 14:14:48 2024 +0700 quartz: Use the correct stride when calculating image size in AVIDec. --- dlls/quartz/avidec.c | 4 ++-- dlls/quartz/tests/avidec.c | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index f020d618fdb..d7f97e0380c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -361,8 +361,8 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface format->bmiHeader.biPlanes = sink_format->bmiHeader.biPlanes; format->bmiHeader.biBitCount = formats[index].bpp; format->bmiHeader.biCompression = formats[index].compression; - format->bmiHeader.biSizeImage = format->bmiHeader.biWidth - * format->bmiHeader.biHeight * formats[index].bpp / 8; + format->bmiHeader.biSizeImage = format->bmiHeader.biHeight * (((format->bmiHeader.biWidth + * formats[index].bpp + 31) / 8) & ~3); if (IsEqualGUID(formats[index].subtype, &MEDIASUBTYPE_RGB565)) { diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 6cb67563bcb..ac3a9abf2b1 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -1313,19 +1313,18 @@ static void test_connect_pin(void) const GUID *subtype; DWORD compression; WORD bpp; - BOOL todo; } expect[9] = { - {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8, TRUE}, - {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16, TRUE}, - {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16, TRUE}, - {&MEDIASUBTYPE_RGB32, BI_RGB, 32, FALSE}, - {&MEDIASUBTYPE_RGB24, BI_RGB, 24, TRUE}, - {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16, TRUE}, - {&MEDIASUBTYPE_RGB555, BI_RGB, 16, TRUE}, - {&MEDIASUBTYPE_RGB8, BI_RGB, 8, TRUE}, - {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12, FALSE}, + {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8}, + {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16}, + {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16}, + {&MEDIASUBTYPE_RGB32, BI_RGB, 32}, + {&MEDIASUBTYPE_RGB24, BI_RGB, 24}, + {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16}, + {&MEDIASUBTYPE_RGB555, BI_RGB, 16}, + {&MEDIASUBTYPE_RGB8, BI_RGB, 8}, + {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12}, }; VIDEOINFOHEADER expect_format = @@ -1351,9 +1350,9 @@ static void test_connect_pin(void) hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine_if(expect[i].todo) ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), + ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), "%u: Media types didn't match.\n", i); - todo_wine_if(expect[i].todo) ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), + ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), "%u: Format blocks didn't match.\n", i); if (i == 5) {

1 0

Ilia Docin : sane.ds: Add missing color modes setting support.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 104d47beae48112a8b5e8e3491d3edd35e93a7f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/104d47beae48112a8b5e8e3491d3ed… Author: Ilia Docin <ilya.docin(a)contentai.ru> Date: Wed May 22 16:19:50 2024 +0300 sane.ds: Add missing color modes setting support. --- dlls/sane.ds/capability.c | 72 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 37 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 560b670ae4d..555575c45a4 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -277,27 +277,45 @@ static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action return twCC; } -static BOOL pixeltype_to_sane_mode(TW_UINT16 pixeltype, char *mode, int len) +static TW_UINT16 set_color_mode(TW_UINT32 pixeltype) { - const char *m = NULL; + TW_UINT16 twCC = TWCC_BADCAP; + BOOL reload = FALSE; + int i; + const char * const * modes; + /* most of the values are taken from https://gitlab.gnome.org/GNOME/simple-scan/-/blob/master/src/scanner.vala */ + static const char * const gray[] = {"Gray", "Grayscale", "True Gray", "8-bit Grayscale", "Grayscale - 256 Levels", "gray", + 0}; + static const char * const rgb[] = {"Color", "24bit Color[Fast]", "24bit Color", + "24 bit Color", "Color - 16 Million Colors", 0}; + static const char * const bw[] = {"Lineart", "LineArt", "Black & White", "Binary", "Thresholded", "1-bit Black & White", + "Black and White - Line Art", "Black and White - Halftone", "Monochrome", 0}; switch (pixeltype) { case TWPT_GRAY: - m = "Gray"; + modes = gray; break; case TWPT_RGB: - m = "Color"; + modes = rgb; break; case TWPT_BW: - m = "Lineart"; + modes = bw; + break; + default: + ERR("Unsupported pixeltype %lu\n", pixeltype); + return TWCC_BADVALUE; + break; + } + TRACE("Setting pixeltype to %lu\n", pixeltype); + for(i=0; modes[i]; ++i) + { + twCC = sane_option_set_str("mode", (char*)modes[i], &reload); + if (twCC == TWCC_SUCCESS) { + if (reload) get_sane_params(&activeDS.frame_params); break; + } } - if (! m) - return FALSE; - if (strlen(m) >= len) - return FALSE; - strcpy(mode, m); - return TRUE; + return twCC; } /* ICAP_PIXELTYPE */ @@ -307,9 +325,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio TW_UINT32 possible_values[3]; int possible_value_count; TW_UINT32 val; - BOOL reload = FALSE; TW_UINT16 current_pixeltype = TWPT_BW; - char mode[64]; TRACE("ICAP_PIXELTYPE\n"); @@ -345,17 +361,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio if (twCC == TWCC_SUCCESS) { TRACE("Setting pixeltype to %ld\n", val); - if (! pixeltype_to_sane_mode(val, mode, sizeof(mode))) - return TWCC_BADVALUE; - - twCC = sane_option_set_str("mode", mode, &reload); - /* Some SANE devices use 'Grayscale' instead of the standard 'Gray' */ - if (twCC != TWCC_SUCCESS && strcmp(mode, "Gray") == 0) - { - strcpy(mode, "Grayscale"); - twCC = sane_option_set_str("mode", mode, &reload); - } - if (reload) get_sane_params( &activeDS.frame_params ); + twCC = set_color_mode(val); } break; @@ -364,19 +370,11 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio break; case MSG_RESET: - current_pixeltype = activeDS.defaultPixelType; - if (! pixeltype_to_sane_mode(current_pixeltype, mode, sizeof(mode))) - return TWCC_BADVALUE; - - twCC = sane_option_set_str("mode", mode, &reload); - /* Some SANE devices use 'Grayscale' instead of the standard 'Gray' */ - if (twCC != TWCC_SUCCESS && strcmp(mode, "Gray") == 0) - { - strcpy(mode, "Grayscale"); - twCC = sane_option_set_str("mode", mode, &reload); - } - if (twCC != TWCC_SUCCESS) break; - if (reload) get_sane_params( &activeDS.frame_params ); + twCC = set_color_mode(activeDS.defaultPixelType); + if (twCC == TWCC_SUCCESS) + current_pixeltype = activeDS.defaultPixelType; + else + ERR("Unable to reset color mode\n"); /* .. fall through intentional .. */

1 0

Anton Baskanov : quartz: Hold the streaming lock while calling ICDecompressEnd.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: a91a7bf5a7602afa0e735f69782897a497290f25 URL: https://gitlab.winehq.org/wine/wine/-/commit/a91a7bf5a7602afa0e735f69782897… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 16 14:17:09 2024 +0700 quartz: Hold the streaming lock while calling ICDecompressEnd. Otherwise, the streaming thread might try to access the decompressor while it's being destroyed. --- dlls/quartz/avidec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index d7f97e0380c..f494efdf1e8 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -573,10 +573,16 @@ static HRESULT avi_decompressor_cleanup_stream(struct strmbase_filter *iface) if (!filter->source.pin.peer) return S_OK; - if (filter->hvid && (res = ICDecompressEnd(filter->hvid))) + if (filter->hvid) { - ERR("ICDecompressEnd() failed, error %Id.\n", res); - return E_FAIL; + EnterCriticalSection(&filter->filter.stream_cs); + res = ICDecompressEnd(filter->hvid); + LeaveCriticalSection(&filter->filter.stream_cs); + if (res) + { + ERR("ICDecompressEnd() failed, error %Id.\n", res); + return E_FAIL; + } } IMemAllocator_Decommit(filter->source.pAllocator);

1 0

Anton Baskanov : quartz/tests: Use unaligned width in AVIDec tests to expose incorrect stride calculation.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 5e592a8e74715c8ffbef03493e035fb7b63fa56f URL: https://gitlab.winehq.org/wine/wine/-/commit/5e592a8e74715c8ffbef03493e035f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue May 21 13:19:29 2024 +0700 quartz/tests: Use unaligned width in AVIDec tests to expose incorrect stride calculation. --- dlls/quartz/tests/avidec.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index f28dfee7402..aa3aada3acc 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -85,10 +85,10 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, out->biSize = sizeof(BITMAPINFOHEADER); out->biCompression = mmioFOURCC('I','4','2','0'); - out->biWidth = 32; + out->biWidth = 29; out->biHeight = 24; out->biBitCount = 12; - out->biSizeImage = 32 * 24 * 12 / 8; + out->biSizeImage = 24 * (((29 * 12 + 31) / 8) & ~3); return ICERR_OK; } @@ -159,7 +159,7 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, for (i = 0; i < 200; ++i) expect[i] = i; ok(!memcmp(params->lpInput, expect, 200), "Data didn't match.\n"); - for (i = 0; i < 32 * 24 * 12 / 8; ++i) + for (i = 0; i < 24 * (((29 * 12 + 31) / 8) & ~3); ++i) output[i] = 111 - i; return ICERR_OK; @@ -876,7 +876,7 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); - BYTE *data, expect[32 * 24 * 12 / 8]; + BYTE *data, expect[24 * (((29 * 12 + 31) / 8) & ~3)]; REFERENCE_TIME start, stop; LONG size, i; HRESULT hr; @@ -884,9 +884,9 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample ++filter->got_sample; size = IMediaSample_GetSize(sample); - ok(size == 32 * 24 * 12 / 8, "Got size %lu.\n", size); + ok(size == 24 * (((29 * 12 + 31) / 8) & ~3), "Got size %lu.\n", size); size = IMediaSample_GetActualDataLength(sample); - ok(size == 32 * 24 * 12 / 8, "Got valid size %lu.\n", size); + ok(size == 24 * (((29 * 12 + 31) / 8) & ~3), "Got valid size %lu.\n", size); hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1221,7 +1221,7 @@ static void test_connect_pin(void) { .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), .bmiHeader.biCompression = test_handler, - .bmiHeader.biWidth = 32, + .bmiHeader.biWidth = 29, .bmiHeader.biHeight = 24, .bmiHeader.biBitCount = 16, }; @@ -1313,28 +1313,29 @@ static void test_connect_pin(void) const GUID *subtype; DWORD compression; WORD bpp; + BOOL todo; } expect[9] = { - {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8}, - {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16}, - {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16}, - {&MEDIASUBTYPE_RGB32, BI_RGB, 32}, - {&MEDIASUBTYPE_RGB24, BI_RGB, 24}, - {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16}, - {&MEDIASUBTYPE_RGB555, BI_RGB, 16}, - {&MEDIASUBTYPE_RGB8, BI_RGB, 8}, - {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12}, + {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8, TRUE}, + {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16, TRUE}, + {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16, TRUE}, + {&MEDIASUBTYPE_RGB32, BI_RGB, 32, FALSE}, + {&MEDIASUBTYPE_RGB24, BI_RGB, 24, TRUE}, + {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16, TRUE}, + {&MEDIASUBTYPE_RGB555, BI_RGB, 16, TRUE}, + {&MEDIASUBTYPE_RGB8, BI_RGB, 8, TRUE}, + {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12, FALSE}, }; VIDEOINFOHEADER expect_format = { .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), - .bmiHeader.biWidth = 32, + .bmiHeader.biWidth = 29, .bmiHeader.biHeight = 24, .bmiHeader.biBitCount = expect[i].bpp, .bmiHeader.biCompression = expect[i].compression, - .bmiHeader.biSizeImage = 32 * 24 * expect[i].bpp / 8, + .bmiHeader.biSizeImage = 24 * (((29 * expect[i].bpp + 31) / 8) & ~3), }; AM_MEDIA_TYPE expect_mt = @@ -1342,7 +1343,7 @@ static void test_connect_pin(void) .majortype = MEDIATYPE_Video, .subtype = *expect[i].subtype, .bFixedSizeSamples = TRUE, - .lSampleSize = 32 * 24 * expect[i].bpp / 8, + .lSampleSize = 24 * (((29 * expect[i].bpp + 31) / 8) & ~3), .formattype = FORMAT_VideoInfo, .cbFormat = sizeof(VIDEOINFOHEADER), .pbFormat = (BYTE *)&expect_format, @@ -1350,9 +1351,9 @@ static void test_connect_pin(void) hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), + todo_wine_if(expect[i].todo) ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), "%u: Media types didn't match.\n", i); - ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), + todo_wine_if(expect[i].todo) ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), "%u: Format blocks didn't match.\n", i); if (i == 5) {

1 0

Anton Baskanov : quartz: Get output format from source, not sink in AVIDec.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: a2996078bf1b4e4f20c26a02011d3cf349765c4b URL: https://gitlab.winehq.org/wine/wine/-/commit/a2996078bf1b4e4f20c26a02011d3c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 16 14:11:24 2024 +0700 quartz: Get output format from source, not sink in AVIDec. --- dlls/quartz/avidec.c | 2 +- dlls/quartz/tests/avidec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 8cc729748c1..f020d618fdb 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -552,7 +552,7 @@ static HRESULT avi_decompressor_init_stream(struct strmbase_filter *iface) filter->late = -1; - source_format = (VIDEOINFOHEADER *)filter->sink.pin.mt.pbFormat; + source_format = (VIDEOINFOHEADER *)filter->source.pin.mt.pbFormat; if ((res = ICDecompressBegin(filter->hvid, filter->pBihIn, &source_format->bmiHeader))) { ERR("ICDecompressBegin() failed, error %Id.\n", res); diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index aa3aada3acc..6cb67563bcb 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -119,7 +119,7 @@ static LRESULT CALLBACK vfw_driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, todo_wine_if (in->biSizeImage != sink_bitmap_info.biSizeImage) ok(!memcmp(in, &sink_bitmap_info, sizeof(BITMAPINFOHEADER)), "Input types didn't match.\n"); - todo_wine ok(!memcmp(out, &source_bitmap_info, sizeof(BITMAPINFOHEADER)), + ok(!memcmp(out, &source_bitmap_info, sizeof(BITMAPINFOHEADER)), "Output types didn't match.\n"); ok(!in_begin, "Got multiple ICM_DECOMPRESS_BEGIN messages.\n"); in_begin = 1;

1 0

Alexandre Julliard : msvcrt/tests: Use function pointers to bypass builtin malloc/realloc.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: a9689eb62c6bd35aecb00f83216f04fe2ba96c74 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9689eb62c6bd35aecb00f83216f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 22:28:33 2024 +0200 msvcrt/tests: Use function pointers to bypass builtin malloc/realloc. --- dlls/msvcrt/tests/heap.c | 50 +++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index a747482130d..e6de728f2b7 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -467,6 +467,35 @@ static void test_sbheap(void) free(mem); } +static void test_malloc(void) +{ + /* use function pointers to bypass gcc builtins */ + void *(__cdecl *p_malloc)(size_t); + void *(__cdecl *p_realloc)(void *,size_t); + void *mem; + + p_malloc = (void *)GetProcAddress( GetModuleHandleA("msvcrt.dll"), "malloc"); + p_realloc = (void *)GetProcAddress( GetModuleHandleA("msvcrt.dll"), "realloc"); + + mem = p_malloc(0); + ok(mem != NULL, "memory not allocated for size 0\n"); + free(mem); + + mem = p_realloc(NULL, 10); + ok(mem != NULL, "memory not allocated\n"); + + mem = p_realloc(mem, 20); + ok(mem != NULL, "memory not reallocated\n"); + + mem = p_realloc(mem, 0); + ok(mem == NULL, "memory not freed\n"); + + mem = p_realloc(NULL, 0); + ok(mem != NULL, "memory not (re)allocated for size 0\n"); + + free(mem); +} + static void test_calloc(void) { /* use function pointer to bypass gcc builtin */ @@ -496,27 +525,8 @@ static void test_calloc(void) START_TEST(heap) { - void *mem; - - mem = malloc(0); - ok(mem != NULL, "memory not allocated for size 0\n"); - free(mem); - - mem = realloc(NULL, 10); - ok(mem != NULL, "memory not allocated\n"); - - mem = realloc(mem, 20); - ok(mem != NULL, "memory not reallocated\n"); - - mem = realloc(mem, 0); - ok(mem == NULL, "memory not freed\n"); - - mem = realloc(NULL, 0); - ok(mem != NULL, "memory not (re)allocated for size 0\n"); - - free(mem); - test_aligned(); test_sbheap(); + test_malloc(); test_calloc(); }

1 0

Alexandre Julliard : msvcp: Use RVAs in rtti and exception data on all platforms except i386.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 44691e8de328c40cd229a7bfe0a051be90623f2c URL: https://gitlab.winehq.org/wine/wine/-/commit/44691e8de328c40cd229a7bfe0a051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 13:50:48 2024 +0200 msvcp: Use RVAs in rtti and exception data on all platforms except i386. --- dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcp140_1/msvcp140_1.c | 2 +- dlls/msvcp60/ios.c | 2 +- dlls/msvcp90/cxx.h | 2 +- dlls/msvcp90/details.c | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/misc.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0fcdc52c203..05e3aee4b6a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -5162,7 +5162,7 @@ static void init_io(void *base) { filebuf *fb; -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_streambuf_rtti(base); init_filebuf_rtti(base); init_strstreambuf_rtti(base); diff --git a/dlls/msvcp140_1/msvcp140_1.c b/dlls/msvcp140_1/msvcp140_1.c index c6a6ff19f13..c9ca98df268 100644 --- a/dlls/msvcp140_1/msvcp140_1.c +++ b/dlls/msvcp140_1/msvcp140_1.c @@ -263,7 +263,7 @@ static BOOL init_cxx_funcs(void) static void init_rtti(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_type_info_rtti(base); init_base_memory_resource_rtti(base); init__Identity_equal_resource_rtti(base); diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 3da714375f4..891c126b6be 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -11154,7 +11154,7 @@ void* __thiscall _Winit_op_assign(void *this, void *rhs) void init_io(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_iosb_rtti(base); init_ios_base_rtti(base); init_basic_ios_char_rtti(base); diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index c0b43f78256..8037d7def56 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -21,7 +21,7 @@ #include "rtlsupportapi.h" #include "wine/asm.h" -#ifndef __x86_64__ +#ifdef __i386__ #undef RTTI_USE_RVA #else #define RTTI_USE_RVA 1 diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index 98579dfa991..984a277ed12 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1118,7 +1118,7 @@ __ASM_BLOCK_END void init_concurrency_details(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init__Concurrent_queue_base_v4_rtti(base); init__Runtime_object_rtti(base); #endif diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 3d569d8d855..5c8e5e85e18 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1497,7 +1497,7 @@ void DECLSPEC_NORETURN throw_failure(const char *str) void init_exception(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_type_info_rtti(base); init_exception_rtti(base); init_bad_alloc_rtti(base); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1240bb537c9..25b5d7fe1a0 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15837,7 +15837,7 @@ void* __thiscall _Winit_op_assign(void *this, void *rhs) void init_io(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init_iosb_rtti(base); init_ios_base_rtti(base); init_basic_ios_char_rtti(base); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b6af02dea42..4eaf679139c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -13336,7 +13336,7 @@ __ASM_BLOCK_END void init_locale(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA init__Facet_base_rtti(base); init_locale_facet_rtti(base); init_locale__Locimp_rtti(base); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index e8998383ecc..a1c9c7f0646 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1781,7 +1781,7 @@ __ASM_BLOCK_END void init_misc(void *base) { -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA #if _MSVCP_VER >= 100 init_error_category_rtti(base); init_generic_category_rtti(base);

1 0