December 2018 - Wine-Devel - list.winehq.org

[PATCH] psapi/tests: Increase GetPerformanceInfo HandleCount error margin
by Alex Henrie Dec. 18, 2018

Dec. 18, 2018

This fixes intermittent test failures on all versions of Windows. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index e61cf02948..d565053722 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -322,7 +322,7 @@ static void test_GetPerformanceInfo(void) } HeapFree(GetProcessHeap(), 0, sys_process_info); - ok(check_with_margin(info.HandleCount, handle_count, 24), + ok(check_with_margin(info.HandleCount, handle_count, 256), "expected approximately %d but got %d\n", info.HandleCount, handle_count); ok(check_with_margin(info.ProcessCount, process_count, 4), -- 2.20.1

1 0

[PATCH v2 1/2] cmd: Tests for "choice"
by Alexander Coffin Dec. 18, 2018

Dec. 18, 2018

From: alex <alexcoffin1999(a)gmail.com> Added currently unsuccessful tests for the "choice" command. Signed-off-by: Alexander Coffin <alexcoffin1999(a)gmail.com> --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 +++++++++++ 2 files changed, 56 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 79233d8..f4dfc9f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -527,6 +527,48 @@ rmdir "fol;der" rmdir folder PATH=%PATH_BACKUP% +echo ------------ Testing 'choice' ------------ + +rem Windows XP and Windows 2000 do not come with choice +rem echo is used for @or_broken@ formatting +choice /C:ABC /M "Example message" /D A /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C ABC "/M:Example message" /D:B /T 0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C def /D:f /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +REM If a pipe fails due to a nonexistent command +REM it will stop the whole program's execution +if %ERRORLEVEL% NEQ 9009 ( + echo Y | choice /C ABCXYZ /D A /T 2 +) +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C ABC /N /D A /T 0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +choice /C abcABC /CS /D:A /T:0 +if %ERRORLEVEL% EQU 9009 ( + echo choice unavailable +) +echo %ERRORLEVEL% +rem intentional error +choice /C abcABC /D:A /T:0 >NUL 2>NUL +echo %ERRORLEVEL% + echo ------------ Testing variable expansion ------------ call :setError 0 echo ~p0 should be path containing batch file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 01ddc4d..d78d91a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -479,6 +479,20 @@ foo I'm here!@space@ I'm here!@space@ I'm here!@space@ +------------ Testing 'choice' ------------ +(a)todo_wine@Example message [A,B,C]?A(a)or_broken@choice unavailable +(a)todo_wine@1(a)or_broken@9009 +(a)todo_wine@Example message [A,B,C]?B(a)or_broken@choice unavailable +(a)todo_wine@2(a)or_broken@9009 +(a)todo_wine@[D,E,F]?F(a)or_broken@choice unavailable +(a)todo_wine@3(a)or_broken@9009 +(a)todo_wine@[A,B,C,X,Y,Z]?Y(a)or_broken@choice unavailable +(a)todo_wine@5(a)or_broken@9009 +(a)todo_wine@A(a)or_broken@choice unavailable +(a)todo_wine@1(a)or_broken@9009 +(a)todo_wine@[a,b,c,A,B,C]?A(a)or_broken@choice unavailable +(a)todo_wine@4(a)or_broken@9009 +(a)todo_wine@255(a)or_broken@9009 ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@ -- 2.7.4

1 1

Wine staging 4.0-rc2 release
by Alistair Leslie-Hughes Dec. 18, 2018

Dec. 18, 2018

inary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 4.0-rc2 (810 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * gdi32/tests: Add a simple test for printing to a PostScript device. * gdi32: Trace full contents of DOCINFO in StartDoc. Added * 30984 winex11: Improve key translation. * 31350 dwmapi: Improve DwmGetTransportAttributes * 44469 ucrtbase: Add missing stub/forwards in api-ms-win-crt-private-l1-1-0.dll Updated: * wow64cpu-Wow64Transition * wintab32-improvements * user32-dialog_focus Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] cmd: Tests for "choice"
by Alexander Coffin Dec. 18, 2018

Dec. 18, 2018

From: alex <alexcoffin1999(a)gmail.com> Added currently unsuccessful tests for the "choice" command. Signed-off-by: Alexander Coffin <alexcoffin1999(a)gmail.com> --- programs/cmd/tests/test_builtins.cmd | 18 ++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 14 ++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 79233d8..ae489eb 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -527,6 +527,24 @@ rmdir "fol;der" rmdir folder PATH=%PATH_BACKUP% +echo ------------ Testing 'choice' ------------ + +choice /C:ABC /M "Example message" /D A /T:0 +echo %ERRORLEVEL% +choice /C ABC "/M:Example message" /D:B /T 0 +echo %ERRORLEVEL% +choice /C def /D:f /T:0 +echo %ERRORLEVEL% +echo Y | choice /C ABCXYZ /D A /T 2 +echo %ERRORLEVEL% +choice /C ABC /N /D A /T 0 +echo %ERRORLEVEL% +choice /C abcABC /CS /D:A /T:0 +echo %ERRORLEVEL% +rem intentional error +choice /C abcABC /D:A /T:0 > NUL +echo %ERRORLEVEL% + echo ------------ Testing variable expansion ------------ call :setError 0 echo ~p0 should be path containing batch file diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 01ddc4d..1386467 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -479,6 +479,20 @@ foo I'm here!@space@ I'm here!@space@ I'm here!@space@ +------------ Testing 'choice' ------------ +(a)todo_wine@Example message [A,B,C]?A +(a)todo_wine@1 +(a)todo_wine@Example message [A,B,C]?B +(a)todo_wine@2 +(a)todo_wine@[D,E,F]?F +(a)todo_wine@3 +(a)todo_wine@[A,B,C,X,Y,Z]?Y +(a)todo_wine@5 +(a)todo_wine@A +(a)todo_wine@1 +(a)todo_wine@[a,b,c,A,B,C]?A +(a)todo_wine@4 +(a)todo_wine@255 ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@ -- 2.7.4

2 3

[PATCH] windowscodecs/tests: Fix a memory leak (Valgrind).
by Sven Baars Dec. 18, 2018

Dec. 18, 2018

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/windowscodecs/tests/pngformat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/tests/pngformat.c b/dlls/windowscodecs/tests/pngformat.c index d08a5fb618..8c33d3b964 100644 --- a/dlls/windowscodecs/tests/pngformat.c +++ b/dlls/windowscodecs/tests/pngformat.c @@ -306,6 +306,8 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma refcount = IStream_Release(stream); ok(refcount > 0, "expected stream refcount > 0\n"); } + else + IStream_Release(stream); return hr; } -- 2.17.1

1 1

[PATCH 2/2] comctl32: Don't ignore page creation error for a non-modal propery sheet.
by Dmitry Timoshkov Dec. 18, 2018

