February 2022 - Wine-Commits

Zhiyi Zhang : uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 7398ed2977ec495fcd074e4c98d434b05304f19d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7398ed2977ec495fcd074e4c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 25 14:24:31 2021 +0800 uxtheme: Use TransparentBlt() for bitmaps with all alpha values being 0xff. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51553 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 96b7a8a317a859dd6f9bf9a0e03d303e7d3503b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/msstyles.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index cd7677e5783..3624bb2d4a6 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -1074,11 +1074,18 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha) if (!bmp || GetObjectW( bmp, sizeof(dib), &dib ) != sizeof(dib)) return FALSE; - if(dib.dsBm.bmBitsPixel != 32) + if (dib.dsBm.bmBitsPixel != 32 || dib.dsBmih.biCompression != BI_RGB) /* nothing to do */ return TRUE; - *hasAlpha = TRUE; + /* If all alpha values are 0xff, don't use alpha blending */ + for (n = 0, p = dib.dsBm.bmBits; n < dib.dsBmih.biWidth * dib.dsBmih.biHeight; n++, p += 4) + if ((*hasAlpha = (p[3] != 0xff))) + break; + + if (!*hasAlpha) + return TRUE; + p = dib.dsBm.bmBits; n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */

1 0

Zhiyi Zhang : user32: Report a fake monitor when running on an invisible window station.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 493a7f4daad1692637681ef711a33e29246dfd08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=493a7f4daad1692637681ef7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Aug 17 16:29:59 2021 +0800 user32: Report a fake monitor when running on an invisible window station. The visible window station check was accidentally deleted in 95be042. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51590 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8ce819ab57b42329b52d18fa29e5a79cfd1abf6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++++++- dlls/user32/tests/monitor.c | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 55d6d7e53a7..8b45704a9f8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4006,12 +4006,20 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { + BOOL is_winstation_visible = FALSE; + USEROBJECTFLAGS flags; + HWINSTA winstation; RECT monitor_rect; DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - if (update_monitor_cache()) + /* Report physical monitor information only if window station has visible display surfaces */ + winstation = GetProcessWindowStation(); + if (GetUserObjectInformationW( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL )) + is_winstation_visible = flags.dwFlags & WSF_VISIBLE; + + if (is_winstation_visible && update_monitor_cache()) { while (TRUE) { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index a587c7c6b16..a5be9021cbc 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1560,6 +1560,7 @@ static void test_EnumDisplayMonitors(void) static const DWORD DESKTOP_ALL_ACCESS = 0x01ff; HWINSTA winstation, old_winstation; HDESK desktop, old_desktop; + USEROBJECTFLAGS flags; INT count, old_count; DWORD error; BOOL ret; @@ -1599,6 +1600,12 @@ static void test_EnumDisplayMonitors(void) ok(ret, "SetProcessWindowStation failed, error %#x.\n", GetLastError()); ok(winstation == GetProcessWindowStation(), "Expected %p, got %p.\n", GetProcessWindowStation(), winstation); + flags.fInherit = FALSE; + flags.fReserved = FALSE; + flags.dwFlags = WSF_VISIBLE; + ret = SetUserObjectInformationW(winstation, UOI_FLAGS, &flags, sizeof(flags)); + ok(ret, "SetUserObjectInformationW failed, error %#x.\n", GetLastError()); + desktop = CreateDesktopW(L"test_desktop", NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL); ok(!!desktop && desktop != old_desktop, "CreateDesktopW failed, error %#x.\n", GetLastError()); ret = SetThreadDesktop(desktop);

1 0

Fabian Maurer : configure: Improve resolv lib test for glibc 2.34.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: f776c46642b200313c124ab0011823044398aef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f776c46642b200313c124ab0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Aug 19 00:53:56 2021 +0200 configure: Improve resolv lib test for glibc 2.34. res_init and res_query don't need lresolv on glibc 2.34. Added another test for ns_initparse and friends. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51635 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a3bbf5137707abb548ff642826992b7069bef1de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 18abeb13cb8..0ac783d7479 100755 --- a/configure +++ b/configure @@ -14015,7 +14015,7 @@ else int main () { -if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0) +if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0); ns_initparse(0,0,0) ; return 0; } diff --git a/configure.ac b/configure.ac index 5c689789c86..ed5116b17c9 100644 --- a/configure.ac +++ b/configure.ac @@ -1482,7 +1482,7 @@ then AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif -#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0)]])], +#include <resolv.h>]],[[if (!(_res.options & RES_INIT)) res_init(); res_query("foo",ns_c_in,0,0,0); ns_initparse(0,0,0)]])], [ac_cv_have_resolv=${lib:-"none required"}],[ac_cv_have_resolv="not found"]) test "x$ac_cv_have_resolv" = "xnot found" || break done

1 0

Zebediah Figura : server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 83923e43d57d624f52ef478bfb18d7f0fb6a91e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83923e43d57d624f52ef478b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 22:08:09 2021 -0500 server: Return STATUS_KEY_DELETED when trying to retrieve the full name of a deleted key. This fixes a server crash that can be triggered by deleting a key and then trying to retrieve its name. In that case key->parent is NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 089b2528c2c933e3c9b45a5f559fa4b5f830872a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/registry.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/registry.c b/server/registry.c index c937e051597..49601bda77e 100644 --- a/server/registry.c +++ b/server/registry.c @@ -402,6 +402,12 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) data_size_t len = sizeof(root_name) - sizeof(WCHAR); char *ret; + if (key->flags & KEY_DELETED) + { + set_error( STATUS_KEY_DELETED ); + return NULL; + } + for (key = (struct key *)obj; key != root_key; key = key->parent) len += key->namelen + sizeof(WCHAR); if (!(ret = malloc( len ))) return NULL;

1 0

Eric Pouech : winedbg: Fix crash when no process attached in 'info wnd' command.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 26c739a4fec6626142323f80ba003494c58f304b URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c739a4fec6626142323f80… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Jul 2 09:43:32 2021 +0200 winedbg: Fix crash when no process attached in 'info wnd' command. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49625 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5d8bad570d23fe7d69a04d8162fc3d4b76aad625) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ddac129bab5..a63e160fac3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -39,7 +39,7 @@ #include "oaidl.h" #include <wine/list.h> -#define ADDRSIZE (dbg_curr_process->be_cpu->pointer_size) +#define ADDRSIZE (dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : (int)sizeof(void*)) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for its internal use */

1 0

Zhiyi Zhang : uxtheme: Get and set system metrics in 96 DPI.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: f0143c1bc9b1186324fafa896fe242eab4da727c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0143c1bc9b1186324fafa89… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 9 14:46:24 2021 +0800 uxtheme: Get and set system metrics in 96 DPI. Fix a bug that font size may be smaller than normal after toggling theming. For example, the following steps will change the system metrics to incorrect values. 1. Open winecfg, and set DPI to 192. Do not restart winecfg. 2. Change the theme to Light. UXTHEME_BackupSystemMetrics() backs up system metrics in 96 DPI because the current DPI is still 96. 3. Restart winecfg and turn off theming. UXTHEME_RestoreSystemMetrics() restores system metrics in 192 DPI because the current DPI is 192. So system metrics will be scaled to 1/2 of the original size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37592 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7290db3e7a9652fcc39717b2fb492071dd52c641) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/msstyles.c | 4 ++++ dlls/uxtheme/system.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 3624bb2d4a6..ded8685a98e 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -830,12 +830,16 @@ static BOOL parse_handle_nonclient_size (struct PARSENONCLIENTSTATE* state, static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state) { + DPI_AWARENESS_CONTEXT old_context; + if (state->metricsDirty) { + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (state->metrics), &state->metrics, 0); SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (state->iconTitleFont), &state->iconTitleFont, 0); + SetThreadDpiAwarenessContext(old_context); } } diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index f8cc876b0c9..8b772a946d3 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -276,9 +276,12 @@ static void save_sys_colors (HKEY baseKey) * is deactivated */ static void UXTHEME_BackupSystemMetrics(void) { + DPI_AWARENESS_CONTEXT old_context; HKEY hKey; const struct BackupSysParam* bsp = backupSysParams; + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegCreateKeyExW( HKEY_CURRENT_USER, szThemeManager, 0, 0, 0, KEY_ALL_ACCESS, 0, &hKey, 0) == ERROR_SUCCESS) @@ -315,14 +318,19 @@ static void UXTHEME_BackupSystemMetrics(void) RegCloseKey (hKey); } + + SetThreadDpiAwarenessContext(old_context); } /* Read back old settings after a theme was deactivated */ static void UXTHEME_RestoreSystemMetrics(void) { + DPI_AWARENESS_CONTEXT old_context; HKEY hKey; const struct BackupSysParam* bsp = backupSysParams; + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + if (RegOpenKeyExW (HKEY_CURRENT_USER, szThemeManager, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { @@ -402,6 +410,8 @@ static void UXTHEME_RestoreSystemMetrics(void) RegCloseKey (hKey); } + + SetThreadDpiAwarenessContext(old_context); } /* Make system settings persistent, so they're in effect even w/o uxtheme

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement PsGetCurrentProcessSessionId.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: db98059c71c8151cae0a8d1a57f7d78bc0672d1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db98059c71c8151cae0a8d1a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 27 16:45:05 2021 +1000 ntoskrnl.exe: Implement PsGetCurrentProcessSessionId. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36887 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5aec01a7af42cd0b026a763f0c5d13e609a254f6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 52172cc180d..f8836748628 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2945,6 +2945,13 @@ HANDLE WINAPI PsGetCurrentProcessId(void) return KeGetCurrentThread()->id.UniqueProcess; } +/*********************************************************************** + * PsGetCurrentProcessSessionId (NTOSKRNL.EXE.@) + */ +ULONG WINAPI PsGetCurrentProcessSessionId(void) +{ + return PsGetCurrentProcess()->info.PebBaseAddress->SessionId; +} /*********************************************************************** * PsGetCurrentThreadId (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 54e8b6cb6cc..b845c4e96d9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -886,7 +886,7 @@ @ stub PsGetContextThread @ stdcall PsGetCurrentProcess() IoGetCurrentProcess @ stdcall PsGetCurrentProcessId() -@ stub PsGetCurrentProcessSessionId +@ stdcall PsGetCurrentProcessSessionId() @ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode

1 0

Nikolay Sivov : d3dx9/effect: Reset output handle for next after last technique in FindNextValidTechnique().
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: f1589ee006bfff29e1aea70bd82a80ce213bc5e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1589ee006bfff29e1aea70b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 17 19:17:33 2021 +0200 d3dx9/effect: Reset output handle for next after last technique in FindNextValidTechnique(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 60a3e0106246cb91d598a815d4fadf2791011142) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/tests/effect.c | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 710e999f27f..22afa649db3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3816,7 +3816,7 @@ static HRESULT WINAPI d3dx_effect_FindNextValidTechnique(ID3DXEffect *iface, D3D } } - *next_technique = get_technique_handle(&effect->techniques[0]); + *next_technique = NULL; return S_FALSE; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ae6f65d52d5..d6998284271 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7892,9 +7892,9 @@ static void test_effect_find_next_valid_technique(void) D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; D3DXTECHNIQUE_DESC desc; + D3DXHANDLE tech, tech2; ID3DXEffect *effect; IDirect3D9 *d3d; - D3DXHANDLE tech; ULONG refcount; HWND window; HRESULT hr; @@ -7939,9 +7939,12 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); - hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + tech2 = tech; + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech2); ok(hr == S_FALSE, "Got result %#x.\n", hr); - hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(!tech2, "Unexpected technique handle %p.\n", tech2); + /* Test GetTechniqueDesc() with a NULL handle. */ + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech2, &desc); ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); @@ -7957,9 +7960,10 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); - hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech2); ok(hr == S_FALSE, "Got result %#x.\n", hr); - hr = effect->lpVtbl->GetTechniqueDesc(effect, tech, &desc); + ok(!tech2, "Unexpected technique handle %p.\n", tech2); + hr = effect->lpVtbl->GetTechniqueDesc(effect, tech2, &desc); ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech0"), "Got unexpected technique %s.\n", desc.Name); @@ -7985,8 +7989,9 @@ static void test_effect_find_next_valid_technique(void) ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(!strcmp(desc.Name, "tech1"), "Got unexpected technique %s.\n", desc.Name); - hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech); + hr = effect->lpVtbl->FindNextValidTechnique(effect, tech, &tech2); ok(hr == S_FALSE, "Got result %#x.\n", hr); + ok(!tech2, "Unexpected technique handle %p.\n", tech2); hr = effect->lpVtbl->FindNextValidTechnique(effect, "nope", &tech); ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr);

