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

Vijay Kiran Kamuju : include: Add missing navigation and gamepad key definitions in winuser.rh.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 9cbfd2c9c593706377ae22f191e5e18cba44a8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cbfd2c9c593706377ae22f1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon May 6 15:04:24 2019 +0200 include: Add missing navigation and gamepad key definitions in winuser.rh. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.rh | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/include/winuser.rh b/include/winuser.rh index bcc7160..fd984a9 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -93,6 +93,7 @@ #define VK_KANA 0x15 #define VK_HANGEUL VK_KANA #define VK_HANGUL VK_KANA +/* 0x16 Undefined */ #define VK_JUNJA 0x17 #define VK_FINAL 0x18 #define VK_HANJA 0x19 @@ -170,7 +171,14 @@ #define VK_F22 0x85 #define VK_F23 0x86 #define VK_F24 0x87 -/* 0x88-0x8F Unassigned */ +#define VK_NAVIGATION_VIEW 0x88 +#define VK_NAVIGATION_MENU 0x89 +#define VK_NAVIGATION_UP 0x8A +#define VK_NAVIGATION_DOWN 0x8B +#define VK_NAVIGATION_LEFT 0x8C +#define VK_NAVIGATION_RIGHT 0x8D +#define VK_NAVIGATION_ACCEPT 0x8E +#define VK_NAVIGATION_CANCEL 0x8F #define VK_NUMLOCK 0x90 #define VK_SCROLL 0x91 #define VK_OEM_NEC_EQUAL 0x92 @@ -218,7 +226,31 @@ #define VK_OEM_PERIOD 0xBE #define VK_OEM_2 0xBF #define VK_OEM_3 0xC0 -/* 0xC1-0xDA Unassigned */ +/* 0xC1-0xC2 Unassigned */ +#define VK_GAMEPAD_A 0xC3 +#define VK_GAMEPAD_B 0xC4 +#define VK_GAMEPAD_X 0xC5 +#define VK_GAMEPAD_Y 0xC6 +#define VK_GAMEPAD_RIGHT_SHOULDER 0xC7 +#define VK_GAMEPAD_LEFT_SHOULDER 0xC8 +#define VK_GAMEPAD_LEFT_TRIGGER 0xC9 +#define VK_GAMEPAD_RIGHT_TRIGGER 0xCA +#define VK_GAMEPAD_DPAD_UP 0xCB +#define VK_GAMEPAD_DPAD_DOWN 0xCC +#define VK_GAMEPAD_DPAD_LEFT 0xCD +#define VK_GAMEPAD_DPAD_RIGHT 0xCE +#define VK_GAMEPAD_MENU 0xCF +#define VK_GAMEPAD_VIEW 0xD0 +#define VK_GAMEPAD_LEFT_THUMBSTICK_BUTTON 0xD1 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_BUTTON 0xD2 +#define VK_GAMEPAD_LEFT_THUMBSTICK_UP 0xD3 +#define VK_GAMEPAD_LEFT_THUMBSTICK_DOWN 0xD4 +#define VK_GAMEPAD_LEFT_THUMBSTICK_RIGHT 0xD5 +#define VK_GAMEPAD_LEFT_THUMBSTICK_LEFT 0xD6 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_UP 0xD7 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN 0xD8 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT 0xD9 +#define VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT 0xDA #define VK_OEM_4 0xDB #define VK_OEM_5 0xDC #define VK_OEM_6 0xDD @@ -563,7 +595,7 @@ #define WM_TOUCHHITTESTING 0x024d #define WM_POINTERWHEEL 0x024e #define WM_POINTERHWHEEL 0x024f - +#define DM_POINTERHITTEST 0x0250 #define WM_POINTERROUTEDTO 0x0251 #define WM_POINTERROUTEDAWAY 0x0252 #define WM_POINTERROUTEDRELEASED 0x0253 @@ -812,6 +844,7 @@ #define WS_EX_APPWINDOW __MSABI_LONG(0x00040000) #define WS_EX_LAYERED __MSABI_LONG(0x00080000) #define WS_EX_NOINHERITLAYOUT __MSABI_LONG(0x00100000) +#define WS_EX_NOREDIRECTIONBITMAP __MSABI_LONG(0x00200000) #define WS_EX_LAYOUTRTL __MSABI_LONG(0x00400000) #define WS_EX_COMPOSITED __MSABI_LONG(0x02000000) #define WS_EX_NOACTIVATE __MSABI_LONG(0x08000000)

1 0