Dec. 18, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/propsheet.c | 12 ++++++++---- dlls/comctl32/tests/propsheet.c | 4 ---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 8c72f20449..09a455121c 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2012,6 +2012,13 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg, if (!psInfo->proppage[index].hwndPage) { if(!PROPSHEET_CreatePage(hwndDlg, index, psInfo, ppshpage)) { PROPSHEET_RemovePage(hwndDlg, index, NULL); + + if (!psInfo->isModeless) + { + DestroyWindow(hwndDlg); + return FALSE; + } + if(index >= psInfo->nPages) index--; if(index < 0) @@ -2754,7 +2761,7 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) static INT do_loop(const PropSheetInfo *psInfo) { MSG msg; - INT ret = -1; + INT ret = 0; HWND hwnd = psInfo->hwnd; HWND parent = psInfo->ppshheader.hwndParent; @@ -2771,10 +2778,7 @@ static INT do_loop(const PropSheetInfo *psInfo) } if(ret == 0) - { PostQuitMessage(msg.wParam); - ret = -1; - } if(ret != -1) ret = psInfo->result; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index b5c05b253a..ea9b4a8e62 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -276,7 +276,6 @@ static void test_disableowner(void) psh.pfnCallback = disableowner_callback; p = pPropertySheetA(&psh); - todo_wine ok(p == 0, "Expected 0, got %ld\n", p); ok(IsWindowEnabled(parenthwnd) != 0, "parent window should be enabled\n"); DestroyWindow(parenthwnd); @@ -1165,11 +1164,8 @@ static void test_bad_control_class(void) psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = &hpsp; -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once Wine is fixed */ -{ ret = pPropertySheetA(&psh); ok(ret == 0, "got %ld\n", ret); -} /* Need to recreate hpsp otherwise the test fails under Windows */ hpsp = pCreatePropertySheetPageA(&psp); -- 2.19.2

2 3

[RFC PATCH 8/9] vulkan-1/tests: Add tests for vkGetPhysicalDeviceProperties2.
by Zhiyi Zhang Dec. 18, 2018

Dec. 18, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 64 ++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 4143af752c..cb4d2e9e53 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -158,6 +158,69 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void test_enumerate_physical_device2(void) +{ + static const char *extensions[] = {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}; + static const char *procs[] = {"vkGetPhysicalDeviceProperties2", "vkGetPhysicalDeviceProperties2KHR"}; + PFN_vkGetPhysicalDeviceProperties2 pfn_vkGetPhysicalDeviceProperties2; + VkPhysicalDeviceProperties2 properties2; + VkPhysicalDeviceIDProperties id; + VkPhysicalDevice *vk_physical_devices; + VkInstance vk_instance; + VkResult vr; + const LUID *luid; + uint32_t count; + unsigned int i, j; + + if ((vr = create_instance_skip(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) return; + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + if (!count) + { + skip("No physical devices.\n"); + vkDestroyInstance(vk_instance, NULL); + return; + } + + vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); + ok(!!vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < ARRAY_SIZE(procs); ++i) + { + pfn_vkGetPhysicalDeviceProperties2 = + (PFN_vkGetPhysicalDeviceProperties2)vkGetInstanceProcAddr(vk_instance, procs[i]); + if (!pfn_vkGetPhysicalDeviceProperties2) + { + skip("%s is not available.\n", procs[i]); + return; + } + + for (j = 0; j < count; ++j) + { + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id; + + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + id.pNext = NULL; + + pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[j], &properties2); + luid = (const LUID *)id.deviceLUID; + trace("Device '%s', device UUID:%s, driver UUID:%s, device LUID:%08x:%08x\n", + properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), + wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); + todo_wine ok(id.deviceLUIDValid == VK_TRUE, "Expect valid device LUID \n"); + todo_wine ok(id.deviceNodeMask == 1, "Expect device node mask %08x, got %08x\n", 1, id.deviceNodeMask); + } + } + + heap_free(vk_physical_devices); + vkDestroyInstance(vk_instance, NULL); +} + static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) { VkPhysicalDeviceProperties device_properties; @@ -359,6 +422,7 @@ START_TEST(vulkan) { test_instance_version(); for_each_device(enumerate_physical_device); + test_enumerate_physical_device2(); for_each_device(enumerate_device_queues); test_physical_device_groups(); for_each_device(test_destroy_command_pool); -- 2.19.2

2 1

[RFC PATCH 7/9] dxgi/tests: Add test for enumerating display adapters using SetupAPI.
by Zhiyi Zhang Dec. 18, 2018

Dec. 18, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/dxgi.c | 111 ++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 1c99d70957..76f78cc5fd 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = d3d10_1 dxgi user32 +IMPORTS = d3d10_1 dxgi setupapi user32 C_SRCS = \ dxgi.c diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b42b76186c..a5f05f247f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -22,6 +22,9 @@ #include "dxgi1_6.h" #include "d3d11.h" #include "d3d12.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" #include "wine/heap.h" #include "wine/test.h" @@ -820,6 +823,113 @@ static void test_adapter_luid(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +DEFINE_DEVPROPKEY(DEVPROPKEY_DISPLAY_ADAPTER_LUID, + 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); + +static void test_display_adapters(void) +{ + DXGI_ADAPTER_DESC adapter_desc; + BOOL found_display_adapter; + unsigned int adapter_index; + unsigned int device_index; + DEVPROPTYPE property_type; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + SP_DEVINFO_DATA data; + HDEVINFO dev_info; + DWORD last_error; + ULONG refcount; + void *buffer; + WCHAR *name; + DWORD size; + HRESULT hr; + LUID luid; + BOOL ret; + + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + for (adapter_index = 0; (hr = IDXGIFactory_EnumAdapters(factory, adapter_index, &adapter)) == S_OK; ++adapter_index) + { + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "Adapter has %u references left.\n", refcount); + + /* Skip WARP. */ + if ((!adapter_desc.SubSysId && !adapter_desc.Revision && !adapter_desc.VendorId && !adapter_desc.DeviceId) + || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)) + continue; + + found_display_adapter = FALSE; + + dev_info = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, DIGCF_PRESENT); + ok(dev_info != INVALID_HANDLE_VALUE, "Failed to get device information set.\n"); + + data.cbSize = sizeof(data); + for (device_index = 0; SetupDiEnumDeviceInfo(dev_info, device_index, &data); ++device_index) + { + /* LUID */ + size = 0; + property_type = DEVPROP_TYPE_EMPTY; + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPROPKEY_DISPLAY_ADAPTER_LUID, + &property_type, NULL, 0, &size, 0); + last_error = GetLastError(); + ok(!ret && last_error == ERROR_INSUFFICIENT_BUFFER, + "Failed to get device property size, ret %#x, last_error %#x.\n", ret, last_error); + ok(property_type == DEVPROP_TYPE_UINT64, "Got unexpected property type %#x.\n", property_type); + ok(size == sizeof(LUID), "Got unexpected size %u.\n", size); + + buffer = heap_alloc(size); + ok(!!buffer, "Failed to allocate memory.\n"); + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPROPKEY_DISPLAY_ADAPTER_LUID, + &property_type, buffer, size, &size, 0); + ok(ret, "Failed to get device property, ret %#x, last_error %#x.\n", ret, GetLastError()); + luid = *(LUID *)buffer; + heap_free(buffer); + + if (equal_luid(luid, adapter_desc.AdapterLuid)) + { + found_display_adapter = TRUE; + + /* name */ + size = 0; + property_type = DEVPROP_TYPE_STRING; + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPKEY_NAME, + &property_type, NULL, 0, &size, 0); + last_error = GetLastError(); + ok(!ret && last_error == ERROR_INSUFFICIENT_BUFFER, + "Failed to get device property size, ret %#x, last_error %#x.\n", ret, last_error); + ok(property_type == DEVPROP_TYPE_STRING, "Got unexpected property type %#x.\n", property_type); + + name = heap_alloc(size); + ok(!!name, "Failed to allocate memory.\n"); + ret = SetupDiGetDevicePropertyW(dev_info, &data, &DEVPKEY_NAME, + &property_type, (void *)name, size, &size, 0); + ok(ret, "Failed to get device property, ret %#x, last_error %#x.\n", ret, GetLastError()); + + ok(!lstrcmpW(adapter_desc.Description, name), + "Adapter names do not match: %s, %s.\n", + wine_dbgstr_w(adapter_desc.Description), wine_dbgstr_w(name)); + + heap_free(name); + break; + } + } + + ret = SetupDiDestroyDeviceInfoList(dev_info); + ok(ret, "Failed to destroy device info list.\n"); + + ok(found_display_adapter, "Failed to find display adapter for IDXGIAdapter %u (%s %04x:%04x).\n", + adapter_index, wine_dbgstr_w(adapter_desc.Description), + adapter_desc.VendorId, adapter_desc.DeviceId); + } + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void test_query_video_memory_info(void) { DXGI_QUERY_VIDEO_MEMORY_INFO memory_info; @@ -5018,6 +5128,7 @@ START_TEST(dxgi) queue_test(test_adapter_desc); queue_test(test_adapter_luid); + queue_test(test_display_adapters); queue_test(test_query_video_memory_info); queue_test(test_check_interface_support); queue_test(test_create_surface); -- 2.19.2

2 1

[PATCH 1/2] comctl32/tests: Add a test for passing dialog template with bad control class to PropertySheet.
by Dmitry Timoshkov Dec. 18, 2018

Dec. 18, 2018

The test is currently disabled under Wine because current PropertySheet hangs, and doesn't respond to any events. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/propsheet.c | 42 +++++++++++++++++++++++++++++++++ dlls/comctl32/tests/resources.h | 1 + dlls/comctl32/tests/rsrc.rc | 7 ++++++ 3 files changed, 50 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 2a4afaa51e..b5c05b253a 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1143,6 +1143,47 @@ static void test_CreatePropertySheetPage(void) } } +static void test_bad_control_class(void) +{ + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HPROPSHEETPAGE hpsp; + INT_PTR ret; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.hInstance = GetModuleHandleA(NULL); + U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_BAD_CONTROL); + psp.pfnDlgProc = page_dlg_proc; + + hpsp = pCreatePropertySheetPageA(&psp); + ok(hpsp != 0, "CreatePropertySheetPage failed\n"); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = &hpsp; + +if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once Wine is fixed */ +{ + ret = pPropertySheetA(&psh); + ok(ret == 0, "got %ld\n", ret); +} + + /* Need to recreate hpsp otherwise the test fails under Windows */ + hpsp = pCreatePropertySheetPageA(&psp); + ok(hpsp != 0, "CreatePropertySheetPage failed\n"); + U3(psh).phpage = &hpsp; + + psh.dwFlags = PSH_MODELESS; + ret = pPropertySheetA(&psh); + ok(ret != 0, "got %ld\n", ret); + + ok(IsWindow((HWND)ret), "bad window handle %#lx\n", ret); + DestroyWindow((HWND)ret); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1168,6 +1209,7 @@ START_TEST(propsheet) init_functions(); + test_bad_control_class(); test_title(); test_nopage(); test_disableowner(); diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 3a89cd7baf..53522c0a09 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -39,6 +39,7 @@ #define IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON 34 #define IDD_PROP_PAGE_MESSAGE_TEST 35 #define IDD_PROP_PAGE_ERROR 36 +#define IDD_PROP_PAGE_BAD_CONTROL 37 #define IDC_PS_EDIT1 1000 #define IDC_PS_EDIT2 1001 diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 327aa225e1..6eb4fe8a0a 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -78,6 +78,13 @@ FONT 8, "MS Shell Dlg" { } +IDD_PROP_PAGE_BAD_CONTROL DIALOG 0, 0, 100, 100 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +FONT 8, "MS Shell Dlg" +{ + CONTROL "", -1, "invalid class", 0, 0, 0, 0, 0 +} + STRINGTABLE { IDS_TBADD1 "abc" -- 2.19.2

2 1

[PATCH] d3dcompiler_43. Fix a MSVC-x64 warning about dxbc_init().
by Serge Gautherie Dec. 18, 2018

Dec. 18, 2018

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- "...\utils.c(561) : warning C4028: formal parameter 2 different from declaration" ReactOS-Bug: https://jira.reactos.org/browse/CORE-7538 --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1eea0d2..dcd1467 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1214,7 +1214,7 @@ HRESULT dxbc_write_blob(struct dxbc *dxbc, ID3DBlob **blob) DECLSPEC_HIDDEN; void dxbc_destroy(struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DECLSPEC_HIDDEN; HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, DWORD data_size) DECLSPEC_HIDDEN; -HRESULT dxbc_init(struct dxbc *dxbc, DWORD count) DECLSPEC_HIDDEN; +HRESULT dxbc_init(struct dxbc *dxbc, UINT count) DECLSPEC_HIDDEN; static inline void read_dword(const char **ptr, DWORD *d) { -- 2.10.0.windows.1

1 0

[PATCH] comctl32/tests: Add a test for passing dialog template with bad control class to PropertySheet.
by Dmitry Timoshkov Dec. 18, 2018

Dec. 18, 2018

The test is disabled under Wine because current PropertySheet implementation hangs, and doesn't respond to any events. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/propsheet.c | 42 +++++++++++++++++++++++++++++++++ dlls/comctl32/tests/resources.h | 1 + dlls/comctl32/tests/rsrc.rc | 7 ++++++ 3 files changed, 50 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 2a4afaa51e..b5c05b253a 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1143,6 +1143,47 @@ static void test_CreatePropertySheetPage(void) } } +static void test_bad_control_class(void) +{ + PROPSHEETPAGEA psp; + PROPSHEETHEADERA psh; + HPROPSHEETPAGE hpsp; + INT_PTR ret; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.hInstance = GetModuleHandleA(NULL); + U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_BAD_CONTROL); + psp.pfnDlgProc = page_dlg_proc; + + hpsp = pCreatePropertySheetPageA(&psp); + ok(hpsp != 0, "CreatePropertySheetPage failed\n"); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = &hpsp; + +if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once Wine is fixed */ +{ + ret = pPropertySheetA(&psh); + ok(ret == 0, "got %ld\n", ret); +} + + /* Need to recreate hpsp otherwise the test fails under Windows */ + hpsp = pCreatePropertySheetPageA(&psp); + ok(hpsp != 0, "CreatePropertySheetPage failed\n"); + U3(psh).phpage = &hpsp; + + psh.dwFlags = PSH_MODELESS; + ret = pPropertySheetA(&psh); + ok(ret != 0, "got %ld\n", ret); + + ok(IsWindow((HWND)ret), "bad window handle %#lx\n", ret); + DestroyWindow((HWND)ret); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1168,6 +1209,7 @@ START_TEST(propsheet) init_functions(); + test_bad_control_class(); test_title(); test_nopage(); test_disableowner(); diff --git a/dlls/comctl32/tests/resources.h b/dlls/comctl32/tests/resources.h index 3a89cd7baf..53522c0a09 100644 --- a/dlls/comctl32/tests/resources.h +++ b/dlls/comctl32/tests/resources.h @@ -39,6 +39,7 @@ #define IDD_PROP_PAGE_WITH_CUSTOM_DEFAULT_BUTTON 34 #define IDD_PROP_PAGE_MESSAGE_TEST 35 #define IDD_PROP_PAGE_ERROR 36 +#define IDD_PROP_PAGE_BAD_CONTROL 37 #define IDC_PS_EDIT1 1000 #define IDC_PS_EDIT2 1001 diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 327aa225e1..6eb4fe8a0a 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -78,6 +78,13 @@ FONT 8, "MS Shell Dlg" { } +IDD_PROP_PAGE_BAD_CONTROL DIALOG 0, 0, 100, 100 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +FONT 8, "MS Shell Dlg" +{ + CONTROL "", -1, "invalid class", 0, 0, 0, 0, 0 +} + STRINGTABLE { IDS_TBADD1 "abc" -- 2.19.2

2 1

[RFC PATCH 0/9] LUID support for DXGI and Vulkan
by Zhiyi Zhang Dec. 18, 2018

Dec. 18, 2018

Hi all, This patch set is implemented so that wine can report valid LUID for DXGI adapters and Vulkan adapters. Thus a DXGI adapter and a Vulkan adapter can be uniquely correlated via LUID. The adapters are first enumerated via Vulkan in user driver if it is available, then the adapter information and the generated LUIDs are stored in registry via SetupAPI, using device properties. Later, wined3d and winex11.drv both use SetupAPI to query the device information. There are some work that can be done on top of this, e.g., reporting real PCI ID as well. I'm sure there are many places I haven't considered, so let me know if there are any suggestions or problems. Thanks, Zhiyi

1 0

[RFC PATCH 6/9] wined3d: Use physical adapter name if available.
by Zhiyi Zhang Dec. 18, 2018

Dec. 18, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/directx.c | 29 +++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ee7b75a38c..31ddd0ed28 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1166,6 +1166,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier) { + static const WCHAR x11_default_adapter_name[] = {'W', 'i', 'n', 'e', ' ', 'X', '1', '1', ' ', 'D', 'r', 'i', 'v', 'e', 'r', 0}; const struct wined3d_adapter *adapter; size_t len; @@ -1189,10 +1190,19 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, if (identifier->description_size) { - const char *description = adapter->driver_info.description; - len = min(strlen(description), identifier->description_size - 1); - memcpy(identifier->description, description, len); - memset(&identifier->description[len], 0, identifier->description_size - len); + if(!strcmpW(adapter->name, x11_default_adapter_name)) + { + const char *description = adapter->driver_info.description; + len = min(strlen(description), identifier->description_size - 1); + memcpy(identifier->description, description, len); + memset(&identifier->description[len], 0, identifier->description_size - len); + } + else if (!WideCharToMultiByte(CP_ACP, 0, adapter->name, -1, identifier->description, identifier->description_size, + NULL, NULL)) + { + ERR("Failed to convert adapter name, last error %#x.\n", GetLastError()); + goto fail; + } } /* Note that d3d8 doesn't supply a device name. */ @@ -2536,6 +2546,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o adapter->ordinal = ordinal; + /* We need to differentiate the adapter->name and the adapter->device_name here. + * the device name from EnumDisplayDevicesW is \\.\\DISPLAY0 for example, which is the name of an output + * in DXGI concept, whereas adapter->name is the name of a physical adapter. */ display_device.cb = sizeof(display_device); /* FIXME: EnumDisplayDevicesW is a stub. It doesn't support multiple displays and adapters. * Use the first device name for now. */ @@ -2597,6 +2610,14 @@ HRESULT wined3d_init(struct wined3d *wined3d, DWORD flags) goto fail; } + property_type = DEVPROP_TYPE_STRING; + if (!SetupDiGetDevicePropertyW(devinfo, &devinfo_data, &DEVPKEY_NAME, &property_type, + (BYTE *)&wined3d->adapters[i].name, sizeof(wined3d->adapters[i].name), NULL, 0)) + { + WARN("Failed to get adapter %u name.\n", i); + goto fail; + } + if (!wined3d_adapter_init(&wined3d->adapters[i], i, flags)) { WARN("Failed to initialise adapter %u.\n", i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8190327cce..6580464899 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2679,6 +2679,7 @@ struct wined3d_adapter UINT64 vram_bytes_used; LUID luid; + WCHAR name[256]; /* physical adapter name, for use with e.g. IDXGIAdapter::GetDesc */ WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ unsigned int cfg_count; struct wined3d_pixel_format *cfgs; -- 2.19.2

1 0

[RFC PATCH 4/9] winex11.drv: Enumerate adapters via Vulkan if possible.
by Zhiyi Zhang Dec. 18, 2018

Dec. 18, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 3 +- dlls/winex11.drv/adapter.c | 220 +++++++++++++++++++++++++++++++++++ dlls/winex11.drv/init.c | 3 + dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 dlls/winex11.drv/adapter.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..509e84670d 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,10 +1,11 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 setupapi DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) C_SRCS = \ + adapter.c \ bitblt.c \ brush.c \ clipboard.c \ diff --git a/dlls/winex11.drv/adapter.c b/dlls/winex11.drv/adapter.c new file mode 100644 index 0000000000..b8c4b9e437 --- /dev/null +++ b/dlls/winex11.drv/adapter.c @@ -0,0 +1,220 @@ +/* + * Adapter enumeration + * + * Copyright 2018 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" +#include "winuser.h" +#include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" + +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +DEFINE_DEVPROPKEY(DEVPROPKEY_DISPLAY_ADAPTER_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +/* Private DEVPROPKEY for associating an physical adapter to a vulkan adapter */ +DEFINE_DEVPROPKEY(DEVPROPKEY_DISPLAY_ADAPTER_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); + +struct adapter_desc +{ + uint32_t vendor_id; + uint32_t device_id; + GUID uuid; + WCHAR *device_name; +}; + +static WCHAR *heap_strdupAtoW(const char *str) +{ + WCHAR *ret; + INT len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, 0, 0); + ret = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + +static BOOL add_adapter_entry(const struct adapter_desc *adapter, uint32_t index) +{ + static const WCHAR instance_formatW[] = {'P', 'C', 'I', + '\\', 'V', 'E', 'N', '_', '%', '0', '4', 'X', + '&', 'D', 'E', 'V', '_', '%', '0', '4', 'X', + '&', 'S', 'U', 'B', 'S', 'Y', 'S', '_', '0', '0', '0', '0', '0', '0', '0', '0', + '&', 'R', 'E', 'V', '_', '0', '0', + /* Fake instance id */ + '\\', '3', + '&', '2', '6', '7', 'a', '6', '1', '6', 'a', + '&', '0', + '&', '%','0','2', 'u', 0}; + WCHAR instanceW[ARRAY_SIZE(instance_formatW)]; + HDEVINFO devinfo; + SP_DEVINFO_DATA devinfo_data = {sizeof(SP_DEVINFO_DATA)}; + LUID luid; + BOOL ret = FALSE; + + sprintfW(instanceW, instance_formatW, adapter->vendor_id, adapter->device_id, index); + + devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + if (!SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, adapter->device_name, NULL, 0, + &devinfo_data)) + goto fail; + if (!AllocateLocallyUniqueId(&luid)) + goto fail; + if (!SetupDiSetDevicePropertyW(devinfo, &devinfo_data, &DEVPROPKEY_DISPLAY_ADAPTER_LUID, DEVPROP_TYPE_UINT64, + (const BYTE *)&luid, sizeof(luid), 0)) + goto fail; + if (!SetupDiSetDevicePropertyW(devinfo, &devinfo_data, &DEVPROPKEY_DISPLAY_ADAPTER_UUID, DEVPROP_TYPE_UINT64, + (const BYTE *)&adapter->uuid, sizeof(adapter->uuid), 0)) + goto fail; + if (!SetupDiSetDevicePropertyW(devinfo, &devinfo_data, &DEVPKEY_NAME, DEVPROP_TYPE_STRING, + (const BYTE *)adapter->device_name, + (strlenW(adapter->device_name) + 1) * sizeof(WCHAR), 0)) + goto fail; + if (!SetupDiRegisterDeviceInfo(devinfo, &devinfo_data, 0, NULL, NULL, NULL)) + goto fail; + + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + return ret; +} + +static BOOL init_vulkan_adapters(void) +{ + static const CHAR *extensions[] = {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}; + const struct vulkan_funcs *vk_funcs; + PFN_vkEnumeratePhysicalDevices p_vkEnumeratePhysicalDevices; + PFN_vkGetPhysicalDeviceProperties2KHR p_vkGetPhysicalDeviceProperties2KHR; + VkInstanceCreateInfo create_info = {0}; + VkInstance instance; + VkPhysicalDevice *devices = NULL; + VkPhysicalDeviceProperties2 prop2; + VkPhysicalDeviceIDProperties id; + VkResult vr; + struct adapter_desc desc; + uint32_t i, count = 0; + BOOL ret = FALSE; + + vk_funcs = get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); + if (!vk_funcs) + return FALSE; + + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.enabledExtensionCount = ARRAY_SIZE(extensions); + create_info.ppEnabledExtensionNames = extensions; + vr = vk_funcs->p_vkCreateInstance(&create_info, NULL, &instance); + if (vr != VK_SUCCESS) + return FALSE; + + p_vkEnumeratePhysicalDevices = + (PFN_vkEnumeratePhysicalDevices)vk_funcs->p_vkGetInstanceProcAddr(instance, "vkEnumeratePhysicalDevices"); + p_vkGetPhysicalDeviceProperties2KHR = (PFN_vkGetPhysicalDeviceProperties2KHR)vk_funcs->p_vkGetInstanceProcAddr( + instance, "vkGetPhysicalDeviceProperties2KHR"); + + vr = p_vkEnumeratePhysicalDevices(instance, &count, NULL); + if (vr != VK_SUCCESS || count == 0) + goto fail; + + devices = heap_alloc(count * sizeof(VkPhysicalDevice)); + if (!devices) + goto fail; + + vr = p_vkEnumeratePhysicalDevices(instance, &count, devices); + if (vr != VK_SUCCESS) + goto fail; + + for (i = 0; i < count; i++) + { + prop2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + prop2.pNext = &id; + + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + id.pNext = NULL; + + p_vkGetPhysicalDeviceProperties2KHR(devices[i], &prop2); + desc.vendor_id = prop2.properties.vendorID; + desc.device_id = prop2.properties.deviceID; + desc.uuid = *(GUID *)id.deviceUUID; + desc.device_name = heap_strdupAtoW(prop2.properties.deviceName); + ret = add_adapter_entry(&desc, i); + heap_free(desc.device_name); + if (!ret) + goto fail; + } + +fail: + heap_free(devices); + vk_funcs->p_vkDestroyInstance(instance, NULL); + return ret; +} + +static void init_default_adpater(void) +{ + WCHAR device_name[] = {'W', 'i', 'n', 'e', ' ', 'X', '1', '1', ' ', 'D', 'r', 'i', 'v', 'e', 'r', 0}; + struct adapter_desc desc = {0, 0, {0}, device_name}; + if (!add_adapter_entry(&desc, 0)) + ERR("Failed to initialize the default adapter\n"); +} + +static void delete_all_adapters(void) +{ + HDEVINFO devinfo; + SP_DEVINFO_DATA devinfo_data = {0}; + DWORD i = 0; + BOOL result; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + if (devinfo == INVALID_HANDLE_VALUE) + return; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &devinfo_data)) + { + result = SetupDiRemoveDevice(devinfo, &devinfo_data); + if (!result) + ERR("Failed to remove adapter %d\n", i); + } + + SetupDiDestroyDeviceInfoList(devinfo); +} + +void X11DRV_Adapter_Init(void) +{ + delete_all_adapters(); + if (!init_vulkan_adapters()) + { + WARN("Failed to enumerate adapters via Vulkan, fallling back to using the default adapter\n"); + init_default_adpater(); + } +} \ No newline at end of file diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 326873314c..f27d0e178f 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -59,6 +59,9 @@ static BOOL WINAPI device_init( INIT_ONCE *once, void *param, void **context ) stock_bitmap_pixmap = XCreatePixmap( gdi_display, root_window, 1, 1, 1 ); + /* Enumerate adapters */ + X11DRV_Adapter_Init(); + return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a0308b0675..608eda1db5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -194,6 +194,7 @@ extern BOOL X11DRV_UnrealizePalette( HPALETTE hpal ) DECLSPEC_HIDDEN; extern void X11DRV_Xcursor_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XInput2_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_Adapter_Init(void) DECLSPEC_HIDDEN; extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, -- 2.19.2

