June 2020 - Wine-devel - list.winehq.org

[PATCH v2 2/2] oleaut32: Include the leading '\1' in the CompObj stream name.
by Huw Davies 12 Jun '20

12 Jun '20

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/typelib.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 521d176bfe1..515d4b557e6 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -326,12 +326,11 @@ typedef struct { /* These then get followed by this magic */ typedef struct { -/*00*/ BYTE res00; /* always 0x01 */ -/*01*/ CHAR CompObj_magic[8]; /* always "CompObj" */ +/*00*/ CHAR CompObj_magic[9]; /* always "\1CompObj" */ /*09*/ CHAR dir_magic[4]; /* always "dir" */ } SLTG_Magic; -#define SLTG_COMPOBJ_MAGIC "CompObj" +#define SLTG_COMPOBJ_MAGIC "\1CompObj" #define SLTG_DIR_MAGIC "dir" /* Next we have SLTG_Header.nrOfFileBlks - 2 of Index strings. These -- 2.23.0

1 0

[PATCH v2 1/2] oleaut32: Merge four DWORDs into a GUID.
by Huw Davies 12 Jun '20

12 Jun '20

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/typelib.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 9c700b11a76..521d176bfe1 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -309,10 +309,7 @@ typedef struct { /*08*/ WORD res08; /* some kind of len/offset ?? */ /*0a*/ WORD first_blk; /* 1 based index into blk entries that corresponds to first block in file */ -/*0c*/ DWORD res0c; /* always 0x000204ff */ -/*10*/ DWORD res10; /* always 0x00000000 */ -/*14*/ DWORD res14; /* always 0x000000c0 */ -/*18*/ DWORD res18; /* always 0x46000000 */ +/*0c*/ GUID guid; /* always 000204ff-0000-0000-c000-000000000046 */ /*1c*/ DWORD res1c; /* always 0x00000044 */ /*20*/ DWORD res20; /* always 0xffff0000 */ } SLTG_Header; -- 2.23.0

1 0

[PATCH] winhttp: Support WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET option
by Alistair Leslie-Hughes 12 Jun '20

12 Jun '20

Example used https://github.com/microsoft/Windows-classic-samples/tree/master/Samples/Wi… When this option is used, it adds the following headers Connection, Upgrade, Sec-WebSocket-Key, Sec-WebSocket-Version Using wireshark shows, Without Option GET /index.html HTTP/1.1 Connection: Keep-Alive User-Agent: WebSocket sample Host: XXXXX With Option GET /index.html HTTP/1.1 Connection: Upgrade Upgrade: websocket User-Agent: WebSocket sample Sec-WebSocket-Key: FbVt3BszLghHUJlUAGA+kw== Sec-WebSocket-Version: 13 Host: XXXXX Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/session.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 24455d858a6..105e292b15d 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1042,6 +1042,38 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b FIXME("WINHTTP_OPTION_CONNECT_RETRIES\n"); return TRUE; + case WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET: + { + BYTE buf[16]; + WCHAR str[64]; + DWORD length = 64; + int i; + + add_request_headers(request, L"Connection: Upgrade", -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + add_request_headers(request, L"Upgrade: websocket", -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + add_request_headers(request, L"Sec-WebSocket-Version: 13", -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + + for(i = 0; i < sizeof(buf); i++) + buf[i] = rand() % 256; + + /* + * As per rfc6455, Sec-WebSocket-Key is a base64-encoded 16 BYTE array value. + */ + if (CryptBinaryToStringW(buf, sizeof(buf), CRYPT_STRING_BASE64, str, &length)) + { + WCHAR websocketkey[64]; + + swprintf(websocketkey, ARRAY_SIZE(websocketkey), L"Sec-WebSocket-Key: %s", str); + + add_request_headers(request, websocketkey, -1, + WINHTTP_ADDREQ_FLAG_ADD | WINHTTP_ADDREQ_FLAG_REPLACE); + } + return TRUE; + } + default: FIXME("unimplemented option %u\n", option); SetLastError( ERROR_WINHTTP_INVALID_OPTION ); -- 2.26.2

2 2

[PATCH 1/3] user32/tests: Test changing to a 1Hz display mode.
by Zhiyi Zhang 12 Jun '20

12 Jun '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 205df1c2935..482e2f1301f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -257,6 +257,7 @@ struct vid_mode static const struct vid_mode vid_modes_test[] = { {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, + {1024, 768, 0, 1, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, {1024, 768, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, {1024, 768, 0, 0, DM_BITSPERPEL , 0}, @@ -447,6 +448,7 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + todo_wine_if(i == 2) ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || -- 2.25.1

2 1

[PATCH 3/3] winemac.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Zhiyi Zhang 12 Jun '20

12 Jun '20

0 or 1 in dmDisplayFrequency means to use the default frequency. Fix Disgaea PC and Ostriv failing to launch in exclusive fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1a3cc349b52..001906efdf8 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -893,7 +893,9 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmPelsHeight != height) continue; } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && devmode->dmDisplayFrequency != 0) + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && + devmode->dmDisplayFrequency != 0 && + devmode->dmDisplayFrequency != 1) { double refresh_rate = CGDisplayModeGetRefreshRate(display_mode); if (!refresh_rate) -- 2.25.1

1 0

[PATCH 2/3] winex11.drv: Use the default frequency in ChangeDisplaySettingsExW() if dmDisplayFrequency is 1.
by Zhiyi Zhang 12 Jun '20

12 Jun '20

0 or 1 in dmDisplayFrequency means to use the default frequency. Fix Disgaea PC and Ostriv failing to launch in exclusive fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 1 - dlls/winex11.drv/settings.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 482e2f1301f..afde67cd034 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -448,7 +448,6 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmDisplayFrequency = vid_modes_test[i].freq; dm.dmFields = vid_modes_test[i].fields; res = ChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - todo_wine_if(i == 2) ok(vid_modes_test[i].must_succeed ? (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART) : (res == DISP_CHANGE_SUCCESSFUL || res == DISP_CHANGE_RESTART || diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index c3f31d0430d..bbbb6fdf0a3 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -420,7 +420,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, continue; } if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0) + devmode->dmDisplayFrequency != 0 && devmode->dmDisplayFrequency != 1) { if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) continue; -- 2.25.1

