May 2024 - Wine-commits - list.winehq.org

Rémi Bernon : wineandroid: Remove now unnecessary set_surface_region calls.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 39f79d73fa129e950001387ea0540be84fec9d4a URL: https://gitlab.winehq.org/wine/wine/-/commit/39f79d73fa129e950001387ea0540b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 14:50:58 2024 +0200 wineandroid: Remove now unnecessary set_surface_region calls. --- dlls/wineandroid.drv/android.h | 1 - dlls/wineandroid.drv/init.c | 1 - dlls/wineandroid.drv/window.c | 81 ++++++++---------------------------------- 3 files changed, 14 insertions(+), 69 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index e793d103788..2512976089b 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -95,7 +95,6 @@ extern LRESULT ANDROID_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM extern void ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ); extern void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ); -extern void ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ); extern void ANDROID_SetCapture( HWND hwnd, UINT flags ); extern void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ); extern UINT ANDROID_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index d48c4153b06..5b4ec59d2fa 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -346,7 +346,6 @@ static const struct user_driver_funcs android_drv_funcs = .pSetCapture = ANDROID_SetCapture, .pSetLayeredWindowAttributes = ANDROID_SetLayeredWindowAttributes, .pSetParent = ANDROID_SetParent, - .pSetWindowRgn = ANDROID_SetWindowRgn, .pSetWindowStyle = ANDROID_SetWindowStyle, .pShowWindow = ANDROID_ShowWindow, .pUpdateLayeredWindow = ANDROID_UpdateLayeredWindow, diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 61ebc097f47..d04649da69f 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -70,8 +70,6 @@ static inline int context_idx( HWND hwnd ) return LOWORD( hwnd ) >> 1; } -static void set_surface_region( struct window_surface *window_surface, HRGN win_region ); - /* only for use on sanitized BITMAPINFO structures */ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) { @@ -654,6 +652,8 @@ static void *android_surface_get_bitmap_info( struct window_surface *window_surf static void android_surface_set_region( struct window_surface *window_surface, HRGN region ) { struct android_window_surface *surface = get_android_surface( window_surface ); + RGNDATA *data; + UINT size; TRACE( "updating surface %p hwnd %p with %p\n", surface, window_surface->hwnd, region ); @@ -668,8 +668,19 @@ static void android_surface_set_region( struct window_surface *window_surface, H if (!surface->region) surface->region = NtGdiCreateRectRgn( 0, 0, 0, 0 ); NtGdiCombineRgn( surface->region, region, 0, RGN_COPY ); } + + if (!(size = NtGdiGetRegionData( region, 0, NULL ))) goto done; + if (!(data = malloc( size ))) goto done; + if (!NtGdiGetRegionData( region, size, data )) + { + free( data ); + data = NULL; + } + free( surface->region_data ); + surface->region_data = data; + +done: window_surface_unlock( window_surface ); - set_surface_region( &surface->header, (HRGN)1 ); } /*********************************************************************** @@ -791,53 +802,6 @@ static void set_color_key( struct android_window_surface *surface, COLORREF key surface->color_key = (GetRValue(key) << 16) | (GetGValue(key) << 8) | GetBValue(key); } -/*********************************************************************** - * set_surface_region - */ -static void set_surface_region( struct window_surface *window_surface, HRGN win_region ) -{ - struct android_window_surface *surface = get_android_surface( window_surface ); - struct android_win_data *win_data; - HRGN region = win_region; - RGNDATA *data = NULL; - DWORD size; - int offset_x, offset_y; - - if (window_surface->funcs != &android_surface_funcs) return; /* we may get the null surface */ - - if (!(win_data = get_win_data( window_surface->hwnd ))) return; - offset_x = win_data->window_rect.left - win_data->whole_rect.left; - offset_y = win_data->window_rect.top - win_data->whole_rect.top; - release_win_data( win_data ); - - if (win_region == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ - { - region = NtGdiCreateRectRgn( 0, 0, win_data->window_rect.right - win_data->window_rect.left, - win_data->window_rect.bottom - win_data->window_rect.top ); - if (NtUserGetWindowRgnEx( window_surface->hwnd, region, 0 ) == ERROR && !surface->region) goto done; - } - - NtGdiOffsetRgn( region, offset_x, offset_y ); - if (surface->region) NtGdiCombineRgn( region, region, surface->region, RGN_AND ); - - if (!(size = NtGdiGetRegionData( region, 0, NULL ))) goto done; - if (!(data = malloc( size ))) goto done; - - if (!NtGdiGetRegionData( region, size, data )) - { - free( data ); - data = NULL; - } - -done: - window_surface_lock( window_surface ); - free( surface->region_data ); - surface->region_data = data; - window_surface->bounds = surface->header.rect; - window_surface_unlock( window_surface ); - if (region != win_region) NtGdiDeleteObjectApp( region ); -} - /*********************************************************************** * create_surface */ @@ -860,7 +824,6 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, surface->window = get_ioctl_window( hwnd ); surface->alpha = alpha; set_color_key( surface, color_key ); - set_surface_region( &surface->header, (HRGN)1 ); if (!(surface->bits = malloc( surface->info.bmiHeader.biSizeImage ))) goto failed; @@ -1435,22 +1398,6 @@ void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) } -/*********************************************************************** - * ANDROID_SetWindowRgn - */ -void ANDROID_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) -{ - struct android_win_data *data; - - if ((data = get_win_data( hwnd ))) - { - if (data->surface) set_surface_region( data->surface, hrgn ); - release_win_data( data ); - } - else FIXME( "not supported on other process window %p\n", hwnd ); -} - - /*********************************************************************** * ANDROID_SetLayeredWindowAttributes */

