wine-commits July 2023

wine-commits@winehq.org

1 participants
865 discussions

Conor McCarthy : vkd3d-shader/dxil: Emit the shader instructions.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: vkd3d Branch: master Commit: 3e553aaaa7a5cba0dec4b23148c13a05d3920ee4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e553aaaa7a5cba0dec4b23148c13… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon May 22 16:21:46 2023 +1000 vkd3d-shader/dxil: Emit the shader instructions. Sufficient for compiling a no-op pixel shader. --- libs/vkd3d-shader/dxil.c | 47 ++++++++++++++++++++++++++++++++ libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 7011cd56..9dee9c40 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1737,6 +1737,27 @@ static enum vkd3d_result sm6_parser_constants_init(struct sm6_parser *sm6, const return VKD3D_OK; } +static struct vkd3d_shader_instruction *sm6_parser_require_space(struct sm6_parser *sm6, size_t extra) +{ + if (!shader_instruction_array_reserve(&sm6->p.instructions, sm6->p.instructions.count + extra)) + { + ERR("Failed to allocate instruction.\n"); + return NULL; + } + return &sm6->p.instructions.elements[sm6->p.instructions.count]; +} + +/* Space should be reserved before calling this. It is intended to require no checking of the returned pointer. */ +static struct vkd3d_shader_instruction *sm6_parser_add_instruction(struct sm6_parser *sm6, + enum vkd3d_shader_opcode handler_idx) +{ + struct vkd3d_shader_instruction *ins = sm6_parser_require_space(sm6, 1); + assert(ins); + shader_instruction_init(ins, handler_idx); + ++sm6->p.instructions.count; + return ins; +} + static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) { const struct dxil_block *block = &sm6->root_block; @@ -1932,6 +1953,21 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const return VKD3D_OK; } +static bool sm6_block_emit_instructions(struct sm6_block *block, struct sm6_parser *sm6) +{ + struct vkd3d_shader_instruction *ins = sm6_parser_require_space(sm6, block->instruction_count + 1); + + if (!ins) + return false; + + memcpy(ins, block->instructions, block->instruction_count * sizeof(*block->instructions)); + sm6->p.instructions.count += block->instruction_count; + + sm6_parser_add_instruction(sm6, VKD3DSIH_RET); + + return true; +} + static enum vkd3d_result sm6_parser_module_init(struct sm6_parser *sm6, const struct dxil_block *block, unsigned int level) { @@ -2066,6 +2102,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t struct vkd3d_shader_version version; struct dxil_block *block; enum vkd3d_result ret; + unsigned int i; count = byte_code_size / sizeof(*byte_code); if (count < 6) @@ -2255,6 +2292,16 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + for (i = 0; i < sm6->function_count; ++i) + { + if (!sm6_block_emit_instructions(sm6->functions[i].blocks[0], sm6)) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory emitting shader instructions."); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + } + dxil_block_destroy(&sm6->root_block); return VKD3D_OK; diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 11c2da5b..d74f81af 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -247,7 +247,7 @@ static void shader_register_init(struct vkd3d_shader_register *reg, enum vkd3d_s reg->immconst_type = VKD3D_IMMCONST_SCALAR; } -static void shader_instruction_init(struct vkd3d_shader_instruction *ins, enum vkd3d_shader_opcode handler_idx) +void shader_instruction_init(struct vkd3d_shader_instruction *ins, enum vkd3d_shader_opcode handler_idx) { memset(ins, 0, sizeof(*ins)); ins->handler_idx = handler_idx; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 49ad7b3e..233f3c86 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -976,6 +976,8 @@ struct vkd3d_shader_instruction } declaration; }; +void shader_instruction_init(struct vkd3d_shader_instruction *ins, enum vkd3d_shader_opcode handler_idx); + static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_shader_instruction *ins) { return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w;

1 0

Conor McCarthy : vkd3d-shader/spirv: Do not normalise Shader Model 6 shaders.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: vkd3d Branch: master Commit: f26d47585f70da091e0115c4954b4be50cfe09f0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f26d47585f70da091e0115c4954b4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Jun 3 00:23:49 2023 +1000 vkd3d-shader/spirv: Do not normalise Shader Model 6 shaders. --- libs/vkd3d-shader/ir.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1ce05247..11c2da5b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1199,6 +1199,9 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser) struct vkd3d_shader_instruction_array *instructions = &parser->instructions; enum vkd3d_result result = VKD3D_OK; + if (parser->shader_desc.is_dxil) + return result; + if (parser->shader_version.type == VKD3D_SHADER_TYPE_HULL && (result = instruction_array_flatten_hull_shader_phases(instructions)) >= 0) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Return an error from sm6_parser_globals_init() on invalid operand count.
by Alexandre Julliard 20 Jul '23

20 Jul '23

Module: vkd3d Branch: master Commit: 8fe6d2eeac9fd6cc1904ba12e0cb5800e2ccd946 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8fe6d2eeac9fd6cc1904ba12e0cb5… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jul 13 11:41:04 2023 +1000 vkd3d-shader/dxil: Return an error from sm6_parser_globals_init() on invalid operand count. --- libs/vkd3d-shader/dxil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 53a4c2da..7011cd56 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1767,7 +1767,8 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) break; case MODULE_CODE_VERSION: - dxil_record_validate_operand_count(record, 1, 1, sm6); + if (!dxil_record_validate_operand_count(record, 1, 1, sm6)) + return VKD3D_ERROR_INVALID_SHADER; if ((version = record->operands[0]) != 1) { FIXME("Unsupported format version %#"PRIx64".\n", version);

1 0

Brendan Shanks : winecoreaudio: Fix missing struct member in get_position() Wow64 thunk.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: de18372065589e88d14f947897a711532cfefb9a URL: https://gitlab.winehq.org/wine/wine/-/commit/de18372065589e88d14f947897a711… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 19 11:06:02 2023 -0700 winecoreaudio: Fix missing struct member in get_position() Wow64 thunk. --- dlls/winecoreaudio.drv/coreaudio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index fcf02401429..18b70738215 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -2112,6 +2112,7 @@ static NTSTATUS unix_wow64_get_position(void *args) struct { stream_handle stream; + BOOL device; HRESULT result; PTR32 pos; PTR32 qpctime; @@ -2119,6 +2120,7 @@ static NTSTATUS unix_wow64_get_position(void *args) struct get_position_params params = { .stream = params32->stream, + .device = params32->device, .pos = ULongToPtr(params32->pos), .qpctime = ULongToPtr(params32->qpctime) };

1 0

Zhiyi Zhang : winex11.drv: Move the dummy parent window to (0, 0).
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 35193586f78863810f6bb886abca2bc940890acd URL: https://gitlab.winehq.org/wine/wine/-/commit/35193586f78863810f6bb886abca2b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jul 19 17:25:46 2023 +0800 winex11.drv: Move the dummy parent window to (0, 0). Move the dummy parent window from (-1, -1) to (0, 0) so that the window is considered visible by Wayland. The X11 window region is set to an empty rectangle so that the window is still in fact invisible. If Xshape support is not compiled in, then fall back to using (-1, -1). This fixes poor performance when running Office 2016 on Xwayland. It's caused by glXWaitForSbcOML() in glxdrv_wglSwapBuffers() taking 1 second every time it gets called. The timeout is from TIMER_LEN_FLIP (1000ms) in xwl_present_reset_timer() in the xserver source code hw/xwayland/xwayland-present.c. Xwayland doesn't actually know when a frame is visible on screen[1][2]. It relies on a timer to simulate the process and when the window is invisible it uses a timer with a 1000ms timeout. This patch makes the dummy parent window visible so that Xwayland will use the timer with a 17ms timeout(~60fps), which also means that there will still be a 60fps limit for some windows when running on Xwayland. [1]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/971 [2]: https://gitlab.freedesktop.org/xorg/xserver/-/issues/973 --- dlls/winex11.drv/window.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 14490ecd028..9ada6a63d59 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1512,9 +1512,22 @@ Window get_dummy_parent(void) attrib.override_redirect = True; attrib.border_pixel = 0; attrib.colormap = default_colormap; + +#ifdef HAVE_LIBXSHAPE + { + static XRectangle empty_rect; + dummy_parent = XCreateWindow( gdi_display, root_window, 0, 0, 1, 1, 0, + default_visual.depth, InputOutput, default_visual.visual, + CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); + XShapeCombineRectangles( gdi_display, dummy_parent, ShapeBounding, 0, 0, &empty_rect, 1, + ShapeSet, YXBanded ); + } +#else dummy_parent = XCreateWindow( gdi_display, root_window, -1, -1, 1, 1, 0, default_visual.depth, InputOutput, default_visual.visual, CWColormap | CWBorderPixel | CWOverrideRedirect, &attrib ); + WARN("Xshape support is not compiled in. Applications under XWayland may have poor performance."); +#endif XMapWindow( gdi_display, dummy_parent ); } return dummy_parent;

1 0

Gabriel Ivăncescu : mshtml: Grab the binding while aborting it.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 8713e2ad6497e6eba63a4dd7136d47a80a430815 URL: https://gitlab.winehq.org/wine/wine/-/commit/8713e2ad6497e6eba63a4dd7136d47… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Jul 18 20:44:07 2023 +0300 mshtml: Grab the binding while aborting it. Holding the BindStatusCallback ref is not enough; Abort can end up calling OnStopBinding which intentionally removes the binding and releases its ref. urlmon's Abort will then have a use-after-free when accessing the state to set BINDING_ABORTED, if it was destroyed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/navigate.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 4706167875e..112b63ba4b1 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1993,10 +1993,16 @@ void abort_window_bindings(HTMLInnerWindow *window) IBindStatusCallback_AddRef(&iter->IBindStatusCallback_iface); - if(iter->binding) - IBinding_Abort(iter->binding); - else + if(iter->binding) { + IBinding *binding = iter->binding; + + /* Abort can end up calling our OnStopBinding, which releases the binding. */ + IBinding_AddRef(binding); + IBinding_Abort(binding); + IBinding_Release(binding); + }else { iter->vtbl->stop_binding(iter, E_ABORT); + } iter->window = NULL; list_remove(&iter->entry);

1 0

Francois Gouget : riched20/tests: Make the editor paste test failures more informative and unique.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: b8950d04e439f649f2167477a36ee453ad8b81ef URL: https://gitlab.winehq.org/wine/wine/-/commit/b8950d04e439f649f2167477a36ee4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 19 10:55:21 2023 +0200 riched20/tests: Make the editor paste test failures more informative and unique. Knowing the content of the edit field is more useful than knowing the strcmp() result. The text field may contain carriage returns and linefeeds so use wine_dbgstr_a() so they are clearly visible in the failure message. Also prefix the ok messages with a unique string to indicate which test_WM_PASTE() test failed. --- dlls/riched20/tests/editor.c | 61 ++++++++++++-------------------------------- 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 9682a4ad99f..f8abb7a3e65 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5606,16 +5606,12 @@ static void test_WM_PASTE(void) send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Pasted text should be visible at this step */ - result = strcmp(text1_step1, buffer); - ok(result == 0, - "test paste: strcmp = %i, text='%s'\n", result, buffer); + ok(strcmp(text1_step1, buffer) == 0, "1:Ctrl-V %s\n", wine_dbgstr_a(buffer)); send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ - result = strcmp(text1_after, buffer); - ok(result == 0, - "test paste: strcmp = %i, text='%s'\n", result, buffer); + ok(strcmp(text1_after, buffer) == 0, "1:Ctrl-Z %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text2); SendMessageA(hwndRichEdit, EM_SETSEL, 8, 13); @@ -5624,21 +5620,15 @@ static void test_WM_PASTE(void) send_ctrl_key(hwndRichEdit, 'V'); /* Paste */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Pasted text should be visible at this step */ - result = strcmp(text3, buffer); - ok(result == 0, - "test paste: strcmp = %i\n", result); + ok(strcmp(text3, buffer) == 0, "2:Ctrl-V %s\n", wine_dbgstr_a(buffer)); send_ctrl_key(hwndRichEdit, 'Z'); /* Undo */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Text should be the same as before (except for \r -> \r\n conversion) */ - result = strcmp(text2_after, buffer); - ok(result == 0, - "test paste: strcmp = %i\n", result); + ok(strcmp(text2_after, buffer) == 0, "2:Ctrl-Z %s\n", wine_dbgstr_a(buffer)); send_ctrl_key(hwndRichEdit, 'Y'); /* Redo */ SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Text should revert to post-paste state */ - result = strcmp(buffer,text3); - ok(result == 0, - "test paste: strcmp = %i\n", result); + ok(strcmp(buffer,text3) == 0, "2:Ctrl-Y %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); /* Send WM_CHAR to simulate Ctrl-V */ @@ -5646,9 +5636,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('V', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); /* Shouldn't paste because pasting is handled by WM_KEYDOWN */ - result = strcmp(buffer,""); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "") == 0, "3:Ctrl-V %s\n", wine_dbgstr_a(buffer)); /* Send keystrokes with WM_KEYDOWN after setting the modifiers * with SetKeyboard state. */ @@ -5660,9 +5648,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('V', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"paste"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "paste") == 0, "VK:Ctrl-V %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); SendMessageA(hwndRichEdit, EM_SETSEL, 0, 7); @@ -5674,9 +5660,7 @@ static void test_WM_PASTE(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"testing"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "testing") == 0, "VK:Ctrl-C %s\n", wine_dbgstr_a(buffer)); /* Cut with WM_KEYDOWN to simulate Ctrl-X */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"cut"); @@ -5689,30 +5673,22 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('X', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,""); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "") == 0, "VK:Ctrl-A,X %s\n", wine_dbgstr_a(buffer)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"cut\r\n"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "cut\r\n") == 0, "VK:paste %s\n", wine_dbgstr_a(buffer)); /* Simulates undo (Ctrl-Z) */ hold_key(VK_CONTROL); SendMessageA(hwndRichEdit, WM_KEYDOWN, 'Z', (MapVirtualKeyA('Z', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,""); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "") == 0, "VK:Ctrl-Z %s\n", wine_dbgstr_a(buffer)); /* Simulates redo (Ctrl-Y) */ SendMessageA(hwndRichEdit, WM_KEYDOWN, 'Y', (MapVirtualKeyA('Y', MAPVK_VK_TO_VSC) << 16) | 1); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer,"cut\r\n"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "cut\r\n") == 0, "VK:Ctrl-Y %s\n", wine_dbgstr_a(buffer)); release_key(VK_CONTROL); /* Copy multiline text to clipboard for future use */ @@ -5723,19 +5699,16 @@ static void test_WM_PASTE(void) /* Paste into read-only control */ result = SendMessageA(hwndRichEdit, EM_SETREADONLY, TRUE, 0); + ok(result, "ro:set failed\n"); SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer, text3); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, text3) == 0, "ro:paste %s\n", wine_dbgstr_a(buffer)); /* Cut from read-only control */ SendMessageA(hwndRichEdit, EM_SETSEL, 0, -1); SendMessageA(hwndRichEdit, WM_CUT, 0, 0); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer, text3); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, text3) == 0, "ro:cut %s\n", wine_dbgstr_a(buffer)); /* FIXME: Wine doesn't flush Ole clipboard when window is destroyed so do it manually */ OleFlushClipboard(); @@ -5745,9 +5718,7 @@ static void test_WM_PASTE(void) hwndRichEdit = new_richedit_with_style(NULL, 0); send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); - result = strcmp(buffer, "testing paste"); - ok(result == 0, - "test paste: strcmp = %i, actual = '%s'\n", result, buffer); + ok(strcmp(buffer, "testing paste") == 0, "multi:paste %s\n", wine_dbgstr_a(buffer)); DestroyWindow(hwndRichEdit); }

1 0

Francois Gouget : msvcrt/tests: Check that some functions are only available in 32-bit code.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: fc37683985168c952a3dc6fba3280d2845977168 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc37683985168c952a3dc6fba3280d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 10 17:17:24 2023 +0200 msvcrt/tests: Check that some functions are only available in 32-bit code. --- dlls/msvcrt/tests/environ.c | 20 ++++++-------------- dlls/msvcrt/tests/time.c | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 3d6b55dffa8..22f697a12ea 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -95,14 +95,10 @@ static void test__environ(void) return; } - /* Examine the returned pointer from __p__environ(), if available. */ - if (p__p__environ) - { - ok( *p__p__environ() == *p_environ, - "Expected _environ pointers to be identical\n" ); - } + if (sizeof(void*) != sizeof(int)) + ok( !p__p__environ, "__p__environ() should be 32-bit only\n"); else - skip( "__p__environ() is not available\n" ); + ok( *p__p__environ() == *p_environ, "Expected _environ pointers to be identical\n" ); if (p_get_environ) { @@ -158,14 +154,10 @@ static void test__wenviron(void) return; } - /* Examine the returned pointer from __p__wenviron(), if available. */ - if (p__p__wenviron) - { - ok( *p__p__wenviron() == NULL, - "Expected _wenviron pointers to be NULL\n" ); - } + if (sizeof(void*) != sizeof(int)) + ok( !p__p__wenviron, "__p__wenviron() should be 32-bit only\n"); else - skip( "__p__wenviron() is not available\n" ); + ok( *p__p__wenviron() == NULL, "Expected _wenviron pointers to be NULL\n" ); if (p_get_wenviron) { diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index d4e0ac40239..4ed17c940a9 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -590,15 +590,15 @@ static void test_daylight(void) return; } - if (!p___p__daylight) + /* Examine the returned pointer from __p__environ(), if available. */ + if (sizeof(void*) != sizeof(int)) + ok( !p___p__daylight, "___p__daylight() should be 32-bit only\n"); + else { - skip("__p__daylight not available\n"); - return; + ret1 = p__daylight(); + ret2 = p___p__daylight(); + ok(ret1 && ret1 == ret2, "got %p\n", ret1); } - - ret1 = p__daylight(); - ret2 = p___p__daylight(); - ok(ret1 && ret1 == ret2, "got %p\n", ret1); } static void test_strftime(void) @@ -907,8 +907,11 @@ static void test__tzset(void) char TZ_env[256]; int ret; - if(!p___p__daylight || !p___p__timezone || !p___p__dstbias) { - skip("__p__daylight, __p__timezone or __p__dstbias is not available\n"); + if (sizeof(void*) != sizeof(int)) + { + ok(!p___p__daylight, "___p__daylight() should be 32-bit only\n"); + ok(!p___p__timezone, "___p__timezone() should be 32-bit only\n"); + ok(!p___p__dstbias, "___p__dstbias() should be 32-bit only\n"); return; }

1 0

Francois Gouget : uxtheme/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 858811a9f5b24a3bbf0bcc841ebf2a3d2a19cb84 URL: https://gitlab.winehq.org/wine/wine/-/commit/858811a9f5b24a3bbf0bcc841ebf2a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 5 02:31:42 2023 +0200 uxtheme/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/uxtheme/tests/system.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index f8253c6a983..2e769625dab 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -173,17 +173,18 @@ static BOOL set_primary_monitor_effective_dpi(unsigned int primary_dpi) BOOL ret = FALSE; LONG error; -#define CHECK_FUNC(func) \ - if (!p##func) \ - { \ - skip("%s() is unavailable.\n", #func); \ - return FALSE; \ +#define CHECK_FUNC(func) \ + if (!p##func) \ + { \ + win_skip("%s() is unavailable.\n", #func); \ + ret = TRUE; \ } CHECK_FUNC(D3DKMTCloseAdapter) CHECK_FUNC(D3DKMTOpenAdapterFromGdiDisplayName) CHECK_FUNC(DisplayConfigGetDeviceInfo) - CHECK_FUNC(DisplayConfigSetDeviceInfo) + todo_wine CHECK_FUNC(DisplayConfigSetDeviceInfo) + if (ret) return FALSE; #undef CHECK_FUNC

1 0

Francois Gouget : user32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: d569196e95944686162c4cbd4c71e5cd2260d436 URL: https://gitlab.winehq.org/wine/wine/-/commit/d569196e95944686162c4cbd4c71e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 5 02:31:29 2023 +0200 user32/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/user32/tests/monitor.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6b7f7b44b15..429a55eb277 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2065,19 +2065,21 @@ static void test_DisplayConfigSetDeviceInfo(void) HKEY key; LONG ret; -#define CHECK_FUNC(func) \ - if (!p##func) \ - { \ - skip("%s() is unavailable.\n", #func); \ - return; \ +#define CHECK_FUNC(func) \ + if (!p##func) \ + { \ + win_skip("%s() is unavailable.\n", #func); \ + ret = TRUE; \ } + ret = FALSE; CHECK_FUNC(D3DKMTCloseAdapter) CHECK_FUNC(D3DKMTOpenAdapterFromGdiDisplayName) CHECK_FUNC(DisplayConfigGetDeviceInfo) - CHECK_FUNC(DisplayConfigSetDeviceInfo) + todo_wine CHECK_FUNC(DisplayConfigSetDeviceInfo) CHECK_FUNC(GetDpiForMonitorInternal) CHECK_FUNC(SetThreadDpiAwarenessContext) + if (ret) return; #undef CHECK_FUNC

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2023