Nikolay Sivov : mf: Set preferred media types for nodes.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 45d084d7891231b9d82b0c3254587e60ca029c81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d084d7891231b9d82b0c32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:44 2019 +0300 mf: Set preferred media types for nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/mf_private.h | 29 +++++++++ dlls/mf/tests/mf.c | 163 +++++++++++++++++++++++++++++++++++++++++------ dlls/mf/topology.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 330 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45d084d7891231b9d82b…

1 0

Nikolay Sivov : mfplat: Write flags when registering MFT.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: ea96db6557f755969474f9e19907ced9be6148e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea96db6557f755969474f9e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:43 2019 +0300 mfplat: Write flags when registering MFT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 14 +++++++++----- include/mfapi.h | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4f634e0..d10e643 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -71,6 +71,7 @@ static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d', static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; +static const WCHAR mftflagsW[] = {'M','F','T','F','l','a','g','s',0}; static const WCHAR szGUIDFmt[] = { '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', @@ -167,7 +168,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, +static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { @@ -224,6 +225,12 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, } } + if (SUCCEEDED(hr) && flags) + { + if ((ret = RegSetValueExW(hclsid, mftflagsW, 0, REG_DWORD, (BYTE *)&flags, sizeof(flags)))) + hr = HRESULT_FROM_WIN32(ret); + } + RegCloseKey(hclsid); return hr; } @@ -259,10 +266,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags TRACE("%s, %s, %s, %#x, %u, %p, %u, %p, %p.\n", debugstr_guid(&clsid), debugstr_guid(&category), debugstr_w(name), flags, cinput, input_types, coutput, output_types, attributes); - if (flags) - FIXME("flags not yet supported.\n"); - - hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types, attributes); + hr = register_transform(&clsid, name, flags, cinput, input_types, coutput, output_types, attributes); if(FAILED(hr)) ERR("Failed to write register transform\n"); diff --git a/include/mfapi.h b/include/mfapi.h index d172db1..f3ca3d9 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -350,6 +350,22 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +enum _MFT_ENUM_FLAG +{ + MFT_ENUM_FLAG_SYNCMFT = 0x00000001, + MFT_ENUM_FLAG_ASYNCMFT = 0x00000002, + MFT_ENUM_FLAG_HARDWARE = 0x00000004, + MFT_ENUM_FLAG_FIELDOFUSE = 0x00000008, + MFT_ENUM_FLAG_LOCALMFT = 0x00000010, + MFT_ENUM_FLAG_TRANSCODE_ONLY = 0x00000020, + MFT_ENUM_FLAG_ALL = 0x0000003f, + MFT_ENUM_FLAG_SORTANDFILTER = 0x00000040, + MFT_ENUM_FLAG_SORTANDFILTER_APPROVED_ONLY = 0x000000c0, + MFT_ENUM_FLAG_SORTANDFILTER_WEB_ONLY = 0x00000140, + MFT_ENUM_FLAG_SORTANDFILTER_WEB_ONLY_EDGEMODE = 0x00000240, + MFT_ENUM_FLAG_UNTRUSTED_STOREMFT = 0x00000400, +}; + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue);

1 0