1 0

Rémi Bernon : win32u: Use a helper to set the window surface clipping, within the lock.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 8d587a47ebcd96ba2aacf44f2ca28ab304f5baee URL: https://gitlab.winehq.org/wine/wine/-/commit/8d587a47ebcd96ba2aacf44f2ca28a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 14:51:24 2024 +0200 win32u: Use a helper to set the window surface clipping, within the lock. --- dlls/win32u/dce.c | 42 +++++++++++++++++++++++--- dlls/win32u/window.c | 4 +-- dlls/wineandroid.drv/window.c | 52 ++++++++------------------------- dlls/winemac.drv/surface.c | 26 ++--------------- dlls/winewayland.drv/window_surface.c | 8 ++--- dlls/winex11.drv/bitblt.c | 55 ++++++++++++++++++----------------- include/wine/gdi_driver.h | 4 ++- 7 files changed, 91 insertions(+), 100 deletions(-)

1 0

Vijay Kiran Kamuju : ntdll: Add stub RtlLookupGenericTableAvl function.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 349c2275d41b8bae1fc886c404ae6e879863caaf URL: https://gitlab.winehq.org/wine/wine/-/commit/349c2275d41b8bae1fc886c404ae6e… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed May 29 19:14:45 2024 +0200 ntdll: Add stub RtlLookupGenericTableAvl function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56736 --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 2d2ec919c5c..3471905c762 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -877,7 +877,7 @@ # @ stub RtlLogStackBackTrace @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -# @ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) @ stdcall -arch=!i386 RtlLookupFunctionTable(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 3d482ec2f92..948412071c5 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2175,6 +2175,15 @@ void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, FIXME("%p %p %lu %p: stub\n", table, buffer, size, element); } +/****************************************************************************** + * RtlLookupElementGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer) +{ + FIXME("(%p, %p) stub!\n", table, buffer); + return NULL; +} + /********************************************************************* * RtlQueryPackageIdentity [NTDLL.@] */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 996777fd7fd..d7a77f5911a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1199,7 +1199,7 @@ @ stub RtlLockBootStatusData @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -@ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stub RtlLookupElementGenericTableFull @ stub RtlLookupElementGenericTableFullAvl @ stdcall -arch=!i386 RtlLookupFunctionEntry(long ptr ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index c705958e147..6a8fffd532e 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -280,6 +280,7 @@ void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPA void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE,void *); void WINAPI RtlMapGenericMask(ACCESS_MASK*,const GENERIC_MAPPING*); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN);

1 0