1 0

[PATCH 3/4] winex11.drv: Add a RandR provider ID property for GPUs.
by Zhiyi Zhang 12 Jun '20

12 Jun '20

A RandR provider ID is needed to identify the corresponding GPU. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 13 ++++++++++++- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xrandr.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 1dedf32a52f..0a8d809cc71 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -43,11 +43,12 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0 DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); -/* Wine specific monitor properties */ +/* Wine specific properties */ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; @@ -357,6 +358,16 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g (const BYTE *)&present, sizeof(present), 0)) goto done; + /* Write WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID property */ + if (gpu->randr_provider_id) + { + TRACE("RandR provider ID: 0x%s.\n", wine_dbgstr_longlong(gpu->randr_provider_id)); + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID, + DEVPROP_TYPE_UINT64, (const BYTE *)&gpu->randr_provider_id, + sizeof(gpu->randr_provider_id), 0)) + goto done; + } + /* Write DEVPROPKEY_GPU_LUID property */ if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &property_type, (BYTE *)&luid, sizeof(luid), NULL, 0)) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a9eaed20cab..d9f8b250f51 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -690,6 +690,8 @@ struct x11drv_gpu UINT device_id; UINT subsys_id; UINT revision_id; + /* Optional RandR provider ID. If it's not supported, set it to zero */ + UINT64 randr_provider_id; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 76e76806c55..ce7efc9deb4 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -711,6 +711,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { WARN("XRandR implementation doesn't report any providers, faking one.\n"); lstrcpyW( gpus[0].name, wine_adapterW ); + gpus[0].randr_provider_id = 1; *new_gpus = gpus; *count = 1; ret = TRUE; @@ -742,6 +743,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) } gpus[i].id = provider_resources->providers[i]; + gpus[i].randr_provider_id = provider_resources->providers[i]; MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report * their PCI address in the name but many others don't */ -- 2.25.1

1 0

[PATCH 2/4] winex11.drv: Enable VK_EXT_acquire_xlib_display if VK_KHR_get_physical_device_properties2 is enabled.
by Zhiyi Zhang 12 Jun '20

12 Jun '20

