November 2022 - Wine-commits

Sven Baars : ntdll/tests: Factor out the NtEnumerateKey() tests.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 0f8b90a7de681ce8302cd886502f3e8d68ad82c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0f8b90a7de681ce8302cd886502f3e… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Sep 29 10:56:26 2022 +0200 ntdll/tests: Factor out the NtEnumerateKey() tests. --- dlls/ntdll/tests/reg.c | 268 +++++++++++++++---------------------------------- 1 file changed, 83 insertions(+), 185 deletions(-)

1 0

Sven Baars : ntdll/tests: Refactor the Software\Classes tests.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: ca4c6f115023ade3c3c488885cc223af22fc08b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca4c6f115023ade3c3c488885cc223… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Oct 19 13:27:57 2022 +0200 ntdll/tests: Refactor the Software\Classes tests. And add some extra ones. --- dlls/ntdll/tests/reg.c | 251 ++++++++++++++----------------------------------- 1 file changed, 72 insertions(+), 179 deletions(-)

1 0

Brendan Shanks : ntdll: Add native thread renaming for macOS.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 8ae70731b148258fdb0efb37ea4f7e0bbfb28d89 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ae70731b148258fdb0efb37ea4f7e… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 7 12:07:33 2022 -0800 ntdll: Add native thread renaming for macOS. --- dlls/ntdll/unix/thread.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 43de6cefad3..711cb4cb13c 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -59,6 +59,10 @@ #include <libprocstat.h> #endif +#ifdef __APPLE__ +#include <mach/mach.h> +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "ntstatus.h" @@ -1876,6 +1880,40 @@ static void set_native_thread_name( HANDLE handle, const UNICODE_STRING *name ) write( fd, nameA, len ); close( fd ); } +#elif defined(__APPLE__) + /* pthread_setname_np() silently fails if the name is longer than 63 characters + null terminator */ + char nameA[64]; + NTSTATUS status; + int unix_pid, unix_tid, len, current_tid; + + SERVER_START_REQ( get_thread_times ) + { + req->handle = wine_server_obj_handle( handle ); + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + { + unix_pid = reply->unix_pid; + unix_tid = reply->unix_tid; + } + } + SERVER_END_REQ; + + if (status != STATUS_SUCCESS || unix_pid == -1 || unix_tid == -1) + return; + + current_tid = mach_thread_self(); + mach_port_deallocate(mach_task_self(), current_tid); + + if (unix_tid != current_tid) + { + static int once; + if (!once++) FIXME("setting other thread name not supported\n"); + return; + } + + len = ntdll_wcstoumbs( name->Buffer, name->Length / sizeof(WCHAR), nameA, sizeof(nameA) - 1, FALSE ); + nameA[len] = '\0'; + pthread_setname_np(nameA); #else static int once; if (!once++) FIXME("not implemented on this platform\n");

1 0