Esme Povirk : win32u: Implement EVENT_SYSTEM_FOREGROUND.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 962eb7ca02da7c657354a7f8f7c80aabbe75fea8 URL: https://gitlab.winehq.org/wine/wine/-/commit/962eb7ca02da7c657354a7f8f7c80a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 25 17:13:46 2024 +0000 win32u: Implement EVENT_SYSTEM_FOREGROUND. --- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++-------------------- dlls/win32u/input.c | 2 ++ 2 files changed, 29 insertions(+), 20 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context.namedArraysLoaded field.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 4a4292d3e10911aad45b1b503598cf8dd54ff35f URL: https://gitlab.winehq.org/wine/wine/-/commit/4a4292d3e10911aad45b1b503598cf… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 16:01:25 2024 -0500 wined3d: Remove the no longer used wined3d_context.namedArraysLoaded field. --- dlls/wined3d/context_gl.c | 30 ------------------------------ dlls/wined3d/wined3d_gl.h | 1 - dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8072ec15500..49d54d49e33 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4874,18 +4874,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s TRACE("Draw completed.\n"); } -void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int texture_idx; - - for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx) - { - gl_info->gl_ops.ext.p_glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx); - gl_info->gl_ops.gl.p_glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } -} - static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_element *element, const struct wined3d_state *state) { @@ -4896,22 +4884,6 @@ static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_el return offset; } -/* This should match any arrays loaded in wined3d_context_gl_load_vertex_data(). */ -static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (!context_gl->c.namedArraysLoaded) - return; - gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); - gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); - gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY); - if (gl_info->supported[EXT_SECONDARY_COLOR]) - gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - wined3d_context_gl_unload_tex_coords(context_gl); - context_gl->c.namedArraysLoaded = FALSE; -} - static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl *context_gl, unsigned int i) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -5164,7 +5136,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - wined3d_context_gl_unload_vertex_data(context_gl); wined3d_context_gl_load_numbered_arrays(context_gl, &context_gl->c.stream_info, state); } @@ -5243,7 +5214,6 @@ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); - wined3d_context_gl_unload_vertex_data(context_gl); wined3d_context_gl_unload_numbered_arrays(context_gl); GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 1dfa4138894..060d92318f8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -762,7 +762,6 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl); void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_gl); void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl); -void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl); void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges); void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c762de4b5bf..2d1bab87b00 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1930,11 +1930,10 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; - DWORD namedArraysLoaded : 1; DWORD update_primitive_type : 1; DWORD update_patch_vertex_count : 1; DWORD update_multisample_state : 1; - DWORD padding : 13; + DWORD padding : 14; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */

1 0