Nikolay Sivov : mfplat: Write attribute store when registering MFT.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: b0bd57f953da6a9ff1dc26e4fced73d901f2d646 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0bd57f953da6a9ff1dc26e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 7 15:25:42 2019 +0300 mfplat: Write attribute store when registering MFT. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 68 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 61521ce..4f634e0 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -70,6 +70,7 @@ static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d', 'C','a','t','e','g','o','r','i','e','s',0}; static const WCHAR inputtypesW[] = {'I','n','p','u','t','T','y','p','e','s',0}; static const WCHAR outputtypesW[] = {'O','u','t','p','u','t','T','y','p','e','s',0}; +static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; static const WCHAR szGUIDFmt[] = { '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', @@ -166,46 +167,65 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } -static HRESULT register_transform(CLSID *clsid, WCHAR *name, - UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, - UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types) +static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, + UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, + const MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes) { static const WCHAR reg_format[] = {'%','s','\\','%','s',0}; + HRESULT hr = S_OK; HKEY hclsid = 0; WCHAR buffer[64]; - DWORD size; + DWORD size, ret; WCHAR str[250]; + UINT8 *blob; GUIDToString(buffer, clsid); sprintfW(str, reg_format, transform_keyW, buffer); - if (RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid)) - return E_FAIL; + if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) + hr = HRESULT_FROM_WIN32(ret); - size = (strlenW(name) + 1) * sizeof(WCHAR); - if (RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size)) - goto err; + if (SUCCEEDED(hr)) + { + size = (strlenW(name) + 1) * sizeof(WCHAR); + if ((ret = RegSetValueExW(hclsid, NULL, 0, REG_SZ, (BYTE *)name, size))) + hr = HRESULT_FROM_WIN32(ret); + } - if (cinput && input_types) + if (SUCCEEDED(hr) && cinput && input_types) { size = cinput * sizeof(MFT_REGISTER_TYPE_INFO); - if (RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size)) - goto err; + if ((ret = RegSetValueExW(hclsid, inputtypesW, 0, REG_BINARY, (BYTE *)input_types, size))) + hr = HRESULT_FROM_WIN32(ret); } - if (coutput && output_types) + if (SUCCEEDED(hr) && coutput && output_types) { size = coutput * sizeof(MFT_REGISTER_TYPE_INFO); - if (RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size)) - goto err; + if ((ret = RegSetValueExW(hclsid, outputtypesW, 0, REG_BINARY, (BYTE *)output_types, size))) + hr = HRESULT_FROM_WIN32(ret); } - RegCloseKey(hclsid); - return S_OK; + if (SUCCEEDED(hr) && attributes) + { + if (SUCCEEDED(hr = MFGetAttributesAsBlobSize(attributes, &size))) + { + if ((blob = heap_alloc(size))) + { + if (SUCCEEDED(hr = MFGetAttributesAsBlob(attributes, blob, size))) + { + if ((ret = RegSetValueExW(hclsid, attributesW, 0, REG_BINARY, blob, size))) + hr = HRESULT_FROM_WIN32(ret); + } + heap_free(blob); + } + else + hr = E_OUTOFMEMORY; + } + } -err: RegCloseKey(hclsid); - return E_FAIL; + return hr; } static HRESULT register_category(CLSID *clsid, GUID *category) @@ -236,17 +256,13 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags { HRESULT hr; - TRACE("(%s, %s, %s, %x, %u, %p, %u, %p, %p)\n", debugstr_guid(&clsid), debugstr_guid(&category), - debugstr_w(name), flags, cinput, input_types, - coutput, output_types, attributes); - - if (attributes) - FIXME("attributes not yet supported.\n"); + TRACE("%s, %s, %s, %#x, %u, %p, %u, %p, %p.\n", debugstr_guid(&clsid), debugstr_guid(&category), + debugstr_w(name), flags, cinput, input_types, coutput, output_types, attributes); if (flags) FIXME("flags not yet supported.\n"); - hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types); + hr = register_transform(&clsid, name, cinput, input_types, coutput, output_types, attributes); if(FAILED(hr)) ERR("Failed to write register transform\n");

1 0

Henri Verbeet : wined3d: Determine the ORM_BACKBUFFER depth/ stencil format in wined3d_adapter_gl_create_context().
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 1859ca857f94a8ca489a49d8d5d885651c0cf1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1859ca857f94a8ca489a49d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:09 2019 +0430 wined3d: Determine the ORM_BACKBUFFER depth/stencil format in wined3d_adapter_gl_create_context(). Instead of in wined3d_swapchain_cs_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context.c | 90 ++++++++++++++++++++++++++++-------------- dlls/wined3d/directx.c | 3 +- dlls/wined3d/swapchain.c | 27 +------------ dlls/wined3d/wined3d_private.h | 8 ++-- 5 files changed, 67 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1859ca857f94a8ca489a…

1 0

Józef Kucia : wined3d: Make the adapter responsible for initialising and de-initialising 3D.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 449925146108569e2fa0501f1c265f4e946160cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=449925146108569e2fa0501f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 15:18:08 2019 +0430 wined3d: Make the adapter responsible for initialising and de-initialising 3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 34 ++++++++++++++++++++++---- dlls/wined3d/adapter_vk.c | 14 +++++++++++ dlls/wined3d/device.c | 54 +++++++----------------------------------- dlls/wined3d/directx.c | 22 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 5 files changed, 77 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=449925146108569e2fa0…

1 0

