April 2019 - Wine-Commits - list.winehq.org

Francois Gouget : Disable multithreaded DirectX tests if WINETEST_NO_MT_D3D is set.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 1684b011189435d9bd3d6838be4cf1ce62edba4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1684b011189435d9bd3d6838… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 2 19:26:10 2019 +0200 Disable multithreaded DirectX tests if WINETEST_NO_MT_D3D is set. The nouveau graphics driver's support for multithreaded OpenGL is buggy at least up to (18.2.8) so that any Wine test that performs multithreaded OpenGL accesses freezes, crashes the Mesa stack and eventually freezes the whole computer. Typically the first such test is d2d1:d2d1. The relevant tests have a --single option but WineTest neither knows which tests accept this option, nor whether it is needed for the current host. The WINETEST_NO_MT_D3D environnement variable can be set on hosts that need it (such as the cw2-gtx560 box) and is automatically inherited by the relevant tests thus working around this issue. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 ++ dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/dxgi/tests/dxgi.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2214be6..f8fc1f5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8051,6 +8051,8 @@ START_TEST(d2d1) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 00bd16b..f799922 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17925,6 +17925,8 @@ START_TEST(d3d10core) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 90bcbae..d5445ef 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29191,6 +29191,8 @@ START_TEST(d3d11) unsigned int argc, i; char **argv; + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 91d218f..79e4bc0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5041,6 +5041,8 @@ START_TEST(dxgi) registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); + use_mt = !getenv("WINETEST_NO_MT_D3D"); + argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) {

1 0

Michael Müller : server: Correctly validate SID length in sd_is_valid.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: f926811e0df963319aa1b7903c368fbfe4a51986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f926811e0df963319aa1b790… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Apr 3 17:44:31 2019 +0200 server: Correctly validate SID length in sd_is_valid. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/token.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/token.c b/server/token.c index e58e6a4..5c35bcc 100644 --- a/server/token.c +++ b/server/token.c @@ -305,8 +305,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) owner = sd_get_owner( sd ); if (owner) { - size_t needed_size = security_sid_len( owner ); - if ((sd->owner_len < sizeof(SID)) || (needed_size > sd->owner_len)) + if ((sd->owner_len < sizeof(SID)) || (security_sid_len( owner ) > sd->owner_len)) return FALSE; } offset += sd->owner_len; @@ -317,8 +316,7 @@ int sd_is_valid( const struct security_descriptor *sd, data_size_t size ) group = sd_get_group( sd ); if (group) { - size_t needed_size = security_sid_len( group ); - if ((sd->group_len < sizeof(SID)) || (needed_size > sd->group_len)) + if ((sd->group_len < sizeof(SID)) || (security_sid_len( group ) > sd->group_len)) return FALSE; } offset += sd->group_len;

1 0

Piotr Caban : ws2_32: Don't use strcasecmp.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 17779b44d10c3eff0a4b3b8b239da8a5966d07df URL: https://source.winehq.org/git/wine.git/?a=commit;h=17779b44d10c3eff0a4b3b8b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:39 2019 +0200 ws2_32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a56e284..a302612 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6509,7 +6509,7 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) unsigned int i; for (i = 0; i < ARRAY_SIZE(protocols); i++) { - if (strcasecmp( protocols[i].names[0], name )) continue; + if (_strnicmp( protocols[i].names[0], name, -1 )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, protocols[i].prot ); break;

1 0