Krzysztof Bogacki : win32u: Use common name for fake GPUs and prefer Vulkan name over it.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: cb98a9b5abf483868730322d176367912c6a3c08 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb98a9b5abf483868730322d176367… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:48:47 2024 +0200 win32u: Use common name for fake GPUs and prefer Vulkan name over it. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 4 ++-- dlls/wineandroid.drv/init.c | 2 +- dlls/winewayland.drv/display.c | 2 +- dlls/winex11.drv/xinerama.c | 2 +- dlls/winex11.drv/xrandr.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c556f79719d..bd1100cbb98 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1252,7 +1252,7 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid; else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid; - if (!name && vulkan_gpu) name = vulkan_gpu->name; + if ((!name || !strcmp( name, "Wine GPU" )) && vulkan_gpu) name = vulkan_gpu->name; if (name) RtlUTF8ToUnicodeN( ctx->gpu.name, sizeof(ctx->gpu.name) - sizeof(WCHAR), &len, name, strlen( name ) ); snprintf( ctx->gpu.path, sizeof(ctx->gpu.path), "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X", @@ -1799,7 +1799,7 @@ static NTSTATUS default_update_display_devices( struct device_manager_ctx *ctx ) struct gdi_monitor monitor = {0}; DEVMODEW mode = {.dmSize = sizeof(mode)}; - add_gpu( "Default GPU", &pci_id, NULL, ctx ); + add_gpu( "Wine GPU", &pci_id, NULL, ctx ); add_source( "Default", source_flags, ctx ); if (!read_source_mode( ctx->source_key, ENUM_CURRENT_SETTINGS, &mode )) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index dd102375e44..d48c4153b06 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -281,7 +281,7 @@ UINT ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag }; DEVMODEW current = mode; - device_manager->add_gpu( "Android GPU", &pci_id, NULL, param ); + device_manager->add_gpu( "Wine GPU", &pci_id, NULL, param ); device_manager->add_source( "Default", source_flags, param ); device_manager->add_monitor( &gdi_monitor, param ); diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 002bcd0f542..9b4ebe7cdc1 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -193,7 +193,7 @@ static void wayland_add_device_gpu(const struct gdi_device_manager *device_manag TRACE("\n"); - device_manager->add_gpu("Wayland GPU", &pci_id, NULL, param); + device_manager->add_gpu("Wine GPU", &pci_id, NULL, param); } static void wayland_add_device_source(const struct gdi_device_manager *device_manager, diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c394c8a49b4..1fd170b0e07 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -199,7 +199,7 @@ static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL ge if (!gpus) return FALSE; - gpus[0].name = strdup( "Xinerama GPU" ); + gpus[0].name = strdup( "Wine GPU" ); *new_gpus = gpus; *count = 1; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index d255864fe57..9a4284f493f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -787,7 +787,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL ge if (!provider_resources->nproviders) { WARN("XRandR implementation doesn't report any providers, faking one.\n"); - gpus[0].name = strdup( "Xrandr GPU" ); + gpus[0].name = strdup( "Wine GPU" ); *new_gpus = gpus; *count = 1; ret = TRUE;

1 0

Krzysztof Bogacki : win32u: Prefer Vulkan PCI IDs over empty ones.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 93b95767f68da205d61a346e5f3b1019116fce73 URL: https://gitlab.winehq.org/wine/wine/-/commit/93b95767f68da205d61a346e5f3b10… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Tue May 28 00:12:34 2024 +0200 win32u: Prefer Vulkan PCI IDs over empty ones. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bd1100cbb98..890ca8129de 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1252,6 +1252,8 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid; else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid; + if (!pci_id->vendor && !pci_id->device && vulkan_gpu) pci_id = &vulkan_gpu->pci_id; + if ((!name || !strcmp( name, "Wine GPU" )) && vulkan_gpu) name = vulkan_gpu->name; if (name) RtlUTF8ToUnicodeN( ctx->gpu.name, sizeof(ctx->gpu.name) - sizeof(WCHAR), &len, name, strlen( name ) );

1 0

Krzysztof Bogacki : win32u: Prefer Vulkan UUIDs over empty ones.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: ef36081fe7b0b449c990db80f97cfd5d23e852f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef36081fe7b0b449c990db80f97cfd… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Tue May 28 01:13:21 2024 +0200 win32u: Prefer Vulkan UUIDs over empty ones. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 890ca8129de..49bf26214e7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1218,6 +1218,8 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * HKEY hkey, subkey; DWORD len; + static const GUID empty_uuid; + TRACE( "%s %04X %04X %08X %02X %s\n", debugstr_a( name ), pci_id->vendor, pci_id->device, pci_id->subsystem, pci_id->revision, debugstr_guid( vulkan_uuid ) ); @@ -1249,7 +1251,7 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); } - if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid; + if (vulkan_uuid && !IsEqualGUID( vulkan_uuid, &empty_uuid )) ctx->gpu.vulkan_uuid = *vulkan_uuid; else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid; if (!pci_id->vendor && !pci_id->device && vulkan_gpu) pci_id = &vulkan_gpu->pci_id;

1 0

Alexandre Julliard : msvcrt: Add missing C++ mangled names for ARM.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: a930c0ab0b83ba4062bc33e02c9f5f20c2b73fc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a930c0ab0b83ba4062bc33e02c9f5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:29:54 2024 +0200 msvcrt: Add missing C++ mangled names for ARM. --- dlls/msvcr100/msvcr100.spec | 171 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr70/msvcr70.spec | 28 ++++++++ dlls/msvcr71/msvcr71.spec | 28 ++++++++ dlls/msvcr80/msvcr80.spec | 23 ++++++ dlls/msvcr90/msvcr90.spec | 23 ++++++ dlls/msvcrtd/msvcrtd.spec | 23 ++++++ 6 files changed, 296 insertions(+)

1 0

Alexandre Julliard : msvcirt: Add missing C++ mangled names for ARM.
by Alexandre Julliard 29 May '24

29 May '24

Module: wine Branch: master Commit: 1fb8f23e61ce507ccfd0e04eb7180269791f916a URL: https://gitlab.winehq.org/wine/wine/-/commit/1fb8f23e61ce507ccfd0e04eb71802… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:30:34 2024 +0200 msvcirt: Add missing C++ mangled names for ARM. --- dlls/msvcirt/msvcirt.spec | 332 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 320 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt40/msvcrt40.spec | 349 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1001 insertions(+)

1 0