January 2024 - Wine-Commits

Arkadiusz Hiler : winebus.sys: Use 4 bits for hat switches.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: e3431a02e1d23ad506512b906f244eae1db05035 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3431a02e1d23ad506512b906f244e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Jan 30 00:20:55 2024 +0200 winebus.sys: Use 4 bits for hat switches. Declaring them as 8 bits crashes game due to how Unity's native hid support parses the data. --- dlls/winebus.sys/hid.c | 74 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 733f9a51f96..d31718c6293 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -209,13 +209,14 @@ static BOOL hid_device_add_hatswitch_count(struct unix_device *iface, BYTE count ERR("hatswitches should be added before buttons!\n"); else if ((iface->hid_device_state.bit_size % 8)) ERR("hatswitches should be byte aligned, missing padding!\n"); - else if (iface->hid_device_state.bit_size + 8 * count > 0x80000) + else if (iface->hid_device_state.bit_size + 4 * (count + 1) > 0x80000) ERR("report size overflow, too many elements!\n"); else { if (!iface->hid_device_state.hatswitch_count) iface->hid_device_state.hatswitch_start = offset; iface->hid_device_state.hatswitch_count += count; - iface->hid_device_state.bit_size += 8 * count; + iface->hid_device_state.bit_size += 4 * count; + if (count % 2) iface->hid_device_state.bit_size += 4; return TRUE; } @@ -231,16 +232,28 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) USAGE(1, HID_USAGE_GENERIC_HATSWITCH), LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 8), - REPORT_SIZE(1, 8), + REPORT_SIZE(1, 4), REPORT_COUNT(4, count), UNIT(1, 0x0), /* None */ INPUT(1, Data|Var|Abs|Null), }; + const BYTE template_pad[] = + { + REPORT_COUNT(1, 4), + REPORT_SIZE(1, 1), + INPUT(1, Cnst|Ary|Abs), + }; if (!hid_device_add_hatswitch_count(iface, count)) return FALSE; - return hid_report_descriptor_append(desc, template, sizeof(template)); + if (!hid_report_descriptor_append(desc, template, sizeof(template))) + return FALSE; + + if ((count % 2) && !hid_report_descriptor_append(desc, template_pad, sizeof(template_pad))) + return FALSE; + + return TRUE; } static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count, @@ -1409,8 +1422,9 @@ BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set) * +1 | 6 5 4 * v */ -static void hatswitch_decompose(BYTE value, LONG *x, LONG *y) +static void hatswitch_decompose(BYTE value, ULONG index, LONG *x, LONG *y) { + value = (index % 2) ? (value >> 4) : (value & 0x0f); *x = *y = 0; if (value == 8 || value == 1 || value == 2) *y = -1; if (value == 6 || value == 5 || value == 4) *y = +1; @@ -1418,49 +1432,61 @@ static void hatswitch_decompose(BYTE value, LONG *x, LONG *y) if (value == 2 || value == 3 || value == 4) *x = +1; } -static void hatswitch_compose(LONG x, LONG y, BYTE *value) +static void hatswitch_compose(LONG x, LONG y, BYTE *value, ULONG index) { - if (x == 0 && y == 0) *value = 0; - else if (x == 0 && y < 0) *value = 1; - else if (x > 0 && y < 0) *value = 2; - else if (x > 0 && y == 0) *value = 3; - else if (x > 0 && y > 0) *value = 4; - else if (x == 0 && y > 0) *value = 5; - else if (x < 0 && y > 0) *value = 6; - else if (x < 0 && y == 0) *value = 7; - else if (x < 0 && y < 0) *value = 8; + BYTE new_value = 0; + if (x == 0 && y == 0) new_value = 0; + else if (x == 0 && y < 0) new_value = 1; + else if (x > 0 && y < 0) new_value = 2; + else if (x > 0 && y == 0) new_value = 3; + else if (x > 0 && y > 0) new_value = 4; + else if (x == 0 && y > 0) new_value = 5; + else if (x < 0 && y > 0) new_value = 6; + else if (x < 0 && y == 0) new_value = 7; + else if (x < 0 && y < 0) new_value = 8; + + if (index % 2) + { + *value &= 0xf; + *value |= new_value << 4; + } + else + { + *value &= 0xf0; + *value |= new_value; + } } BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x) { struct hid_device_state *state = &iface->hid_device_state; - ULONG offset = state->hatswitch_start + index; + ULONG offset = state->hatswitch_start + index / 2; LONG x, y; if (index > state->hatswitch_count) return FALSE; - hatswitch_decompose(state->report_buf[offset], &x, &y); - hatswitch_compose(new_x, y, &state->report_buf[offset]); + hatswitch_decompose(state->report_buf[offset], index, &x, &y); + hatswitch_compose(new_x, y, &state->report_buf[offset], index); return TRUE; } BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y) { struct hid_device_state *state = &iface->hid_device_state; - ULONG offset = state->hatswitch_start + index; + ULONG offset = state->hatswitch_start + index / 2; LONG x, y; if (index > state->hatswitch_count) return FALSE; - hatswitch_decompose(state->report_buf[offset], &x, &y); - hatswitch_compose(x, new_y, &state->report_buf[offset]); + hatswitch_decompose(state->report_buf[offset], index, &x, &y); + hatswitch_compose(x, new_y, &state->report_buf[offset], index); return TRUE; } BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) { struct hid_device_state *state = &iface->hid_device_state; - ULONG offset = state->hatswitch_start + index; + ULONG offset = state->hatswitch_start + index / 2; LONG old_x, old_y; if (index > state->hatswitch_count) return FALSE; - hatswitch_decompose(state->report_buf[offset], &old_x, &old_y); - hatswitch_compose(old_x + x, old_y + y, &state->report_buf[offset]); + hatswitch_decompose(state->report_buf[offset], index, &old_x, &old_y); + hatswitch_compose(old_x + x, old_y + y, &state->report_buf[offset], index); return TRUE; }