VK_KHR_get_physical_device_properties2 doesn't report a valid LUID on non-Windows hosts. Extension VK_EXT_acquire_xlib_display is needed for the use of vkGetRandROutputDisplayEXT(), which will be used to fill in the LUID property of Vulkan devices. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 1 + dlls/winex11.drv/vulkan.c | 55 +++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 63fd48b33d3..4ebfe6815bf 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -352,6 +352,7 @@ static void test_unsupported_instance_extensions(void) { "VK_KHR_xcb_surface", "VK_KHR_xlib_surface", + "VK_EXT_acquire_xlib_display", }; for (i = 0; i < ARRAY_SIZE(extensions); ++i) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index c988b1a6b27..9ee79220f76 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -155,9 +155,9 @@ fail: * Caller is responsible for allocation and cleanup of 'dst'. */ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, - VkInstanceCreateInfo *dst) + VkInstanceCreateInfo *dst, BOOL enable_acquire_xlib_display) { - unsigned int i; + unsigned int i, extension_count; const char **enabled_extensions = NULL; dst->sType = src->sType; @@ -169,9 +169,13 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo dst->enabledExtensionCount = 0; dst->ppEnabledExtensionNames = NULL; - if (src->enabledExtensionCount > 0) + extension_count = src->enabledExtensionCount; + if (enable_acquire_xlib_display) + ++extension_count; + + if (extension_count) { - enabled_extensions = heap_calloc(src->enabledExtensionCount, sizeof(*src->ppEnabledExtensionNames)); + enabled_extensions = heap_calloc(extension_count, sizeof(*src->ppEnabledExtensionNames)); if (!enabled_extensions) { ERR("Failed to allocate memory for enabled extensions\n"); @@ -192,8 +196,12 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo enabled_extensions[i] = src->ppEnabledExtensionNames[i]; } } + + if (enable_acquire_xlib_display) + enabled_extensions[i] = "VK_EXT_acquire_xlib_display"; + dst->ppEnabledExtensionNames = enabled_extensions; - dst->enabledExtensionCount = src->enabledExtensionCount; + dst->enabledExtensionCount = extension_count; } return VK_SUCCESS; @@ -232,6 +240,7 @@ static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { VkInstanceCreateInfo create_info_host; + unsigned int i; VkResult res; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); @@ -240,9 +249,33 @@ static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, /* Perform a second pass on converting VkInstanceCreateInfo. Winevulkan * performed a first pass in which it handles everything except for WSI - * functionality such as VK_KHR_win32_surface. Handle this now. + * functionality such as VK_KHR_win32_surface. Handle this now. And try + * to enable VK_EXT_acquire_xlib_display if VK_KHR_get_physical_device_properties2 + * is enabled for getting valid LUIDs. */ - res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + for (i = 0; i < create_info->enabledExtensionCount; ++i) + { + if (!strcmp(create_info->ppEnabledExtensionNames[i], + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) + break; + } + + if (i < create_info->enabledExtensionCount) + { + res = wine_vk_instance_convert_create_info(create_info, &create_info_host, TRUE); + if (res != VK_SUCCESS) + { + ERR("Failed to convert instance create info, res=%d\n", res); + return res; + } + + res = pvkCreateInstance(&create_info_host, NULL /* allocator */, instance); + heap_free((void *)create_info_host.ppEnabledExtensionNames); + if (res != VK_ERROR_EXTENSION_NOT_PRESENT) + return res; + } + + res = wine_vk_instance_convert_create_info(create_info, &create_info_host, FALSE); if (res != VK_SUCCESS) { ERR("Failed to convert instance create info, res=%d\n", res); @@ -413,6 +446,14 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_ VK_KHR_WIN32_SURFACE_EXTENSION_NAME); properties[i].specVersion = VK_KHR_WIN32_SURFACE_SPEC_VERSION; } + + /* Do not report VK_EXT_acquire_xlib_display */ + if (!strcmp(properties[i].extensionName, "VK_EXT_acquire_xlib_display")) + { + if (i + 1 < *count) + memmove(&properties[i], &properties[i + 1], sizeof(*properties) * (*count - (i + 1))); + *count = *count - 1; + } } TRACE("Returning %u extensions.\n", *count); -- 2.25.1

1 0

[PATCH v2 1/6] d3dcompiler: Use the cached scalar type in expr_common_type() where possible.
by Zebediah Figura 11 Jun '20

11 Jun '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index ec0da2d4034..97e3cdf1a3f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1294,6 +1294,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_type *t1, struct hlsl_type } } + if (type == HLSL_CLASS_SCALAR) + return hlsl_ctx.builtin_types.scalar[base]; return new_hlsl_type(NULL, type, base, dimx, dimy); } -- 2.26.2

4 16

[PATCH] d3dcompiler: Print float constants with more precision.
by Matteo Bruni 11 Jun '20

11 Jun '20

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dcompiler_43/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 4769ebc399b3..4b1e8f7ff061 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1831,10 +1831,10 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) switch (type->base_type) { case HLSL_TYPE_FLOAT: - wine_dbg_printf("%g ", (double)constant->value.f[y * type->dimx + x]); + wine_dbg_printf("%.8e ", constant->value.f[y * type->dimx + x]); break; case HLSL_TYPE_DOUBLE: - wine_dbg_printf("%g ", constant->value.d[y * type->dimx + x]); + wine_dbg_printf("%.16e ", constant->value.d[y * type->dimx + x]); break; case HLSL_TYPE_INT: wine_dbg_printf("%d ", constant->value.i[y * type->dimx + x]); -- 2.26.2

2 1