September 2018 - Wine-Commits

Tag wine-3.0.3 : Alexandre Julliard : Release 3.0.3
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: refs/tags/wine-3.0.3 Tag: dc831787582cf83b8a75cddfaded82fcb0df8080 URL: https://source.winehq.org/git/wine.git/?a=tag;h=dc831787582cf83b8a75cddfade… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 10:47:10 2018 +0200 Release 3.0.3

1 0

Alexandre Julliard : winex11: Use the client window support also for XComposite child windows.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: c8bebe0f4b760462cf3a81c6887349175c38c3df URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8bebe0f4b760462cf3a81c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 12 15:49:23 2018 +0100 winex11: Use the client window support also for XComposite child windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1ce36987eba0a9310f3e0ac6bd55148ededca7c6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/opengl.c | 62 ++++--------------------- dlls/winex11.drv/window.c | 116 +++++++++++++++++++++++++++------------------- dlls/winex11.drv/x11drv.h | 4 +- 3 files changed, 80 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c8bebe0f4b760462cf3a…

1 0

Alexandre Julliard : winex11: Support using an ARGB visual as default visual.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 1d92c8dbbed0528c6930d7aef305fa02474e3f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d92c8dbbed0528c6930d7ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:39:03 2018 +0100 winex11: Support using an ARGB visual as default visual. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e40ff92e7c80082c449c480e457cba7525e0bbcd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/systray.c | 4 ++-- dlls/winex11.drv/window.c | 17 ++++++++++------- dlls/winex11.drv/x11drv.h | 3 ++- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 815e554..da322e0 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -644,14 +644,14 @@ static void dock_systray_icon( Display *display, struct tray_icon *icon, Window get_systray_visual_info( display, systray_window, &visual ); - icon->layered = (visual.visualid != default_visual.visualid); + icon->layered = (visual.depth == 32); icon->window = CreateWindowExW( icon->layered ? WS_EX_LAYERED : 0, icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, icon_cx, icon_cy, NULL, NULL, NULL, icon ); if (!(data = get_win_data( icon->window ))) return; - if (icon->layered) set_window_visual( data, &visual ); + if (icon->layered) set_window_visual( data, &visual, TRUE ); make_window_embedded( data ); window = data->whole_window; release_win_data( data ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ed3b9ab..568f34f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1593,16 +1593,19 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des * * Change the visual by destroying and recreating the X window if needed. */ -void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis ) +void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) { Window client_window = data->client_window; Window whole_window = data->whole_window; + if (!data->use_alpha == !use_alpha) return; + if (data->surface) window_surface_release( data->surface ); + data->surface = NULL; + data->use_alpha = use_alpha; + if (data->vis.visualid == vis->visualid) return; data->client_window = 0; destroy_whole_window( data, client_window != 0 /* don't destroy whole_window until reparented */ ); - if (data->surface) window_surface_release( data->surface ); - data->surface = NULL; data->vis = *vis; create_whole_window( data ); if (!client_window) return; @@ -1649,7 +1652,7 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ { data->layered = FALSE; - set_window_visual( data, &default_visual ); + set_window_visual( data, &default_visual, FALSE ); sync_window_opacity( data->display, data->whole_window, 0, 0, 0 ); if (data->surface) set_surface_color_key( data->surface, CLR_INVALID ); } @@ -2232,7 +2235,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window && !data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; - if (data->vis.visualid != default_visual.visualid) goto done; + if (data->use_alpha) goto done; if (!get_surface_rect( visible_rect, &surface_rect )) goto done; if (*surface) window_surface_release( *surface ); @@ -2542,7 +2545,7 @@ void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alph if (data) { - set_window_visual( data, &default_visual ); + set_window_visual( data, &default_visual, FALSE ); if (data->whole_window) sync_window_opacity( data->display, data->whole_window, key, alpha, flags ); @@ -2598,7 +2601,7 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO if (!(data = get_win_data( hwnd ))) return FALSE; data->layered = TRUE; - if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual ); + if (!data->embedded && argb_visual.visualid) set_window_visual( data, &argb_visual, TRUE ); rect = *window_rect; OffsetRect( &rect, -window_rect->left, -window_rect->top ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 34b6902..51e5545 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -563,6 +563,7 @@ struct x11drv_win_data BOOL embedded : 1; /* is window an XEMBED client? */ BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ + BOOL use_alpha : 1; /* does window use an alpha channel? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */ @@ -590,7 +591,7 @@ extern void read_net_wm_states( Display *display, struct x11drv_win_data *data ) extern void update_net_wm_states( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern void make_window_embedded( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window create_client_window( struct x11drv_win_data *data, const XVisualInfo *visual ) DECLSPEC_HIDDEN; -extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis ) DECLSPEC_HIDDEN; +extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void change_systray_owner( Display *display, Window systray_window ) DECLSPEC_HIDDEN; extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN;

1 0

Austin English : winecfg: Recommend against overriding secur32.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: f16195d138d8180bdaee89b78378376fec01aa04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f16195d138d8180bdaee89b7… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 2 05:23:07 2018 +0200 winecfg: Recommend against overriding secur32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45344 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 53cc1da18f3683197fa5e62c2f7d4f9d3ef39c51) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/libraries.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index d414c75..f6d38c9 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -64,6 +64,7 @@ static const char * const builtin_only[] = "ntoskrnl.exe", "opengl32", "sane.ds", + "secur32", "twain_32", "unicows", "user32",

1 0

Jason Edmeades : cmd: Fix statements after 'else' inside for loops.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: ecdcf1ba42feaebbd8ed976efb397501eaa32950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecdcf1ba42feaebbd8ed976e… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Jul 15 23:15:29 2018 +0100 cmd: Fix statements after 'else' inside for loops. When inside a for loop, an 'if' statement is processed and the true part taken. Once all the commands in the true are processed, the else part is parsed, and a flag set to skip all commands in the else part. Unfortunately this flag is left on even when the if statement ends, meaning subsequent commands are also skipped. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6cb520476a79fd7ff5a67c1a1064de9c267fdbc1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 18 +++++++++++++++-- programs/cmd/tests/test_builtins.cmd | 34 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 +++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7c2122e..160940e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1571,10 +1571,12 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* execute all appropriate commands */ curPosition = *cmdList; - WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d)\n", + WINE_TRACE("Processing cmdList(%p) - delim(%d) bd(%d / %d) processThese(%d)\n", *cmdList, (*cmdList)->prevDelim, - (*cmdList)->bracketDepth, myDepth); + (*cmdList)->bracketDepth, + myDepth, + processThese); /* Execute any statements appended to the line */ /* FIXME: Only if previous call worked for && or failed for || */ @@ -1613,6 +1615,18 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, if (*cmd) { WCMD_execute (cmd, (*cmdList)->redirects, cmdList, FALSE); } + } else { + /* Loop skipping all commands until we get back to the current + depth, including skipping commands and their subsequent + pipes (eg cmd | prog) */ + do { + *cmdList = (*cmdList)->nextcommand; + } while (*cmdList && + ((*cmdList)->bracketDepth > myDepth || + (*cmdList)->prevDelim)); + + /* After the else is complete, we need to now process subsequent commands */ + processThese = TRUE; } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; } else if (!processThese) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index f344de2..236238c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -418,6 +418,7 @@ if 1==1 (echo n1) else echo n2|echo n3 if 1==1 (echo o1) else echo o2&&echo o3 if 1==1 (echo p1) else echo p2||echo p3 if 1==1 (echo q1) else echo q2&echo q3 +echo --- echo --- chain else (if false) if 1==0 echo a1 else echo a2 if 1==0 echo b1|echo b2 else echo b3 @@ -1328,6 +1329,39 @@ for /L %%i in (2,2,1) do ( echo %%i echo FAILED ) +echo --- ifs inside for loops +for %%i in (test) do ( + echo a1 + if 1==1 ( + echo b1 + ) else ( + echo c1 + ) + echo d1 +) +for %%i in (test) do ( + echo a2 + if 1==1 ( + echo b2 + ) else echo c2 + echo d2 +) +for %%i in (test) do ( + echo a3 + if 1==0 ( + echo b3 + ) else echo c3 + echo d3 +) +for %%i in (test) do ( + echo a4 + if 1==0 ( + echo b4 + ) else ( + echo c4 + ) + echo d4 +) echo --- set /a goto :testseta diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index cab4a35..eb60620 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -428,6 +428,7 @@ n1 o1 p1 q1 +(a)todo_wine@--- --- chain else (if false) @todo_wine(a)j3 --- @@ -974,6 +975,19 @@ ErrorLevel 0 -1 1 3 +--- ifs inside for loops +a1 +b1 +d1 +a2 +b2 +d2 +a3 +c3 +d3 +a4 +c4 +d4 --- set /a ------ individual operations WINE_foo correctly 3

1 0

Alex Henrie : gdi32: Add DECLSPEC_HOTPATCH to GetDIBits.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 6f8db1d2cd5b4cbf4891cdf6feda7008374da024 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f8db1d2cd5b4cbf4891cdf6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 5 08:39:25 2018 +0200 gdi32: Add DECLSPEC_HOTPATCH to GetDIBits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 478a3d64ef7630f16e6c618375a76ad665c7cf63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/dib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2eb0e91..6936434 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1208,7 +1208,7 @@ BITMAPINFO *copy_packed_dib( const BITMAPINFO *src_info, UINT usage ) * Success: Number of scan lines copied from bitmap * Failure: 0 */ -INT WINAPI GetDIBits( +INT WINAPI DECLSPEC_HOTPATCH GetDIBits( HDC hdc, /* [in] Handle to device context */ HBITMAP hbitmap, /* [in] Handle to bitmap */ UINT startscan, /* [in] First scan line to set in dest bitmap */

1 0

Hans Leidekker : webservices: Avoid a warning from HeapDestroy.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 5b835e75d95a8ca977615b0d4d3c19cf74901b75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b835e75d95a8ca977615b0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 20 15:04:44 2018 +0200 webservices: Avoid a warning from HeapDestroy. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab2f25d40c4e72b8f156af43e615c028bd268db4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/webservices/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 080cc0d..b4f94af 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -215,7 +215,7 @@ HRESULT WINAPI WsCreateHeap( SIZE_T max_size, SIZE_T trim_size, const WS_HEAP_PR static void reset_heap( struct heap *heap ) { - HeapDestroy( heap->handle ); + if (heap->handle) HeapDestroy( heap->handle ); heap->handle = NULL; heap->max_size = heap->allocated = 0; }

1 0

Alexandre Julliard : winex11: Don' t allocate a window surface for off-screen windows.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 6f9f87faafbb30fae96d3903eac5585819792966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9f87faafbb30fae96d3903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 12:45:35 2018 +0100 winex11: Don't allocate a window surface for off-screen windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ef349e45f38ae4d204f151256ad02db6937acab) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/window.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b13a2eb..ed3b9ab 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2186,17 +2186,17 @@ done: } -static inline RECT get_surface_rect( const RECT *visible_rect ) +static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - RECT rect = get_virtual_screen_rect(); + *surface_rect = get_virtual_screen_rect(); - IntersectRect( &rect, &rect, visible_rect ); - OffsetRect( &rect, -visible_rect->left, -visible_rect->top ); - rect.left &= ~31; - rect.top &= ~31; - rect.right = max( rect.left + 32, (rect.right + 31) & ~31 ); - rect.bottom = max( rect.top + 32, (rect.bottom + 31) & ~31 ); - return rect; + if (!IntersectRect( surface_rect, surface_rect, visible_rect )) return FALSE; + OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); + surface_rect->left &= ~31; + surface_rect->top &= ~31; + surface_rect->right = max( surface_rect->left + 32, (surface_rect->right + 31) & ~31 ); + surface_rect->bottom = max( surface_rect->top + 32, (surface_rect->bottom + 31) & ~31 ); + return TRUE; } @@ -2233,6 +2233,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window && !data->embedded) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; if (data->vis.visualid != default_visual.visualid) goto done; + if (!get_surface_rect( visible_rect, &surface_rect )) goto done; if (*surface) window_surface_release( *surface ); *surface = NULL; /* indicate that we want to draw directly to the window */ @@ -2242,7 +2243,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (data->client_window) goto done; if (!client_side_graphics && !layered) goto done; - surface_rect = get_surface_rect( visible_rect ); if (data->surface) { if (EqualRect( &data->surface->rect, &surface_rect ))

1 0

Zhiyi Zhang : gdiplus: Fix a memory leak.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 0ead54c80ee9d596a9799ab6e9d4035765f6369a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ead54c80ee9d596a9799ab6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 18 22:00:09 2018 +0800 gdiplus: Fix a memory leak. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 40ce1dd473e706a00456b8d1c7bc3e802810a97e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 06fb89e..4aa8831 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1064,7 +1064,11 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { HDC hdc = CreateCompatibleDC(NULL); - if (!hdc) break; + if (!hdc) + { + DeleteObject(bmp); + break; + } SelectObject(hdc, bmp); gdi_alpha_blend(graphics, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top,

1 0

Józef Kucia : wined3d: Add GPU information for AMD Radeon RX Vega.
by Alexandre Julliard Sept. 13, 2018

Sept. 13, 2018

Module: wine Branch: stable Commit: 10358aefa9f144bc50ce8f568168edb7f0c3587d URL: https://source.winehq.org/git/wine.git/?a=commit;h=10358aefa9f144bc50ce8f56… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 22:45:00 2018 +0200 wined3d: Add GPU information for AMD Radeon RX Vega. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00abf4222db0fcad92fe5a5af8dbfbb47ff848c7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4eeb461..6790a71 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1450,6 +1450,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9e412b6..8afcc9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2275,6 +2275,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_R9_FURY = 0x7300, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, + CARD_AMD_RADEON_RX_VEGA = 0x687f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0