Henri Verbeet : wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain().
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 9a373586a36e3702414e2d50814db78d9c9fbbc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a373586a36e3702414e2d50… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:07 2019 +0430 wined3d: Share more swapchain setup with the "no3d" adapter in wined3d_device_set_implicit_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2dbb40..dcf05f0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1151,23 +1151,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str { if (FAILED(hr = wined3d_device_create_primary_opengl_context(device))) goto err_out; - device_init_swapchain_state(device, swapchain); - TRACE("All defaults now set up.\n"); + device->d3d_initialized = TRUE; + } - /* Clear the screen */ - if (device->back_buffer_view) - clear_flags |= WINED3DCLEAR_TARGET; - if (swapchain_desc->enable_auto_depth_stencil) - clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; - if (clear_flags) - wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + device_init_swapchain_state(device, swapchain); - device->d3d_initialized = TRUE; + TRACE("All defaults now set up.\n"); - if (wined3d_settings.logo) - device_load_logo(device, wined3d_settings.logo); - } + /* Clear the screen. */ + if (device->back_buffer_view) + clear_flags |= WINED3DCLEAR_TARGET; + if (swapchain_desc->enable_auto_depth_stencil) + clear_flags |= WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL; + if (clear_flags) + wined3d_device_clear(device, 0, NULL, clear_flags, &black, 1.0f, 0); + + if (wined3d_settings.logo) + device_load_logo(device, wined3d_settings.logo); return WINED3D_OK;

1 0

Józef Kucia : d3d11: Report format support more accurately based on feature level.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 735b5ebd1e43d19d6fe763361682cb2c8aaf3a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=735b5ebd1e43d19d6fe76336… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 7 11:03:39 2019 +0200 d3d11: Report format support more accurately based on feature level. Our partial stub for CheckFormatSupport() is still quite inaccurate. For example, we might report SHADER_SAMPLE support for UINT formats. In the long term, wined3d should probably return the format support flags directly. Unfortunately, the current wined3d interface shared with d3d9 isn't well suited for returning fine-grained format support flags. 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/d3d10core/tests/d3d10core.c | 20 ++++++++++++++++++-- dlls/d3d11/device.c | 13 ++++++++++--- dlls/d3d11/tests/d3d11.c | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 32f9437..ecf1f38 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13390,7 +13390,7 @@ static void check_format_support(const unsigned int *format_support, } } -static void test_required_format_support(void) +static void test_format_support(void) { unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; ID3D10Device *device; @@ -13425,6 +13425,22 @@ static void test_required_format_support(void) format, hr, format_support[format]); } + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + ok(!(format_support[format] & D3D10_FORMAT_SUPPORT_SHADER_GATHER), + "Unexpected SHADER_GATHER for format %#x.\n", format); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON), + "Unexpected SHADER_GATHER_COMPARISON for format %#x.\n", format); + } + + ok(format_support[DXGI_FORMAT_R8G8B8A8_UNORM] & D3D10_FORMAT_SUPPORT_SHADER_SAMPLE, + "SHADER_SAMPLE is not supported for R8G8B8A8_UNORM.\n"); + todo_wine + ok(!(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D10_FORMAT_SUPPORT_SHADER_SAMPLE), + "SHADER_SAMPLE is supported for R32G32B32A32_UINT.\n"); + ok(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D10_FORMAT_SUPPORT_SHADER_LOAD, + "SHADER_LOAD is not supported for R32G32B32A32_UINT.\n"); + check_format_support(format_support, index_buffers, ARRAY_SIZE(index_buffers), D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); @@ -18057,7 +18073,7 @@ START_TEST(d3d10core) queue_test(test_index_buffer_offset); queue_test(test_face_culling); queue_test(test_line_antialiasing_blending); - queue_test(test_required_format_support); + queue_test(test_format_support); queue_test(test_ddy); queue_test(test_shader_input_registers_limits); queue_test(test_unbind_shader_resource_view); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 751afc1..31292e9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3378,6 +3378,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * struct d3d_device *device = impl_from_ID3D11Device2(iface); struct wined3d_device_creation_parameters params; enum wined3d_format_id wined3d_format; + D3D_FEATURE_LEVEL feature_level; struct wined3d *wined3d; unsigned int i; @@ -3410,6 +3411,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * *format_support = 0; wined3d_mutex_lock(); + feature_level = device->feature_level; wined3d = wined3d_device_get_wined3d(device->wined3d_device); wined3d_device_get_creation_parameters(device->wined3d_device, &params); for (i = 0; i < ARRAY_SIZE(flag_mapping); ++i) @@ -3434,12 +3436,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * { *format_support |= D3D11_FORMAT_SUPPORT_SHADER_LOAD; *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE; - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; + + if (feature_level >= D3D_FEATURE_LEVEL_10_1) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER; if (*format_support & D3D11_FORMAT_SUPPORT_DEPTH_STENCIL) { - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; - *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON; + + if (feature_level >= D3D_FEATURE_LEVEL_10_1) + *format_support |= D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON; } } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b56a04..e8c2f64 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18425,7 +18425,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE } } -static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) +static void test_format_support(const D3D_FEATURE_LEVEL feature_level) { unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; struct device_desc device_desc; @@ -18463,6 +18463,37 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) format, hr, format_support[format]); } + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + if (feature_level < D3D_FEATURE_LEVEL_10_0) + { + /* SHADER_SAMPLE_COMPARISON is never advertised as supported on feature level 9. */ + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON), + "Unexpected SHADER_SAMPLE_COMPARISON for format %#x, feature level %#x.\n", + format, feature_level); + } + if (feature_level < D3D_FEATURE_LEVEL_10_1) + { + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER), + "Unexpected SHADER_GATHER for format %#x, feature level %#x.\n", + format, feature_level); + ok(!(format_support[format] & D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON), + "Unexpected SHADER_GATHER_COMPARISON for format %#x, feature level %#x.\n", + format, feature_level); + } + } + + ok(format_support[DXGI_FORMAT_R8G8B8A8_UNORM] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE, + "SHADER_SAMPLE is not supported for R8G8B8A8_UNORM.\n"); + todo_wine + ok(!(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D11_FORMAT_SUPPORT_SHADER_SAMPLE), + "SHADER_SAMPLE is supported for R32G32B32A32_UINT.\n"); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + ok(format_support[DXGI_FORMAT_R32G32B32A32_UINT] & D3D11_FORMAT_SUPPORT_SHADER_LOAD, + "SHADER_LOAD is not supported for R32G32B32A32_UINT.\n"); + } + check_format_support(format_support, feature_level, index_buffers, ARRAY_SIZE(index_buffers), D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); @@ -29365,7 +29396,7 @@ START_TEST(d3d11) queue_test(test_index_buffer_offset); queue_test(test_face_culling); queue_test(test_line_antialiasing_blending); - queue_for_each_feature_level(test_required_format_support); + queue_for_each_feature_level(test_format_support); queue_for_each_9_x_feature_level(test_fl9_draw); queue_test(test_ddy); queue_test(test_shader_input_registers_limits);