1 0

Daniel Lehman : glu32: Return GLU_INVALID_ENUM for illegal pixel types.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: ee1e15ac9d209a48f57daab942277a28d6a4ac21 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee1e15ac9d209a48f57daab942277a… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Jan 28 08:05:20 2024 -0800 glu32: Return GLU_INVALID_ENUM for illegal pixel types. --- dlls/glu32/mipmap.c | 4 ++-- dlls/glu32/tests/glu.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 4a324f45e70..b0854f2fca8 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -3448,10 +3448,10 @@ GLint WINAPI gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum return GLU_INVALID_ENUM; } if (!isLegalFormatForPackedPixelType(format, typein)) { - return GLU_INVALID_OPERATION; + return GLU_INVALID_ENUM; } if (!isLegalFormatForPackedPixelType(format, typeout)) { - return GLU_INVALID_OPERATION; + return GLU_INVALID_ENUM; } if (!wglGetCurrentContext()) { return GL_OUT_OF_MEMORY; /* windows returns this if no gl context (not glu error) */ diff --git a/dlls/glu32/tests/glu.c b/dlls/glu32/tests/glu.c index 4e9931141fb..16607a96e51 100644 --- a/dlls/glu32/tests/glu.c +++ b/dlls/glu32/tests/glu.c @@ -72,14 +72,12 @@ static void test_gluScaleImage(HDC hdc, HGLRC hglrc) DIMOUT, DIMOUT, ~0, bufout); ok(err == GLU_INVALID_ENUM, "got %x\n", err); - todo_wine { err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE_3_3_2, bufin, DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); ok(err == GLU_INVALID_ENUM, "got %x\n", err); err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, DIMOUT, DIMOUT, GL_UNSIGNED_BYTE_3_3_2, bufout); ok(err == GLU_INVALID_ENUM, "got %x\n", err); - } /* valid arguments */ memset(bufout, 0, SIZEOUT);

1 0