1 0

[RFC PATCH 1/9] setupapi: Sync spec file.
by Zhiyi Zhang Dec. 18, 2018

Dec. 18, 2018

File version 10.0.17763.1 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/setupapi.spec | 158 +++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 0b44e184fc..eb2dab204d 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -3,12 +3,16 @@ @ stub AddTagToGroupOrderListEntry @ stub AppendStringToMultiSz @ stdcall AssertFail(str long str) +@ stub CMP_GetBlockedDriverInfo +@ stub CMP_GetServerSideDeviceInstallFlags @ stub CMP_Init_Detection @ stub CMP_RegisterNotification @ stub CMP_Report_LogOn @ stub CMP_UnregisterNotification @ stdcall CMP_WaitNoPendingInstallEvents(long) @ stub CMP_WaitServices +@ stub CMP_WaitServicesAvailable +@ stub CM_Add_Driver_PackageW @ stub CM_Add_Empty_Log_Conf @ stub CM_Add_Empty_Log_Conf_Ex @ stub CM_Add_IDA @@ -18,6 +22,7 @@ @ stub CM_Add_Range @ stub CM_Add_Res_Des @ stub CM_Add_Res_Des_Ex +@ stub CM_Apply_PowerScheme @ stdcall CM_Connect_MachineA(str ptr) @ stdcall CM_Connect_MachineW(wstr ptr) @ stdcall CM_Create_DevNodeA(ptr str long long) @@ -29,6 +34,12 @@ @ stub CM_Delete_Class_Key_Ex @ stub CM_Delete_DevNode_Key @ stub CM_Delete_DevNode_Key_Ex +@ stub CM_Delete_Device_Interface_KeyA +@ stub CM_Delete_Device_Interface_KeyW +@ stub CM_Delete_Device_Interface_Key_ExA +@ stub CM_Delete_Device_Interface_Key_ExW +@ stub CM_Delete_Driver_PackageW +@ stub CM_Delete_PowerScheme @ stub CM_Delete_Range @ stub CM_Detect_Resource_Conflict @ stub CM_Detect_Resource_Conflict_Ex @@ -36,6 +47,7 @@ @ stub CM_Disable_DevNode_Ex @ stdcall CM_Disconnect_Machine(long) @ stub CM_Dup_Range_List +@ stub CM_Duplicate_PowerScheme @ stub CM_Enable_DevNode @ stub CM_Enable_DevNode_Ex @ stdcall CM_Enumerate_Classes(long ptr long) @@ -53,6 +65,7 @@ @ stub CM_Free_Res_Des @ stub CM_Free_Res_Des_Ex @ stub CM_Free_Res_Des_Handle +@ stub CM_Free_Resource_Conflict_Handle @ stdcall CM_Get_Child(ptr long long) @ stdcall CM_Get_Child_Ex(ptr long long ptr) @ stub CM_Get_Class_Key_NameA @@ -67,6 +80,10 @@ @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex +@ stub CM_Get_DevNode_Custom_PropertyA +@ stub CM_Get_DevNode_Custom_PropertyW +@ stub CM_Get_DevNode_Custom_Property_ExA +@ stub CM_Get_DevNode_Custom_Property_ExW @ stdcall CM_Get_DevNode_Registry_PropertyA(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @@ -123,13 +140,22 @@ @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex +@ stub CM_Get_Resource_Conflict_Count +@ stub CM_Get_Resource_Conflict_DetailsA +@ stub CM_Get_Resource_Conflict_DetailsW @ stub CM_Get_Sibling @ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex +@ stub CM_Import_PowerScheme +@ stub CM_Install_DevNodeW +@ stub CM_Install_DevNode_ExW @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List @ stub CM_Is_Dock_Station_Present +@ stub CM_Is_Dock_Station_Present_Ex +@ stub CM_Is_Version_Available +@ stub CM_Is_Version_Available_Ex @ stdcall CM_Locate_DevNodeA(ptr str long) @ stdcall CM_Locate_DevNodeW(ptr wstr long) @ stdcall CM_Locate_DevNode_ExA(ptr str long long) @@ -146,6 +172,10 @@ @ stub CM_Open_Class_Key_ExW @ stdcall CM_Open_DevNode_Key(long long long long ptr long) @ stub CM_Open_DevNode_Key_Ex +@ stub CM_Open_Device_Interface_KeyA +@ stub CM_Open_Device_Interface_KeyW +@ stub CM_Open_Device_Interface_Key_ExA +@ stub CM_Open_Device_Interface_Key_ExW @ stub CM_Query_And_Remove_SubTreeA @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Query_And_Remove_SubTree_ExA @@ -156,6 +186,7 @@ @ stub CM_Query_Arbitrator_Free_Size_Ex @ stub CM_Query_Remove_SubTree @ stub CM_Query_Remove_SubTree_Ex +@ stub CM_Query_Resource_Conflict_List @ stdcall CM_Reenumerate_DevNode(ptr long) @ stdcall CM_Reenumerate_DevNode_Ex(ptr long ptr) @ stub CM_Register_Device_Driver @@ -170,11 +201,17 @@ @ stub CM_Remove_Unmarked_Children_Ex @ stub CM_Request_Device_EjectA @ stub CM_Request_Device_EjectW +@ stub CM_Request_Device_Eject_ExA +@ stub CM_Request_Device_Eject_ExW @ stub CM_Request_Eject_PC +@ stub CM_Request_Eject_PC_Ex @ stub CM_Reset_Children_Marks @ stub CM_Reset_Children_Marks_Ex +@ stub CM_RestoreAll_DefaultPowerSchemes +@ stub CM_Restore_DefaultPowerScheme @ stub CM_Run_Detection @ stub CM_Run_Detection_Ex +@ stub CM_Set_ActiveScheme @ stdcall CM_Set_Class_Registry_PropertyA(ptr long ptr long long ptr) @ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) @ stub CM_Set_DevNode_Problem @@ -198,8 +235,17 @@ @ stub CM_Unregister_Device_InterfaceW @ stub CM_Unregister_Device_Interface_ExA @ stub CM_Unregister_Device_Interface_ExW +@ stub CM_Write_UserPowerKey @ stdcall CaptureAndConvertAnsiArg(str ptr) @ stdcall CaptureStringArg(wstr ptr) +@ stub DriverStoreAddDriverPackageA +@ stub DriverStoreAddDriverPackageW +@ stub DriverStoreDeleteDriverPackageA +@ stub DriverStoreDeleteDriverPackageW +@ stub DriverStoreEnumDriverPackageA +@ stub DriverStoreEnumDriverPackageW +@ stub DriverStoreFindDriverPackageA +@ stub DriverStoreFindDriverPackageW @ stub CenterWindowRelativeToParent @ stub ConcatenatePaths @ stdcall DelayedMove(wstr wstr) @@ -233,6 +279,11 @@ @ stdcall MyRealloc(ptr long) @ stdcall OpenAndMapFileForRead(wstr ptr ptr ptr ptr) @ stub OutOfMemory +@ stub PnpEnumDrpFile +@ stub PnpIsFileAclIntact +@ stub PnpIsFileContentIntact +@ stub PnpIsFilePnpDriver +@ stub PnpRepairWindowsProtectedDriver @ stub QueryMultiSzValueToArray @ stdcall QueryRegistryValue(long wstr ptr ptr ptr) @ stub ReadAsciiOrUnicodeTextFile @@ -252,6 +303,8 @@ @ stdcall SetupAddToSourceListW(long wstr) @ stub SetupAdjustDiskSpaceListA @ stub SetupAdjustDiskSpaceListW +@ stub SetupBackupErrorA +@ stub SetupBackupErrorW @ stub SetupCancelTemporarySourceList @ stdcall SetupCloseFileQueue(ptr) @ stdcall SetupCloseInfFile(long) @@ -259,6 +312,8 @@ @ stdcall SetupCommitFileQueue(long long ptr ptr) SetupCommitFileQueueW @ stdcall SetupCommitFileQueueA(long long ptr ptr) @ stdcall SetupCommitFileQueueW(long long ptr ptr) +@ stub SetupConfigureWmiFromInfSectionA +@ stub SetupConfigureWmiFromInfSectionW @ stdcall SetupCopyErrorA(long str str str str str long long str long ptr) @ stdcall SetupCopyErrorW(long wstr wstr wstr wstr wstr long long wstr long ptr) @ stdcall SetupCopyOEMInfA(str str long long ptr long ptr ptr) @@ -273,6 +328,7 @@ @ stdcall SetupDeleteErrorA(long str str long long) @ stdcall SetupDeleteErrorW(long wstr wstr long long) @ stdcall SetupDestroyDiskSpaceList(long) +@ stub SetupDiApplyPowerScheme @ stub SetupDiAskForOEMDisk @ stdcall SetupDiBuildClassInfoList(long ptr long ptr) @ stdcall SetupDiBuildClassInfoListExA(long ptr long ptr str ptr) @@ -313,7 +369,11 @@ @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) @ stdcall SetupDiEnumDriverInfoA(ptr ptr long long ptr) @ stdcall SetupDiEnumDriverInfoW(ptr ptr long long ptr) +@ stub SetupDiGetActualModelsSectionA +@ stub SetupDiGetActualModelsSectionW @ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) +@ stub SetupDiGetActualSectionToInstallExA +@ stub SetupDiGetActualSectionToInstallExW @ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) @ stdcall SetupDiGetClassBitmapIndex(ptr ptr) @ stdcall SetupDiGetClassDescriptionA(ptr str long ptr) @@ -332,6 +392,14 @@ @ stub SetupDiGetClassImageListExW @ stub SetupDiGetClassInstallParamsA @ stub SetupDiGetClassInstallParamsW +@ stub SetupDiGetClassPropertyExW +@ stub SetupDiGetClassPropertyKeys +@ stub SetupDiGetClassPropertyKeysExW +@ stub SetupDiGetClassPropertyW +@ stub SetupDiGetClassRegistryPropertyA +@ stub SetupDiGetClassRegistryPropertyW +@ stub SetupDiGetCustomDevicePropertyA +@ stub SetupDiGetCustomDevicePropertyW @ stub SetupDiGetDeviceInfoListClass @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) @@ -342,6 +410,8 @@ @ stub SetupDiGetDeviceInterfaceAlias @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr) @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr) +@ stub SetupDiGetDeviceInterfacePropertyKeys +@ stub SetupDiGetDevicePropertyKeys @ stdcall SetupDiGetDevicePropertyW(ptr ptr ptr ptr ptr long ptr long) @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr) @@ -367,8 +437,10 @@ @ stub SetupDiInstallClassExW @ stdcall SetupDiInstallClassW(long wstr long ptr) @ stub SetupDiInstallDevice +@ stub SetupDiInstallDeviceInterfaces @ stub SetupDiInstallDriverFiles @ stdcall SetupDiLoadClassIcon(ptr ptr ptr) +@ stub SetupDiLoadDeviceIcon @ stub SetupDiMoveDuplicateDevice @ stdcall SetupDiOpenClassRegKey(ptr long) @ stdcall SetupDiOpenClassRegKeyExA(ptr long long str ptr) @@ -379,16 +451,31 @@ @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) +@ stub SetupDiRegisterCoDeviceInstallers @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stdcall SetupDiRemoveDeviceInterface(ptr ptr) +@ stub SetupDiReportAdditionalSoftwareRequested +@ stub SetupDiReportDeviceInstallError +@ stub SetupDiReportDriverNotFoundError +@ stub SetupDiReportDriverPackageImportationError +@ stub SetupDiReportGenericDriverInstalled +@ stub SetupDiReportPnPDeviceProblem +@ stub SetupDiRestartDevices @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) +@ stub SetupDiSetClassPropertyExW +@ stub SetupDiSetClassPropertyW +@ stub SetupDiSetClassRegistryPropertyA +@ stub SetupDiSetClassRegistryPropertyW @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) +@ stub SetupDiSetDeviceInterfaceDefault +@ stub SetupDiSetDeviceInterfacePropertyW +@ stub SetupDiSetDevicePropertyW @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long) @ stub SetupDiSetDriverInstallParamsA @@ -401,6 +488,8 @@ @ stdcall SetupDuplicateDiskSpaceListW(ptr ptr long long) @ stdcall SetupEnumInfSectionsA(long long ptr long ptr) @ stdcall SetupEnumInfSectionsW(long long ptr long ptr) +@ stub SetupEnumPublishedInfA +@ stub SetupEnumPublishedInfW @ stdcall SetupFindFirstLineA(long str str ptr) @ stdcall SetupFindFirstLineW(long wstr wstr ptr) @ stdcall SetupFindNextLine(ptr ptr) @@ -418,10 +507,14 @@ @ stdcall SetupGetFileCompressionInfoW(wstr ptr ptr ptr ptr) @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) +@ stub SetupGetInfDriverStoreLocationA +@ stub SetupGetInfDriverStoreLocationW @ stdcall SetupGetInfFileListA(str long ptr long ptr) @ stdcall SetupGetInfFileListW(wstr long ptr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) @ stdcall SetupGetInfInformationW(ptr long ptr long ptr) +@ stub SetupGetInfPublishedNameA +@ stub SetupGetInfPublishedNameW @ stub SetupGetInfSections @ stdcall SetupGetIntField(ptr long ptr) @ stdcall SetupGetLineByIndexA(long str long ptr) @@ -443,6 +536,7 @@ @ stdcall SetupGetStringFieldW(ptr long ptr long ptr) @ stdcall SetupGetTargetPathA(ptr ptr str ptr long ptr) @ stdcall SetupGetTargetPathW(ptr ptr wstr ptr long ptr) +@ stub SetupGetThreadLogToken @ stdcall SetupInitDefaultQueueCallback(long) @ stdcall SetupInitDefaultQueueCallbackEx(long long long long ptr) @ stdcall SetupInitializeFileLogA (str long) @@ -455,6 +549,8 @@ @ stdcall SetupInstallFilesFromInfSectionW(long long long wstr wstr long) @ stdcall SetupInstallFromInfSectionA(long long str long long str long ptr ptr long ptr) @ stdcall SetupInstallFromInfSectionW(long long wstr long long wstr long ptr ptr long ptr) +@ stub SetupInstallLogCloseEventGroup +@ stub SetupInstallLogCreateEventGroup @ stdcall SetupInstallServicesFromInfSectionA(long str long) @ stub SetupInstallServicesFromInfSectionExA @ stub SetupInstallServicesFromInfSectionExW @@ -472,6 +568,8 @@ @ stdcall SetupOpenInfFileW(wstr wstr long ptr) @ stdcall SetupOpenLog(long) @ stdcall SetupOpenMasterInf() +@ stub SetupPrepareQueueForRestoreA +@ stub SetupPrepareQueueForRestoreW @ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) @ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) @@ -532,10 +630,17 @@ @ stub SetupSetPlatformPathOverrideW @ stdcall SetupSetSourceListA(long ptr long) @ stdcall SetupSetSourceListW(long ptr long) +@ stub SetupSetThreadLogToken @ stdcall SetupTermDefaultQueueCallback(ptr) @ stdcall SetupTerminateFileLog(long) +@ stub SetupUninstallNewlyCopiedInfs @ stdcall SetupUninstallOEMInfA(str long ptr) @ stdcall SetupUninstallOEMInfW(wstr long ptr) +@ stub SetupVerifyInfFileA +@ stub SetupVerifyInfFileW +@ stub SetupWriteTextLog +@ stub SetupWriteTextLogError +@ stub SetupWriteTextLogInfLine @ stub ShouldDeviceBeExcluded @ stdcall StampFileSecurity(wstr ptr) @ stdcall StringTableAddString(ptr wstr long) @@ -557,28 +662,71 @@ @ stdcall UnmapAndCloseFile(long long ptr) @ stub VerifyCatalogFile @ stub VerifyFile +@ stub pGetDriverPackageHash @ stub pSetupAccessRunOnceNodeList @ stub pSetupAddMiniIconToList @ stub pSetupAddTagToGroupOrderListEntry +@ stub pSetupAppendPath @ stub pSetupAppendStringToMultiSz +@ stub pSetupCaptureAndConvertAnsiArg +@ stub pSetupCenterWindowRelativeToParent +@ stub pSetupCloseTextLogSection +@ stub pSetupConcatenatePaths +@ stub pSetupCreateTextLogSectionA +@ stub pSetupCreateTextLogSectionW @ stub pSetupDestroyRunOnceNodeList +@ stub pSetupDiBuildInfoDataFromStrongName +@ stub pSetupDiCrimsonLogDeviceInstall +@ stub pSetupDiEnumSelectedDrivers +@ stub pSetupDiGetDriverInfoExtensionId +@ stub pSetupDiGetStrongNameForDriverNode +@ stub pSetupDiInvalidateHelperModules @ stub pSetupDirectoryIdToPath +@ stub pSetupDoLastKnownGoodBackup +@ stub pSetupDoesUserHavePrivilege +@ stub pSetupDuplicateString +@ stub pSetupEnablePrivilege @ stdcall pSetupFree(ptr) MyFree +@ stub pSetupGetCurrentDriverSigningPolicy +@ stub pSetupGetDriverDate +@ stub pSetupGetDriverVersion @ stdcall pSetupGetField(ptr long) +@ stub pSetupGetFileTitle @ stdcall pSetupGetGlobalFlags() +@ stub pSetupGetIndirectStringsFromDriverInfo +@ stub pSetupGetInfSections @ stub pSetupGetOsLoaderDriveAndPath @ stdcall pSetupGetQueueFlags(ptr) +@ stub pSetupGetRealSystemTime @ stub pSetupGetVersionDatum @ stub pSetupGuidFromString -@ stub pSetupIsGuidNull +@ stub pSetupHandleFailedVerification +@ stub pSetupInfGetDigitalSignatureInfo +@ stub pSetupInfIsInbox +@ stub pSetupInfSetDigitalSignatureInfo @ stdcall pSetupInstallCatalog(wstr wstr ptr) +@ stub pSetupIsBiDiLocalizedSystemEx +@ stub pSetupIsGuidNull +@ stub pSetupIsLocalSystem @ stdcall pSetupIsUserAdmin() IsUserAdmin +@ stub pSetupIsUserTrustedInstaller +@ stub pSetupLoadIndirectString @ stub pSetupMakeSurePathExists @ stdcall pSetupMalloc(long) MyMalloc +@ stub pSetupModifyGlobalFlags +@ stub pSetupMultiByteToUnicode +@ stub pSetupOpenAndMapFileForRead +@ stub pSetupOutOfMemory +@ stub pSetupQueryMultiSzValueToArray @ stdcall pSetupRealloc(ptr long) MyRealloc +@ stub pSetupRegistryDelnode +@ stub pSetupRetrieveServiceConfig +@ stub pSetupSetArrayToMultiSzValue +@ stub pSetupSetDriverPackageRestorePoint @ stdcall pSetupSetGlobalFlags(long) @ stdcall pSetupSetQueueFlags(ptr long) @ stub pSetupSetSystemSourceFlags +@ stub pSetupShouldDeviceBeExcluded @ stub pSetupStringFromGuid @ stdcall pSetupStringTableAddString(ptr wstr long) StringTableAddString @ stdcall pSetupStringTableAddStringEx(ptr wstr long ptr long) StringTableAddStringEx @@ -591,5 +739,13 @@ @ stdcall pSetupStringTableLookUpString(ptr wstr long) StringTableLookUpString @ stdcall pSetupStringTableLookUpStringEx(ptr wstr long ptr ptr) StringTableLookUpStringEx @ stdcall pSetupStringTableSetExtraData(ptr long ptr long) StringTableSetExtraData +@ stub pSetupStringTableStringFromId +@ stub pSetupStringTableStringFromIdEx +@ stub pSetupUnicodeToMultiByte +@ stub pSetupUninstallCatalog +@ stub pSetupUnmapAndCloseFile +@ stub pSetupValidateDriverPackage @ stub pSetupVerifyCatalogFile @ stub pSetupVerifyQueuedCatalogs +@ stub pSetupWriteLogEntry +@ stub pSetupWriteLogError -- 2.19.2

