April 2020 - Wine-commits - list.winehq.org

Patrick Hibbs : wtsapi32: Make WTSRegisterSessionNotificationEx's return consistent with WTSRegisterSessionNotification.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 4d18a7f237fc47d347861a9254a8b8b6b59847f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d18a7f237fc47d347861a92… Author: Patrick Hibbs <hibbsncc1701(a)gmail.com> Date: Sat Dec 7 03:06:14 2019 -0500 wtsapi32: Make WTSRegisterSessionNotificationEx's return consistent with WTSRegisterSessionNotification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f870aa4988fa8e980919c144682da72865364ff0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 3edf9215fd..02ca0d2723 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -303,7 +303,7 @@ BOOL WINAPI WTSRegisterSessionNotification(HWND hWnd, DWORD dwFlags) BOOL WINAPI WTSRegisterSessionNotificationEx(HANDLE hServer, HWND hWnd, DWORD dwFlags) { FIXME("Stub %p %p 0x%08x\n", hServer, hWnd, dwFlags); - return FALSE; + return TRUE; }

1 0

Andrew Sheldon : wined3d: Add Navi 10 PCI id and device description.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 0355ca9e2b1aba5e2ffe8c272bdfa5f929615a0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0355ca9e2b1aba5e2ffe8c27… Author: Andrew Sheldon <asheldon55(a)gmail.com> Date: Mon Nov 11 18:07:12 2019 +1100 wined3d: Add Navi 10 PCI id and device description. Signed-off-by: Andrew Sheldon <asheldon55(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit da5a80879f165e773f0c9f3d87929c9d9c6f01d7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 4 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 06677c3ba3..383873e9dd 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1633,6 +1633,8 @@ cards_intel[] = * drivers: R700, RV790, R680, RV535, RV516, R410, RS485, RV360, RV351. */ cards_amd_mesa[] = { + /* Navi 10 */ + {"NAVI10", CARD_AMD_RADEON_RX_NAVI_10}, /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 57e8ac4811..a4f2eef905 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -398,6 +398,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, /* 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 19e294fe51..db199ea513 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2315,6 +2315,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, + CARD_AMD_RADEON_RX_NAVI_10 = 0x731f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Ethan Lee : wined3d: Add Intel HD 615 PCI id and device description.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: fc274645cfde22d99c6fb88b8ce43b1420df3600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc274645cfde22d99c6fb88b… Author: Ethan Lee <elee(a)codeweavers.com> Date: Fri Nov 29 12:46:56 2019 -0500 wined3d: Add Intel HD 615 PCI id and device description. Signed-off-by: Ethan Lee <elee(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 46556c2f8c0a94263e87af2d9d0ba20d54e0e2ca) 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 a4f2eef905..21a183430c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -481,6 +481,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD620, "Intel(R) UHD Graphics 620", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD615, "Intel(R) HD Graphics 615", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index db199ea513..7b6667b6e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2533,6 +2533,7 @@ enum wined3d_pci_device CARD_INTEL_IPP580_2 = 0x193d, CARD_INTEL_UHD617 = 0x87c0, CARD_INTEL_UHD620 = 0x3ea0, + CARD_INTEL_HD615 = 0x591e, CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b,

1 0

Paul Gofman : d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 9d42b179a9c917e4e2c8504921d44c48f5682dc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d42b179a9c917e4e2c85049… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jan 14 18:18:19 2020 +0100 d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate. Manual testing shows that the backward compatible compilation is used in d3dx9 versions below 37. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48302 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 13880f8e6a0a972382de7de04b56bd1a414bef67) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e8ce3dd796..10c75d556b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -426,6 +426,9 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile), flags, shader, error_msgs, constant_table); + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); @@ -506,6 +509,9 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO return D3DXERR_INVALIDDATA; } + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(buffer, len, filename_a, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_messages);

1 0

Rémi Bernon : opencl: Define CL_TARGET_OPENCL_VERSION 220 to fix a header warning.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 55d1a591efadc0d24f031ee06f7840f3ad832fab URL: https://source.winehq.org/git/wine.git/?a=commit;h=55d1a591efadc0d24f031ee0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:24 2019 +0100 opencl: Define CL_TARGET_OPENCL_VERSION 220 to fix a header warning. This is going to be the value used anyway, as we didn't specify it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 97e47fe0668add38dbcee327a4a0a26e20be4891) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opencl/opencl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/opencl/opencl.c b/dlls/opencl/opencl.c index 2d145bf25c..7e680ba057 100644 --- a/dlls/opencl/opencl.c +++ b/dlls/opencl/opencl.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(opencl); #define CL_USE_DEPRECATED_OPENCL_1_1_APIS #define CL_USE_DEPRECATED_OPENCL_1_2_APIS #define CL_USE_DEPRECATED_OPENCL_2_0_APIS +#define CL_TARGET_OPENCL_VERSION 220 #include <CL/cl.h> #elif defined(HAVE_OPENCL_OPENCL_H) #include <OpenCL/opencl.h>

1 0

Alexandre Julliard : msi: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 3b50c56fd3189a0ae69e9a0404745d499241e18f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b50c56fd3189a0ae69e9a04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:05 2019 +0100 msi: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d977c55bb4b9c564f376c22b43c60c9be7dc782d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/cond.y | 2 +- dlls/msi/sql.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 2e252be5f4..8ba6916af1 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -117,7 +117,7 @@ static void value_free( struct value val ) %lex-param { COND_input *info } %parse-param { COND_input *info } -%pure-parser +%define api.pure %union { diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 2101c680eb..2cc280c9cf 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -62,7 +62,7 @@ static struct expr * EXPR_wildcard( void *info ); %lex-param { SQL_input *info } %parse-param { SQL_input *info } -%pure-parser +%define api.pure %union {

1 0

Alexandre Julliard : msxml3: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 0cc00dfb4e1a92930cce4172cb519c8b0e2fce79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc00dfb4e1a92930cce4172… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:39 2019 +0100 msxml3: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 096eda01cce80fe3338aa26b00dacade504c7c4c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/xslpattern.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 0cefe59168..4a2aad215c 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -70,7 +70,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons %start XSLPattern -%pure-parser +%define api.pure %parse-param {parser_param* p} %parse-param {void* scanner} %lex-param {yyscan_t* scanner}

1 0

Alexandre Julliard : vbscript: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 6d2df2328f745e20e09f0a5588be09246b9c7837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2df2328f745e20e09f0a55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:47 2019 +0100 vbscript: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 003a5f7c981fafe31c1b218df50259ba4131804b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 52c98fca59..704eeef83d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -80,7 +80,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %lex-param { parser_ctx_t *ctx } %parse-param { parser_ctx_t *ctx } -%pure-parser +%define api.pure %start Program %union {

1 0

Alexandre Julliard : wbemprox: Use %define api.pure instead of %pure-parser.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: 39d3c93162ca00317af3bd713119c8ef352e99d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d3c93162ca00317af3bd71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 25 14:37:54 2019 +0100 wbemprox: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7026b59b48abecfe51444df491ff40b33f53d3d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/wql.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 75ce5b0621..988feb2db1 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -188,7 +188,7 @@ static int wql_lex( void *val, struct parser *parser ); %lex-param { struct parser *ctx } %parse-param { struct parser *ctx } %define parse.error verbose -%pure-parser +%define api.pure %union {

1 0

Chip Davis : winemac.drv: Pass the CAMetalLayer to MoltenVK.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: oldstable Commit: a6dde4d38b08ca11d5979a26747b556ca6ea5445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6dde4d38b08ca11d5979a26… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 23:58:17 2019 -0600 winemac.drv: Pass the CAMetalLayer to MoltenVK. It isn't safe to access the view object from any thread other than the main thread. In fact, if you try to call vkCreateMacOSSurfaceMVK() from any other thread, MoltenVK prints out a big, scary warning telling you not to do this! Instead, get the layer from the view ourselves and pass that to MoltenVK. Recent versions of MoltenVK can accept either the view or the layer. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 606424bbbc614f720ac6190151f9fe5cc3e57005) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/vulkan.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index f43b26b8e3..0b9fd64ebb 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3789,6 +3789,18 @@ macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_devi return (macdrv_metal_view)metalView; } +macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) +{ + WineMetalView* view = (WineMetalView*)v; + __block CAMetalLayer* layer; + + OnMainThread(^{ + layer = (CAMetalLayer*)view.layer; + }); + + return (macdrv_metal_layer)layer; +} + void macdrv_view_release_metal_view(macdrv_metal_view v) { WineMetalView* view = (WineMetalView*)v; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 011b1ffd37..da82f9dbfa 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -141,6 +141,7 @@ typedef struct macdrv_opaque_opengl_context* macdrv_opengl_context; #ifdef HAVE_METAL_METAL_H typedef struct macdrv_opaque_metal_device* macdrv_metal_device; typedef struct macdrv_opaque_metal_view* macdrv_metal_view; +typedef struct macdrv_opaque_metal_layer* macdrv_metal_layer; #endif typedef struct macdrv_opaque_status_item* macdrv_status_item; struct macdrv_event; @@ -538,6 +539,7 @@ extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_conte extern macdrv_metal_device macdrv_create_metal_device(void) DECLSPEC_HIDDEN; extern void macdrv_release_metal_device(macdrv_metal_device d) DECLSPEC_HIDDEN; extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) DECLSPEC_HIDDEN; +extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) DECLSPEC_HIDDEN; extern void macdrv_view_release_metal_view(macdrv_metal_view v) DECLSPEC_HIDDEN; #endif extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index d49c9a1ab2..580002cf21 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -280,7 +280,7 @@ static VkResult macdrv_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.sType = VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ - create_info_host.pView = mac_surface->view; + create_info_host.pView = macdrv_view_get_metal_layer(mac_surface->view); res = pvkCreateMacOSSurfaceMVK(instance, &create_info_host, NULL /* allocator */, &mac_surface->surface); if (res != VK_SUCCESS)

1 0