Zhiyi Zhang : winex11.drv: Translate whole_rect to x11 root coordinates in set_size_hints().
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: a128ad5c5b69e59f5da35500cf9facc6699fd460 URL: https://gitlab.winehq.org/wine/wine/-/commit/a128ad5c5b69e59f5da35500cf9fac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 3 16:11:17 2024 +0800 winex11.drv: Translate whole_rect to x11 root coordinates in set_size_hints(). whole_rect is in win32 virtual screen coordinates. It needs to be converted to x11 root coordinates for XSetWMNormalHints(). --- dlls/winex11.drv/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9d6dbf1121..8ab694450ef 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -716,8 +716,9 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) { if (data->hwnd != NtUserGetDesktopWindow()) /* don't force position of desktop */ { - size_hints->x = data->whole_rect.left; - size_hints->y = data->whole_rect.top; + POINT pt = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); + size_hints->x = pt.x; + size_hints->y = pt.y; size_hints->flags |= PPosition; } else size_hints->win_gravity = NorthWestGravity;

1 0

Rémi Bernon : winegstreamer: Ask GStreamer to stop messing with signal handlers.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 02921e4900b5b377a4b4b0cddbb7c2b7419cee9e URL: https://gitlab.winehq.org/wine/wine/-/commit/02921e4900b5b377a4b4b0cddbb7c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 19:29:15 2024 +0100 winegstreamer: Ask GStreamer to stop messing with signal handlers. --- dlls/winegstreamer/unixlib.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index db9d1eb114f..a2ec66e1990 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -253,6 +253,13 @@ NTSTATUS wg_init_gstreamer(void *arg) char **argv = args; GError *err; + /* GStreamer installs a temporary SEGV handler when it loads plugins + * to initialize its registry calling exit(-1) when any fault is caught. + * We need to make sure any signal reaches our signal handlers to catch + * and handle them, or eventually propagate the exceptions to the user. + */ + gst_segtrap_set_enabled(false); + if (!gst_init_check(&argc, &argv, &err)) { fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", err->message);

1 0

Daniel Lehman : glu32: Return GL_OUT_OF_MEMORY from gluScaleImage if no context.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 3b61019b8cdb64853fe1cb8f5e4c9381dcdaec02 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b61019b8cdb64853fe1cb8f5e4c93… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Jan 28 08:05:20 2024 -0800 glu32: Return GL_OUT_OF_MEMORY from gluScaleImage if no context. --- dlls/glu32/mipmap.c | 5 +++++ dlls/glu32/tests/glu.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 6877e2f342c..4a324f45e70 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -37,6 +37,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "wine/wgl.h" #include "wine/glu.h" @@ -3452,6 +3453,10 @@ GLint WINAPI gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum if (!isLegalFormatForPackedPixelType(format, typeout)) { return GLU_INVALID_OPERATION; } + if (!wglGetCurrentContext()) { + return GL_OUT_OF_MEMORY; /* windows returns this if no gl context (not glu error) */ + } + beforeImage = HeapAlloc(GetProcessHeap(), 0, image_size(widthin, heightin, format, GL_UNSIGNED_SHORT)); afterImage = diff --git a/dlls/glu32/tests/glu.c b/dlls/glu32/tests/glu.c index 698976d3bd0..4e9931141fb 100644 --- a/dlls/glu32/tests/glu.c +++ b/dlls/glu32/tests/glu.c @@ -40,12 +40,9 @@ static void test_gluScaleImage(HDC hdc, HGLRC hglrc) /* test without any context */ wglMakeCurrent(hdc, 0); - /* test crashes on Wine */ - if (!winetest_platform_is_wine) { err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); ok(err == GL_OUT_OF_MEMORY, "got %x\n", err); - } /* test with context */ wglMakeCurrent(hdc, hglrc);

1 0

Arkadiusz Hiler : winebus.sys: Fix units used for hat switches.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 94a7b32a55fa46d7156907b8ea6b68b545cb3122 URL: https://gitlab.winehq.org/wine/wine/-/commit/94a7b32a55fa46d7156907b8ea6b68… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Jan 30 00:18:58 2024 +0200 winebus.sys: Fix units used for hat switches. The 0xe nibble value is reserved and makes hid-decode from hid-tools crash while tryign to parse the descriptor. 0x0 is the correct way of expressing no special units are used. --- dlls/winebus.sys/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 6d2b484ccca..733f9a51f96 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -233,7 +233,7 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) LOGICAL_MAXIMUM(1, 8), REPORT_SIZE(1, 8), REPORT_COUNT(4, count), - UNIT(1, 0x0e /* none */), + UNIT(1, 0x0), /* None */ INPUT(1, Data|Var|Abs|Null), };