1 0

[PATCH] gdi32: Use the default fallback list before trying Fontconfig.
by Akihiro Sagawa Dec. 18, 2018

Dec. 18, 2018

This fixes a regression introduced by 11ab9ff7b3c43bb41c0325fe9417b1d7f44ad516. It overrides default fallback font fix for Latin scripts as seen in 3b9669017bc8425f04860f331d8a1f689c8d63e0. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46285 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46244 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-)

2 2

[PATCH 1/3] shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set
by Gabriel Ivăncescu Dec. 18, 2018

Dec. 18, 2018

On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This is actually needed for proper enumeration implementation of, for example, the ACList_ISF class (not implemented yet but it requires this patch). dlls/shell32/shfldr_desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index d0b97c6..938871e 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -611,7 +611,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, if ((clsid = _ILGetGUIDPointer (pidl))) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING) { BOOL bWantsForParsing; -- 2.19.1

1 2

[PATCH] gdi32: Fix compile error with Fontconfig <= 2.10.91.
by Akihiro Sagawa Dec. 18, 2018

Dec. 18, 2018

FC_PRGNAME is available since 2.10.92 and FC_NAMELANG is available since 2.9.91. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46296 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 4 ++++ 1 file changed, 4 insertions(+)

3 2

[PATCH] po: Update Catalan translation
by Alex Henrie Dec. 17, 2018

Dec. 17, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 632 +++++++++++++++++++++++-------------------------------- 1 file changed, 264 insertions(+), 368 deletions(-) diff --git a/po/ca.po b/po/ca.po index 302e4ad32b..5411e0d3c4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-31 19:18-0700\n" +"PO-Revision-Date: 2018-12-17 21:33-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.5\n" +"X-Generator: Poedit 2.2\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -313,25 +313,23 @@ msgstr "S'està cancel·lant..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "resten %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "resten %1!u! %2 i %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Segons" +msgstr "segons" #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "minuts" #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "hores" #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -430,16 +428,12 @@ msgid "&Retry" msgstr "&Reintenta" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Amaga &pestanyes" +msgstr "Amaga els detalls" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Detalls" +msgstr "Mostra els detalls" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -1038,7 +1032,7 @@ msgstr "" #: comdlg32.rc:67 msgid "A printer error occurred." -msgstr "S'ha produït un error d'impressora." +msgstr "Ha ocorregut un error d'impressora." #: comdlg32.rc:68 msgid "No default printer defined." @@ -2212,7 +2206,7 @@ msgstr "" #: cryptui.rc:273 cryptui.rc:69 msgid "Select Certificate Store" -msgstr "Seleccionar el magatzem de certificats" +msgstr "Seleccioneu un magatzem de certificats" #: cryptui.rc:276 msgid "Select the certificate store you want to use:" @@ -2463,16 +2457,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Heu acabat amb èxit l'Assistent d'Exportació de Certificats." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Seleccionar el magatzem de certificats" +msgstr "Seleccionar el certificat" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Seleccioneu el magatzem de certificats que voleu utilitzar:" +msgstr "Seleccioneu el magatzem de certificats que voleu utilitzar" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -3007,20 +2997,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Nota: La clau privada d'aquest certificat no és exportable." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Finalitat prevista:" +msgstr "Finalitat prevista" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Ubicació" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Seleccionar el magatzem de certificats" +msgstr "Seleccioneu un certificat" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -3514,46 +3500,36 @@ msgid "Publishers..." msgstr "Publicadors..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Connexió LAN" +msgstr "Connexions" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Configuració del Wine" +msgstr "Configuració automàtica" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Utilitza autodescobriment de servidor intermediari web (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Utilitza script de autoconfiguració de servidor intermediari (PAC)" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adreça" +msgstr "Adreça:" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "Servidor &local" +msgstr "Servidor intermediari" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "Utilitza un servidor intermediari" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Cap port" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3816,18 +3792,20 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"no es pot establir l'atribut 'writable' en el descriptor de propietat com a " +"'true' en aquest objecte" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "No es pot redefinir la propietat no configurable '|'" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "No es pot modificar la propietat no escrivible '|'" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "La propietat no pot tenir ambdós mètodes d'accés i un valor" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -6800,10 +6778,8 @@ msgid "Connection reset by peer.\n" msgstr "Un igual ha restablert la connexió.\n" #: winerror.mc:3760 -#, fuzzy -#| msgid "Message 0x%1 not found in file %2.\n" msgid "No Signature found in file.\n" -msgstr "No s'ha trobat el missatge 0x%1 en el fitxer %2.\n" +msgstr "No s'ha trobat cap signatura en el fitxer.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -8651,10 +8627,8 @@ msgid "&Browse..." msgstr "&Navega..." #: shell32.rc:355 shell32.rc:384 -#, fuzzy -#| msgid "File type" msgid "File type:" -msgstr "Tipus de fitxer" +msgstr "Tipus de fitxer:" #: shell32.rc:359 shell32.rc:392 urlmon.rc:37 explorer.rc:32 msgid "Location:" @@ -8665,16 +8639,12 @@ msgid "Size:" msgstr "Mida:" #: shell32.rc:365 shell32.rc:398 -#, fuzzy -#| msgid "Creation date" msgid "Creation date:" -msgstr "Data de creació" +msgstr "Data de creació:" #: shell32.rc:369 shell32.rc:406 -#, fuzzy -#| msgid "&Attributes:" msgid "Attributes:" -msgstr "&Atributs:" +msgstr "Atributs:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8685,28 +8655,20 @@ msgid "&Archive" msgstr "&Arxiu" #: shell32.rc:386 -#, fuzzy -#| msgid "Open:" msgid "Open with:" -msgstr "Obre:" +msgstr "Obre amb:" #: shell32.rc:389 -#, fuzzy -#| msgid "Change &Icon..." msgid "&Change..." -msgstr "&Canvia d'icona..." +msgstr "&Canvia..." #: shell32.rc:400 -#, fuzzy -#| msgid "Modified" msgid "Last modified:" -msgstr "Modificat" +msgstr "Última modificació:" #: shell32.rc:402 -#, fuzzy -#| msgid "Last Change:" msgid "Last accessed:" -msgstr "Últim canvi:" +msgstr "Últim accés:" #: shell32.rc:138 shell32.rc:142 winefile.rc:108 msgid "Size" @@ -9131,811 +9093,791 @@ msgstr "Seleccionar font" #: tzres.rc:82 msgid "China Standard Time" -msgstr "" +msgstr "Hora estàndard de la Xina" #: tzres.rc:83 msgid "China Daylight Time" -msgstr "" +msgstr "Hora d'estiu de la Xina" #: tzres.rc:160 msgid "North Asia Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àsia del Nord" #: tzres.rc:161 msgid "North Asia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àsia del Nord" #: tzres.rc:104 msgid "Georgian Standard Time" -msgstr "" +msgstr "Hora estàndard de Geòrgia" #: tzres.rc:105 msgid "Georgian Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Geòrgia" #: tzres.rc:152 msgid "Nepal Standard Time" -msgstr "" +msgstr "Hora estàndard del Nepal" #: tzres.rc:153 msgid "Nepal Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Nepal" #: tzres.rc:60 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "Hora estàndard de Cap Verd" #: tzres.rc:61 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Cap Verd" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "Europeu central" +msgstr "Hora estàndard de l'Europa Central" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "Europeu central" +msgstr "Hora d'estiu de l'Europa Central" #: tzres.rc:140 msgid "Morocco Standard Time" -msgstr "" +msgstr "Hora estàndard del Marroc" #: tzres.rc:141 msgid "Morocco Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Marroc" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "Europeu central" +msgstr "Hora estàndard de l'Europa Central" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "Europeu central" +msgstr "Hora d'estiu de l'Europa Central" #: tzres.rc:118 msgid "Iran Standard Time" -msgstr "" +msgstr "Hora estàndard d'Iran" #: tzres.rc:119 msgid "Iran Daylight Time" -msgstr "" +msgstr "Hora d'estiu d'Iran" #: tzres.rc:150 msgid "Namibia Standard Time" -msgstr "" +msgstr "Hora estàndard de Namíbia" #: tzres.rc:151 msgid "Namibia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Namíbia" #: tzres.rc:200 msgid "Tonga Standard Time" -msgstr "" +msgstr "Hora estàndard de Tonga" #: tzres.rc:201 msgid "Tonga Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Tonga" #: tzres.rc:144 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "Hora estàndard de les muntanyes (Mèxic)" #: tzres.rc:145 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "Hora d'estiu de les muntanyes (Mèxic)" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "Barra &estàndard" +msgstr "Hora estàndard GMT" #: tzres.rc:107 msgid "GMT Daylight Time" -msgstr "" +msgstr "Hora d'estiu GMT" #: tzres.rc:68 msgid "Central Asia Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àsia Central" #: tzres.rc:69 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àsia Central" #: tzres.rc:38 msgid "Arabic Standard Time" -msgstr "" +msgstr "Hora estàndard àrab" #: tzres.rc:39 msgid "Arabic Daylight Time" -msgstr "" +msgstr "Hora d'estiu àrab" #: tzres.rc:132 msgid "Magadan Standard Time" -msgstr "" +msgstr "Hora estàndard de Magadan" #: tzres.rc:133 msgid "Magadan Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Magadan" #: tzres.rc:156 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "Hora estàndard de Terranova" #: tzres.rc:157 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Terranova" #: tzres.rc:224 msgid "West Pacific Standard Time" -msgstr "" +msgstr "Hora estàndard del Pacífic Occidental" #: tzres.rc:225 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Pacífic Occidental" #: tzres.rc:164 msgid "Pacific Standard Time" -msgstr "" +msgstr "Hora estàndard del Pacífic" #: tzres.rc:165 msgid "Pacific Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Pacífic" #: tzres.rc:48 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Azerbaidjan" #: tzres.rc:49 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Azerbaidjan" #: tzres.rc:182 msgid "Samoa Standard Time" -msgstr "" +msgstr "Hora estàndard de Samoa" #: tzres.rc:183 msgid "Samoa Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Samoa" #: tzres.rc:124 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "Hora estàndard de Kaliningrad" #: tzres.rc:125 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Kaliningrad" #: tzres.rc:166 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "Hora estàndard del Pacífic (Mèxic)" #: tzres.rc:167 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "Hora d'estiu del Pacífic (Mèxic)" #: tzres.rc:136 msgid "Middle East Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Orient Mitjà" #: tzres.rc:137 msgid "Middle East Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Orient Mitjà" #: tzres.rc:198 msgid "Tokyo Standard Time" -msgstr "" +msgstr "Hora estàndard de Tokyo" #: tzres.rc:199 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Tokyo" #: tzres.rc:130 msgid "Line Islands Standard Time" -msgstr "" +msgstr "Hora estàndard de les Illes de la Línia" #: tzres.rc:131 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "Hora d'estiu de les Illes de la Línia" #: tzres.rc:122 msgid "Jordan Standard Time" -msgstr "" +msgstr "Hora estàndard de Jordània" #: tzres.rc:123 msgid "Jordan Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Jordània" #: tzres.rc:78 msgid "Central Standard Time" -msgstr "" +msgstr "Hora estàndard central" #: tzres.rc:79 msgid "Central Daylight Time" -msgstr "" +msgstr "Hora d'estiu central" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "" +msgstr "Hora estàndard dels Açores" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "" +msgstr "Hora d'estiu dels Açores" #: tzres.rc:158 msgid "North Asia East Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àsia del Norest" #: tzres.rc:159 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àsia del Norest" #: tzres.rc:40 msgid "Argentina Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Argentina" #: tzres.rc:41 msgid "Argentina Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Argentina" #: tzres.rc:146 msgid "Myanmar Standard Time" -msgstr "" +msgstr "Hora estàndard de Birmània" #: tzres.rc:147 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Birmània" #: tzres.rc:210 tzres.rc:211 msgid "Coordinated Universal Time" -msgstr "" +msgstr "Temps universal coordinat" #: tzres.rc:116 msgid "India Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Índia" #: tzres.rc:117 msgid "India Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Índia" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "Barra &estàndard" +msgstr "Hora estàndard GTB" #: tzres.rc:113 msgid "GTB Daylight Time" -msgstr "" +msgstr "Hora d'estiu GTB" #: tzres.rc:202 msgid "Turkey Standard Time" -msgstr "" +msgstr "Hora estàndard de Turquia" #: tzres.rc:203 msgid "Turkey Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Turquia" #: tzres.rc:100 msgid "Fiji Standard Time" -msgstr "" +msgstr "Hora estàndard de Fiji" #: tzres.rc:101 msgid "Fiji Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Fiji" #: tzres.rc:58 msgid "Canada Central Standard Time" -msgstr "" +msgstr "Hora estàndard del Canadà Central" #: tzres.rc:59 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Canadà Central" #: tzres.rc:194 msgid "Taipei Standard Time" -msgstr "" +msgstr "Hora estàndard de Taipei" #: tzres.rc:195 msgid "Taipei Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Taipei" #: tzres.rc:220 msgid "W. Europe Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Europa Occidental" #: tzres.rc:221 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Europa Occidental" #: tzres.rc:138 msgid "Montevideo Standard Time" -msgstr "" +msgstr "Hora estàndard de Montevideo" #: tzres.rc:139 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Montevideo" #: tzres.rc:168 msgid "Pakistan Standard Time" -msgstr "" +msgstr "Hora estàndard del Pakistan" #: tzres.rc:169 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Pakistan" #: tzres.rc:62 msgid "Caucasus Standard Time" -msgstr "" +msgstr "Hora estàndard del Caucas" #: tzres.rc:63 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Caucas" #: tzres.rc:46 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "Hora estàndard oriental AUS" #: tzres.rc:47 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "Hora d'estiu oriental AUS" #: tzres.rc:148 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àsia del Centre-Nord" #: tzres.rc:149 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àsia del Centre-Nord" #: tzres.rc:94 msgid "Eastern Standard Time" -msgstr "" +msgstr "Hora estàndard oriental" #: tzres.rc:95 msgid "Eastern Daylight Time" -msgstr "" +msgstr "Hora d'estiu oriental" #: tzres.rc:80 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "Hora estàndard central (Mèxic)" #: tzres.rc:81 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "Hora d'estiu central (Mèxic)" #: tzres.rc:42 msgid "Atlantic Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Atlàntic" #: tzres.rc:43 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Atlàntic" #: tzres.rc:142 msgid "Mountain Standard Time" -msgstr "" +msgstr "Hora estàndard de les muntanyes" #: tzres.rc:143 msgid "Mountain Daylight Time" -msgstr "" +msgstr "Hora d'estiu de les muntanyes" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "" +msgstr "Hora estàndard oriental EEUU" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "Hora d'estiu oriental EEUU" #: tzres.rc:196 msgid "Tasmania Standard Time" -msgstr "" +msgstr "Hora estàndard de Tasmània" #: tzres.rc:197 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Tasmània" #: tzres.rc:66 msgid "Central America Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àmerica Central" #: tzres.rc:67 msgid "Central America Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àmerica Central" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "" +msgstr "Hora estàndard de les muntanyes EEUU" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "Hora d'estiu de les muntanyes EEUU" #: tzres.rc:188 msgid "South Africa Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àfrica del Sud" #: tzres.rc:189 msgid "South Africa Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àfrica del Sud" #: tzres.rc:64 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "Hora estàndard d'Austràlia Central" #: tzres.rc:65 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "Hora d'estiu d'Austràlia Central" #: tzres.rc:190 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "Hora estàndard de Sri Lanka" #: tzres.rc:191 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Sri Lanka" #: tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Afganistan" #: tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Afganistan" #: tzres.rc:226 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "Hora estàndard de Iakutsk" #: tzres.rc:227 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Iakutsk" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àmerica del Sud-Est" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àmerica del Sud-Est" #: tzres.rc:34 msgid "Arab Standard Time" -msgstr "" +msgstr "Hora estàndard àrab" #: tzres.rc:35 msgid "Arab Daylight Time" -msgstr "" +msgstr "Hora d'estiu àrab" #: tzres.rc:36 msgid "Arabian Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àrabia" #: tzres.rc:37 msgid "Arabian Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àrabia" #: tzres.rc:174 msgid "Russian Standard Time" -msgstr "" +msgstr "Hora estàndard de Rússia" #: tzres.rc:175 msgid "Russian Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Rússia" #: tzres.rc:172 msgid "Romance Standard Time" -msgstr "" +msgstr "Hora estàndard romànic" #: tzres.rc:173 msgid "Romance Daylight Time" -msgstr "" +msgstr "Hora d'estiu romànic" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "Hora estàndard d'Iekaterinburg" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "Hora d'estiu d'Iekaterinburg" #: tzres.rc:192 msgid "Syria Standard Time" -msgstr "" +msgstr "Hora estàndard de Síria" #: tzres.rc:193 msgid "Syria Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Síria" #: tzres.rc:44 msgid "AUS Central Standard Time" -msgstr "" +msgstr "Hora estàndard central AUS" #: tzres.rc:45 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "Hora d'estiu central AUS" #: tzres.rc:110 msgid "Greenwich Standard Time" -msgstr "" +msgstr "Hora estàndard de Greenwich" #: tzres.rc:111 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Greenwich" #: tzres.rc:204 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "Hora estàndard d'Ulan Bator" #: tzres.rc:205 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "Hora d'estiu d'Ulan Bator" #: tzres.rc:120 msgid "Israel Standard Time" -msgstr "" +msgstr "Hora estàndard d'Israel" #: tzres.rc:121 msgid "Israel Daylight Time" -msgstr "" +msgstr "Hora d'estiu d'Israel" #: tzres.rc:54 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "Hora estàndard de Bangla Desh" #: tzres.rc:55 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Bangla Desh" #: tzres.rc:178 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "Hora estàndard del Pacífic de l'Amèrica del Sud" #: tzres.rc:179 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" #: tzres.rc:222 msgid "West Asia Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àsia Occidental" #: tzres.rc:223 msgid "West Asia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àsia Occidental" #: tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "Hora estàndard d'Alaska" #: tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "Hora d'estiu d'Alaska" #: tzres.rc:170 msgid "Paraguay Standard Time" -msgstr "" +msgstr "Hora estàndard del Paraguai" #: tzres.rc:171 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Paraguai" #: tzres.rc:84 -#, fuzzy -#| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "Data i hora" +msgstr "Hora estàndard de la línia de canvi de data" #: tzres.rc:85 msgid "Dateline Daylight Time" -msgstr "" +msgstr "Hora d'estiu de la línia de canvi de data" #: tzres.rc:128 msgid "Libya Standard Time" -msgstr "" +msgstr "Hora estàndard de Líbia" #: tzres.rc:129 msgid "Libya Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Líbia" #: tzres.rc:52 msgid "Bahia Standard Time" -msgstr "" +msgstr "Hora estàndard de Bahia" #: tzres.rc:53 msgid "Bahia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Bahia" #: tzres.rc:212 msgid "Venezuela Standard Time" -msgstr "" +msgstr "Hora estàndard de Veneçuela" #: tzres.rc:213 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Veneçuela" #: tzres.rc:114 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "Hora estàndard de Hawaii" #: tzres.rc:115 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Hawaii" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àsia del Sud-Est" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àsia del Sud-Est" #: tzres.rc:154 msgid "New Zealand Standard Time" -msgstr "" +msgstr "Hora estàndard de Nova Zelanda" #: tzres.rc:155 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Nova Zelanda" #: tzres.rc:70 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "Hora estàndard del Brasil Central" #: tzres.rc:71 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Brasil Central" #: tzres.rc:56 msgid "Belarus Standard Time" -msgstr "" +msgstr "Hora estàndard de Bielorússia" #: tzres.rc:57 msgid "Belarus Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Bielorússia" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àmerica del Sud-Oest" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àmerica del Sud-Oest" #: tzres.rc:108 msgid "Greenland Standard Time" -msgstr "" +msgstr "Hora estàndard de Groenlàndia" #: tzres.rc:109 msgid "Greenland Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Groenlàndia" #: tzres.rc:92 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "Data i hora" +msgstr "Hora estàndard de l'Illa de Pasqua" #: tzres.rc:93 -#, fuzzy -#| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "Data i hora" +msgstr "Hora d'estiu de l'Illa de Pasqua" #: tzres.rc:96 msgid "Egypt Standard Time" -msgstr "" +msgstr "Hora estàndard d'Egipte" #: tzres.rc:97 msgid "Egypt Daylight Time" -msgstr "" +msgstr "Hora d'estiu d'Egipte" #: tzres.rc:134 msgid "Mauritius Standard Time" -msgstr "" +msgstr "Hora estàndard de Maurici" #: tzres.rc:135 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Maurici" #: tzres.rc:214 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "Hora estàndard de Vladivostok" #: tzres.rc:215 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Vladivostok" #: tzres.rc:186 msgid "Singapore Standard Time" -msgstr "" +msgstr "Hora estàndard de Singapur" #: tzres.rc:187 msgid "Singapore Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Singapur" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "" +msgstr "Hora estàndard de Corea" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "" +msgstr "Hora d'estiu de Corea" #: tzres.rc:86 msgid "E. Africa Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àfrica Oriental" #: tzres.rc:87 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àfrica Oriental" #: tzres.rc:102 -#, fuzzy -#| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "Barra &estàndard" +msgstr "Hora estàndard FLE" #: tzres.rc:103 msgid "FLE Daylight Time" -msgstr "" +msgstr "Hora d'estiu FLE" #: tzres.rc:90 msgid "E. South America Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àmerica del Sudest" #: tzres.rc:91 msgid "E. South America Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àmerica del Sudest" #: tzres.rc:76 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "Hora estàndard del Pacífic Central" #: tzres.rc:77 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Pacífic Central" #: tzres.rc:218 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Àfrica del Centre-Oest" #: tzres.rc:219 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Àfrica del Centre-Oest" #: tzres.rc:162 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "Hora estàndard del Pacífic de l'Amèrica del Sud" #: tzres.rc:163 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "Hora d'estiu del Pacífic de l'Amèrica del Sud" #: tzres.rc:88 msgid "E. Australia Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Austràlia Oriental" #: tzres.rc:89 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Austràlia Oriental" #: tzres.rc:216 msgid "W. Australia Standard Time" -msgstr "" +msgstr "Hora estàndard de l'Austràlia Occidental" #: tzres.rc:217 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "Hora d'estiu de l'Austràlia Occidental" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -10126,70 +10068,61 @@ msgstr "" "Hi ha almenys un problema de seguretat no especificat amb aquest certificat." #: winineterror.mc:26 -#, fuzzy -#| msgid "Service request timeout.\n" msgid "The request has timed out.\n" -msgstr "S'ha superat el temps d'espera de sol·licitud de servei.\n" +msgstr "S'ha superat el temps d'espera de la sol·licitud.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "S'ha produït un error d'impressora." +msgstr "Ha ocorregut un error intern.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "El camí no és vàlid.\n" +msgstr "L'URL no és vàlid.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "No s'ha pogut reconèixer l'esquema URL o no és compatible.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "No s'ha pogut trobar el nom d'usuari.\n" +msgstr "No s'ha pogut resoldre el nom de servidor.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "El perfil d'usuari no és vàlid.\n" +msgstr "L'operació demanada no és vàlida.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"S'ha cancel·lat l'operació, usualment perquè s'ha tancat l'identificador en " +"el qual la sol·licitud s'estava operant abans que es completés l'operació.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "No s'ha pogut afegir el perfil.\n" +msgstr "No s'ha pogut ubicar l'element demanat.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "No es pot connectar al servidor LDAP" +msgstr "L'intent de connectar al servidor ha fallat.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "S'ha terminat la connexió amb el servidor.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"La data del certificat SSL que s'ha rebut del servidor està malmesa. El " +"certificat està caducat.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" msgstr "" +"El nom comú del certificat SSL (camp de nom de màquina) és incorrecte.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -10430,7 +10363,7 @@ msgstr "El controlador de dispositiu no està llest." #: winmm.rc:78 msgid "A problem occurred in initializing MCI. Try restarting Windows." msgstr "" -"Hi ha hagut un problema en inicialitzar l'MCI. Proveu reiniciar el Windows." +"Ha ocorregut un problema en inicialitzar l'MCI. Proveu reiniciar el Windows." #: winmm.rc:79 msgid "" @@ -10450,7 +10383,7 @@ msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" -"S'han produït errors en més d'un dispositiu. Especifiqueu cada ordre i " +"Han ocorregut errors en més d'un dispositiu. Especifiqueu cada ordre i " "dispositiu separadament per a determinar quins dispositius han causat " "l'error." @@ -10764,7 +10697,7 @@ msgstr "" #: winmm.rc:130 msgid "An error occurred with the specified port." -msgstr "S'ha ocorregut un error amb el port especificat." +msgstr "Ha ocorregut un error amb el port especificat." #: winmm.rc:133 msgid "" @@ -12041,10 +11974,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Error: L'opció '%c' no és vàlida.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Error: No s'ha pogut trobar el procés \"%1\".\n" +msgstr "Error: No s'ha pogut obtenir el nom de màquina: %u.\n" #: hostname.rc:33 msgid "" @@ -12245,7 +12176,7 @@ msgstr "Desconnectat" #: net.rc:50 msgid "A network error occurred" -msgstr "Hi ha hagut un error de xarxa" +msgstr "Ha ocorregut un error de xarxa" #: net.rc:51 msgid "Connection is being made" @@ -13266,16 +13197,16 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" -"reg: No s'ha pogut suprimir tots els valors de registre en '%1'. Un error " -"inesperat ha ocorregut.\n" +"reg: No s'ha pogut suprimir tots els valors de registre en '%1'. Ha " +"ocorregut un error inesperat.\n" #: reg.rc:59 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"reg: No s'ha pogut completar l'operació especificada. Un error inesperat ha " -"ocorregut.\n" +"reg: No s'ha pogut completar l'operació especificada. Ha ocorregut un error " +"inesperat.\n" #: reg.rc:60 msgid "Search complete. Number of matches found: %1!d!\n" @@ -13852,10 +13783,8 @@ msgid "Confirm Value Delete" msgstr "Confirmar eliminació de valor" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "Esteu segur que voleu suprimir el valor de registre '%1'?" +msgstr "Esteu segur que voleu suprimir el valor de registre seleccionat?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -15236,11 +15165,11 @@ msgstr "Co&lor:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Tipus MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Gestiona &associacions de fitxer" #: winecfg.rc:308 msgid "Folders" @@ -15857,6 +15786,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"Un program en el vostre sistema ha tingut una pana, però el WineDbg no ha " +"pogut enganxar-se al procès per a obtenir una traça inversa." #: winedbg.rc:41 msgid "(unidentified)" @@ -16716,41 +16647,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -16789,8 +16685,8 @@ msgstr "" "XCOPY - Copia fitxers o arbres de directori a una destinació.\n" "\n" "Sintaxi:\n" -"XCOPY origen [destinació] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] [/R]\n" -"\t [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" +"XCOPY origen [destinació] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" +"\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" "\n" "On:\n" "\n" @@ -16810,7 +16706,7 @@ msgstr "" "[/U] Copia només els fitxers que ja existeixin a la destinació.\n" "[/R] Sobreescriu qualsevol fitxer de només lectura.\n" "[/H] Inclou els fitxers amagats i els fitxers de sistema en la còpia.\n" -"[/C] Continuar inclús si es produeix un error durant la còpia.\n" +"[/C] Continuar inclús si ocorr un error durant la còpia.\n" "[/A] Només copiar els fitxers amb l'atribut d'arxiu establert.\n" "[/M] Només copiar els fitxers amb l'atribut d'arxiu establert, elimina\n" "\tl'atribut d'arxiu.\n" -- 2.20.1

1 0

[PATCH v2] setupapi/tests: Fix return value checking.
by Zhiyi Zhang Dec. 17, 2018

Dec. 17, 2018

SetupDiCreateDeviceInfoList returns INVALID_HANDLE_VALUE(~0) on error instead of NULL. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: No need to check for null as well. Thanks to Zeb. dlls/setupapi/tests/devinst.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bfffcb9c32..4abc188ea4 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -125,13 +125,13 @@ static void test_create_device_list_ex(void) "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(set && set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(set && set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); @@ -286,7 +286,7 @@ static void test_device_info(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device info, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); @@ -366,7 +366,7 @@ static void test_device_info(void) SetupDiDestroyDeviceInfoList(set); set = SetupDiCreateDeviceInfoList(NULL, NULL); - ok(set != NULL, "Failed to create device info, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device info, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", NULL, NULL, NULL, 0, NULL); @@ -427,7 +427,7 @@ static void test_get_device_instance_id(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiGetDeviceInstanceIdA(set, NULL, NULL, 0, NULL); @@ -485,7 +485,7 @@ static void test_register_device_info(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiRegisterDeviceInfo(set, NULL, 0, NULL, NULL, NULL); @@ -528,7 +528,7 @@ static void test_register_device_info(void) SetupDiDestroyDeviceInfoList(set); set = SetupDiGetClassDevsA(&guid, NULL, NULL, 0); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); check_device_info(set, 0, &guid, "Root\\LEGACY_BOGUS\\0000"); check_device_info(set, 1, &guid, "Root\\LEGACY_BOGUS\\0002"); @@ -596,7 +596,7 @@ static void test_device_iface(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); @@ -697,7 +697,7 @@ static void test_device_iface_detail(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetupDiGetDeviceInterfaceDetailA(set, NULL, NULL, 0, NULL, NULL); @@ -787,7 +787,7 @@ static void test_device_key(void) ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); res = RegOpenKeyW(HKEY_LOCAL_MACHINE, bogus, &key); ok(res != ERROR_SUCCESS, "Key should not exist.\n"); -- 2.19.2

2 1

[PATCH 1/5] d3d9: Support drawing from D3DPOOL_SYSTEMMEM vertex buffers.
by Matteo Bruni Dec. 17, 2018

Dec. 17, 2018

From: Henri Verbeet <hverbeet(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45486 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/buffer.c | 24 ++++++++++++++-- dlls/d3d9/d3d9_private.h | 4 +++ dlls/d3d9/device.c | 60 ++++++++++++++++++++++++++++++++++++---- dlls/d3d9/stateblock.c | 17 ++++++++++++ 4 files changed, 96 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 02b3570402f..15b7e2bdbce 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -59,6 +59,8 @@ static ULONG WINAPI d3d9_vertexbuffer_AddRef(IDirect3DVertexBuffer9 *iface) IDirect3DDevice9Ex_AddRef(buffer->parent_device); wined3d_mutex_lock(); wined3d_buffer_incref(buffer->wined3d_buffer); + if (buffer->draw_buffer) + wined3d_buffer_incref(buffer->draw_buffer); wined3d_mutex_unlock(); } @@ -78,6 +80,8 @@ static ULONG WINAPI d3d9_vertexbuffer_Release(IDirect3DVertexBuffer9 *iface) wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -274,6 +278,7 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, UINT size, UINT usage, DWORD fvf, D3DPOOL pool) { + const struct wined3d_parent_ops *parent_ops = &d3d9_null_wined3d_parent_ops; struct wined3d_buffer_desc desc; HRESULT hr; @@ -299,15 +304,28 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.byte_width = size; desc.usage = usage & WINED3DUSAGE_MASK; - desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; + if (desc.access & WINED3D_RESOURCE_ACCESS_GPU) + { + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + parent_ops = &d3d9_vertexbuffer_wined3d_parent_ops; + } + wined3d_mutex_lock(); - hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, - &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, parent_ops, &buffer->wined3d_buffer); + if (SUCCEEDED(hr) && !(desc.access & WINED3D_RESOURCE_ACCESS_GPU)) + { + desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->draw_buffer))) + wined3d_buffer_decref(buffer->wined3d_buffer); + } wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index d6155eba60b..8647aac4af1 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -42,6 +42,7 @@ #define D3D9_MAX_VERTEX_SHADER_CONSTANTF 256 #define D3D9_MAX_TEXTURE_UNITS 20 +#define D3D9_MAX_STREAMS 16 #define D3DPRESENTFLAGS_MASK 0x00000fffu @@ -105,6 +106,8 @@ struct d3d9_device BOOL in_destruction; BOOL in_scene; BOOL has_vertex_declaration; + BOOL recording; + unsigned int upload_map; unsigned int max_user_clip_planes; @@ -181,6 +184,7 @@ struct d3d9_vertexbuffer struct d3d9_resource resource; struct wined3d_buffer *wined3d_buffer; IDirect3DDevice9Ex *parent_device; + struct wined3d_buffer *draw_buffer; DWORD fvf; }; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f19e2ae6f65..7c488bfd601 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -974,6 +974,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { + device->recording = FALSE; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } @@ -2317,7 +2318,8 @@ static HRESULT WINAPI d3d9_device_BeginStateBlock(IDirect3DDevice9Ex *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - hr = wined3d_device_begin_stateblock(device->wined3d_device); + if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device))) + device->recording = TRUE; wined3d_mutex_unlock(); return hr; @@ -2340,6 +2342,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire WARN("Failed to end the state block, hr %#x.\n", hr); return hr; } + device->recording = FALSE; if (!(object = heap_alloc_zero(sizeof(*object)))) { @@ -2688,10 +2691,38 @@ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) } } +static void d3d9_device_upload_sysmem_buffers(struct d3d9_device *device, + unsigned int start_vertex, unsigned int vertex_count) +{ + struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + struct d3d9_vertexbuffer *d3d9_buffer; + unsigned int i, offset, stride, map; + struct wined3d_buffer *dst_buffer; + HRESULT hr; + + map = device->upload_map; + while (map) + { + i = ffs(map) - 1; + map ^= 1u << i; + + if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) + ERR("Failed to get stream source.\n"); + d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); + box.left = offset + start_vertex * stride; + box.right = box.left + vertex_count * stride; + if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, + wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0))) + ERR("Failed to update buffer.\n"); + } +} + static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, D3DPRIMITIVETYPE primitive_type, UINT start_vertex, UINT primitive_count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + unsigned int vertex_count; HRESULT hr; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", @@ -2704,10 +2735,11 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + d3d9_device_upload_sysmem_buffers(device, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); - hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, - vertex_count_from_primitive_count(primitive_type, primitive_count)); + hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -2734,6 +2766,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + d3d9_device_upload_sysmem_buffers(device, min_vertex_idx, vertex_count); d3d9_generate_auto_mipmaps(device); wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); @@ -3378,6 +3411,7 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_vertexbuffer *buffer_impl = unsafe_impl_from_IDirect3DVertexBuffer9(buffer); + struct wined3d_buffer *wined3d_buffer; HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", @@ -3386,14 +3420,28 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); if (!stride) { - struct wined3d_buffer *wined3d_buffer; unsigned int cur_offset; hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, &cur_offset, &stride); } - hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, - buffer_impl ? buffer_impl->wined3d_buffer : NULL, offset, stride); + + if (!buffer_impl) + wined3d_buffer = NULL; + else if (buffer_impl->draw_buffer) + wined3d_buffer = buffer_impl->draw_buffer; + else + wined3d_buffer = buffer_impl->wined3d_buffer; + + hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, wined3d_buffer, offset, stride); + if (SUCCEEDED(hr) && !device->recording) + { + if (buffer_impl && buffer_impl->draw_buffer) + device->upload_map |= (1u << stream_idx); + else + device->upload_map &= ~(1u << stream_idx); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 62b3bacb28d..c5306fd80b3 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -108,11 +108,28 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct wined3d_buffer *wined3d_buffer; + struct d3d9_vertexbuffer *buffer; + unsigned int i, offset, stride; + struct d3d9_device *device; + HRESULT hr; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); wined3d_stateblock_apply(stateblock->wined3d_stateblock); + device = impl_from_IDirect3DDevice9Ex(stateblock->parent_device); + device->upload_map = 0; + for (i = 0; i < D3D9_MAX_STREAMS; ++i) + { + if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, + i, &wined3d_buffer, &offset, &stride))) + continue; + if (!wined3d_buffer || !(buffer = wined3d_buffer_get_parent(wined3d_buffer))) + continue; + if (buffer->draw_buffer) + device->upload_map |= 1u << i; + } wined3d_mutex_unlock(); return D3D_OK; -- 2.18.1