1 0

Paul Gofman : wined3d: Add GPU information for AMD VANGOGH.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 7ad7ceb1a24770fa8a171b964521fba43eb4bad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ad7ceb1a24770fa8a171b96… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 22 19:13:23 2021 +0300 wined3d: Add GPU information for AMD VANGOGH. Signed-off-by: Paul Gofman <pgofman(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 6b724c3dd8d1ae83e90d4e7e9ec191016fabc7d0) 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 317a5dd9e51..c1e1aefd614 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -515,6 +515,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_14, "Radeon RX 5500M", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_21, "Radeon RX 6800/6800 XT / 6900 XT", DRIVER_AMD_RX, 16384}, + {HW_VENDOR_AMD, CARD_AMD_VANGOGH, "AMD VANGOGH", DRIVER_AMD_RX, 4096}, /* Red Hat */ {HW_VENDOR_REDHAT, CARD_REDHAT_VIRGL, "Red Hat VirtIO GPU", DRIVER_REDHAT_VIRGL, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df51de27345..598813cbe8f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2899,6 +2899,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_AMD_RADEON_RX_NAVI_14 = 0x7340, CARD_AMD_RADEON_RX_NAVI_21 = 0x73bf, + CARD_AMD_VANGOGH = 0x163f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Andrew Boyarshin : include: Fix IRequestDictionary IID.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 3c83603c8cf317b917f07a161726e60fe3c9631b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c83603c8cf317b917f07a16… Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Date: Fri Jul 23 14:49:36 2021 +0700 include: Fix IRequestDictionary IID. IRequestDictionary had the wrong UUID specified (IResponse one). Found by using MIDL instead of WIDL to compile Wine headers: duplicated IID caused compilation error in MIDL. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 32ec7d7b94d1c2a476553c1e50f59ac6ecb5c8f1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- include/asptlb.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a64bc5bc2b0..f5f6bc9e6de 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13026,7 +13026,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_IServiceProvider) || IsEqualIID(riid, &IID_IStream) || IsEqualIID(riid, &IID_ISequentialStream) || - IsEqualIID(riid, &IID_IRequestDictionary); + IsEqualIID(riid, &IID_IResponse); todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); diff --git a/include/asptlb.idl b/include/asptlb.idl index b38bc5d1fe9..07f250702dd 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -23,7 +23,7 @@ import "oaidl.idl"; [ object, dual, - uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) + uuid(D97A6DA0-A85F-11DF-83AE-00A0C90C2BD8) ] interface IRequestDictionary : IDispatch {

1 0