1 0

Piotr Caban : winedump: Sync demangling code with msvcrt.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 268f3adce9088ae1d38e844c40b70a7d37d6feef URL: https://gitlab.winehq.org/wine/wine/-/commit/268f3adce9088ae1d38e844c40b70a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 30 17:07:44 2024 +0100 winedump: Sync demangling code with msvcrt. --- tools/winedump/msmangle.c | 92 ++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 50 deletions(-)

1 0

Daniel Lehman : glu32/tests: Add a few tests for gluScaleImage.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: ac363481796ed64ef853f7b1c986551ed2aca4b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac363481796ed64ef853f7b1c98655… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Jan 28 08:05:20 2024 -0800 glu32/tests: Add a few tests for gluScaleImage. --- configure | 1 + configure.ac | 1 + dlls/glu32/tests/Makefile.in | 5 ++ dlls/glu32/tests/glu.c | 163 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+) diff --git a/configure b/configure index 165cd9c73e6..0e0d653b21c 100755 --- a/configure +++ b/configure @@ -21861,6 +21861,7 @@ wine_fn_config_makefile dlls/gdiplus/tests enable_tests wine_fn_config_makefile dlls/geolocation enable_geolocation wine_fn_config_makefile dlls/geolocation/tests enable_tests wine_fn_config_makefile dlls/glu32 enable_glu32 +wine_fn_config_makefile dlls/glu32/tests enable_tests wine_fn_config_makefile dlls/gphoto2.ds enable_gphoto2_ds wine_fn_config_makefile dlls/gpkcsp enable_gpkcsp wine_fn_config_makefile dlls/graphicscapture enable_graphicscapture diff --git a/configure.ac b/configure.ac index b2ec7c4c7c8..edba6e2f0fb 100644 --- a/configure.ac +++ b/configure.ac @@ -2678,6 +2678,7 @@ WINE_CONFIG_MAKEFILE(dlls/gdiplus/tests) WINE_CONFIG_MAKEFILE(dlls/geolocation) WINE_CONFIG_MAKEFILE(dlls/geolocation/tests) WINE_CONFIG_MAKEFILE(dlls/glu32) +WINE_CONFIG_MAKEFILE(dlls/glu32/tests) WINE_CONFIG_MAKEFILE(dlls/gphoto2.ds) WINE_CONFIG_MAKEFILE(dlls/gpkcsp) WINE_CONFIG_MAKEFILE(dlls/graphicscapture) diff --git a/dlls/glu32/tests/Makefile.in b/dlls/glu32/tests/Makefile.in new file mode 100644 index 00000000000..3ac459d37ee --- /dev/null +++ b/dlls/glu32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = glu32.dll +IMPORTS = opengl32 gdi32 user32 glu32 + +SOURCES = \ + glu.c diff --git a/dlls/glu32/tests/glu.c b/dlls/glu32/tests/glu.c new file mode 100644 index 00000000000..698976d3bd0 --- /dev/null +++ b/dlls/glu32/tests/glu.c @@ -0,0 +1,163 @@ +/* + * Some tests for GLU functions + * + * Copyright (C) 2024 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> +#include "wine/test.h" +#include "wine/wgl.h" +#include "wine/glu.h" + +#define DIMIN 1 +#define DIMOUT 2 +#define SIZEIN (DIMIN * DIMIN * 4) +#define SIZEOUT (DIMOUT * DIMOUT * 4) +static void test_gluScaleImage(HDC hdc, HGLRC hglrc) +{ + char bufin[SIZEIN]; + char bufout[SIZEOUT]; + char expect[SIZEOUT]; + GLenum err = 0; + + memset(bufin, 0xff, SIZEIN); + memset(expect, 0xff, SIZEOUT); + + /* test without any context */ + wglMakeCurrent(hdc, 0); + + /* test crashes on Wine */ + if (!winetest_platform_is_wine) { + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(err == GL_OUT_OF_MEMORY, "got %x\n", err); + } + + /* test with context */ + wglMakeCurrent(hdc, hglrc); + + /* invalid arguments */ + err = gluScaleImage(GL_RGBA, 0, 0, GL_UNSIGNED_BYTE, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(!err, "got %x\n", err); + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, + 0, 0, GL_UNSIGNED_BYTE, bufout); + ok(!err, "got %x\n", err); + + err = gluScaleImage(GL_RGBA, -1, DIMIN, GL_UNSIGNED_BYTE, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(err == GLU_INVALID_VALUE, "got %x\n", err); + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, + -1, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(err == GLU_INVALID_VALUE, "got %x\n", err); + + err = gluScaleImage(~0, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(err == GLU_INVALID_ENUM, "got %x\n", err); + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, ~0, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(err == GLU_INVALID_ENUM, "got %x\n", err); + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, + DIMOUT, DIMOUT, ~0, bufout); + ok(err == GLU_INVALID_ENUM, "got %x\n", err); + + todo_wine { + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE_3_3_2, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(err == GLU_INVALID_ENUM, "got %x\n", err); + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE_3_3_2, bufout); + ok(err == GLU_INVALID_ENUM, "got %x\n", err); + } + + /* valid arguments */ + memset(bufout, 0, SIZEOUT); + err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, + DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); + ok(!err, "got %x\n", err); + ok(!memcmp(bufout, expect, SIZEOUT), "miscompare\n"); +} + +START_TEST(glu) +{ + HWND hwnd; + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), + 1, /* version */ + PFD_DRAW_TO_WINDOW | + PFD_SUPPORT_OPENGL | + PFD_DOUBLEBUFFER, + PFD_TYPE_RGBA, + 24, /* 24-bit color depth */ + 0, 0, 0, 0, 0, 0, /* color bits */ + 0, /* alpha buffer */ + 0, /* shift bit */ + 0, /* accumulation buffer */ + 0, 0, 0, 0, /* accum bits */ + 32, /* z-buffer */ + 0, /* stencil buffer */ + 0, /* auxiliary buffer */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0 /* layer masks */ + }; + + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, + NULL, NULL); + ok(hwnd != NULL, "err: %ld\n", GetLastError()); + if (hwnd) + { + HDC hdc; + int format, res; + HGLRC hglrc = NULL; + ShowWindow(hwnd, SW_SHOW); + + hdc = GetDC(hwnd); + + format = ChoosePixelFormat(hdc, &pfd); + if (format == 0) + { + win_skip("Unable to find pixel format.\n"); + goto cleanup; + } + + res = SetPixelFormat(hdc, format, &pfd); + ok(res, "SetPixelformat failed: %lx\n", GetLastError()); + + hglrc = wglCreateContext(hdc); + res = wglMakeCurrent(hdc, hglrc); + ok(res, "wglMakeCurrent failed!\n"); + if (res) + { + trace("OpenGL renderer: %s\n", glGetString(GL_RENDERER)); + trace("OpenGL driver version: %s\n", glGetString(GL_VERSION)); + trace("OpenGL vendor: %s\n", glGetString(GL_VENDOR)); + } + else + { + skip("Skipping OpenGL tests without a current context\n"); + goto cleanup; + } + + test_gluScaleImage(hdc, hglrc); + +cleanup: + wglDeleteContext(hglrc); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + } +}