1 0

Alexandre Julliard : kernel32: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 59e1d114a407a358157d316e8ba09febd3b00b1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e1d114a407a358157d316e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:31:05 2019 -0500 kernel32: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 +- dlls/kernel32/process.c | 2 +- dlls/kernel32/volume.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 6c82613..30c8dbd 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1521,7 +1521,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, static const WCHAR conW[] = {'C','O','N'}; if (LOWORD(dosdev) == sizeof(conW) && - !memicmpW( filename + HIWORD(dosdev)/sizeof(WCHAR), conW, ARRAY_SIZE( conW ))) + !strncmpiW( filename + HIWORD(dosdev)/sizeof(WCHAR), conW, ARRAY_SIZE( conW ))) { switch (access & (GENERIC_READ|GENERIC_WRITE)) { diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 09f0433..09ab077 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -550,7 +550,7 @@ static void set_registry_variables( HANDLE hkey, ULONG type ) } /* PATH is magic */ if (env_name.Length == sizeof(pathW) && - !memicmpW( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && + !strncmpiW( env_name.Buffer, pathW, ARRAY_SIZE( pathW )) && !RtlQueryEnvironmentVariable_U( NULL, &env_name, &tmp )) { RtlAppendUnicodeToString( &tmp, sep ); diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 1208436..4fd913a 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1942,7 +1942,7 @@ BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR volumename, LPWSTR volumepa linkname = (const WCHAR *)((const char *)link + link->MountPoints[j].SymbolicLinkNameOffset); if (link->MountPoints[j].SymbolicLinkNameLength == sizeof(dosdevicesW) + 2 * sizeof(WCHAR) && - !memicmpW( linkname, dosdevicesW, ARRAY_SIZE( dosdevicesW ))) + !strncmpiW( linkname, dosdevicesW, ARRAY_SIZE( dosdevicesW ))) { len += 4; if (volumepathname && len < buflen)

1 0

Alexandre Julliard : atl: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: d9db7faf6c4c11a494c9a25f1ba9509f9821535d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9db7faf6c4c11a494c9a25f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:30:48 2019 -0500 atl: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index b717afe..c7d37a2 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -161,7 +161,7 @@ static HRESULT do_preprocess(const Registrar *This, LPCOLESTR data, strbuf *buf) }else { for(rep_iter = This->rep; rep_iter; rep_iter = rep_iter->next) { if(rep_iter->key_len == iter-iter2 - && !memicmpW(iter2, rep_iter->key, rep_iter->key_len)) + && !strncmpiW(iter2, rep_iter->key, rep_iter->key_len)) break; } if(!rep_iter) {

1 0