Piotr Caban : iphlpapi: Don't use strncasecmp.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 95510d5b1b541c0f9e6dd508adc050d057f63ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95510d5b1b541c0f9e6dd508… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:20:05 2019 +0200 iphlpapi: Don't use strncasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index be1cc52..b4ed542 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -302,7 +302,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) while ((ptr = fgets(buf, sizeof(buf), fp))) { while (*ptr && isspace(*ptr)) ptr++; - if (strncasecmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') + if (_strnicmp(ptr, name, nameLen) == 0 && *(ptr + nameLen) == ':') { ptr += nameLen + 1; sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u", @@ -433,10 +433,10 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -657,13 +657,13 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) if ((ptr = strchr(value, '\n'))) *ptr='\0'; - if (!strcasecmp(buf, "Icmp6InMsgs")) + if (!_strnicmp(buf, "Icmp6InMsgs", -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.dwMsgs = res; continue; } - if (!strcasecmp(buf, "Icmp6InErrors")) + if (!_strnicmp(buf, "Icmp6InErrors", -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.dwErrors = res; continue; @@ -671,7 +671,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) for (i = 0; i < ARRAY_SIZE(icmpinstatlist); i++) { - if (!strcasecmp(buf, icmpinstatlist[i].name)) + if (!_strnicmp(buf, icmpinstatlist[i].name, -1)) { if (sscanf(value, "%d", &res)) stats->icmpInStats.rgdwTypeCount[icmpinstatlist[i].pos] = res; @@ -679,13 +679,13 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) } } - if (!strcasecmp(buf, "Icmp6OutMsgs")) + if (!_strnicmp(buf, "Icmp6OutMsgs", -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwMsgs = res; continue; } - if (!strcasecmp(buf, "Icmp6OutErrors")) + if (!_strnicmp(buf, "Icmp6OutErrors", -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.dwErrors = res; continue; @@ -693,7 +693,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) for (i = 0; i < ARRAY_SIZE(icmpoutstatlist); i++) { - if (!strcasecmp(buf, icmpoutstatlist[i].name)) + if (!_strnicmp(buf, icmpoutstatlist[i].name, -1)) { if (sscanf(value, "%d", &res)) stats->icmpOutStats.rgdwTypeCount[icmpoutstatlist[i].pos] = res; @@ -823,7 +823,7 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(ipstatlist); i++) - if (!strcasecmp(buf, ipstatlist[i].name) && sscanf(value, "%d", &res)) + if (!_strnicmp(buf, ipstatlist[i].name, -1) && sscanf(value, "%d", &res)) *ipstatlist[i].elem = res; } fclose(fp); @@ -847,10 +847,10 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -1029,10 +1029,10 @@ DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u %u %u %u %u %u %u %u %u %u", @@ -1210,7 +1210,7 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) *ptr='\0'; for (i = 0; i < ARRAY_SIZE(udpstatlist); i++) - if (!strcasecmp(buf, udpstatlist[i].name) && sscanf(value, "%d", &res)) + if (!_strnicmp(buf, udpstatlist[i].name, -1) && sscanf(value, "%d", &res)) *udpstatlist[i].elem = res; } fclose(fp); @@ -1234,10 +1234,10 @@ DWORD WINAPI GetUdpStatisticsEx(PMIB_UDPSTATS stats, DWORD family) while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (strncasecmp(buf, hdr, sizeof(hdr) - 1)) continue; + if (_strnicmp(buf, hdr, sizeof(hdr) - 1)) continue; /* last line was a header, get another */ if (!(ptr = fgets(buf, sizeof(buf), fp))) break; - if (!strncasecmp(buf, hdr, sizeof(hdr) - 1)) + if (!_strnicmp(buf, hdr, sizeof(hdr) - 1)) { ptr += sizeof(hdr); sscanf( ptr, "%u %u %u %u %u",

1 0

Nikolay Sivov : dbgeng: Add IDebugControl2 stub.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 406ac1bc746574aaa9432a958c6de5e1ddf2dade URL: https://source.winehq.org/git/wine.git/?a=commit;h=406ac1bc746574aaa9432a95… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:48 2019 +0300 dbgeng: Add IDebugControl2 stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 905 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 905 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=406ac1bc746574aaa943…

1 0

Józef Kucia : wined3d: Pass application info to Vulkan.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 46a451f32738668738c980635ff813f209b6434e URL: https://source.winehq.org/git/wine.git/?a=commit;h=46a451f32738668738c98063… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:34 2019 +0200 wined3d: Pass application info to Vulkan. 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> --- dlls/wined3d/adapter_vk.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/wined3d_main.c | 42 +++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cea6e69..ca3a0f9 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -110,11 +110,28 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = adapter_vk_check_format, }; +static unsigned int wined3d_get_wine_vk_version(void) +{ + const char *ptr = PACKAGE_VERSION; + int major, minor; + + major = atoi(ptr); + + while (isdigit(*ptr) || *ptr == '.') + ++ptr; + + minor = atoi(ptr); + + return VK_MAKE_VERSION(major, minor, 0); +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; + VkApplicationInfo app_info; + char app_name[MAX_PATH]; VkResult vr; if (!wined3d_load_vulkan(vk_info)) @@ -126,8 +143,17 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + memset(&app_info, 0, sizeof(app_info)); + app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; + if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) + app_info.pApplicationName = app_name; + app_info.pEngineName = "Damavand"; + app_info.engineVersion = wined3d_get_wine_vk_version(); + app_info.apiVersion = VK_API_VERSION_1_0; + memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_info.pApplicationInfo = &app_info; if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index d2e4978..0a0121d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -142,6 +142,30 @@ success: return 0; } +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) +{ + char buffer[MAX_PATH]; + unsigned int len; + char *p, *name; + + len = GetModuleFileNameA(0, buffer, ARRAY_SIZE(buffer)); + if (!(len && len < MAX_PATH)) + return FALSE; + + name = buffer; + if ((p = strrchr(name, '/' ))) + name = p + 1; + if ((p = strrchr(name, '\\'))) + name = p + 1; + + len = strlen(name) + 1; + if (app_name_size < len) + return FALSE; + + memcpy(app_name, name, len); + return TRUE; +} + static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; @@ -149,7 +173,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) DWORD size = sizeof(buffer); HKEY hkey = 0; HKEY appkey = 0; - DWORD len, tmpvalue; + DWORD tmpvalue; WNDCLASSA wc; wined3d_context_tls_idx = TlsAlloc(); @@ -191,20 +215,16 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) /* @@ Wine registry key: HKCU\Software\Wine\Direct3D */ if ( RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Direct3D", &hkey ) ) hkey = 0; - len = GetModuleFileNameA( 0, buffer, MAX_PATH ); - if (len && len < MAX_PATH) + if (wined3d_get_app_name(buffer, ARRAY_SIZE(buffer))) { HKEY tmpkey; /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Direct3D */ - if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey )) + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmpkey)) { - char *p, *appname = buffer; - if ((p = strrchr( appname, '/' ))) appname = p + 1; - if ((p = strrchr( appname, '\\' ))) appname = p + 1; - strcat( appname, "\\Direct3D" ); - TRACE("appname = [%s]\n", appname); - if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; - RegCloseKey( tmpkey ); + strcat(buffer, "\\Direct3D"); + TRACE("Application name %s.\n", buffer); + if (RegOpenKeyA(tmpkey, buffer, &appkey)) appkey = 0; + RegCloseKey(tmpkey); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 012c90f..c2fbf1d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2919,6 +2919,8 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; +BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) DECLSPEC_HIDDEN; + struct wined3d_blend_state { LONG refcount;

1 0

Józef Kucia : wined3d: Add support for USE_WIN32_VULKAN.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: f9cf21512e2a114e7f76db1834d309cb2f072734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9cf21512e2a114e7f76db18… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:33 2019 +0200 wined3d: Add support for USE_WIN32_VULKAN. 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> --- dlls/wined3d/adapter_vk.c | 87 ++++++++++++++++++++++++++++++++++++----------- dlls/wined3d/wined3d_vk.h | 6 ++++ 2 files changed, 74 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 337c6f7..cea6e69 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -24,12 +24,63 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#ifdef USE_WIN32_VULKAN +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + + if (!(vk_info->vulkan_lib = LoadLibraryA("vulkan-1.dll"))) + { + WARN("Failed to load vulkan-1.dll.\n"); + return FALSE; + } + + vk_ops->vkGetInstanceProcAddr = (void *)GetProcAddress(vk_info->vulkan_lib, "vkGetInstanceProcAddr"); + if (!vk_ops->vkGetInstanceProcAddr) + { + FreeLibrary(vk_info->vulkan_lib); + return FALSE; + } + + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) +{ + if (vk_info->vulkan_lib) + { + FreeLibrary(vk_info->vulkan_lib); + vk_info->vulkan_lib = NULL; + } +} +#else +static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) +{ + struct vulkan_ops *vk_ops = &vk_info->vk_ops; + const struct vulkan_funcs *vk_funcs; + HDC dc; + + dc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(dc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, dc); + + if (!vk_funcs) + return FALSE; + + vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; + return TRUE; +} + +static void wined3d_unload_vulkan(struct wined3d_vk_info *vk_info) {} +#endif + static void adapter_vk_destroy(struct wined3d_adapter *adapter) { struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(adapter); - const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_unload_vulkan(vk_info); wined3d_adapter_cleanup(&adapter_vk->a); heap_free(adapter_vk); } @@ -62,25 +113,17 @@ static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { struct vulkan_ops *vk_ops = &vk_info->vk_ops; - const struct vulkan_funcs *vk_funcs; + VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; - VkInstance instance; VkResult vr; - HDC dc; - - dc = GetDC(0); - vk_funcs = __wine_get_vulkan_driver(dc, WINE_VULKAN_DRIVER_VERSION); - ReleaseDC(0, dc); - if (!vk_funcs) + if (!wined3d_load_vulkan(vk_info)) return FALSE; - vk_ops->vkGetInstanceProcAddr = (void *)vk_funcs->p_vkGetInstanceProcAddr; - if (!(vk_ops->vkCreateInstance = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkCreateInstance")))) { ERR("Could not get 'vkCreateInstance'.\n"); - return FALSE; + goto fail; } memset(&instance_info, 0, sizeof(instance_info)); @@ -88,7 +131,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); - return FALSE; + goto fail; } TRACE("Created Vulkan instance %p.\n", instance); @@ -97,8 +140,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!(vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)))) \ { \ WARN("Could not get instance proc addr for '" #name "'.\n"); \ - vk_funcs->p_vkDestroyInstance(instance, NULL); \ - return FALSE; \ + goto fail; \ } #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN @@ -110,6 +152,12 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) vk_info->instance = instance; return TRUE; + +fail: + if (vk_ops->vkDestroyInstance) + VK_CALL(vkDestroyInstance(instance, NULL)); + wined3d_unload_vulkan(vk_info); + return FALSE; } static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, @@ -134,12 +182,12 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(gpu_description = wined3d_get_gpu_description(HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA))) { ERR("Failed to get GPU description.\n"); - goto fail; + goto fail_vulkan; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); if (!wined3d_adapter_vk_init_format_info(adapter)) - goto fail; + goto fail_vulkan; adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; @@ -150,9 +198,10 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, return TRUE; +fail_vulkan: + VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); + wined3d_unload_vulkan(vk_info); fail: - if (vk_info->vk_ops.vkDestroyInstance) - VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_adapter_cleanup(adapter); return FALSE; } diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index ac59a2d..784dd0c 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -20,7 +20,9 @@ #define __WINE_WINED3D_VK_H #define VK_NO_PROTOTYPES +#ifndef USE_WIN32_VULKAN #define WINE_VK_HOST +#endif #include "wine/vulkan.h" #define VK_INSTANCE_FUNCS() \ @@ -179,6 +181,10 @@ struct wined3d_vk_info { VkInstance instance; struct vulkan_ops vk_ops; + +#ifdef USE_WIN32_VULKAN + HMODULE vulkan_lib; +#endif }; #define VK_CALL(f) (vk_info->vk_ops.f)

1 0

Józef Kucia : wined3d: Initialise Vulkan for adapters.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 3dd8cab4f33fd7391f3f80ada0d024ed97afc603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dd8cab4f33fd7391f3f80ad… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 3 11:11:32 2019 +0200 wined3d: Initialise Vulkan for adapters. 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> --- dlls/wined3d/adapter_vk.c | 80 +++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 + dlls/wined3d/wined3d_vk.h | 186 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 265 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3dd8cab4f33fd7391f3f…

1 0

Piotr Caban : winex11.drv: Don't use strcasecmp.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: b8f0a28e8cae5e268e44ae556de1fd583759ed7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f0a28e8cae5e268e44ae55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 3 18:23:18 2019 +0200 winex11.drv: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/xim.c | 7 ++++--- dlls/winex11.drv/xrender.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b9b8293..3b8d916 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2334,7 +2334,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) if (name && (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU)) { char* idx = strrchr(name, '_'); - if (idx && (strcasecmp(idx, "_r") == 0 || strcasecmp(idx, "_l") == 0)) + if (idx && (_strnicmp(idx, "_r", -1) == 0 || _strnicmp(idx, "_l", -1) == 0)) { LeaveCriticalSection( &kbd_section ); TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index f6af293..44fe62e 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "wingdi.h" #include "winnls.h" +#include "winternl.h" #include "x11drv.h" #include "imm.h" #include "wine/debug.h" @@ -293,11 +294,11 @@ void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) */ BOOL X11DRV_InitXIM( const char *input_style ) { - if (!strcasecmp(input_style, "offthespot")) + if (!_strnicmp(input_style, "offthespot", -1)) ximStyleRequest = STYLE_OFFTHESPOT; - else if (!strcasecmp(input_style, "overthespot")) + else if (!_strnicmp(input_style, "overthespot", -1)) ximStyleRequest = STYLE_OVERTHESPOT; - else if (!strcasecmp(input_style, "root")) + else if (!_strnicmp(input_style, "root", -1)) ximStyleRequest = STYLE_ROOT; if (!XSupportsLocale()) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 4d04741..8350bad 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -800,7 +800,7 @@ static UINT get_xft_aa_flags( const LOGFONTW *lf ) if (!(value = XGetDefault( gdi_display, "Xft", "antialias" ))) break; TRACE( "got antialias '%s'\n", value ); if (tolower(value[0]) == 'f' || tolower(value[0]) == 'n' || - value[0] == '0' || !strcasecmp( value, "off" )) + value[0] == '0' || !_strnicmp( value, "off", -1 )) { ret = GGO_BITMAP; break;

1 0

Nikolay Sivov : dbgeng: Add IDebugSymbols stub.
by Alexandre Julliard April 3, 2019

April 3, 2019

Module: wine Branch: master Commit: 9c0ed2a999e5b860ed73b4e97da09808a3e9bde3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0ed2a999e5b860ed73b4e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 3 12:16:46 2019 +0300 dbgeng: Add IDebugSymbols stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 469 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 118 +++++++++++++ 2 files changed, 587 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c0ed2a999e5b860ed73…

1 0