Alexandre Julliard : winex11: Fix int/long type mismatches.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 0c68dde6e887c66b4c60f979901943acea456dc9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c68dde6e887c66b4c60f979901943… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 09:17:57 2022 +0100 winex11: Fix int/long type mismatches. --- dlls/winex11.drv/display.c | 2 +- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 671c0c5dea2..a09b0600fa0 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -550,7 +550,7 @@ BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage INT gpu_count, adapter_count, monitor_count; INT gpu, adapter, monitor; DEVMODEW *modes, *mode; - DWORD mode_count; + UINT mode_count; if (!force && !force_display_devices_refresh) return TRUE; force_display_devices_refresh = FALSE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d54bfe1bd87..f712207df80 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -182,7 +182,7 @@ HWND *build_hwnd_list(void) { NTSTATUS status; HWND *list; - UINT count = 128; + ULONG count = 128; for (;;) { diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 77e72752017..5759558ab21 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1150,7 +1150,7 @@ NTSTATUS CDECL X11DRV_D3DKMTOpenAdapterFromLuid( D3DKMT_OPENADAPTERFROMLUID *des VkPhysicalDevice *vk_physical_devices = NULL; VkPhysicalDeviceProperties2 properties2; NTSTATUS status = STATUS_UNSUCCESSFUL; - DWORD device_count, device_idx = 0; + UINT device_count, device_idx = 0; struct x11_d3dkmt_adapter *adapter; VkInstanceCreateInfo create_info; VkPhysicalDeviceIDProperties id;

1 0

Alexandre Julliard : winex11: Add a debug helper to print color values.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 1a5bfe13077dd6af85c939902de55263b6191e11 URL: https://gitlab.winehq.org/wine/wine/-/commit/1a5bfe13077dd6af85c939902de552… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 09:18:50 2022 +0100 winex11: Add a debug helper to print color values. --- dlls/winex11.drv/brush.c | 4 ++-- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/palette.c | 14 +++++++------- dlls/winex11.drv/x11drv.h | 10 ++++++++++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 2a2e8ef4e98..9ecb5ec5eda 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -170,11 +170,11 @@ static Pixmap BRUSH_DitherMono( COLORREF color ) static const char gray_dither[][2] = {{ 0x1, 0x0 }, /* DKGRAY */ { 0x2, 0x1 }, /* GRAY */ { 0x1, 0x3 }, /* LTGRAY */ - }; + }; int gray = (30 * GetRValue(color) + 59 * GetGValue(color) + 11 * GetBValue(color)) / 100; int idx = gray * (ARRAY_SIZE( gray_dither ) + 1)/256 - 1; - TRACE("color=%06x -> gray=%x\n", color, gray); + TRACE("color=%s -> gray=%x\n", debugstr_color(color), gray); return XCreateBitmapFromData( gdi_display, root_window, gray_dither[idx], 2, 2 ); } diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 22e1987b9fa..7adb79e181d 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1445,7 +1445,7 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT RECT rect, bounds; POINT pt; - TRACE("X11DRV_ExtFloodFill %d,%d %06x %d\n", x, y, color, fillType ); + TRACE("X11DRV_ExtFloodFill %d,%d %s %d\n", x, y, debugstr_color(color), fillType ); pt.x = x; pt.y = y; diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 7845985dbb0..0fb6c1cb90b 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -508,7 +508,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template sysPixel[i] = color.pixel; - TRACE("syscolor(%x) -> pixel %i\n", *(const COLORREF*)(sys_pal_template+i), + TRACE("syscolor %s -> pixel %i\n", debugstr_color(*(const COLORREF *)(sys_pal_template+i)), (int)color.pixel); /* Set EGA mapping if color in the first or last eight */ @@ -932,7 +932,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) if (!get_palette_entries( hPal, idx, 1, &entry )) { - WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); + WARN("%s: out of bounds, assuming black\n", debugstr_color(color)); return 0; } if (mapping) return mapping[idx]; @@ -990,7 +990,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color ) { index = LOWORD( color ); if (!get_palette_entries( hPal, index, 1, &entry )) - WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index); + WARN("%s: out of bounds\n", debugstr_color(color)); else if (mapping) index = mapping[index]; } else if (color >> 24 == 2) /* PALETTERGB */ @@ -1287,7 +1287,7 @@ UINT CDECL X11DRV_RealizePalette( PHYSDEV dev, HPALETTE hpal, BOOL primary ) if( !prev_mapping || mapping[i] != index ) iRemapped++; mapping[i] = index; - TRACE("entry %i (%x) -> pixel %i\n", i, *(COLORREF*)&entries[i], index); + TRACE("entry %i %s -> pixel %i\n", i, debugstr_color(*(COLORREF *)&entries[i]), index); } pthread_mutex_unlock( &palette_mutex ); @@ -1334,7 +1334,7 @@ UINT CDECL X11DRV_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, entries[i].peGreen = COLOR_sysPal[start + i].peGreen; entries[i].peBlue = COLOR_sysPal[start + i].peBlue; entries[i].peFlags = 0; - TRACE("\tidx(%02x) -> RGB(%08x)\n", start + i, *(COLORREF*)(entries + i) ); + TRACE("\tidx(%02x) -> %s\n", start + i, debugstr_color(*(COLORREF *)(entries + i)) ); } pthread_mutex_unlock( &palette_mutex ); return count; @@ -1368,7 +1368,7 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) if (!get_palette_entries( hpal, index, 1, &entry )) { - WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); + WARN("%s: idx %d is out of bounds, assuming NULL\n", debugstr_color(color), index ); if (!get_palette_entries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); @@ -1378,7 +1378,7 @@ COLORREF CDECL X11DRV_GetNearestColor( PHYSDEV dev, COLORREF color ) nearest = (0x00ffffff & *(COLORREF*)(COLOR_sysPal + X11DRV_SysPaletteLookupPixel(color, FALSE))); pthread_mutex_unlock( &palette_mutex ); - TRACE("(%06x): returning %06x\n", color, nearest ); + TRACE("(%s): returning %s\n", debugstr_color(color), debugstr_color(nearest) ); return nearest; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a424eb112e8..d51df30c2d0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -66,6 +66,7 @@ typedef int Status; #include "wine/gdi_driver.h" #include "unixlib.h" #include "wine/list.h" +#include "wine/debug.h" #define MAX_DASHLEN 16 @@ -322,6 +323,15 @@ extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color) DE extern COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) DECLSPEC_HIDDEN; extern int *get_window_surface_mapping( int bpp, int *mapping ) DECLSPEC_HIDDEN; +static inline const char *debugstr_color( COLORREF color ) +{ + if (color & (1 << 24)) /* PALETTEINDEX */ + return wine_dbg_sprintf( "PALETTEINDEX(%u)", LOWORD(color) ); + if (color >> 16 == 0x10ff) /* DIBINDEX */ + return wine_dbg_sprintf( "DIBINDEX(%u)", LOWORD(color) ); + return wine_dbg_sprintf( "RGB(%02x,%02x,%02x)", GetRValue(color), GetGValue(color), GetBValue(color) ); +} + /* GDI escapes */ #define X11DRV_ESCAPE 6789

1 0

Alexandre Julliard : winex11: Use int instead of long types in a few places.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 7d614be43c2637a1512bf94d242e7d0b5a3dacc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d614be43c2637a1512bf94d242e7d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 09:23:38 2022 +0100 winex11: Use int instead of long types in a few places. --- dlls/winex11.drv/display.c | 2 +- dlls/winex11.drv/event.c | 6 +++--- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/keyboard.c | 4 ++-- dlls/winex11.drv/pen.c | 4 ++-- dlls/winex11.drv/window.c | 8 ++++---- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xim.c | 11 +++++------ 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a09b0600fa0..6e3340fb069 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -163,7 +163,7 @@ void init_registry_display_settings(void) DISPLAY_DEVICEW dd = {sizeof(dd)}; UNICODE_STRING device_name; DWORD i = 0; - LONG ret; + int ret; while (!NtUserEnumDisplayDevices( NULL, i++, &dd, 0 )) { diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 4a1a8dc0443..12d86216a61 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1268,7 +1268,7 @@ static int get_window_wm_state( Display *display, Window window ) static void handle_wm_state_notify( HWND hwnd, XPropertyEvent *event, BOOL update_window ) { struct x11drv_win_data *data = get_win_data( hwnd ); - DWORD style; + UINT style; if (!data) return; @@ -1781,7 +1781,7 @@ static DWORD xdnd_action_to_drop_effect( long action ) } -static long drop_effect_to_xdnd_action( DWORD effect ) +static long drop_effect_to_xdnd_action( UINT effect ) { if (effect == DROPEFFECT_COPY) return x11drv_atom(XdndActionCopy); @@ -1801,7 +1801,7 @@ static void handle_xdnd_position_event( HWND hwnd, XClientMessageEvent *event ) { struct dnd_position_event_params params; XClientMessageEvent e; - DWORD effect; + UINT effect; params.hwnd = HandleToUlong( hwnd ); params.point = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 7adb79e181d..6365c9a30ad 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1704,7 +1704,7 @@ BOOL CDECL X11DRV_GetICMProfile( PHYSDEV dev, BOOL allow_default, LPDWORD size, IO_STATUS_BLOCK io; UINT64 hash = 0; HANDLE file; - NTSTATUS status; + int status; for (i = 0; i < buflen; i++) hash = (hash << 16) - hash + buffer[i]; for (i = 0; i < sizeof(hash) * 2; i++) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index adf00b052c0..f67db25525d 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1132,7 +1132,7 @@ static WORD EVENT_event_to_vkey( XIC xic, XKeyEvent *e) /*********************************************************************** * X11DRV_send_keyboard_input */ -static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD flags, DWORD time ) +static void X11DRV_send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, UINT flags, UINT time ) { INPUT input; @@ -1275,7 +1275,7 @@ static void adjust_lock_state( BYTE *keystate, HWND hwnd, WORD vkey, WORD scan, } } -static void update_lock_state( HWND hwnd, WORD vkey, UINT state, DWORD time ) +static void update_lock_state( HWND hwnd, WORD vkey, UINT state, UINT time ) { BYTE keystate[256]; diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index a32bf4752e1..3baf6a0a74e 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -51,7 +51,7 @@ static DWORD get_user_dashes( char *res, const DWORD *style, DWORD len ) } else dashes[pos++] = dashes[i]; } - for (i = 0; i < pos; i++) res[i] = min( dashes[i], 255 ); + for (i = 0; i < pos; i++) res[i] = (char)min( dashes[i], 255 ); return pos; } @@ -147,7 +147,7 @@ HPEN CDECL X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern (logpen.lopnStyle & PS_STYLE_MASK) != PS_USERSTYLE && (logpen.lopnStyle & PS_STYLE_MASK) != PS_ALTERNATE) for(i = 0; i < physDev->pen.dash_len; i++) - physDev->pen.dashes[i] = min( physDev->pen.dashes[i] * physDev->pen.width, 255 ); + physDev->pen.dashes[i] = (char)min( physDev->pen.dashes[i] * physDev->pen.width, 255 ); free( elp ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f712207df80..585eff2eeb2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -737,7 +737,7 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) /*********************************************************************** * set_mwm_hints */ -static void set_mwm_hints( struct x11drv_win_data *data, DWORD style, DWORD ex_style ) +static void set_mwm_hints( struct x11drv_win_data *data, UINT style, UINT ex_style ) { MwmHints mwm_hints; @@ -1015,7 +1015,7 @@ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) */ void update_net_wm_states( struct x11drv_win_data *data ) { - DWORD i, style, ex_style, new_state = 0; + UINT i, style, ex_style, new_state = 0; if (!data->managed) return; if (data->whole_window == root_window) return; @@ -2053,7 +2053,7 @@ HWND create_foreign_window( Display *display, Window xwin ) Window *xchildren; unsigned int nchildren; XWindowAttributes attr; - DWORD style = WS_CLIPCHILDREN; + UINT style = WS_CLIPCHILDREN; UNICODE_STRING class_name; if (!class_registered) @@ -2592,7 +2592,7 @@ void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, { struct x11drv_thread_data *thread_data; struct x11drv_win_data *data; - DWORD new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); + UINT new_style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); RECT old_window_rect, old_whole_rect, old_client_rect; int event_type; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d51df30c2d0..47a29c8eb98 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -823,7 +823,7 @@ extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN; extern BOOL X11DRV_InitXIM( const WCHAR *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN; -extern void X11DRV_XIMLookupChars( const char *str, DWORD count ) DECLSPEC_HIDDEN; +extern void X11DRV_XIMLookupChars( const char *str, UINT count ) DECLSPEC_HIDDEN; #define XEMBED_MAPPED (1 << 0) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 00c15bb3bcf..d736dd80345 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -61,17 +61,16 @@ static XIMStyle ximStyle = 0; static XIMStyle ximStyleRoot = 0; static XIMStyle ximStyleRequest = STYLE_CALLBACK; -static void X11DRV_ImmSetInternalString(DWORD dwOffset, - DWORD selLength, LPWSTR lpComp, DWORD dwCompLen) +static void X11DRV_ImmSetInternalString(UINT offset, UINT selLength, LPWSTR lpComp, UINT len) { /* Composition strings are edited in chunks */ - unsigned int byte_length = dwCompLen * sizeof(WCHAR); - unsigned int byte_offset = dwOffset * sizeof(WCHAR); + unsigned int byte_length = len * sizeof(WCHAR); + unsigned int byte_offset = offset * sizeof(WCHAR); unsigned int byte_selection = selLength * sizeof(WCHAR); int byte_expansion = byte_length - byte_selection; LPBYTE ptr_new; - TRACE("( %i, %i, %p, %d):\n", dwOffset, selLength, lpComp, dwCompLen ); + TRACE("( %i, %i, %p, %d):\n", offset, selLength, lpComp, len ); if (byte_expansion + dwCompStringLength >= dwCompStringSize) { @@ -96,7 +95,7 @@ static void X11DRV_ImmSetInternalString(DWORD dwOffset, CompositionString, dwCompStringLength ); } -void X11DRV_XIMLookupChars( const char *str, DWORD count ) +void X11DRV_XIMLookupChars( const char *str, UINT count ) { WCHAR *output; DWORD len;

1 0

Alexandre Julliard : winex11: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: wine Branch: master Commit: 7c9d04a4a780730d677ddb4d3e3205b3e7568033 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c9d04a4a780730d677ddb4d3e3205… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 18 09:30:43 2022 +0100 winex11: Build without -DWINE_NO_LONG_TYPES. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/desktop.c | 3 ++- dlls/winex11.drv/display.c | 10 ++++----- dlls/winex11.drv/event.c | 14 +++++++------ dlls/winex11.drv/ime.c | 46 +++++++++++++++++++++--------------------- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 11 +++++----- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/systray.c | 4 ++-- dlls/winex11.drv/window.c | 10 ++++----- dlls/winex11.drv/x11drv_main.c | 16 +++++++-------- dlls/winex11.drv/xdnd.c | 28 ++++++++++++------------- dlls/winex11.drv/xrandr.c | 6 ++++-- dlls/winex11.drv/xrender.c | 8 ++++---- dlls/winex11.drv/xvidmode.c | 3 ++- 16 files changed, 86 insertions(+), 80 deletions(-)

1 0

Francisco Casas : tests: Add missing entry for max.shader_test in Makefile.am.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: vkd3d Branch: master Commit: dd1008867ec5e1b7d3b9a64cffcff9d2ba409192 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dd1008867ec5e1b7d3b9a64cffcff… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 7 16:32:44 2022 -0300 tests: Add missing entry for max.shader_test in Makefile.am. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 0db71d67..74c45aed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -121,6 +121,7 @@ vkd3d_shader_tests = \ tests/logic-operations.shader_test \ tests/math.shader_test \ tests/matrix-semantics.shader_test \ + tests/max.shader_test \ tests/multiple-rt.shader_test \ tests/nointerpolation.shader_test \ tests/object-references.shader_test \

1 0

Francisco Casas : vkd3d-shader/hlsl: Check for non-static object references on resource stores.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: vkd3d Branch: master Commit: f100f5b726cf13f742975e34210ef719f5f9d14c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f100f5b726cf13f742975e34210ef… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 9 16:41:50 2022 -0300 vkd3d-shader/hlsl: Check for non-static object references on resource stores. --- libs/vkd3d-shader/hlsl_codegen.c | 12 ++++++++++++ tests/object-references.shader_test | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 58d44c4d..6e4168fc 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1024,6 +1024,18 @@ static bool validate_static_object_references(struct hlsl_ctx *ctx, struct hlsl_ note_non_static_deref_expressions(ctx, &load->sampler, "resource load sampler"); } } + else if (instr->type == HLSL_IR_RESOURCE_STORE) + { + struct hlsl_ir_resource_store *store = hlsl_ir_resource_store(instr); + + if (!hlsl_component_index_range_from_deref(ctx, &store->resource, &start, &count)) + { + hlsl_error(ctx, &instr->loc, VKD3D_SHADER_ERROR_HLSL_NON_STATIC_OBJECT_REF, + "Accessed resource from \"%s\" must be determinable at compile time.", + store->resource.var->name); + note_non_static_deref_expressions(ctx, &store->resource, "accessed resource"); + } + } return false; } diff --git a/tests/object-references.shader_test b/tests/object-references.shader_test index a33bd14a..12f745e6 100644 --- a/tests/object-references.shader_test +++ b/tests/object-references.shader_test @@ -120,6 +120,18 @@ float4 main() : sv_target } +[pixel shader fail] +// Note: Only valid in shader model 5.1 +RWTexture2D<float4> tex[3]; +uniform int n; + +float4 main() : sv_target +{ + tex[n][int2(0, 0)] = 0.6; + return 0; +} + + [pixel shader todo] Texture2D tex; uniform float f;