6 17

[PATCH] devenum/tests: Fix some more memory leaks (Valgrind).
by Zebediah Figura Dec. 17, 2018

Dec. 17, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/tests/devenum.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 10ca27a614..e31f65c653 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -95,6 +95,7 @@ static void test_devenum(IBindCtx *bind_ctx) if (winetest_debug > 1) trace("%s %s:\n", wine_dbgstr_guid(&cat_guid), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); @@ -688,6 +689,7 @@ static BOOL CALLBACK test_dsound(GUID *guid, const WCHAR *desc, const WCHAR *mod ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); IParseDisplayName_Release(parser); -- 2.19.2

1 0

[PATCH vkd3d 2/2] vkd3d-shader: Implement DXBC checksum for root signatures.
by Józef Kucia Dec. 17, 2018

Dec. 17, 2018

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- MD5 code assumes that sizeof(unsigned int) == 4. --- libs/vkd3d-shader/checksum.c | 73 ++++++++++++++++-------- libs/vkd3d-shader/dxbc.c | 6 +- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- tests/d3d12.c | 7 +-- 4 files changed, 56 insertions(+), 36 deletions(-) diff --git a/libs/vkd3d-shader/checksum.c b/libs/vkd3d-shader/checksum.c index d2929da92635..b9a7140221e0 100644 --- a/libs/vkd3d-shader/checksum.c +++ b/libs/vkd3d-shader/checksum.c @@ -35,11 +35,15 @@ #include "vkd3d_shader_private.h" +#define DXBC_CHECKSUM_BLOCK_SIZE 64 + +STATIC_ASSERT(sizeof(unsigned int) == 4); + struct md5_ctx { unsigned int i[2]; unsigned int buf[4]; - unsigned char in[64]; + unsigned char in[DXBC_CHECKSUM_BLOCK_SIZE]; unsigned char digest[16]; }; @@ -163,7 +167,7 @@ static void byte_reverse(unsigned char *buf, unsigned longs) * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious * initialization constants. */ -void md5_init(struct md5_ctx *ctx) +static void md5_init(struct md5_ctx *ctx) { ctx->buf[0] = 0x67452301; ctx->buf[1] = 0xefcdab89; @@ -177,7 +181,7 @@ void md5_init(struct md5_ctx *ctx) * Update context to reflect the concatenation of another buffer full * of bytes. */ -void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) +static void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) { unsigned int t; @@ -194,7 +198,7 @@ void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) if (t) { unsigned char *p = (unsigned char *)ctx->in + t; - t = 64 - t; + t = DXBC_CHECKSUM_BLOCK_SIZE - t; if (len < t) { @@ -212,27 +216,25 @@ void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) } /* Process data in 64-byte chunks */ - while (len >= 64) + while (len >= DXBC_CHECKSUM_BLOCK_SIZE) { - memcpy(ctx->in, buf, 64); + memcpy(ctx->in, buf, DXBC_CHECKSUM_BLOCK_SIZE); byte_reverse(ctx->in, 16); md5_transform(ctx->buf, (unsigned int *)ctx->in); - buf += 64; - len -= 64; + buf += DXBC_CHECKSUM_BLOCK_SIZE; + len -= DXBC_CHECKSUM_BLOCK_SIZE; } /* Handle any remaining bytes of data. */ memcpy(ctx->in, buf, len); } -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -void md5_final(struct md5_ctx *ctx) +static void dxbc_checksum_final(struct md5_ctx *ctx) { + unsigned int padding; + unsigned int length; unsigned int count; unsigned char *p; @@ -243,34 +245,57 @@ void md5_final(struct md5_ctx *ctx) always at least one byte free */ p = ctx->in + count; *p++ = 0x80; + ++count; /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; + padding = DXBC_CHECKSUM_BLOCK_SIZE - count; /* Pad out to 56 mod 64 */ - if (count < 8) + if (padding < 8) { /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); + memset(p, 0, padding); byte_reverse(ctx->in, 16); md5_transform(ctx->buf, (unsigned int *)ctx->in); - /* Now fill the next block with 56 bytes */ - memset(ctx->in, 0, 56); + /* Now fill the next block */ + memset(ctx->in, 0, DXBC_CHECKSUM_BLOCK_SIZE); } else { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } + /* Make place for bitcount at the beginning of the block */ + memmove(&ctx->in[4], ctx->in, count); - byte_reverse(ctx->in, 14); + /* Pad block to 60 bytes */ + memset(p + 4, 0, padding - 4); + } /* Append length in bits and transform */ - ((unsigned int *)ctx->in)[14] = ctx->i[0]; - ((unsigned int *)ctx->in)[15] = ctx->i[1]; + length = ctx->i[0]; + memcpy(&ctx->in[0], &length, sizeof(length)); + byte_reverse(&ctx->in[4], 14); + length = ctx->i[0] >> 2 | 0x1; + memcpy(&ctx->in[DXBC_CHECKSUM_BLOCK_SIZE - 4], &length, sizeof(length)); md5_transform(ctx->buf, (unsigned int *)ctx->in); byte_reverse((unsigned char *)ctx->buf, 4); memcpy(ctx->digest, ctx->buf, 16); } + +#define DXBC_CHECKSUM_SKIP_BYTE_COUNT 20 + +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) +{ + const uint8_t *ptr = dxbc; + struct md5_ctx ctx; + + assert(size > DXBC_CHECKSUM_SKIP_BYTE_COUNT); + ptr += DXBC_CHECKSUM_SKIP_BYTE_COUNT; + size -= DXBC_CHECKSUM_SKIP_BYTE_COUNT; + + md5_init(&ctx); + md5_update(&ctx, ptr, size); + dxbc_checksum_final(&ctx); + + memcpy(checksum, ctx.digest, sizeof(ctx.digest)); +} diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b199749064f5..4b36ea644b84 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2389,7 +2389,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte if (!write_dword(context, TAG_DXBC)) return VKD3D_ERROR_OUT_OF_MEMORY; - WARN("DXBC checksum is not implemented.\n"); + /* The checksum is computed when all data is generated. */ if (!write_dwords(context, 4, 0x00000000)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -2596,6 +2596,7 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc { struct root_signature_writer_context context; size_t total_size, chunk_size; + uint32_t checksum[4]; int ret; TRACE("root_signature %p, version %#x, dxbc %p.\n", root_signature, version, dxbc); @@ -2628,5 +2629,8 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc dxbc->code = context.data; dxbc->size = total_size; + vkd3d_compute_dxbc_checksum(dxbc->code, dxbc->size, checksum); + memcpy((uint32_t *)dxbc->code + 1, checksum, sizeof(checksum)); + return VKD3D_OK; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e0fad6852e53..bf2f45571375 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -815,11 +815,7 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_code *spirv) DECLSPEC_HIDDEN; void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) DECLSPEC_HIDDEN; -struct md5_ctx; - -void md5_init(struct md5_ctx *ctx) DECLSPEC_HIDDEN; -void md5_update(struct md5_ctx *ctx, const unsigned char *buf, unsigned int len) DECLSPEC_HIDDEN; -void md5_final(struct md5_ctx *ctx) DECLSPEC_HIDDEN; +void vkd3d_compute_dxbc_checksum(const void *dxbc, size_t size, uint32_t checksum[4]) DECLSPEC_HIDDEN; static inline enum vkd3d_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7d67de2966dd..3ba2ce9fbb8f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9109,12 +9109,7 @@ static void test_root_signature_serialization_(unsigned int line, const DWORD *c ok_(line)(blob_buffer[0] == code[0], "Got magic %#x, expected %#x.\n", (unsigned int)blob_buffer[0], (unsigned int)code[0]); - for (i = 1; i < 5; ++i) - { - todo ok_(line)(blob_buffer[i] == code[i], "Got checksum %#x, expected %#x at %u.\n", - (unsigned int)blob_buffer[i], (unsigned int)code[i], i - 1); - } - for (; i < code_size / sizeof(DWORD); ++i) + for (i = 0; i < code_size / sizeof(DWORD); ++i) { ok_(line)(blob_buffer[i] == code[i], "Got dword %#x, expected %#x at %u.\n", (unsigned int)blob_buffer[i], (unsigned int)code[i], i); -- 2.19.2