1 0

Alexandre Julliard : ntdll: Use a .seh handler for DbgUiRemoteBreakin().
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 08f4705e4416c55ba9b941cc7c380d5e61a4715a URL: https://gitlab.winehq.org/wine/wine/-/commit/08f4705e4416c55ba9b941cc7c380d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 15:51:01 2024 +0100 ntdll: Use a .seh handler for DbgUiRemoteBreakin(). --- dlls/ntdll/signal_arm.c | 16 ++++++++++++++++ dlls/ntdll/signal_arm64.c | 30 ++++++++++++++---------------- dlls/ntdll/signal_x86_64.c | 19 ++++++++++++++++++- 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 80d722ccacb..0e6c36e3340 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1688,6 +1688,21 @@ void WINAPI process_breakpoint(void) /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ +#ifdef __WINE_PE_BUILD +__ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, + ".seh_endprologue\n\t" + ".seh_handler DbgUiRemoteBreakin_handler, %except\n\t" + "mrc p15, 0, r0, c13, c0, 2\n\t" /* NtCurrentTeb() */ + "ldr r0, [r0, #0x30]\n\t" /* NtCurrentTeb()->Peb */ + "ldrb r0, [r0, 0x02]\n\t" /* peb->BeingDebugged */ + "cbz r0, 1f\n\t" + "bl " __ASM_NAME("DbgBreakPoint") "\n" + "1:\tmov r0, #0\n\t" + "bl " __ASM_NAME("RtlExitUserThread") "\n" + "DbgUiRemoteBreakin_handler:\n\t" + "mov sp, r1\n\t" /* frame */ + "b 1b" ) +#else void WINAPI DbgUiRemoteBreakin( void *arg ) { if (NtCurrentTeb()->Peb->BeingDebugged) @@ -1704,6 +1719,7 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) } RtlExitUserThread( STATUS_SUCCESS ); } +#endif /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 477f22029bd..82466e926c2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1585,22 +1585,20 @@ __ASM_GLOBAL_FUNC( process_breakpoint, /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ -void WINAPI DbgUiRemoteBreakin( void *arg ) -{ - if (NtCurrentTeb()->Peb->BeingDebugged) - { - __TRY - { - DbgBreakPoint(); - } - __EXCEPT_ALL - { - /* do nothing */ - } - __ENDTRY - } - RtlExitUserThread( STATUS_SUCCESS ); -} +__ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + ".seh_endprologue\n\t" + ".seh_handler DbgUiRemoteBreakin_handler, @except\n\t" + "ldr x0, [x18, #0x60]\n\t" /* NtCurrentTeb()->Peb */ + "ldrb w0, [x0, 0x02]\n\t" /* peb->BeingDebugged */ + "cbz w0, 1f\n\t" + "bl " __ASM_NAME("DbgBreakPoint") "\n" + "1:\tmov w0, #0\n\t" + "bl " __ASM_NAME("RtlExitUserThread") "\n" + "DbgUiRemoteBreakin_handler:\n\t" + "mov sp, x1\n\t" /* frame */ + "b 1b" ) /********************************************************************** * DbgBreakPoint (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index be5851b8c31..e63837d3eac 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1748,6 +1748,23 @@ void WINAPI process_breakpoint(void) /*********************************************************************** * DbgUiRemoteBreakin (NTDLL.@) */ +#ifdef __WINE_PE_BUILD +__ASM_GLOBAL_FUNC( DbgUiRemoteBreakin, + "subq $0x28,%rsp\n\t" + ".seh_stackalloc 0x28\n\t" + ".seh_endprologue\n\t" + ".seh_handler DbgUiRemoteBreakin_handler, @except\n\t" + "mov %gs:0x30,%rax\n\t" + "mov 0x60(%rax),%rax\n\t" + "cmpb $0,2(%rax)\n\t" + "je 1f\n\t" + "call " __ASM_NAME("DbgBreakPoint") "\n" + "1:\txorl %ecx,%ecx\n\t" + "call " __ASM_NAME("RtlExitUserThread") "\n" + "DbgUiRemoteBreakin_handler:\n\t" + "movq %rdx,%rsp\n\t" /* frame */ + "jmp 1b" ) +#else void WINAPI DbgUiRemoteBreakin( void *arg ) { if (NtCurrentTeb()->Peb->BeingDebugged) @@ -1764,7 +1781,7 @@ void WINAPI DbgUiRemoteBreakin( void *arg ) } RtlExitUserThread( STATUS_SUCCESS ); } - +#endif /********************************************************************** * DbgBreakPoint (NTDLL.@)

1 0

Alexandre Julliard : Revert "loader: Associate folder with explorer".
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 5a26d87babd98a776954f7dc8d4a36e36d7a87d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a26d87babd98a776954f7dc8d4a36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 17:29:48 2024 +0100 Revert "loader: Associate folder with explorer". This reverts commit 7a941fd59af6377c1e30012e4a0eaea711dd61f4. It doesn't work properly since explorer fails to launch, and it breaks the tests. --- loader/wine.inf.in | 1 - 1 file changed, 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9a8865698ea..06551152f3a 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -289,7 +289,6 @@ HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,exefile\shell\runas\command,,2,"""%1"" %*" -HKCR,folder\shell\explore\command,,2,"explorer ""%1""" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders"

1 0