1 0

Francisco Casas : vkd3d-shader/hlsl: Don't produce a parse error on empty buffer_body.
by Alexandre Julliard 18 Nov '22

18 Nov '22

Module: vkd3d Branch: master Commit: bd501ce33662e87add2dd7cdbb734b9e074a8c05 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bd501ce33662e87add2dd7cdbb734… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Oct 31 18:13:26 2022 -0300 vkd3d-shader/hlsl: Don't produce a parse error on empty buffer_body. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 2 +- tests/cbuffer.shader_test | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 74c45aed..85cd4642 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,6 +65,7 @@ vkd3d_shader_tests = \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ + tests/cbuffer.shader_test \ tests/compute.shader_test \ tests/conditional.shader_test \ tests/floor.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6461ade5..c1fb003d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3361,7 +3361,7 @@ buffer_type: } declaration_statement_list: - declaration_statement + %empty | declaration_statement_list declaration_statement preproc_directive: diff --git a/tests/cbuffer.shader_test b/tests/cbuffer.shader_test new file mode 100644 index 00000000..07ef18db --- /dev/null +++ b/tests/cbuffer.shader_test @@ -0,0 +1,17 @@ +[pixel shader] +// Test empty constant buffer. +cbuffer Constants : register(b1) +{ +}; + +float4 foo; + +float4 main() : sv_target +{ + return foo; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0)

1 0