2 1

[PATCH 5/5] ddraw: Support drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffers.
by Henri Verbeet Dec. 17, 2018

Dec. 17, 2018

From: Matteo Bruni <mbruni(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45279 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 44 +++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 93 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0d48c7d704e..48803f8f937 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4275,8 +4275,11 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct d3d_vertex_buffer *vb_impl = unsafe_impl_from_IDirect3DVertexBuffer7(vb); - HRESULT hr; + struct wined3d_resource *wined3d_resource; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; DWORD stride; + HRESULT hr; TRACE("iface %p, primitive_type %#x, vb %p, start_vertex %u, vertex_count %u, flags %#x.\n", iface, primitive_type, vb, start_vertex, vertex_count, flags); @@ -4289,6 +4292,26 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE stride = get_flexible_vertex_size(vb_impl->fvf); + if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) + { + TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawPrimitive().\n"); + wined3d_mutex_lock(); + wined3d_resource = wined3d_buffer_get_resource(vb_impl->wined3d_buffer); + wined3d_box.left = start_vertex * stride; + wined3d_box.right = wined3d_box.left + vertex_count * stride; + if (FAILED(hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, + &wined3d_box, WINED3D_MAP_READ))) + { + wined3d_mutex_unlock(); + return D3DERR_VERTEXBUFFERLOCKED; + } + hr = d3d_device7_DrawPrimitive(iface, primitive_type, vb_impl->fvf, wined3d_map_desc.data, + vertex_count, flags); + wined3d_resource_unmap(wined3d_resource, 0); + wined3d_mutex_unlock(); + return hr; + } + wined3d_mutex_lock(); wined3d_device_set_vertex_declaration(device->wined3d_device, vb_impl->wined3d_declaration); if (FAILED(hr = wined3d_device_set_stream_source(device->wined3d_device, @@ -4366,6 +4389,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct d3d_vertex_buffer *vb_impl = unsafe_impl_from_IDirect3DVertexBuffer7(vb); DWORD stride = get_flexible_vertex_size(vb_impl->fvf); + struct wined3d_resource *wined3d_resource; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; struct wined3d_resource *ib; @@ -4382,6 +4406,24 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, return D3D_OK; } + if (vb_impl->Caps & D3DVBCAPS_SYSTEMMEMORY) + { + TRACE("Drawing from D3DVBCAPS_SYSTEMMEMORY vertex buffer, forwarding to DrawIndexedPrimitive().\n"); + wined3d_mutex_lock(); + wined3d_resource = wined3d_buffer_get_resource(vb_impl->wined3d_buffer); + if (FAILED(hr = wined3d_resource_map(wined3d_resource, 0, &wined3d_map_desc, + &wined3d_box, WINED3D_MAP_READ))) + { + wined3d_mutex_unlock(); + return D3DERR_VERTEXBUFFERLOCKED; + } + hr = d3d_device7_DrawIndexedPrimitive(iface, primitive_type, vb_impl->fvf, wined3d_map_desc.data, + start_vertex + vertex_count, indices, index_count, flags); + wined3d_resource_unmap(wined3d_resource, 0); + wined3d_mutex_unlock(); + return hr; + } + /* Steps: * 1) Upload the indices to the index buffer * 2) Set the index source diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 443c78b6439..1c4841891e4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15373,6 +15373,105 @@ static void test_killfocus(void) UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_sysmem_draw(void) +{ + D3DRECT rect_full = {{0}, {0}, {640}, {480}}; + IDirect3DViewport3 *viewport; + D3DVERTEXBUFFERDESC vb_desc; + IDirect3DVertexBuffer *vb; + IDirect3DDevice3 *device; + IDirectDrawSurface4 *rt; + IDirect3D3 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *data; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }; + static WORD indices[] = {0, 1, 2, 3}; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + viewport = create_viewport(device, 0, 0, 640, 480); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwCaps = D3DVBCAPS_SYSTEMMEMORY; + vb_desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; + vb_desc.dwNumVertices = 4; + hr = IDirect3D3_CreateVertexBuffer(d3d, &vb_desc, &vb, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(vb, 0, (void **)&data, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer_Unlock(vb); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 4, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00007f7f, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, indices, 4, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00007f7f, 1), "Got unexpected color 0x%08x.\n", color); + + IDirect3DVertexBuffer_Release(vb); + IDirect3DViewport3_Release(viewport); + IDirectDrawSurface4_Release(rt); + IDirect3D3_Release(d3d); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -15501,4 +15600,5 @@ START_TEST(ddraw4) test_viewport(); test_find_device(); test_killfocus(); + test_sysmem_draw(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 05151b06510..9ab8644191f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15088,6 +15088,98 @@ static void test_killfocus(void) UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_sysmem_draw(void) +{ + D3DVERTEXBUFFERDESC vb_desc; + IDirect3DVertexBuffer7 *vb; + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + IDirect3D7 *d3d; + D3DCOLOR colour; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *data; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, + }; + static WORD indices[] = {0, 1, 2, 3}; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + vb_desc.dwSize = sizeof(vb_desc); + vb_desc.dwCaps = D3DVBCAPS_SYSTEMMEMORY; + vb_desc.dwFVF = D3DFVF_XYZ | D3DFVF_DIFFUSE; + vb_desc.dwNumVertices = 4; + hr = IDirect3D7_CreateVertexBuffer(d3d, &vb_desc, &vb, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(vb, 0, (void **)&data, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer7_Unlock(vb); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 4, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + colour = get_surface_color(rt, 320, 240); + ok(compare_color(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawIndexedPrimitiveVB(device, D3DPT_TRIANGLESTRIP, vb, 0, 4, indices, 4, 0); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + colour = get_surface_color(rt, 320, 240); + ok(compare_color(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + + IDirect3DVertexBuffer7_Release(vb); + IDirectDrawSurface7_Release(rt); + IDirect3D7_Release(d3d); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15227,4 +15319,5 @@ START_TEST(ddraw7) test_device_load(); test_color_vertex(); test_killfocus(); + test_sysmem_draw(); } -- 2.11.0

2 1

[PATCH 4/5] d3d8: Support drawing from D3DPOOL_SYSTEMMEM index buffers.
by Henri Verbeet Dec. 17, 2018

Dec. 17, 2018

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 24 +++++++++++-- dlls/d3d8/d3d8_private.h | 4 ++- dlls/d3d8/device.c | 47 +++++++++++++++++++++--- dlls/d3d8/tests/visual.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 160 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 20efe6bd18a..58aaff275b1 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -377,6 +377,8 @@ static ULONG WINAPI d3d8_indexbuffer_AddRef(IDirect3DIndexBuffer8 *iface) IDirect3DDevice8_AddRef(buffer->parent_device); wined3d_mutex_lock(); wined3d_buffer_incref(buffer->wined3d_buffer); + if (buffer->draw_buffer) + wined3d_buffer_incref(buffer->draw_buffer); wined3d_mutex_unlock(); } @@ -396,6 +398,8 @@ static ULONG WINAPI d3d8_indexbuffer_Release(IDirect3DIndexBuffer8 *iface) wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); + if (buffer->draw_buffer) + wined3d_buffer_decref(buffer->draw_buffer); wined3d_mutex_unlock(); /* Release the device last, as it may cause the device to be destroyed. */ @@ -592,6 +596,7 @@ static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { + const struct wined3d_parent_ops *parent_ops = &d3d8_null_wined3d_parent_ops; struct wined3d_buffer_desc desc; HRESULT hr; @@ -604,19 +609,32 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; - desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; + if (desc.access & WINED3D_RESOURCE_ACCESS_GPU) + { + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + parent_ops = &d3d8_indexbuffer_wined3d_parent_ops; + } + buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl; d3d8_resource_init(&buffer->resource); buffer->format = wined3dformat_from_d3dformat(format); wined3d_mutex_lock(); - hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, - &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, parent_ops, &buffer->wined3d_buffer); + if (SUCCEEDED(hr) && !(desc.access & WINED3D_RESOURCE_ACCESS_GPU)) + { + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_indexbuffer_wined3d_parent_ops, &buffer->draw_buffer))) + wined3d_buffer_decref(buffer->wined3d_buffer); + } wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 4a62dbe40c0..81f4e2009fd 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -124,9 +124,10 @@ struct d3d8_device LONG device_state; DWORD sysmem_vb : 16; /* D3D8_MAX_STREAMS */ + DWORD sysmem_ib : 1; DWORD in_destruction : 1; DWORD recording : 1; - DWORD padding : 14; + DWORD padding : 13; /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ @@ -220,6 +221,7 @@ struct d3d8_indexbuffer struct d3d8_resource resource; struct wined3d_buffer *wined3d_buffer; IDirect3DDevice8 *parent_device; + struct wined3d_buffer *draw_buffer; enum wined3d_format_id format; }; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8ae1502b566..1f61514b0b7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1899,6 +1899,7 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD struct wined3d_buffer *wined3d_buffer; struct d3d8_vertexbuffer *buffer; unsigned int i, offset, stride; + enum wined3d_format_id format; HRESULT hr; TRACE("iface %p, token %#x.\n", iface, token); @@ -1926,6 +1927,8 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD if (buffer->draw_buffer) device->sysmem_vb |= 1u << i; } + device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) + && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; wined3d_mutex_unlock(); return D3D_OK; @@ -2274,6 +2277,31 @@ static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, } } +static void d3d8_device_upload_sysmem_index_buffer(struct d3d8_device *device, + unsigned int start_idx, unsigned int idx_count) +{ + struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + struct d3d8_vertexbuffer *d3d8_buffer; + struct wined3d_buffer *dst_buffer; + enum wined3d_format_id format; + unsigned int offset, idx_size; + HRESULT hr; + + if (!device->sysmem_ib) + return; + + if (!(dst_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset))) + ERR("Failed to get index buffer.\n"); + d3d8_buffer = wined3d_buffer_get_parent(dst_buffer); + idx_size = format == WINED3DFMT_R16_UINT ? 2 : 4; + box.left = offset + start_idx * idx_size; + box.right = box.left + idx_count * idx_size; + if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, + wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, + wined3d_buffer_get_resource(d3d8_buffer->wined3d_buffer), 0, &box, 0))) + ERR("Failed to update buffer.\n"); +} + static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, D3DPRIMITIVETYPE primitive_type, UINT start_vertex, UINT primitive_count) { @@ -2299,16 +2327,18 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, UINT start_idx, UINT primitive_count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + unsigned int index_count; HRESULT hr; TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n", iface, primitive_type, min_vertex_idx, vertex_count, start_idx, primitive_count); + index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); d3d8_device_upload_sysmem_vertex_buffers(device, min_vertex_idx, vertex_count); + d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); - hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, - vertex_count_from_primitive_count(primitive_type, primitive_count)); + hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); wined3d_mutex_unlock(); return hr; @@ -2882,9 +2912,17 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_indexbuffer *ib = unsafe_impl_from_IDirect3DIndexBuffer8(buffer); + struct wined3d_buffer *wined3d_buffer; TRACE("iface %p, buffer %p, base_vertex_idx %u.\n", iface, buffer, base_vertex_idx); + if (!ib) + wined3d_buffer = NULL; + else if (ib->draw_buffer) + wined3d_buffer = ib->draw_buffer; + else + wined3d_buffer = ib->wined3d_buffer; + /* WineD3D takes an INT(due to d3d9), but d3d8 uses UINTs. Do I have to add a check here that * the UINT doesn't cause an overflow in the INT? It seems rather unlikely because such large * vertex buffers can't be created to address them with an index that requires the 32nd bit @@ -2893,8 +2931,9 @@ static HRESULT WINAPI d3d8_device_SetIndices(IDirect3DDevice8 *iface, */ wined3d_mutex_lock(); wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx); - wined3d_device_set_index_buffer(device->wined3d_device, - ib ? ib->wined3d_buffer : NULL, ib ? ib->format : WINED3DFMT_UNKNOWN, 0); + wined3d_device_set_index_buffer(device->wined3d_device, wined3d_buffer, ib ? ib->format : WINED3DFMT_UNKNOWN, 0); + if (!device->recording) + device->sysmem_ib = ib && ib->draw_buffer; wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7576008b384..25f96fd3dd5 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10448,7 +10448,8 @@ static void test_color_vertex(void) static void test_sysmem_draw(void) { - IDirect3DVertexBuffer8 *vb; + IDirect3DVertexBuffer8 *vb, *vb_s0, *vb_s1; + IDirect3DIndexBuffer8 *ib; IDirect3DDevice8 *device; IDirect3D8 *d3d; D3DCOLOR colour; @@ -10456,7 +10457,16 @@ static void test_sysmem_draw(void) HWND window; HRESULT hr; BYTE *data; + DWORD vs; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_STREAM(1), + D3DVSD_REG(D3DVSDE_DIFFUSE, D3DVSDT_D3DCOLOR), + D3DVSD_END() + }; static const struct { struct vec3 position; @@ -10469,6 +10479,21 @@ static void test_sysmem_draw(void) {{ 1.0f, -1.0f, 0.0f}, 0xff0000ff}, {{ 1.0f, 1.0f, 0.0f}, 0xffffffff}, }; + static const struct vec3 quad_s0[] = + { + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, + }; + static const DWORD quad_s1[] = + { + 0xffff0000, + 0xff00ff00, + 0xff0000ff, + 0xffffffff, + }; + static const short indices[] = {0, 1, 2, 3}; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -10512,9 +10537,76 @@ static void test_sysmem_draw(void) colour = getPixelColor(device, 320, 240); ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DIndexBuffer8_Lock(ib, 0, sizeof(indices), (BYTE **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer8_Unlock(ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetIndices(device, ib, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, NULL, &vs, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s0), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vb_s0, 0, sizeof(quad_s0), (BYTE **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad_s0, sizeof(quad_s0)); + hr = IDirect3DVertexBuffer8_Unlock(vb_s0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad_s1), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vb_s1, 0, sizeof(quad_s1), (BYTE **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad_s1, sizeof(quad_s1)); + hr = IDirect3DVertexBuffer8_Unlock(vb_s1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb_s0, sizeof(*quad_s0)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 1, vb_s1, sizeof(*quad_s1)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, 0x00007f7f, 1), "Got unexpected colour 0x%08x.\n", colour); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DVertexBuffer8_Release(vb_s1); + IDirect3DVertexBuffer8_Release(vb_s0); + IDirect3DDevice8_DeleteVertexShader(device, vs); + IDirect3DIndexBuffer8_Release(ib); IDirect3DVertexBuffer8_Release(vb); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.11.0

2 1