- wine-devel - winehq.org

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

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 18 Dec '18

18 Dec '18

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 17 Dec '18

17 Dec '18

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 17 Dec '18

17 Dec '18

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 17 Dec '18

17 Dec '18

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 17 Dec '18

17 Dec '18

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 17 Dec '18

17 Dec '18

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

[PATCH 3/5] d3d8: Support drawing from D3DPOOL_SYSTEMMEM vertex buffers.
by Henri Verbeet 17 Dec '18

17 Dec '18

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 | 14 ++++++--- dlls/d3d8/device.c | 81 ++++++++++++++++++++++++++++++++++++++++++------ dlls/d3d8/tests/visual.c | 77 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 626d74e964c..20efe6bd18a 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -57,6 +57,8 @@ static ULONG WINAPI d3d8_vertexbuffer_AddRef(IDirect3DVertexBuffer8 *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(); } @@ -76,6 +78,8 @@ static ULONG WINAPI d3d8_vertexbuffer_Release(IDirect3DVertexBuffer8 *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. */ @@ -273,6 +277,7 @@ static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) { + const struct wined3d_parent_ops *parent_ops = &d3d8_null_wined3d_parent_ops; struct wined3d_buffer_desc desc; HRESULT hr; @@ -292,15 +297,28 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_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 = &d3d8_vertexbuffer_wined3d_parent_ops; + } + wined3d_mutex_lock(); - hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, - &d3d8_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, + &d3d8_vertexbuffer_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 7f6049df574..4a62dbe40c0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -39,9 +39,14 @@ #define D3DPRESENTFLAGS_MASK 0x00000fffu +#define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 +#define D3D8_MAX_STREAMS 16 + /* CreateVertexShader can return > 0xFFFF */ #define VS_HIGHESTFIXEDFXF 0xF0000000 +extern const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops DECLSPEC_HIDDEN; + void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; struct d3d8 @@ -118,8 +123,10 @@ struct d3d8_device UINT index_buffer_pos; LONG device_state; - /* Avoids recursion with nested ReleaseRef to 0 */ - BOOL inDestruction; + DWORD sysmem_vb : 16; /* D3D8_MAX_STREAMS */ + DWORD in_destruction : 1; + DWORD recording : 1; + DWORD padding : 14; /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ @@ -199,6 +206,7 @@ struct d3d8_vertexbuffer struct d3d8_resource resource; struct wined3d_buffer *wined3d_buffer; IDirect3DDevice8 *parent_device; + struct wined3d_buffer *draw_buffer; DWORD fvf; }; @@ -260,8 +268,6 @@ void d3d8_vertex_shader_destroy(struct d3d8_vertex_shader *shader) DECLSPEC_HIDD HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_device *device, const DWORD *declaration, const DWORD *byte_code, DWORD shader_handle, DWORD usage) DECLSPEC_HIDDEN; -#define D3D8_MAX_VERTEX_SHADER_CONSTANTF 256 - struct d3d8_pixel_shader { DWORD handle; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3c83811103f..8ae1502b566 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static void STDMETHODCALLTYPE d3d8_null_wined3d_object_destroyed(void *parent) {} -static const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = +const struct wined3d_parent_ops d3d8_null_wined3d_parent_ops = { d3d8_null_wined3d_object_destroyed, }; @@ -564,7 +564,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); ULONG ref; - if (device->inDestruction) + if (device->in_destruction) return 0; ref = InterlockedDecrement(&device->ref); @@ -580,7 +580,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) wined3d_mutex_lock(); - device->inDestruction = TRUE; + device->in_destruction = TRUE; for (i = 0; i < device->numConvertedDecls; ++i) { @@ -891,6 +891,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { + device->recording = FALSE; present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; device->implicit_swapchain->swap_interval = wined3dswapinterval_from_d3d(present_parameters->FullScreen_PresentationInterval); @@ -1845,7 +1846,8 @@ static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *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; @@ -1870,6 +1872,7 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * wined3d_mutex_unlock(); return hr; } + device->recording = FALSE; *token = d3d8_allocate_handle(&device->handle_table, stateblock, D3D8_HANDLE_SB); wined3d_mutex_unlock(); @@ -1893,6 +1896,10 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; + struct wined3d_buffer *wined3d_buffer; + struct d3d8_vertexbuffer *buffer; + unsigned int i, offset, stride; + HRESULT hr; TRACE("iface %p, token %#x.\n", iface, token); @@ -1908,6 +1915,17 @@ static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD return D3DERR_INVALIDCALL; } wined3d_stateblock_apply(stateblock); + device->sysmem_vb = 0; + for (i = 0; i < D3D8_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->sysmem_vb |= 1u << i; + } wined3d_mutex_unlock(); return D3D_OK; @@ -2229,19 +2247,48 @@ static HRESULT WINAPI d3d8_device_GetCurrentTexturePalette(IDirect3DDevice8 *ifa return D3DERR_INVALIDCALL; } +static void d3d8_device_upload_sysmem_vertex_buffers(struct d3d8_device *device, + unsigned int start_vertex, unsigned int vertex_count) +{ + struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + struct d3d8_vertexbuffer *d3d8_buffer; + unsigned int i, offset, stride, map; + struct wined3d_buffer *dst_buffer; + HRESULT hr; + + map = device->sysmem_vb; + 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"); + d3d8_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(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) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + unsigned int vertex_count; HRESULT hr; TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", iface, primitive_type, start_vertex, primitive_count); + vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); + d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); 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); wined3d_mutex_unlock(); return hr; @@ -2258,6 +2305,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, iface, primitive_type, min_vertex_idx, vertex_count, start_idx, primitive_count); wined3d_mutex_lock(); + d3d8_device_upload_sysmem_vertex_buffers(device, min_vertex_idx, vertex_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)); @@ -3098,6 +3146,7 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_vertexbuffer *buffer_impl = unsafe_impl_from_IDirect3DVertexBuffer8(buffer); + struct wined3d_buffer *wined3d_buffer; HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, stride %u.\n", @@ -3106,14 +3155,28 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *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, 0, 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, 0, stride); + if (SUCCEEDED(hr) && !device->recording) + { + if (buffer_impl && buffer_impl->draw_buffer) + device->sysmem_vb |= (1u << stream_idx); + else + device->sysmem_vb &= ~(1u << stream_idx); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e8e6bf870e2..7576008b384 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10446,6 +10446,82 @@ static void test_color_vertex(void) DestroyWindow(window); } +static void test_sysmem_draw(void) +{ + IDirect3DVertexBuffer8 *vb; + IDirect3DDevice8 *device; + IDirect3D8 *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}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_SYSTEMMEM, &vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer8_Lock(vb, 0, sizeof(quad), (BYTE **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer8_Unlock(vb); + 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_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, sizeof(*quad)); + 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_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 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); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -10520,4 +10596,5 @@ START_TEST(visual) test_map_synchronisation(); test_viewport(); test_color_vertex(); + test_sysmem_draw(); } -- 2.11.0

2 1

[PATCH 2/5] d3d9: Support drawing from D3DPOOL_SYSTEMMEM index buffers.
by Henri Verbeet 17 Dec '18

17 Dec '18

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/d3d9/buffer.c | 24 ++++++- dlls/d3d9/d3d9_private.h | 4 +- dlls/d3d9/device.c | 44 +++++++++++-- dlls/d3d9/stateblock.c | 3 + dlls/d3d9/tests/visual.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 234 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 15b7e2bdbce..1533a8496d2 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -384,6 +384,8 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *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(); } @@ -403,6 +405,8 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *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. */ @@ -597,6 +601,7 @@ static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { + const struct wined3d_parent_ops *parent_ops = &d3d9_null_wined3d_parent_ops; struct wined3d_buffer_desc desc; HRESULT hr; @@ -615,19 +620,32 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_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 = &d3d9_indexbuffer_wined3d_parent_ops; + } + buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->format = wined3dformat_from_d3dformat(format); d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); - hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, - &d3d9_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, + &d3d9_indexbuffer_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 bd6409ffaf5..a4dc3abb7a6 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -104,11 +104,12 @@ struct d3d9_device LONG device_state; DWORD sysmem_vb : 16; /* D3D9_MAX_STREAMS */ + DWORD sysmem_ib : 1; DWORD in_destruction : 1; DWORD in_scene : 1; DWORD has_vertex_declaration : 1; DWORD recording : 1; - DWORD padding : 12; + DWORD padding : 11; unsigned int max_user_clip_planes; @@ -199,6 +200,7 @@ struct d3d9_indexbuffer struct d3d9_resource resource; struct wined3d_buffer *wined3d_buffer; IDirect3DDevice9Ex *parent_device; + struct wined3d_buffer *draw_buffer; enum wined3d_format_id format; }; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ba84db9338f..6844ad62e9f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2718,6 +2718,31 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, } } +static void d3d9_device_upload_sysmem_index_buffer(struct d3d9_device *device, + unsigned int start_idx, unsigned int idx_count) +{ + struct wined3d_box box = {0, 0, 0, 1, 0, 1}; + struct d3d9_vertexbuffer *d3d9_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"); + d3d9_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(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) { @@ -2752,6 +2777,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface UINT vertex_count, UINT start_idx, UINT primitive_count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + unsigned int index_count; HRESULT hr; TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u, " @@ -2766,12 +2792,13 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, min_vertex_idx, vertex_count); + d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_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); - 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); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); wined3d_mutex_unlock(); @@ -3512,12 +3539,21 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_indexbuffer *ib = unsafe_impl_from_IDirect3DIndexBuffer9(buffer); + struct wined3d_buffer *wined3d_buffer; TRACE("iface %p, buffer %p.\n", iface, buffer); + if (!ib) + wined3d_buffer = NULL; + else if (ib->draw_buffer) + wined3d_buffer = ib->draw_buffer; + else + wined3d_buffer = ib->wined3d_buffer; + wined3d_mutex_lock(); - 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/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 440df0c1e1a..6f39488fc11 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -111,6 +111,7 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; unsigned int i, offset, stride; + enum wined3d_format_id format; struct d3d9_device *device; HRESULT hr; @@ -130,6 +131,8 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) 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; diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f26b0d23f9..392369a3f79 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24197,6 +24197,172 @@ static void test_color_vertex(void) DestroyWindow(window); } +static void test_sysmem_draw(void) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexBuffer9 *vb, *vb_s0, *vb_s1; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR colour; + ULONG refcount; + HWND window; + HRESULT hr; + BYTE *data; + + static const D3DVERTEXELEMENT9 decl_elements[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {1, 0, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + D3DDECL_END() + }; + 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 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"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), 0, 0, D3DPOOL_SYSTEMMEM, &vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), (void **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(*quad)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_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 = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_SYSTEMMEM, &ib, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), (void **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_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 = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad_s0), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s0, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb_s0, 0, sizeof(quad_s0), (void **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad_s0, sizeof(quad_s0)); + hr = IDirect3DVertexBuffer9_Unlock(vb_s0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad_s1), 0, 0, D3DPOOL_SYSTEMMEM, &vb_s1, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb_s1, 0, sizeof(quad_s1), (void **)&data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad_s1, sizeof(quad_s1)); + hr = IDirect3DVertexBuffer9_Unlock(vb_s1); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb_s0, 0, sizeof(*quad_s0)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 1, vb_s1, 0, sizeof(*quad_s1)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 0, 4, 0, 2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_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 = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DVertexBuffer9_Release(vb_s1); + IDirect3DVertexBuffer9_Release(vb_s0); + IDirect3DVertexDeclaration9_Release(vertex_declaration); + IDirect3DIndexBuffer9_Release(ib); + IDirect3DVertexBuffer9_Release(vb); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -24335,4 +24501,5 @@ START_TEST(visual) test_null_format(); test_map_synchronisation(); test_color_vertex(); + test_sysmem_draw(); } -- 2.11.0

2 1

[PATCH 1/5] d3d9: Support drawing from D3DPOOL_SYSTEMMEM vertex buffers.
by Henri Verbeet 17 Dec '18

17 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45486 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 24 ++++++++++++++++--- dlls/d3d9/d3d9_private.h | 11 ++++++--- dlls/d3d9/device.c | 60 +++++++++++++++++++++++++++++++++++++++++++----- dlls/d3d9/stateblock.c | 17 ++++++++++++++ 4 files changed, 100 insertions(+), 12 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..bd6409ffaf5 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 @@ -102,9 +103,12 @@ struct d3d9_device struct d3d9_surface *render_targets[D3D_MAX_SIMULTANEOUS_RENDERTARGETS]; LONG device_state; - BOOL in_destruction; - BOOL in_scene; - BOOL has_vertex_declaration; + DWORD sysmem_vb : 16; /* D3D9_MAX_STREAMS */ + DWORD in_destruction : 1; + DWORD in_scene : 1; + DWORD has_vertex_declaration : 1; + DWORD recording : 1; + DWORD padding : 12; unsigned int max_user_clip_planes; @@ -181,6 +185,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..ba84db9338f 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_vertex_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->sysmem_vb; + 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_vertex_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_vertex_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->sysmem_vb |= (1u << stream_idx); + else + device->sysmem_vb &= ~(1u << stream_idx); + } + wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 62b3bacb28d..440df0c1e1a 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->sysmem_vb = 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->sysmem_vb |= 1u << i; + } wined3d_mutex_unlock(); return D3D_OK; -- 2.11.0

2 1

[PATCH] wined3d: Make wined3d_adapter_init_format_info() static.
by Francois Gouget 17 Dec '18

17 Dec '18

It is no longer referenced in other source files. Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index aa68799535e..f8da256b07e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3971,7 +3971,7 @@ static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, } } -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) +static BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) { unsigned int count = WINED3D_FORMAT_COUNT + ARRAY_SIZE(typeless_depth_stencil_formats); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a6715a5906..6e39db4fa86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2707,7 +2707,6 @@ struct wined3d_caps_gl_ctx GLuint test_program_id; }; -BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, size_t format_size) DECLSPEC_HIDDEN; BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; -- 2.19.2

2 1

Saving file not working in FMSLogo using wine
by sathish kumar 17 Dec '18

17 Dec '18

I am using Boss Linux 7.0 64Bit which is using GNOME 3.22Wine is 1.8.7.FMSLogo 7.3.0 is 32bit I am able to run FMSLogo using wine successfully.But i am not able to save the current logo file.When i try to save it, a file with the provided name is created, but with 0 bytes. Anyone has faced saving file issue ?Anyway to debug ? Thanks,B.Sathish Kumar

3 2

[PATCH] setupapi/tests: Fix returned value checking.
by Zhiyi Zhang 17 Dec '18

17 Dec '18

SetupDiCreateDeviceInfoList returns INVALID_HANDLE_VALUE(~0) on error instead of NULL. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/tests/devinst.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bfffcb9c32..b4c5ce67ed 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -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 && 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 && 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 && 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 && 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 && 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 && 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 && 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 && 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 vkd3d 4/7] vkd3d: Validate RTV format for inactive render targets in pipeline state desc.
by Józef Kucia 17 Dec '18

17 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 9 +++++++++ tests/d3d12.c | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9c2d3ac114cd..b2f177c9798d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1945,6 +1945,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s memset(&input_signature, 0, sizeof(input_signature)); + for (i = desc->NumRenderTargets; i < ARRAY_SIZE(desc->RTVFormats); ++i) + { + if (desc->RTVFormats[i] != DXGI_FORMAT_UNKNOWN) + { + WARN("Format must be set to DXGI_FORMAT_UNKNOWN for inactive render targets.\n"); + return E_INVALIDARG; + } + } + if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { WARN("Root signature is NULL.\n"); diff --git a/tests/d3d12.c b/tests/d3d12.c index 420d7519de88..b96ca430361f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2491,6 +2491,13 @@ static void test_create_graphics_pipeline_state(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D12PipelineState_Release(pipeline_state); + /* Inactive render targets formats must be set to DXGI_FORMAT_UNKNOWN. */ + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + pso_desc.RTVFormats[1] = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(device); -- 2.19.2

2 1

[PATCH vkd3d 7/7] tests: Skip stencil shader resource view tests on Windows AMD drivers.
by Józef Kucia 17 Dec '18

17 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- We also skip similar wine/d3d11/tests on AMD. --- tests/d3d12.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7fe54c94d713..7d67de2966dd 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14689,6 +14689,8 @@ static void test_depth_stencil_sampling(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width, @@ -14753,6 +14755,13 @@ static void test_depth_stencil_sampling(void) destroy_depth_stencil(&ds); continue; } + if (is_amd_device(device)) + { + skip("Reads from depth/stencil shader resource views return stale values on some AMD drivers.\n"); + destroy_depth_stencil(&ds); + continue; + } + srv_desc.Format = tests[i].stencil_view_format; srv_desc.Texture2D.PlaneSlice = 1; ID3D12Device_CreateShaderResourceView(device, texture, &srv_desc, srv_cpu_handle); @@ -14791,6 +14800,7 @@ static void test_depth_stencil_sampling(void) destroy_depth_stencil(&ds); } + vkd3d_test_set_context(NULL); ID3D12Resource_Release(cb); ID3D12DescriptorHeap_Release(srv_heap); -- 2.19.2

2 1

[PATCH vkd3d 3/7] tests: Add test for dual source blending.
by Józef Kucia 17 Dec '18

17 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 463e3046af66..420d7519de88 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21488,6 +21488,136 @@ static void test_blend_factor(void) destroy_test_context(&context); } +static void test_dual_source_blending(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + float4 c0; + float4 c1; + + void main(out float4 o0 : SV_Target0, out float4 o1 : SV_Target1) + { + o0 = c0; + o1 = c1; + } +#endif + 0x43425844, 0x823a4ecf, 0xd409abf6, 0xe76697ab, 0x9b53c9a5, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000088, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x58454853, 0x00000068, 0x00000050, 0x0000001a, 0x0100086a, 0x04000059, + 0x00208e46, 0x00000000, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, + 0x00000001, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x06000036, + 0x001020f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const struct + { + struct + { + struct vec4 c0; + struct vec4 c1; + } constants; + unsigned int expected_color; + } + tests[] = + { + {{{0.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, 0x00000000}, + {{{0.0f, 0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f, 1.0f}}, 0xff0000ff}, + {{{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, 0xff0000ff}, + {{{1.0f, 0.0f, 0.0f, 1.0f}, {0.0f, 1.0f, 1.0f, 0.0f}}, 0xffffffff}, + }; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, sizeof(tests->constants) / sizeof(uint32_t), D3D12_SHADER_VISIBILITY_PIXEL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, &ps, NULL); + pso_desc.BlendState.RenderTarget[0].BlendEnable = TRUE; + pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_SRC1_COLOR; + pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_SRC1_ALPHA; + pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 8, &tests[i].constants, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, tests[i].expected_color, 1); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.BlendState.IndependentBlendEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + + pso_desc.BlendState.RenderTarget[1] = pso_desc.BlendState.RenderTarget[0]; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + pso_desc.BlendState.RenderTarget[1].DestBlendAlpha = D3D12_BLEND_SRC_ALPHA; + pso_desc.BlendState.RenderTarget[1].DestBlend = D3D12_BLEND_SRC_COLOR; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + context.pipeline_state = NULL; + + pso_desc.NumRenderTargets = 2; + pso_desc.RTVFormats[1] = pso_desc.RTVFormats[0]; + pso_desc.BlendState.IndependentBlendEnable = FALSE; + pso_desc.BlendState.RenderTarget[0].BlendEnable = TRUE; + pso_desc.BlendState.RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + pso_desc.BlendState.RenderTarget[0].DestBlend = D3D12_BLEND_SRC1_COLOR; + pso_desc.BlendState.RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + pso_desc.BlendState.RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + pso_desc.BlendState.RenderTarget[0].DestBlendAlpha = D3D12_BLEND_SRC1_ALPHA; + pso_desc.BlendState.RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + destroy_test_context(&context); +} + static void test_multisample_rendering(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -21949,6 +22079,7 @@ START_TEST(d3d12) run_test(test_suballocate_small_textures); run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor); + run_test(test_dual_source_blending); run_test(test_multisample_rendering); run_test(test_primitive_restart); } -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d-shader: Add support for dual source blending.
by Józef Kucia 17 Dec '18

17 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7d9bf70e3131..1153fdea0a0d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -165,6 +165,7 @@ struct vkd3d_shader_compile_arguments const void *next; enum vkd3d_shader_target target; + bool dual_source_blending; const unsigned int *output_swizzles; unsigned int output_swizzle_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ec7cab693c84..a24585c542da 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3400,6 +3400,14 @@ static unsigned int get_shader_output_swizzle(const struct vkd3d_dxbc_compiler * return compile_args->output_swizzles[register_idx]; } +static bool is_dual_source_blending(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; + + return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL + && compile_args && compile_args->dual_source_blending; +} + static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signature_element *e, uint32_t *mask) { @@ -3544,7 +3552,16 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler } else { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + if (is_dual_source_blending(compiler) && reg->idx[0].offset < 2) + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, 0); + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationIndex, reg->idx[0].offset); + } + else + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + } + if (component_idx) vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); } -- 2.19.2

2 1

[PATCH vkd3d 2/7] vkd3d: Implement dual source blending.
by Józef Kucia 17 Dec '18

17 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 64c21588a825..9c2d3ac114cd 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1783,6 +1783,21 @@ static void blend_attachment_from_d3d12(struct VkPipelineColorBlendAttachmentSta FIXME("Ignoring LogicOpEnable %#x.\n", d3d12_desc->LogicOpEnable); } +static bool is_dual_source_blending_blend(D3D12_BLEND b) +{ + return b == D3D12_BLEND_SRC1_COLOR || b == D3D12_BLEND_INV_SRC1_COLOR + || b == D3D12_BLEND_SRC1_ALPHA || b == D3D12_BLEND_INV_SRC1_ALPHA; +} + +static bool is_dual_source_blending(const D3D12_RENDER_TARGET_BLEND_DESC *desc) +{ + return desc->BlendEnable + && (is_dual_source_blending_blend(desc->SrcBlend) + || is_dual_source_blending_blend(desc->DestBlend) + || is_dual_source_blending_blend(desc->SrcBlendAlpha) + || is_dual_source_blending_blend(desc->DestBlendAlpha)); +} + static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input_layout_desc, uint32_t *offsets) { @@ -2063,9 +2078,29 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_compile_args.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS; ps_compile_args.next = NULL; ps_compile_args.target = VKD3D_SHADER_TARGET_SPIRV_VULKAN_1_0; + ps_compile_args.dual_source_blending = is_dual_source_blending(&desc->BlendState.RenderTarget[0]); ps_compile_args.output_swizzles = ps_output_swizzle; ps_compile_args.output_swizzle_count = rt_count; + if (ps_compile_args.dual_source_blending && rt_count > 1) + { + WARN("Only one render target is allowed when dual source blending is used.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (ps_compile_args.dual_source_blending && desc->BlendState.IndependentBlendEnable) + { + for (i = 1; i < ARRAY_SIZE(desc->BlendState.RenderTarget); ++i) + { + if (desc->BlendState.RenderTarget[i].BlendEnable) + { + WARN("Blend enable cannot be set for render target %u when dual source blending is used.\n", i); + hr = E_INVALIDARG; + goto fail; + } + } + } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; -- 2.19.2

2 1

[PATCH vkd3d 6/7] tests: Detect device vendor only on Windows.
by Józef Kucia 17 Dec '18

17 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> For running cross-compiled tests in Wine. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- In Wine tests we do a similar thing. --- tests/d3d12_crosstest.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ee12c891b290..6357d48fe7ea 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -303,6 +303,9 @@ static inline bool is_amd_device(ID3D12Device *device) HRESULT hr; LUID luid; + if (!vkd3d_test_platform_is_windows()) + return false; + luid = ID3D12Device_GetAdapterLuid(device); hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); -- 2.19.2

2 1

[PATCH vkd3d 5/7] tests: Use vkd3d_test_set_context() in more tests.
by Józef Kucia 17 Dec '18

17 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index b96ca430361f..7fe54c94d713 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1749,6 +1749,8 @@ static void test_create_heap(void) { for (j = 0; j < ARRAY_SIZE(heap_flags); ++j) { + vkd3d_test_set_context("Test %u, %u", i, j); + desc.SizeInBytes = 10 * tests[i].alignment; desc.Alignment = tests[i].alignment; desc.Flags = heap_flags[j].flags; @@ -1765,6 +1767,7 @@ static void test_create_heap(void) ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount); } } + vkd3d_test_set_context(NULL); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)); ok(hr == S_OK, "Failed to check feature support, hr %#x.\n", hr); @@ -3682,6 +3685,8 @@ static void test_clear_unordered_access_view(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + buffer = create_default_buffer(device, BUFFER_SIZE, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); @@ -3735,6 +3740,7 @@ static void test_clear_unordered_access_view(void) reset_command_list(command_list, context.allocator); ID3D12Resource_Release(buffer); } + vkd3d_test_set_context(NULL); ID3D12DescriptorHeap_Release(cpu_heap); ID3D12DescriptorHeap_Release(gpu_heap); @@ -4811,6 +4817,8 @@ static void test_draw_depth_only(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, tests[i].clear_depth, 0, 0, NULL); @@ -4832,6 +4840,7 @@ static void test_draw_depth_only(void) transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); } + vkd3d_test_set_context(NULL); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 0, NULL); @@ -8888,6 +8897,8 @@ static void test_incompletely_initialized_shader_outputs(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); @@ -8907,6 +8918,7 @@ static void test_incompletely_initialized_shader_outputs(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); destroy_test_context(&context); } @@ -10265,6 +10277,8 @@ static void test_texture(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + texture = create_default_texture(context.device, tests[i].width, tests[i].height, tests[i].format, 0, D3D12_RESOURCE_STATE_COPY_DEST); upload_texture_data(texture, &tests[i].data, 1, queue, command_list); @@ -10310,6 +10324,7 @@ static void test_texture(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); @@ -10505,6 +10520,8 @@ static void test_texture_ld(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); @@ -10527,6 +10544,7 @@ static void test_texture_ld(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12Resource_Release(texture); ID3D12DescriptorHeap_Release(heap); @@ -11657,6 +11675,8 @@ static void test_multisample_array_texture(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -11679,6 +11699,7 @@ static void test_multisample_array_texture(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); transition_resource_state(command_list, uav_buffer, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); @@ -14901,6 +14922,8 @@ static void test_depth_load(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, tests[i], 0, 0, NULL); transition_sub_resource_state(command_list, ds.texture, 0, @@ -14943,6 +14966,7 @@ static void test_depth_load(void) transition_sub_resource_state(command_list, ds.texture, 0, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); } + vkd3d_test_set_context(NULL); destroy_depth_stencil(&ds); ID3D12Resource_Release(texture); @@ -15258,6 +15282,8 @@ static void test_typed_uav_store(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + resource = create_default_texture(device, 32, 32, tests[i].format, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, NULL, @@ -15292,6 +15318,7 @@ static void test_typed_uav_store(void) reset_command_list(command_list, context.allocator); } + vkd3d_test_set_context(NULL); ID3D12DescriptorHeap_Release(descriptor_heap); destroy_test_context(&context); @@ -16478,6 +16505,8 @@ static void test_cs_uav_store(void) pipeline_state = NULL; for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + if (current_shader != tests[i].shader) { if (pipeline_state) @@ -16510,6 +16539,7 @@ static void test_cs_uav_store(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_float(resource, 0, queue, command_list, tests[i].value, 2); } + vkd3d_test_set_context(NULL); ID3D12PipelineState_Release(pipeline_state); pipeline_state = create_compute_pipeline_state(device, root_signature, cs_1_store); @@ -16958,6 +16988,8 @@ static void test_decrement_uav_counter(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + transition_sub_resource_state(command_list, buffer, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); counter = 0xffffffff; @@ -16989,6 +17021,7 @@ static void test_decrement_uav_counter(void) ok(counter == tests[i].expected_min_value, "Got %u, expected %u.\n", counter, tests[i].expected_min_value); } + vkd3d_test_set_context(NULL); ID3D12Resource_Release(buffer); ID3D12Resource_Release(counter_buffer); @@ -17496,6 +17529,8 @@ static void test_buffer_srv(void) { const struct test *test = &tests[i]; + vkd3d_test_set_context("Test %u", i); + if (current_shader != test->shader) { if (context.pipeline_state) @@ -17568,6 +17603,7 @@ static void test_buffer_srv(void) transition_sub_resource_state(command_list, context.render_target, 0, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12DescriptorHeap_Release(descriptor_heap); ID3D12Resource_Release(buffer); @@ -17887,6 +17923,8 @@ static void test_query_occlusion(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, tests[i].clear_depth, 0, 0, NULL); @@ -17902,6 +17940,7 @@ static void test_query_occlusion(void) ID3D12GraphicsCommandList_ResolveQueryData(command_list, query_heap, tests[i].type, i, 1, resource, i * sizeof(UINT64)); } + vkd3d_test_set_context(NULL); get_buffer_readback_with_command_list(resource, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -19483,6 +19522,8 @@ static void test_face_culling(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + init_pipeline_state_desc(&pso_desc, context.root_signature, context.render_target_desc.Format, NULL, &ps_color, NULL); pso_desc.RasterizerState.CullMode = tests[i].cull_mode; @@ -19535,10 +19576,13 @@ static void test_face_culling(void) ID3D12PipelineState_Release(pso); } + vkd3d_test_set_context(NULL); /* Test SV_IsFrontFace. */ for (i = 0; i < ARRAY_SIZE(front_tests); ++i) { + vkd3d_test_set_context("Test %u", i); + init_pipeline_state_desc(&pso_desc, context.root_signature, context.render_target_desc.Format, NULL, &ps_front, NULL); pso_desc.RasterizerState.CullMode = D3D12_CULL_MODE_NONE; @@ -19589,6 +19633,7 @@ static void test_face_culling(void) ID3D12PipelineState_Release(pso); } + vkd3d_test_set_context(NULL); ID3D12PipelineState_Release(color_pso); ID3D12PipelineState_Release(ccw_color_pso); @@ -21474,6 +21519,8 @@ static void test_blend_factor(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -21491,6 +21538,7 @@ static void test_blend_factor(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); destroy_test_context(&context); } @@ -21570,6 +21618,8 @@ static void test_dual_source_blending(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); @@ -21587,6 +21637,7 @@ static void test_dual_source_blending(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12PipelineState_Release(context.pipeline_state); pso_desc.BlendState.IndependentBlendEnable = TRUE; @@ -21905,6 +21956,8 @@ static void test_primitive_restart(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + buffer_size = (tests[i].last_index + 1) * sizeof(*quad); vb = create_upload_buffer(context.device, buffer_size, NULL); @@ -21968,6 +22021,7 @@ static void test_primitive_restart(void) ID3D12PipelineState_Release(context.pipeline_state); context.pipeline_state = NULL; } + vkd3d_test_set_context(NULL); destroy_test_context(&context); } -- 2.19.2

2 1

[PATCH] [v2] kernel32: Use Rtl function when the time zone name is useless.
by Akihiro Sagawa 17 Dec '18

17 Dec '18

This is v2 patch of "kernel32: Introduce lightweight version of GetTimeZoneInformation." In this version, I remove the wrapper function and properly test the return value of RtlQueryTimeZoneInformation function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)

1 0

[PATCH] msvcrt: Use RtlQueryTimeZoneInformation in ftime64.
by Akihiro Sagawa 17 Dec '18

17 Dec '18

This avoids performance issues caused by MUI string extraction (Bug 46266). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/msvcrt/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 1

[PATCH] kernel32: Introduce lightweight version of GetTimeZoneInformation.
by Akihiro Sagawa 17 Dec '18

17 Dec '18

This is a workaround for Bug 46266. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)

3 2

[PATCH] po: Update Korean translation.
by Byeongsik Jeon 17 Dec '18

17 Dec '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- po/ko.po | 973 +++++++++++++++++++++++++++---------------------------- 1 file changed, 479 insertions(+), 494 deletions(-) diff --git a/po/ko.po b/po/ko.po index 4e9f65f8d7..0d9004770f 100644 --- a/po/ko.po +++ b/po/ko.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: 2018-11-05 10:52+0900\n" +"PO-Revision-Date: 2018-12-17 22:50+0900\n" "Last-Translator: Byeongsik Jeon <bsjeon(a)hanmail.net>\n" "Language-Team: Korean\n" "Language: ko\n" @@ -203,7 +203,7 @@ msgstr "" #: appwiz.rc:36 msgid "Not specified" -msgstr "지정되지 않음" +msgstr "지정하지 않음" #: appwiz.rc:38 shell32.rc:144 shell32.rc:241 regedit.rc:147 winefile.rc:107 msgid "Name" @@ -815,7 +815,7 @@ msgstr "프린터(&R)..." #: comdlg32.rc:462 comdlg32.rc:487 msgid "Look &in:" -msgstr "보기(&I):" +msgstr "위치(&I):" #: comdlg32.rc:468 comdlg32.rc:494 msgid "File &name:" @@ -899,15 +899,15 @@ msgstr "새 폴더 만들기" #: comdlg32.rc:47 msgid "List" -msgstr "목록" +msgstr "간단히" #: comdlg32.rc:48 cryptui.rc:201 msgid "Details" -msgstr "세부사항" +msgstr "자세히" #: comdlg32.rc:49 msgid "Browse to Desktop" -msgstr "바탕 화면 열기" +msgstr "바탕 화면 표시" #: comdlg32.rc:113 msgid "Regular" @@ -1067,7 +1067,7 @@ msgstr "저장(&S)" #: comdlg32.rc:143 msgid "Save &in:" -msgstr "다음 위치에 저장(&I):" +msgstr "위치(&I):" #: comdlg32.rc:144 msgid "Save" @@ -1203,7 +1203,7 @@ msgstr "여백 [인치]" #: comdlg32.rc:80 msgid "Margins [mm]" -msgstr "여백 [mm]" +msgstr "여백 [밀리미터]" #: comdlg32.rc:81 sane.rc:33 msgctxt "unit: millimeters" @@ -1749,7 +1749,7 @@ msgstr "OEM Windows 시스템 구성요소 검증" #: crypt32.rc:152 cryptui.rc:136 msgid "Embedded Windows System Component Verification" -msgstr "내장 Windows 시스템 컴포넌트 확인" +msgstr "내장 Windows 시스템 구성 요소 확인" #: crypt32.rc:153 cryptui.rc:143 msgid "Key Pack Licenses" @@ -2298,7 +2298,7 @@ msgstr "인증서" #: cryptui.rc:345 msgid "I&ntended purpose:" -msgstr "지정된 용도(&N):" +msgstr "용도(&N):" #: cryptui.rc:349 msgid "&Import..." @@ -2895,7 +2895,7 @@ msgstr "콘텐츠를 저장할 파일 이름을 지정합니다." #: cryptui.rc:155 msgid "The specified file already exists. Do you want to replace it?" -msgstr "지정된 파일이 이미 있습니다. 파일을 교체하시겠습니까?" +msgstr "지정한 파일이 이미 있습니다. 파일을 교체하시겠습니까?" #: cryptui.rc:156 msgid "DER-Encoded Binary X.509 (*.cer)" @@ -2965,7 +2965,7 @@ msgstr "참고: 이 인증서의 개인 키는 내보낼 수 없습니다." #: cryptui.rc:177 msgid "Intended Use" -msgstr "지정된 용도" +msgstr "용도" #: cryptui.rc:178 shell32.rc:152 msgid "Location" @@ -4245,7 +4245,7 @@ msgstr "이미 SUBST 타겟입니다.\n" #: winerror.mc:618 msgid "System trace not specified or disallowed.\n" -msgstr "시스템 추적이 지정되지 않았거나 허용되지 않습니다.\n" +msgstr "시스템 추적이 지정하지 않았거나 허용되지 않습니다.\n" #: winerror.mc:623 msgid "Event count for DosMuxSemWait incorrect.\n" @@ -4973,7 +4973,7 @@ msgstr "메시지는 오직 동기 호출에만 사용할 수 있습니다.\n" #: winerror.mc:1528 msgid "The source element is empty.\n" -msgstr "소스 요소가 비어 있습니다.\n" +msgstr "원본 요소가 비어 있습니다.\n" #: winerror.mc:1533 msgid "The destination element is full.\n" @@ -5949,7 +5949,7 @@ msgstr "알 수 없는 특징.\n" #: winerror.mc:2758 msgid "Unknown component.\n" -msgstr "알 수 없는 컴포넌트.\n" +msgstr "알 수 없는 구성 요소.\n" #: winerror.mc:2763 msgid "Unknown property.\n" @@ -5961,7 +5961,7 @@ msgstr "잘못된 핸들 상태.\n" #: winerror.mc:2773 msgid "Bad configuration.\n" -msgstr "나쁜 설정.\n" +msgstr "잘못된 구성.\n" #: winerror.mc:2778 msgid "Index is missing.\n" @@ -5969,7 +5969,7 @@ msgstr "인덱스가 빠짐.\n" #: winerror.mc:2783 msgid "Installation source is missing.\n" -msgstr "설치 원본이 빠짐.\n" +msgstr "설치 원본이 없음.\n" #: winerror.mc:2788 msgid "Wrong installation package version.\n" @@ -6857,26 +6857,26 @@ msgstr "HTML 문서" #: mshtml.rc:29 msgid "Downloading from %s..." -msgstr "%s로부터 다운로드중..." +msgstr "%s에서 다운로드하는 중..." #: mshtml.rc:28 msgid "Done" -msgstr "끝남" +msgstr "완료" #: msi.rc:31 msgid "" "The specified installation package could not be opened. Please check the " "file path and try again." msgstr "" -"지정한 설치 패키지를 열 수 없습니다. 파일 경로를 확인하고 다시 시도하십시오." +"지정한 설치 패키지를 열 수 없습니다. 파일 경로를 검사한 후 다시 시도하십시오." #: msi.rc:32 msgid "path %s not found" -msgstr "%s 경로를 찾을 수 없습니다" +msgstr "경로 %s을(를) 찾을 수 없습니다" #: msi.rc:33 msgid "insert disk %s" -msgstr "디스크 %s 삽입" +msgstr "디스크 %s을(를) 넣으십시오" #: msi.rc:34 msgid "" @@ -6942,19 +6942,19 @@ msgstr "" #: msi.rc:61 msgid "enter which folder contains %s" -msgstr "%s을(를) 포함하는 폴더를 입력하세여" +msgstr "%s을(를) 포함하는 폴더 입력" #: msi.rc:62 msgid "install source for feature missing" -msgstr "빠진 부분(feature)을 위한 설치 원본" +msgstr "기능 누락을 위한 설치 원본" #: msi.rc:63 msgid "network drive for feature missing" -msgstr "빠진 부분(feature)을 위한 네트워크 드라이브" +msgstr "기능 누락을 위한 네트워크 드라이브" #: msi.rc:64 msgid "feature from:" -msgstr "부분(feature)에서:" +msgstr "기능:" #: msi.rc:65 msgid "choose which folder contains %s" @@ -6966,255 +6966,255 @@ msgstr "새 폴더" #: msi.rc:91 msgid "Allocating registry space" -msgstr "레지스트리 공간 할당" +msgstr "레지스트리 공간을 할당하는 중" #: msi.rc:92 msgid "Searching for installed applications" -msgstr "설치된 프로그램 검색" +msgstr "설치한 프로그램을 검색 중" #: msi.rc:93 msgid "Binding executables" -msgstr "실행파일 빌딩" +msgstr "실행 파일을 연결하는 중" #: msi.rc:94 msi.rc:137 msgid "Searching for qualifying products" -msgstr "자격있는 제품 찾는 중" +msgstr "정품을 검색하는 중" #: msi.rc:95 msi.rc:96 msi.rc:101 msgid "Computing space requirements" -msgstr "전산 처리 공간 필요" +msgstr "필요한 공간을 계산하는 중" #: msi.rc:97 msgid "Creating folders" -msgstr "새 폴더" +msgstr "폴더를 만드는 중" #: msi.rc:98 msgid "Creating shortcuts" -msgstr "바로 가기 만들기" +msgstr "바로 가기를 만드는 중" #: msi.rc:99 msgid "Deleting services" -msgstr "서비스 제거" +msgstr "서비스를 삭제하는 중" #: msi.rc:100 msgid "Creating duplicate files" -msgstr "사본 만들기" +msgstr "중복 파일을 만드는 중" #: msi.rc:102 msgid "Searching for related applications" -msgstr "관련된 프로그램 검색 중" +msgstr "관련 프로그램을 검색 중" #: msi.rc:103 msgid "Copying network install files" -msgstr "네트워크 설치 파일 복사" +msgstr "네트워크 설치 파일을 복사하는 중" #: msi.rc:104 msgid "Copying new files" -msgstr "새 파일 복사 중" +msgstr "새 파일을 복사하는 중" #: msi.rc:105 msgid "Installing ODBC components" -msgstr "ODBC 구성 요소 설치 중" +msgstr "ODBC 구성 요소를 설치하는 중" #: msi.rc:106 msgid "Installing new services" -msgstr "새 서비스 설치" +msgstr "새 서비스를 설치하는 중" #: msi.rc:107 msgid "Installing system catalog" -msgstr "시스템 카탈로그 설치" +msgstr "시스템 카탈로그를 설치하는 중" #: msi.rc:108 msgid "Validating install" -msgstr "설치 확인 중" +msgstr "설지 유효성을 확인하는 중" #: msi.rc:109 msgid "Evaluating launch conditions" -msgstr "실행 조건 평가" +msgstr "시작 조건을 평가하는 중" #: msi.rc:110 msgid "Migrating feature states from related applications" -msgstr "관련된 프로그램의 특성 상태를 마이그레이션하는 중" +msgstr "관련 프로그램에서 기능 상태를 마이그레이션하는 중" #: msi.rc:111 msgid "Moving files" -msgstr "파일 이동" +msgstr "파일을 이동하는 중" #: msi.rc:112 msgid "Publishing assembly information" -msgstr "어셈블리 정보 게시" +msgstr "어셈블리 정보를 게시하는 중" #: msi.rc:113 msgid "Unpublishing assembly information" -msgstr "이진 정보 비게시" +msgstr "어셈블리 정보 게시를 취소하는 중" #: msi.rc:114 msgid "Patching files" -msgstr "기우기 파일" +msgstr "파일을 패치하는 중" #: msi.rc:115 msgid "Updating component registration" -msgstr "구성 요소 등록 갱신" +msgstr "구성 요소 등록을 업데이트하는 중" #: msi.rc:116 msgid "Publishing Qualified Components" -msgstr "공식 구성요소 게시" +msgstr "자격 구성 요소를 게시하는 중" #: msi.rc:117 msgid "Publishing Product Features" -msgstr "제품 기능 게시" +msgstr "제품 기능을 게시하는 중" #: msi.rc:118 msgid "Publishing product information" -msgstr "제품 정보 게시" +msgstr "제품 정보를 게시하는 중" #: msi.rc:119 msgid "Registering Class servers" -msgstr "클래스 서버 등록" +msgstr "클래스 서버를 등록하는 중" #: msi.rc:120 msgid "Registering COM+ Applications and Components" -msgstr "COM+ 프로그램 및 구성요소 등록" +msgstr "COM+ 프로그램 및 구성 요소를 등록하는 중" #: msi.rc:121 msgid "Registering extension servers" -msgstr "확장 서버 등록" +msgstr "확장 서버를 등록하는 중" #: msi.rc:122 msgid "Registering fonts" -msgstr "글꼴 등록" +msgstr "글꼴을 등록하는 중" #: msi.rc:123 msgid "Registering MIME info" -msgstr "MIME 정보 등록" +msgstr "MIME 정보를 등록하는 중" #: msi.rc:124 msgid "Registering product" -msgstr "제품 등록" +msgstr "제품을 등록하는 중" #: msi.rc:125 msgid "Registering program identifiers" -msgstr "프로그램 식별자 등록" +msgstr "프로그램 식별자를 등록하는 중" #: msi.rc:126 msgid "Registering type libraries" -msgstr "라이브러리 형식 등록" +msgstr "형식 라이브러리를 등록하는 중" #: msi.rc:127 msgid "Registering user" -msgstr "사용자 등록 중" +msgstr "사용자를 등록하는 중" #: msi.rc:128 msgid "Removing duplicated files" -msgstr "중복된 파일 제거" +msgstr "중복 파일을 제거하는 중" #: msi.rc:129 msi.rc:153 msgid "Updating environment strings" -msgstr "환경 문자열 갱신" +msgstr "환경 문자열을 업데이트하는 중" #: msi.rc:130 msgid "Removing applications" -msgstr "프로그램 제거" +msgstr "프로그램을 제거하는 중" #: msi.rc:131 msgid "Removing files" -msgstr "파일 제거" +msgstr "파일을 제거하는 중" #: msi.rc:132 msgid "Removing folders" -msgstr "폴더 제거" +msgstr "폴더를 제거하는 중" #: msi.rc:133 msgid "Removing INI files entries" -msgstr "설정 파일 목록 제거" +msgstr "INI 파일 항목을 제거하는 중" #: msi.rc:134 msgid "Removing ODBC components" -msgstr "ODBC 구성 요소 제거" +msgstr "ODBC 구성 요소를 제거하는 중" #: msi.rc:135 msgid "Removing system registry values" -msgstr "시스템 레지스트리 값 제거 중" +msgstr "시스템 레지스트리 값을 제거하는 중" #: msi.rc:136 msgid "Removing shortcuts" -msgstr "바로 가기 제거" +msgstr "바로 가기를 제거하는 중" #: msi.rc:138 msgid "Registering modules" -msgstr "구성 요소 등록" +msgstr "모듈을 등록하는 중" #: msi.rc:139 msgid "Unregistering modules" -msgstr "구성 요소 등록 취소" +msgstr "모듈 등록을 취소하는 중" #: msi.rc:140 msgid "Initializing ODBC directories" -msgstr "ODBC 디렉터리 초기화 중" +msgstr "ODBC 디렉터리를 초기화하는 중" #: msi.rc:141 msgid "Starting services" -msgstr "서비스 시작" +msgstr "서비스를 시작하는 중" #: msi.rc:142 msgid "Stopping services" -msgstr "서비스 정지" +msgstr "서비스를 중지하는 중" #: msi.rc:143 msgid "Unpublishing Qualified Components" -msgstr "공인된 구성요소에 대한 게시 취소" +msgstr "자격 구성 요소 게시를 취소하는 중" #: msi.rc:144 msgid "Unpublishing Product Features" -msgstr "제품 특성 게시 취소" +msgstr "제품 기능 게시를 취소하는 중" #: msi.rc:145 msgid "Unpublishing product information" -msgstr "제품 정보 게시 취소" +msgstr "제품 정보 게시를 취소하는 중" #: msi.rc:146 msgid "Unregister Class servers" -msgstr "클래스 서버 등록 취소" +msgstr "클래스 서버 등록을 취소하는 중" #: msi.rc:147 msgid "Unregistering COM+ Applications and Components" -msgstr "COM+ 프로그램 및 구성요소 등록 해제" +msgstr "COM+ 프로그램 및 구성 요소 등록을 취소하는 중" #: msi.rc:148 msgid "Unregistering extension servers" -msgstr "확장 서버 등록 취소" +msgstr "확장 서버 등록을 취소하는 중" #: msi.rc:149 msgid "Unregistering fonts" -msgstr "글꼴 등록 취소" +msgstr "글꼴 등록을 취소하는 중" #: msi.rc:150 msgid "Unregistering MIME info" -msgstr "MIME 정보 등록 취소" +msgstr "MIME 정보 등록을 취소하는 중" #: msi.rc:151 msgid "Unregistering program identifiers" -msgstr "프로그램 식별자 등록 취소" +msgstr "프로그램 식별자 등록을 취소하는 중" #: msi.rc:152 msgid "Unregistering type libraries" -msgstr "형식 라이브러리 등록 취소" +msgstr "형식 라이브러리 등록을 취소하는 중" #: msi.rc:154 msgid "Writing INI files values" -msgstr "INI 파일 값 쓰기" +msgstr "INI 파일 값을 쓰는 중" #: msi.rc:155 msgid "Writing system registry values" -msgstr "시스템 레지스트리 값 쓰기" +msgstr "시스템 레지스트리 값을 쓰는 중" #: msi.rc:161 msgid "Free space: [1]" -msgstr "여유 공간: [1]" +msgstr "사용 가능한 공간: [1]" #: msi.rc:162 msgid "Property: [1], Signature: [2]" -msgstr "속성 : [1], 서명 : [2]" +msgstr "속성: [1], 서명: [2]" #: msi.rc:163 msgid "File: [1]" @@ -7238,7 +7238,7 @@ msgstr "파일: [1], 디렉터리: [9], 크기: [6]" #: msi.rc:168 msgid "Found application: [1]" -msgstr "프로그램 발견: [1]" +msgstr "찾은 프로그램: [1]" #: msi.rc:169 msgid "File: [1], Directory: [9], Size: [6]" @@ -7250,7 +7250,7 @@ msgstr "서비스: [2]" #: msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "파일: [1], 참조 또는 의존: [2]" +msgstr "파일: [1], 종속성: [2]" #: msi.rc:173 msgid "Application: [1]" @@ -7258,7 +7258,7 @@ msgstr "프로그램: [1]" #: msi.rc:175 msi.rc:176 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "프로그램 구성요소: [1], 어셈블리 이름 : [2]" +msgstr "프로그램 컨텍스트: [1], 어셈블리 이름 : [2]" #: msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" @@ -7266,7 +7266,7 @@ msgstr "파일: [1], 디렉터리: [2], 크기: [3]" #: msi.rc:178 msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" -msgstr "구성 요소 ID : [1], 한정자 : [2]" +msgstr "구성 요소 ID: [1], 자격자: [2]" #: msi.rc:179 msi.rc:200 msgid "Feature: [1]" @@ -7274,11 +7274,11 @@ msgstr "기능: [1]" #: msi.rc:180 msi.rc:201 msgid "Class Id: [1]" -msgstr "클래스 ID : [1]" +msgstr "클래스 ID: [1]" #: msi.rc:181 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" +msgstr "AppId: [1]{{, AppType: [2], 사용자: [3], RSN: [4]}}" #: msi.rc:182 msi.rc:203 msgid "Extension: [1]" @@ -7290,7 +7290,7 @@ msgstr "글꼴: [1]" #: msi.rc:184 msi.rc:205 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "MIME 콘텐츠 유형 : [1], 확장 : [2]" +msgstr "MIME 콘텐츠 형식: [1], 확장: [2]" #: msi.rc:185 msi.rc:206 msgid "ProgId: [1]" @@ -7306,7 +7306,7 @@ msgstr "파일: [1], 디렉터리: [9]" #: msi.rc:188 msi.rc:208 msgid "Name: [1], Value: [2], Action [3]" -msgstr "이름: [1], 값: [2], 작동 [3]" +msgstr "이름: [1], 값: [2], 작업 [3]" #: msi.rc:189 msgid "Application: [1], Command line: [2]" @@ -7355,8 +7355,8 @@ msgid "" "arguments are: [2], [3], [4]}}" msgstr "" "설치 프로그램에서 이 패키지를 설치하는 동안 예기치 않은 오류가 발생했습니다. " -"이 패키지에 문제가 있음을 나타낼 수 있습니다. 오류 코드는 [1]입니다. {{인" -"수 : [2], [3], [4]}}" +"이 패키지에 문제가 있음을 나타낼 수 있습니다. 오류 코드 [1]. {{인수 : [2], " +"[3], [4]}}" #: msi.rc:77 msgid "{{Disk full: }}" @@ -7364,35 +7364,35 @@ msgstr "{{디스크가 꽉 찼습니다: }}" #: msi.rc:78 msgid "Action [Time]: [1]. [2]" -msgstr "동작 [Time]: [1]. [2]" +msgstr "작업 [Time]: [1]. [2]" #: msi.rc:79 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "메시지 유형 : [1], 인수 : [2], [3]" +msgstr "메시지 유형: [1], 인수: [2], [3]" #: msi.rc:82 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== 기록 시작: [Date] [Time] ===" +msgstr "=== 기록 시작: [Date] [Time] ===" #: msi.rc:80 msgid "Action start [Time]: [1]." -msgstr "동작 시작 [Time]: [1]." +msgstr "작업 시작 [Time]: [1]." #: msi.rc:81 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "동작 종료 [Time]: [1]. 반환 값 [2]." +msgstr "작업 끝 [Time]: [1]. 반환 값 [2]." #: msi.rc:84 msgid "Please insert the disk: [2]" -msgstr "디스크를 삽입해 주십시오. [2]" +msgstr "디스크를 넣으십시오: [2]" #: msi.rc:85 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" -"소스 파일을 찾을 수 없습니다 {{(cabinet)}}: [2]. 파일이 존재 여부와 액세스 가" -"능 여부를 확인하십시오." +"원본 파일을 찾을 수 없습니다 {{(cabinet)}}: [2]. 파일 존재 및 액세스 가능 여" +"부를 확인하십시오." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8072,7 +8072,7 @@ msgstr "px" #: sane.rc:32 msgctxt "unit: bits" msgid "b" -msgstr "비트" +msgstr "bit" #: sane.rc:34 wineps.rc:49 winecfg.rc:183 msgctxt "unit: dots/inch" @@ -8087,7 +8087,7 @@ msgstr "%" #: sane.rc:36 msgctxt "unit: microseconds" msgid "us" -msgstr "us" +msgstr "µs" #: serialui.rc:28 msgid "Settings for %s" @@ -8095,7 +8095,7 @@ msgstr "%s 설정" #: serialui.rc:31 msgid "Baud Rate" -msgstr "보드속도" +msgstr "전송 속도" #: serialui.rc:33 msgid "Parity" @@ -8143,7 +8143,7 @@ msgstr "%2의 '%1' 파일이 필요합니다" #: setupapi.rc:32 ipconfig.rc:34 msgid "Unknown" -msgstr " 없음" +msgstr "없음" #: setupapi.rc:33 msgid "Copy files from:" @@ -8922,7 +8922,7 @@ msgstr "실행 파일 (*.exe)" #: shell32.rc:244 msgid "There is no Windows program configured to open this type of file." -msgstr "이 형식의 파일을 도록 구성된 Windows 프로그램이 없습니다." +msgstr "이 유형의 파일을 열도록 구성된 Windows 프로그램이 없습니다." #: shell32.rc:246 msgid "Are you sure you wish to permanently delete '%1'?" @@ -9028,815 +9028,799 @@ msgstr " 초" #: twain.rc:29 msgid "Select Source" -msgstr "소스 선택" +msgstr "원본 선택" #: tzres.rc:82 msgid "China Standard Time" -msgstr "" +msgstr "중국 표준 시간" #: tzres.rc:83 msgid "China Daylight Time" -msgstr "" +msgstr "중국 일광 절약 시간" #: tzres.rc:160 msgid "North Asia Standard Time" -msgstr "" +msgstr "북아시아 표준 시간" #: tzres.rc:161 msgid "North Asia Daylight Time" -msgstr "" +msgstr "북아시아 일광 절약 시간" #: tzres.rc:104 msgid "Georgian Standard Time" -msgstr "" +msgstr "그루지아 표준 시간" #: tzres.rc:105 msgid "Georgian Daylight Time" -msgstr "" +msgstr "그루지아 일광 절약 시간" #: tzres.rc:152 msgid "Nepal Standard Time" -msgstr "" +msgstr "네팔 표준 시간" #: tzres.rc:153 msgid "Nepal Daylight Time" -msgstr "" +msgstr "네팔 일광 절약 시간" #: tzres.rc:60 msgid "Cape Verde Standard Time" -msgstr "" +msgstr "카보베르데 표준 시간" #: tzres.rc:61 msgid "Cape Verde Daylight Time" -msgstr "" +msgstr "카보베르데 일광 절약 시간" #: tzres.rc:74 -#, fuzzy -#| msgid "Central European" msgid "Central European Standard Time" -msgstr "중부 유럽" +msgstr "중앙 유럽 표준 시간" #: tzres.rc:75 -#, fuzzy -#| msgid "Central European" msgid "Central European Daylight Time" -msgstr "중부 유럽" +msgstr "중앙 유럽 일관 절약 시간" #: tzres.rc:140 msgid "Morocco Standard Time" -msgstr "" +msgstr "모로코 표준 시간" #: tzres.rc:141 msgid "Morocco Daylight Time" -msgstr "" +msgstr "모로코 일광 절약 시간" #: tzres.rc:72 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Standard Time" -msgstr "중부 유럽" +msgstr "중앙 유럽 표준 시간" #: tzres.rc:73 -#, fuzzy -#| msgid "Central European" msgid "Central Europe Daylight Time" -msgstr "중부 유럽" +msgstr "중앙 유럽 일광 절약 시간" #: tzres.rc:118 msgid "Iran Standard Time" -msgstr "" +msgstr "이란 표준 시간" #: tzres.rc:119 msgid "Iran Daylight Time" -msgstr "" +msgstr "이란 일광 절약 시간" #: tzres.rc:150 msgid "Namibia Standard Time" -msgstr "" +msgstr "나미비아 표준 시간" #: tzres.rc:151 msgid "Namibia Daylight Time" -msgstr "" +msgstr "나미비아 일광 절약 시간" #: tzres.rc:200 msgid "Tonga Standard Time" -msgstr "" +msgstr "통가 표준 시간" #: tzres.rc:201 msgid "Tonga Daylight Time" -msgstr "" +msgstr "통가 일괄 절약 시간" #: tzres.rc:144 msgid "Mountain Standard Time (Mexico)" -msgstr "" +msgstr "산지 표준 시간 (멕시코)" #: tzres.rc:145 msgid "Mountain Daylight Time (Mexico)" -msgstr "" +msgstr "산지 일광 절약 시간 (멕시코)" #: tzres.rc:106 -#, fuzzy -#| msgid "&Standard bar" msgid "GMT Standard Time" -msgstr "표준 바(&S)" +msgstr "GMT 표준 시간" #: tzres.rc:107 msgid "GMT Daylight Time" -msgstr "" +msgstr "GMT 일광 절약 시간" #: tzres.rc:68 msgid "Central Asia Standard Time" -msgstr "" +msgstr "중앙 아시아 표준 시간" #: tzres.rc:69 msgid "Central Asia Daylight Time" -msgstr "" +msgstr "중앙 아시아 일광 절약 시간" #: tzres.rc:38 msgid "Arabic Standard Time" -msgstr "" +msgstr "아랍 표준 시간" #: tzres.rc:39 msgid "Arabic Daylight Time" -msgstr "" +msgstr "아랍 일광 절약 시간" #: tzres.rc:132 msgid "Magadan Standard Time" -msgstr "" +msgstr "마가단 표준 시간" #: tzres.rc:133 msgid "Magadan Daylight Time" -msgstr "" +msgstr "마가단 일광 절약 시간" #: tzres.rc:156 msgid "Newfoundland Standard Time" -msgstr "" +msgstr "뉴펀들랜드 표준 시간" #: tzres.rc:157 msgid "Newfoundland Daylight Time" -msgstr "" +msgstr "뉴펀들랜드 일광 절약 시간" #: tzres.rc:224 msgid "West Pacific Standard Time" -msgstr "" +msgstr "서태평양 표준 시간" #: tzres.rc:225 msgid "West Pacific Daylight Time" -msgstr "" +msgstr "서태평양 일광 절약 시간" #: tzres.rc:164 msgid "Pacific Standard Time" -msgstr "" +msgstr "태평양 표준 시간" #: tzres.rc:165 msgid "Pacific Daylight Time" -msgstr "" +msgstr "태평양 일광 절약 시간" #: tzres.rc:48 msgid "Azerbaijan Standard Time" -msgstr "" +msgstr "아제르바이잔 표준 시간" #: tzres.rc:49 msgid "Azerbaijan Daylight Time" -msgstr "" +msgstr "아제르바이잔 일광 절약 시간" #: tzres.rc:182 msgid "Samoa Standard Time" -msgstr "" +msgstr "사모아 표준 시간" #: tzres.rc:183 msgid "Samoa Daylight Time" -msgstr "" +msgstr "사모아 일광 절약 시간" #: tzres.rc:124 msgid "Kaliningrad Standard Time" -msgstr "" +msgstr "칼리닌그라드 표준 시간" #: tzres.rc:125 msgid "Kaliningrad Daylight Time" -msgstr "" +msgstr "칼리닌그라드 일광 절약 시간" #: tzres.rc:166 msgid "Pacific Standard Time (Mexico)" -msgstr "" +msgstr "태평양 표준 시간 (멕시코)" #: tzres.rc:167 msgid "Pacific Daylight Time (Mexico)" -msgstr "" +msgstr "태평양 일광 절약 시간 (멕시코)" #: tzres.rc:136 msgid "Middle East Standard Time" -msgstr "" +msgstr "중동 표준 시간" #: tzres.rc:137 msgid "Middle East Daylight Time" -msgstr "" +msgstr "중동 일광 절약 시간" #: tzres.rc:198 msgid "Tokyo Standard Time" -msgstr "" +msgstr "도쿄 표준 시간" #: tzres.rc:199 msgid "Tokyo Daylight Time" -msgstr "" +msgstr "도쿄 일광 절약 시간" #: tzres.rc:130 msgid "Line Islands Standard Time" -msgstr "" +msgstr "라인 제도 표준 시간" #: tzres.rc:131 msgid "Line Islands Daylight Time" -msgstr "" +msgstr "라인 제도 일광 절약 시간" #: tzres.rc:122 msgid "Jordan Standard Time" -msgstr "" +msgstr "요르단 표준 시간" #: tzres.rc:123 msgid "Jordan Daylight Time" -msgstr "" +msgstr "요르단 일광 절약 시간" #: tzres.rc:78 msgid "Central Standard Time" -msgstr "" +msgstr "중부 표준 시간" #: tzres.rc:79 msgid "Central Daylight Time" -msgstr "" +msgstr "중부 일광 절약 시간" #: tzres.rc:50 msgid "Azores Standard Time" -msgstr "" +msgstr "아조레스 표준 시간" #: tzres.rc:51 msgid "Azores Daylight Time" -msgstr "" +msgstr "아조레스 일광 절약 시간" #: tzres.rc:158 msgid "North Asia East Standard Time" -msgstr "" +msgstr "북아시아 동부 표준 시간" #: tzres.rc:159 msgid "North Asia East Daylight Time" -msgstr "" +msgstr "북아시아 동부 일광 절약 시간" #: tzres.rc:40 msgid "Argentina Standard Time" -msgstr "" +msgstr "아르헨티나 표준 시간" #: tzres.rc:41 msgid "Argentina Daylight Time" -msgstr "" +msgstr "아르헨티나 일광 절약 시간" #: tzres.rc:146 msgid "Myanmar Standard Time" -msgstr "" +msgstr "미얀마 표준 시간" #: tzres.rc:147 msgid "Myanmar Daylight Time" -msgstr "" +msgstr "미얀마 일광 절약 시간" #: tzres.rc:210 tzres.rc:211 msgid "Coordinated Universal Time" -msgstr "" +msgstr "협정 세계시" #: tzres.rc:116 msgid "India Standard Time" -msgstr "" +msgstr "인도 표준 시간" #: tzres.rc:117 msgid "India Daylight Time" -msgstr "" +msgstr "인도 일광 절약 시간" #: tzres.rc:112 -#, fuzzy -#| msgid "&Standard bar" msgid "GTB Standard Time" -msgstr "표준 바(&S)" +msgstr "GTB 표준 시간" #: tzres.rc:113 msgid "GTB Daylight Time" -msgstr "" +msgstr "GTB 일광 절약 시간" #: tzres.rc:202 msgid "Turkey Standard Time" -msgstr "" +msgstr "터키 표준 시간" #: tzres.rc:203 msgid "Turkey Daylight Time" -msgstr "" +msgstr "터키 일광 절약 시간" #: tzres.rc:100 msgid "Fiji Standard Time" -msgstr "" +msgstr "피지 표준 시간" #: tzres.rc:101 msgid "Fiji Daylight Time" -msgstr "" +msgstr "피지 일광 절약 시간" #: tzres.rc:58 msgid "Canada Central Standard Time" -msgstr "" +msgstr "캐나다 중부 표준 시간" #: tzres.rc:59 msgid "Canada Central Daylight Time" -msgstr "" +msgstr "캐나다 중부 일광 절약 시간" #: tzres.rc:194 msgid "Taipei Standard Time" -msgstr "" +msgstr "타이베이 표준 시간" #: tzres.rc:195 msgid "Taipei Daylight Time" -msgstr "" +msgstr "타이베이 일광 절약 시간" #: tzres.rc:220 msgid "W. Europe Standard Time" -msgstr "" +msgstr "서유럽 표준 시간" #: tzres.rc:221 msgid "W. Europe Daylight Time" -msgstr "" +msgstr "서유럽 일광 절약 시간" #: tzres.rc:138 msgid "Montevideo Standard Time" -msgstr "" +msgstr "몬데비데오 표준 시간" #: tzres.rc:139 msgid "Montevideo Daylight Time" -msgstr "" +msgstr "몬데비데오 일광 절약 시간" #: tzres.rc:168 msgid "Pakistan Standard Time" -msgstr "" +msgstr "파키스탄 표준 시간" #: tzres.rc:169 msgid "Pakistan Daylight Time" -msgstr "" +msgstr "파키스탄 일광 절약 시간" #: tzres.rc:62 msgid "Caucasus Standard Time" -msgstr "" +msgstr "코코서스 표준 시간" #: tzres.rc:63 msgid "Caucasus Daylight Time" -msgstr "" +msgstr "코코서스 일광 절약 시간" #: tzres.rc:46 msgid "AUS Eastern Standard Time" -msgstr "" +msgstr "오스트레일리아 동부 표준 시간" #: tzres.rc:47 msgid "AUS Eastern Daylight Time" -msgstr "" +msgstr "오스트레일리아 동부 일광 절약 시간" #: tzres.rc:148 msgid "N. Central Asia Standard Time" -msgstr "" +msgstr "중앙 아시아 북부 표준 시간" #: tzres.rc:149 msgid "N. Central Asia Daylight Time" -msgstr "" +msgstr "중앙 아시아 북부 일광 절약 시간" #: tzres.rc:94 msgid "Eastern Standard Time" -msgstr "" +msgstr "동부 표준 시간" #: tzres.rc:95 msgid "Eastern Daylight Time" -msgstr "" +msgstr "동부 일광 절약 시간" #: tzres.rc:80 msgid "Central Standard Time (Mexico)" -msgstr "" +msgstr "중부 표준 시간 (멕시코)" #: tzres.rc:81 msgid "Central Daylight Time (Mexico)" -msgstr "" +msgstr "중부 일광 절약 시간 (멕시코)" #: tzres.rc:42 msgid "Atlantic Standard Time" -msgstr "" +msgstr "대서양 표준 시간" #: tzres.rc:43 msgid "Atlantic Daylight Time" -msgstr "" +msgstr "대서양 일광 절약 시간" #: tzres.rc:142 msgid "Mountain Standard Time" -msgstr "" +msgstr "산지 표준 시간" #: tzres.rc:143 msgid "Mountain Daylight Time" -msgstr "" +msgstr "산지 일광 절약 시간" #: tzres.rc:206 msgid "US Eastern Standard Time" -msgstr "" +msgstr "미국 동부 표준 시간" #: tzres.rc:207 msgid "US Eastern Daylight Time" -msgstr "" +msgstr "미국 동부 일광 절약 시간" #: tzres.rc:196 msgid "Tasmania Standard Time" -msgstr "" +msgstr "태즈매이니아 표준 시간" #: tzres.rc:197 msgid "Tasmania Daylight Time" -msgstr "" +msgstr "태즈매이니아 일광 절약 시간" #: tzres.rc:66 msgid "Central America Standard Time" -msgstr "" +msgstr "중앙 아메리카 표준 시간" #: tzres.rc:67 msgid "Central America Daylight Time" -msgstr "" +msgstr "중앙 아메리카 일광 절약 시간" #: tzres.rc:208 msgid "US Mountain Standard Time" -msgstr "" +msgstr "미국 산지 표준 시간" #: tzres.rc:209 msgid "US Mountain Daylight Time" -msgstr "" +msgstr "미국 산지 일광 절약 시간" #: tzres.rc:188 msgid "South Africa Standard Time" -msgstr "" +msgstr "남아프리카 표준 시간" #: tzres.rc:189 msgid "South Africa Daylight Time" -msgstr "" +msgstr "남아프리카 일광 절약 시간" #: tzres.rc:64 msgid "Cen. Australia Standard Time" -msgstr "" +msgstr "중부 오스트레일리아 표준 시간" #: tzres.rc:65 msgid "Cen. Australia Daylight Time" -msgstr "" +msgstr "중부 오스트레일리아 일광 절약 시간" #: tzres.rc:190 msgid "Sri Lanka Standard Time" -msgstr "" +msgstr "스리랑카 표준 시간" #: tzres.rc:191 msgid "Sri Lanka Daylight Time" -msgstr "" +msgstr "스리랑카 일광 절약 시간" #: tzres.rc:30 msgid "Afghanistan Standard Time" -msgstr "" +msgstr "아프가니스탄 표준 시간" #: tzres.rc:31 msgid "Afghanistan Daylight Time" -msgstr "" +msgstr "아프가니스탄 일광 절약 시간" #: tzres.rc:226 msgid "Yakutsk Standard Time" -msgstr "" +msgstr "야쿠츠크 표준 시간" #: tzres.rc:227 msgid "Yakutsk Daylight Time" -msgstr "" +msgstr "야쿠츠크 일광 절약 시간" #: tzres.rc:176 msgid "SA Eastern Standard Time" -msgstr "" +msgstr "SA 동부 표준 시간" #: tzres.rc:177 msgid "SA Eastern Daylight Time" -msgstr "" +msgstr "SA 동부 일광 절약 시간" #: tzres.rc:34 msgid "Arab Standard Time" -msgstr "" +msgstr "아랍 표준 시간" #: tzres.rc:35 msgid "Arab Daylight Time" -msgstr "" +msgstr "아랍 일광 절약 시간" #: tzres.rc:36 msgid "Arabian Standard Time" -msgstr "" +msgstr "아라비아 표준 시간" #: tzres.rc:37 msgid "Arabian Daylight Time" -msgstr "" +msgstr "아라비아 일광 절약 시간" #: tzres.rc:174 msgid "Russian Standard Time" -msgstr "" +msgstr "러시아 표준 시간" #: tzres.rc:175 msgid "Russian Daylight Time" -msgstr "" +msgstr "러시아 일광 절약 시간" #: tzres.rc:172 msgid "Romance Standard Time" -msgstr "" +msgstr "로망스 표준 시간" #: tzres.rc:173 msgid "Romance Daylight Time" -msgstr "" +msgstr "로망스 일광 절약 시간" #: tzres.rc:98 msgid "Ekaterinburg Standard Time" -msgstr "" +msgstr "예카테린부르크 표준 시간" #: tzres.rc:99 msgid "Ekaterinburg Daylight Time" -msgstr "" +msgstr "예카테린부르크 일광 절약 시간" #: tzres.rc:192 msgid "Syria Standard Time" -msgstr "" +msgstr "시리아 표준 시간" #: tzres.rc:193 msgid "Syria Daylight Time" -msgstr "" +msgstr "시리아 일광 절약 시간" #: tzres.rc:44 msgid "AUS Central Standard Time" -msgstr "" +msgstr "오스트레일리아 중부 표준 시간" #: tzres.rc:45 msgid "AUS Central Daylight Time" -msgstr "" +msgstr "오스트레일리아 중부 일광 절약 시간" #: tzres.rc:110 msgid "Greenwich Standard Time" -msgstr "" +msgstr "그리니치 표준 시간" #: tzres.rc:111 msgid "Greenwich Daylight Time" -msgstr "" +msgstr "그리니치 일광 절약 시간" #: tzres.rc:204 msgid "Ulaanbaatar Standard Time" -msgstr "" +msgstr "울란바토르 표준 시간" #: tzres.rc:205 msgid "Ulaanbaatar Daylight Time" -msgstr "" +msgstr "울란바토르 일광 절약 시간" #: tzres.rc:120 msgid "Israel Standard Time" -msgstr "" +msgstr "이스라엘 표준 시간" #: tzres.rc:121 msgid "Israel Daylight Time" -msgstr "" +msgstr "이스라엘 일광 절약 시간" #: tzres.rc:54 msgid "Bangladesh Standard Time" -msgstr "" +msgstr "발글라데시 표준 시간" #: tzres.rc:55 msgid "Bangladesh Daylight Time" -msgstr "" +msgstr "방글라데시 일광 절약 시간" #: tzres.rc:178 msgid "SA Pacific Standard Time" -msgstr "" +msgstr "SA 태평양 표준 시간" #: tzres.rc:179 msgid "SA Pacific Daylight Time" -msgstr "" +msgstr "SA 태평양 일광 절약 시간" #: tzres.rc:222 msgid "West Asia Standard Time" -msgstr "" +msgstr "서아시아 표준 시간" #: tzres.rc:223 msgid "West Asia Daylight Time" -msgstr "" +msgstr "서아시아 일광 절약 시간" #: tzres.rc:32 msgid "Alaskan Standard Time" -msgstr "" +msgstr "알래스카 표준 시간" #: tzres.rc:33 msgid "Alaskan Daylight Time" -msgstr "" +msgstr "알래스카 일광 절약 시간" #: tzres.rc:170 msgid "Paraguay Standard Time" -msgstr "" +msgstr "파라과이 표준 시간" #: tzres.rc:171 msgid "Paraguay Daylight Time" -msgstr "" +msgstr "파라과이 일광 절약 시간" #: tzres.rc:84 -#, fuzzy #| msgid "Date and time" msgid "Dateline Standard Time" -msgstr "날짜와 시간" +msgstr "날짜 변경선 표준 시간" #: tzres.rc:85 msgid "Dateline Daylight Time" -msgstr "" +msgstr "날짜 변경선 일광 절약 시간" #: tzres.rc:128 msgid "Libya Standard Time" -msgstr "" +msgstr "리비아 표준 시간" #: tzres.rc:129 msgid "Libya Daylight Time" -msgstr "" +msgstr "리비아 일광 절약 시간" #: tzres.rc:52 msgid "Bahia Standard Time" -msgstr "" +msgstr "바이아 표준 시간" #: tzres.rc:53 msgid "Bahia Daylight Time" -msgstr "" +msgstr "바이아 일광 절약 시간" #: tzres.rc:212 msgid "Venezuela Standard Time" -msgstr "" +msgstr "베네수엘라 표준 시간" #: tzres.rc:213 msgid "Venezuela Daylight Time" -msgstr "" +msgstr "베네수엘라 일광 절약 시간" #: tzres.rc:114 msgid "Hawaiian Standard Time" -msgstr "" +msgstr "하와이 표준 시간" #: tzres.rc:115 msgid "Hawaiian Daylight Time" -msgstr "" +msgstr "하와이 일광 절약 시간" #: tzres.rc:184 msgid "SE Asia Standard Time" -msgstr "" +msgstr "동남 아시아 표준 시간" #: tzres.rc:185 msgid "SE Asia Daylight Time" -msgstr "" +msgstr "동남 아시아 일광 절약 시간" #: tzres.rc:154 msgid "New Zealand Standard Time" -msgstr "" +msgstr "뉴질랜드 표준 시간" #: tzres.rc:155 msgid "New Zealand Daylight Time" -msgstr "" +msgstr "뉴질랜드 일광 절약 시간" #: tzres.rc:70 msgid "Central Brazilian Standard Time" -msgstr "" +msgstr "브라질 중부 표준 시간" #: tzres.rc:71 msgid "Central Brazilian Daylight Time" -msgstr "" +msgstr "브라질 중부 일광 절약 시간" #: tzres.rc:56 msgid "Belarus Standard Time" -msgstr "" +msgstr "벨로루시 표준 시간" #: tzres.rc:57 msgid "Belarus Daylight Time" -msgstr "" +msgstr "벨로루시 표준 시간" #: tzres.rc:180 msgid "SA Western Standard Time" -msgstr "" +msgstr "SA 서부 표준 시간" #: tzres.rc:181 msgid "SA Western Daylight Time" -msgstr "" +msgstr "SA 서부 일광 절약 시간" #: tzres.rc:108 msgid "Greenland Standard Time" -msgstr "" +msgstr "그린란드 표준 시간" #: tzres.rc:109 msgid "Greenland Daylight Time" -msgstr "" +msgstr "그린란드 일광 절약 시간" #: tzres.rc:92 -#, fuzzy #| msgid "Date and time" msgid "Easter Island Standard Time" -msgstr "날짜와 시간" +msgstr "이스터 섬 표준 시간" #: tzres.rc:93 -#, fuzzy #| msgid "Date and time" msgid "Easter Island Daylight Time" -msgstr "날짜와 시간" +msgstr "이스터 섬 일광 절약 시간" #: tzres.rc:96 msgid "Egypt Standard Time" -msgstr "" +msgstr "이집트 표준 시간" #: tzres.rc:97 msgid "Egypt Daylight Time" -msgstr "" +msgstr "이집트 일광 절약 시간" #: tzres.rc:134 msgid "Mauritius Standard Time" -msgstr "" +msgstr "모리셔스 표준 시간" #: tzres.rc:135 msgid "Mauritius Daylight Time" -msgstr "" +msgstr "모리셔스 일광 절약 시간" #: tzres.rc:214 msgid "Vladivostok Standard Time" -msgstr "" +msgstr "블라디보스토크 표준 시간" #: tzres.rc:215 msgid "Vladivostok Daylight Time" -msgstr "" +msgstr "블라디보스토크 일광 절약 시간" #: tzres.rc:186 msgid "Singapore Standard Time" -msgstr "" +msgstr "싱가포르 표준 시간" #: tzres.rc:187 msgid "Singapore Daylight Time" -msgstr "" +msgstr "싱가포르 일광 절약 시간" #: tzres.rc:126 msgid "Korea Standard Time" -msgstr "" +msgstr "대한민국 표준 시간" #: tzres.rc:127 msgid "Korea Daylight Time" -msgstr "" +msgstr "대한민국 일광 절약 시간" #: tzres.rc:86 msgid "E. Africa Standard Time" -msgstr "" +msgstr "동아프리카 표준 시간" #: tzres.rc:87 msgid "E. Africa Daylight Time" -msgstr "" +msgstr "동아프리카 일광 절약 시간" #: tzres.rc:102 -#, fuzzy #| msgid "&Standard bar" msgid "FLE Standard Time" -msgstr "표준 바(&S)" +msgstr "FLE 표준 시간" #: tzres.rc:103 msgid "FLE Daylight Time" -msgstr "" +msgstr "FLE 일광 절약 시간" #: tzres.rc:90 msgid "E. South America Standard Time" -msgstr "" +msgstr "남아메리카 동부 표준 시간" #: tzres.rc:91 msgid "E. South America Daylight Time" -msgstr "" +msgstr "남아메리카 동부 일광 절약 시간" #: tzres.rc:76 msgid "Central Pacific Standard Time" -msgstr "" +msgstr "중앙 태평양 표준 시간" #: tzres.rc:77 msgid "Central Pacific Daylight Time" -msgstr "" +msgstr "중앙 태평양 일광 절약 시간" #: tzres.rc:218 msgid "W. Central Africa Standard Time" -msgstr "" +msgstr "중앙아프리카 서부 표준 시간" #: tzres.rc:219 msgid "W. Central Africa Daylight Time" -msgstr "" +msgstr "중앙아프리카 서부 일광 절약 시간" #: tzres.rc:162 msgid "Pacific SA Standard Time" -msgstr "" +msgstr "태평양 SA 표준 시간" #: tzres.rc:163 msgid "Pacific SA Daylight Time" -msgstr "" +msgstr "태평양 SA 일광 절약 시간" #: tzres.rc:88 msgid "E. Australia Standard Time" -msgstr "" +msgstr "오스트레일리아 동부 표준 시간" #: tzres.rc:89 msgid "E. Australia Daylight Time" -msgstr "" +msgstr "오스트레일리아 동부 일광 절약 시간" #: tzres.rc:216 msgid "W. Australia Standard Time" -msgstr "" +msgstr "오스트레일리아 서부 표준 시간" #: tzres.rc:217 msgid "W. Australia Daylight Time" -msgstr "" +msgstr "오스트레일리아 서부 일광 절약 시간" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -9856,7 +9840,7 @@ msgid "" "not click install unless you have absolute trust in the above source." msgstr "" "설치할 때, ActiveX 구성 요소는 컴퓨터에 대한 완전한 액세스 권한을 가집니다. " -"위의 소스에 대한 절대적인 신뢰가 없는 경우 [설치]를 클릭하지 마십시오." +"위 원본에 대한 절대적인 신뢰가 없는 경우 [설치]를 클릭하지 마십시오." #: urlmon.rc:51 msgid "Installation of component failed: %08x" @@ -10022,7 +10006,7 @@ msgstr "인증서 이름이 사이트와 일치하지 않습니다." #: wininet.rc:32 msgid "" "There is at least one unspecified security problem with this certificate." -msgstr "인증서에 최소한 하나의 지정되지 않은 보안 문제가 있습니다." +msgstr "인증서에 최소한 하나의 알 수 없는 보안 문제가 있습니다." #: winineterror.mc:26 msgid "The request has timed out.\n" @@ -10053,8 +10037,7 @@ msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" -"작업이 완료되기 전에 요청이 작동하는 핸들이 닫혀 있기 때문에 작업이 취소되었" -"습니다.\n" +"요청을 수행중인 핸들이 작업 완료 전에 닫혔기 때문에 작업이 취소되었습니다.\n" #: winineterror.mc:61 msgid "The requested item could not be located.\n" @@ -10100,11 +10083,12 @@ msgid "" "The specified device is already in use. Wait until it is free, and then try " "again." msgstr "" -"지정된 장치는 이미 사용중입니다.자유롭게 될때까지 기다리고 다시 시도하십시오." +"지정한 장치가 이미 사용되고 있습니다. 사용할 수 있을 때까지 기다린 다음 다시 " +"시도하십시오." #: winmm.rc:37 msgid "The specified device handle is invalid." -msgstr "지정된 장치 핸들은 적합하지 않습니다." +msgstr "지정한 장치 핸들이 잘못되었습니다." #: winmm.rc:38 msgid "There is no driver installed on your system!" @@ -10115,110 +10099,111 @@ msgid "" "Not enough memory available for this task. Quit one or more applications to " "increase available memory, and then try again." msgstr "" -"이 작업을 위한 충분한 메모리가 없습니다.하나나더 많은 프로그램을 끝내아서 메" -"모리를 늘리고 다시 시도하십시오." +"메모리가 부족하기 때문에 이 작업을 할 수 없습니다. 응용 프로그램을 한 개 이" +"상 닫아 사용 가능한 메모리를 늘린 다음 다시 실행하십시오." #: winmm.rc:40 msgid "" "This function is not supported. Use the Capabilities function to determine " "which functions and messages the driver supports." msgstr "" -"이 함수는 지원되지 않습니다. 기능(Capability) 함수를 사용하여 드라이버가 지원" -"하는 함수와 메시지를 결정합니다." +"이 기능은 지원하지 않습니다. Capabilities 함수를 사용하여 드라이버가 지원하" +"는 기능 및 메시지를 결정하십시오." #: winmm.rc:41 msgid "An error number was specified that is not defined in the system." -msgstr "이 오류 넘버는 시스템에서 정의되지 않았습니다." +msgstr "시스템에서 정의되지 않은 오류 번호를 지정했습니다." #: winmm.rc:42 msgid "An invalid flag was passed to a system function." -msgstr "잘못된 플래그는 시스템 함수에서 무시했습니다." +msgstr "잘못된 플래그를 시스템 함수에 전달했습니다." #: winmm.rc:43 msgid "An invalid parameter was passed to a system function." -msgstr "잘못된 매개변수는 시스템 함수에서 무시했습니다." +msgstr "잘못된 매개변수가 시스템 함수에 전달되었습니다." #: winmm.rc:46 msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." msgstr "" -"지정된 형식은 지원하지 않거나 전송할 수 없습니다. 지원하는 형식을 결정하는 가" -"능한 함수를 사용하십시오." +"지정한 형식이 지원되지 않거나 변환할 수 없습니다. 지원되는 형식을 결정하려면 " +"Capabilities 함수를 사용하십시오." #: winmm.rc:47 winmm.rc:53 msgid "" "Cannot perform this operation while media data is still playing. Reset the " "device, or wait until the data is finished playing." msgstr "" -"미디어 데이터가 재생되는 동안 이 작업을 실행할 수 없습니다. 장치를 리셋하거" -"나, 데이터 재생이 끝날때까지 기다리십시오." +"미디어 데이터가 계속 재생되는 동안에는 이 작업을 수행할 수 없습니다. 장치를 " +"재설정하거나 데이터 재생이 끝날 때까지 기다립니다." #: winmm.rc:48 msgid "" "The wave header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"웨이브 헤더가 준비되어 있지 않습니다. 준비 함수를 사용하여 헤더를 준비한 후" -"에 다시 시도하십시오." +"웨이브 헤더가 준비되지 않았습니다. Prepare 함수를 사용하여 헤더를 준비한 후 " +"다시 시도하십시오." #: winmm.rc:49 msgid "" "Cannot open the device without using the WAVE_ALLOWSYNC flag. Use the flag, " "and then try again." msgstr "" -"WAVE_ALLOWSYNC 플래그를 사용하지 않고 장치를 열 수 없습니다. 이 플래그를 사용" -"해서 다시 시도하십시오." +"WAVE_ALLOWSYNC 플래그를 사용하지 않고 장치를 열 수 없습니다. 플래그를 사용한 " +"후 다시 시도하십시오." #: winmm.rc:52 msgid "" "The MIDI header was not prepared. Use the Prepare function to prepare the " "header, and then try again." msgstr "" -"MIDI 헤더는 준비되지 않았습니다. 헤더를 준비하려면 준비 함수를 사용하십시오, " -"그리고 다시 시도하십시오n." +"MIDI 헤더가 준비되지 않았습니다. Prepare 함수를 사용하여 헤더를 준비한 후 다" +"시 시도하십시오." #: winmm.rc:54 msgid "" "A MIDI map was not found. There may be a problem with the driver, or the " "MIDIMAP.CFG file may be corrupt or missing." msgstr "" -"MIDI 맵은 찾을 수 없습니다. 드라이버의 문제이거나, MIDIMAP.CFG 파일이 망가졌" -"거나 없는 문제일 수도 있습니다." +"MIDI 맵을 찾을 수 없습니다. 드라이버에 문제가 있거나, 또는 MIDIMAP.CFG 파일" +"이 손실되었거나 없을 수 있습니다." #: winmm.rc:55 msgid "" "The port is transmitting data to the device. Wait until the data has been " "transmitted, and then try again." msgstr "" -"이 포트는 장치로 데이터를 옮기는 중입니다. 데이터가 다 옮겨질 때까지 기다리십" -"시오,그리고 다시 시도하십시오." +"포트가 데이터를 장치로 전송하고 있습니다. 데이터가 모두 전송될 때까지 기다린 " +"후 다시 시도하십시오." #: winmm.rc:56 winmm.rc:129 msgid "" "The current MIDI Mapper setup refers to a MIDI device that is not installed " "on the system." -msgstr "현재 미디 맵퍼 설정은 시스템에 설치되지 않은 미디 장치를 참조합니다." +msgstr "현재 MIDI 매퍼 설정은 시스템에 설치되지 않은 MIDI 장치를 참조합니다." #: winmm.rc:57 msgid "" "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " "Windows SYSTEM directory, and then try again." msgstr "" -"현재 MIDI 설정은 손상되었습니다. 본래 MIDIMAP.CFG 파일을 Windows SYSTEM 디" -"렉터리에 복사하고, 다시 시도하십시오." +"현재 MIDI 설정이 손상되었습니다. 원래의 MIDIMAP.CFG 파일을 Windows SYSTEM 디" +"렉터리에 복사한 후 다시 시도하십시오." #: winmm.rc:60 msgid "Invalid MCI device ID. Use the ID returned when opening the MCI device." -msgstr "잘못된 MCI 장치 ID. MCI 장치를 열 때 반환한 ID를 사용하십시오." +msgstr "" +"MCI 장치 ID가 잘못되었습니다. MCI 장치를 열 때 반환된 ID를 사용하십시오." #: winmm.rc:61 msgid "The driver cannot recognize the specified command parameter." -msgstr "이 드라이버는 지정된 명령 매개변수를 인식할 수 없습니다." +msgstr "지정한 명령 매개변수를 드라이버가 인식할 수 없습니다." #: winmm.rc:62 msgid "The driver cannot recognize the specified command." -msgstr "이 드라이버는 지정된 명령을 인식할 수 없습니다." +msgstr "지정한 명령을 드라이버가 인식할 수 없습니다." #: winmm.rc:63 msgid "" @@ -10237,185 +10222,185 @@ msgid "" "The device name is already being used as an alias by this application. Use a " "unique alias." msgstr "" -"이 프로그램에서 장치 이름을 이미 별칭으로 사용하고 있습니다. 고유한 별칭을 사" -"용하십시오." +"프로그램에서 장치 이름을 이미 별칭으로 사용하고 있습니다. 고유한 별칭을 사용" +"하십시오." #: winmm.rc:67 msgid "" "There is an undetectable problem in loading the specified device driver." -msgstr "지정한 장치 드라이버를 로드하는 데 탐지할 수 없는 문제가 있습니다." +msgstr "지정한 장치 드라이버를 로드하는 중에 탐지할 수 없는 문제가 있습니다." #: winmm.rc:68 msgid "No command was specified." -msgstr "어떤 명령도 정의되지 않았습니다." +msgstr "명령을 지정하지 않았습니다." #: winmm.rc:69 msgid "" "The output string was too large to fit in the return buffer. Increase the " "size of the buffer." msgstr "" -"출력 문자열은 반환 버퍼에 채우기에는 너무 큽니다. 버퍼 크기를 증가시키십시오." +"출력 문자열이 너무 커서 리턴 버퍼에 맞지 않았습니다. 버퍼의 크기를 늘리십시" +"오." #: winmm.rc:70 msgid "" "The specified command requires a character-string parameter. Please provide " "one." -msgstr "지정된 명령은 캐릭터-문자열 매개변수를 요구합니다. 지정해 주십시오." +msgstr "지정한 명령에 문자열 매개변수가 필요합니다. 매개변수를 입력하십시오." #: winmm.rc:71 msgid "The specified integer is invalid for this command." -msgstr "지정된 정수는 이 명령에 적합하지 않습니다." +msgstr "지정한 정수는 이 명령에 적합하지 않습니다." #: winmm.rc:72 msgid "" "The device driver returned an invalid return type. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"이 장치 드라이버는 잘못된 반환 값을 반환하였습니다. 장치 제조자에게서 새 드라" -"이버를 얻을 수 있는지 체크하십시오." +"장치 드라이버가 잘못된 반환 형식을 반환했습니다. 새 드라이버를 얻을 수 있는" +"지 장치 제조업체에 확인하십시오." #: winmm.rc:73 msgid "" "There is a problem with the device driver. Check with the device " "manufacturer about obtaining a new driver." msgstr "" -"이것은 장치 드라이버 문제입니다. 장치 제조자에게서 새 드라이버를 얻을 수 있는" -"지 체크하십시오." +"장치 드라이버에 문제가 있습니다. 새 드라이버를 얻을 수 있는지 장치 제조업체" +"에 확인하십시오." #: winmm.rc:74 msgid "The specified command requires a parameter. Please supply one." -msgstr "지정된 명령은 매개변수를 요구합니다. 매개변수를 추가하십시오." +msgstr "지정한 명령은 매개변수가 필요합니다. 매개변수를 입력하십시오." #: winmm.rc:75 msgid "The MCI device you are using does not support the specified command." -msgstr "사용 중인 MCI 장치가 지정된 명령을 지원하지 않습니다." +msgstr "사용 중인 MCI 장치가 지정한 명령을 지원하지 않습니다." #: winmm.rc:76 msgid "" "Cannot find the specified file. Make sure the path and filename are correct." msgstr "" -"지정된 파일을 찾을 수 없습니다.경로와 파일 이름이 올바른지 확인하십시오." +"지정한 파일을 찾을 수 없습니다.경로와 파일 이름이 올바른지 확인하십시오." #: winmm.rc:77 msgid "The device driver is not ready." -msgstr "장치 드라이버는 준비되지 않았습니다." +msgstr "장치 드라이버가 준비되지 않았습니다." #: winmm.rc:78 msgid "A problem occurred in initializing MCI. Try restarting Windows." -msgstr "" -"MCI 초기화시 문제가 발생했습니다. Windows를 다시 시작하고 시도해보세요." +msgstr "MCI 초기화 중 문제가 발생했습니다. Windows를 다시 시작하십시오." #: winmm.rc:79 msgid "" "There is a problem with the device driver. The driver has closed. Cannot " "access error." msgstr "" -"이것은 장치 드라이버 문제입니다. 드라이버가 닫혔습니다. 오류에 접근할 수 없습" -"니다." +"장치 드라이버에 문제가 있습니다. 드라이버가 닫혔습니다. 오류에 액세스할 수 없" +"습니다." #: winmm.rc:80 msgid "Cannot use 'all' as the device name with the specified command." -msgstr "지정된 명령의 장치 이름으로 'all'은 사용할 수 없습니다." +msgstr "지정한 명령의 장치 이름으로 'all'을 사용할 수 없습니다." #: winmm.rc:81 msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." msgstr "" -"하나나 더 많은 장치에서 오류 발생. 장치가 발생시키는 오류를 처리할 수 있도록 " -"각가의 장치에 명령을 지정하십시오." +"두 개 이상의 장치에서 오류가 발생했습니다. 각 명령 및 장치를 별도로 지정하여 " +"오류를 일으킨 장치를 결정합니다." #: winmm.rc:82 msgid "Cannot determine the device type from the given filename extension." -msgstr "주어진 파일 확장자로 장치 타입을 결정할 수 없습니다." +msgstr "주어진 파일 확장자에서 장치 유형을 결정할 수 없습니다." #: winmm.rc:83 msgid "The specified parameter is out of range for the specified command." -msgstr "지정된 매개변수는 지정된 명령 범위 밖에 있습니다." +msgstr "매개변수가 지정한 명령의 범위를 벗어났습니다." #: winmm.rc:84 msgid "The specified parameters cannot be used together." -msgstr "지정된 매개변수는 함께 사용할 수 없습니다." +msgstr "지정한 매개변수는 함께 사용할 수 없습니다." #: winmm.rc:85 msgid "" "Cannot save the specified file. Make sure you have enough disk space or are " "still connected to the network." msgstr "" -"지정된 파일을 저장할 수 없습니다. 충분한 공간이 있는지 확인하거나.내트워크가 " -"연결되어있는지 확인하세요." +"지정한 파일을 저장할 수 없습니다. 디스크 공간이 충분한지 또는 아직 네트에크" +"에 연결되어 있는지 확인하십시오." #: winmm.rc:86 msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." msgstr "" -"지정한 장치를 찾을 수 없습니다. 장치가 설치되어 있는지, 장치 이름이 올바른지 " -"확인하기 바랍니다." +"지정한 장치를 찾을 수 없습니다. 장치가 설치 여부와 장치 이름 철자가 올바른지" +"를 확인하십시오." #: winmm.rc:87 msgid "" "The specified device is now being closed. Wait a few seconds, and then try " "again." -msgstr "지정된 장치는 지금 닫혔습니다. 잠시 기다린 후에 다시 시도하십시오." +msgstr "지정한 장치는 현재 닫혀 있습니다. 잠시 기다린 후, 다시 시도하십시오." #: winmm.rc:88 msgid "" "The specified alias is already being used in this application. Use a unique " "alias." msgstr "" -"지정된 별칭은 이미 이 프로그램이 사용하고 있습니다. 다른 유일한 별칭을 사용하" -"십시오." +"지정한 별칭이 이미 응용프로그램에서 사용되고 있습니다. 다른 고유한 별칭을 사" +"용하십시오." #: winmm.rc:89 msgid "The specified parameter is invalid for this command." -msgstr "지정된 매개변수는 이 명령에 적합하지 않습니다." +msgstr "지정한 매개변수가 이 명령에 적합하지 않습니다." #: winmm.rc:90 msgid "" "The device driver is already in use. To share it, use the 'shareable' " "parameter with each 'open' command." msgstr "" -"이 장치 드라이버는 이미 사용중입니다. 이것을 공유하려면, 'shareable' 매개변수" -"를 'open'명령과 같이 사용하십시오." +"장치 드라이버가 이미 사용되고 있습니다. 공유하려면 각 'open' 명령마다 " +"'shareable' 매개변수를 사용하십시오." #: winmm.rc:91 msgid "" "The specified command requires an alias, file, driver, or device name. " "Please supply one." msgstr "" -"지정된 명령은 별명,파일,드라이버나 장치 이름을 필요로 합니다. 이것을 지정하십" -"시오." +"지정한 명령은 별칭, 파일, 드라이버 또는 장치 이름이 필요합니다. 이 중 하나를 " +"입력하십시오." #: winmm.rc:92 msgid "" "The specified value for the time format is invalid. Refer to the MCI " "documentation for valid formats." msgstr "" -"시간 형식에 지정된 값은 올바르지 않습니다. MCI 문서에서 올바를 형식을 확인하" -"십시오." +"시간 형식에 지정한 값이 잘못되었습니다. MCI 문서에서 유효한 형식에 관한 내용" +"을 참조하십시오." #: winmm.rc:93 msgid "" "A closing double-quotation mark is missing from the parameter value. Please " "supply one." -msgstr "매개변수 값에서 닫힌 쌍 따옴표 하나가 빠졌습니다. 이것을 지정하십시오." +msgstr "매개변수 값에 닫는 큰 따옴표(\")가 빠졌습니다. 입력하십시오." #: winmm.rc:94 msgid "A parameter or value was specified twice. Only specify it once." -msgstr "이 값의 매개변수는 두번 지정되었습니다. 오직 하나만 지정하십시오." +msgstr "매개변수 또는 값을 두 번 지정했습니다. 한번만 지정하십시오." #: winmm.rc:95 msgid "" "The specified file cannot be played on the specified MCI device. The file " "may be corrupt, or not in the correct format." msgstr "" -"이 지정된 파일은 지정된 MCI장치에서 재생할 수 없습니다. 이 파일이 깨졌거나 올" -"바르지 않은 형식입니다." +"지정한 파일을 MCI 장치에서 재생할 수 없습니다. 파일이 손상되었거나 올바른 형" +"식이 아닐 수 있습니다." #: winmm.rc:96 msgid "A null parameter block was passed to MCI." -msgstr "이 빈 매개변수 블럭은 MCI에서 무시되었습니다." +msgstr "비어있는 매개변수 블럭이 MCI에 전달되었습니다." #: winmm.rc:97 msgid "Cannot save an unnamed file. Supply a filename." @@ -10423,59 +10408,59 @@ msgstr "이름없는 파일을 저장할 수 없습니다. 파일 이름을 지 #: winmm.rc:98 msgid "You must specify an alias when using the 'new' parameter." -msgstr "'반드시 new'매개변수를 사용할 별명을 지정해주어야 합니다." +msgstr "'new' 매개변수를 사용할 때 별칭을 지정해야 합니다." #: winmm.rc:99 msgid "Cannot use the 'notify' flag with auto-opened devices." -msgstr "'notify' 플래그는 자동으로 열린 장치에 사용할 수 없습니다." +msgstr "'notify' 플래그는 자동 열기 장치에 사용할 수 없습니다." #: winmm.rc:100 msgid "Cannot use a filename with the specified device." -msgstr "지정된 장치하고 파일 이름은 같이 사용할 수 없습니다." +msgstr "저정한 장치에 파일 이름을 사용할 수 없습니다." #: winmm.rc:101 msgid "" "Cannot carry out the commands in the order specified. Correct the command " "sequence, and then try again." msgstr "" -"명령을 지정된 순서대로 보낼 수 없습니다. 명령 순서를 수정하여 다시 시도하십시" -"오." +"지정한 순서대로 명령을 수행할 수 없습니다. 명령 순서를 수정한 다음 다시 시도" +"하십시오." #: winmm.rc:102 msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"지정된 명령을 자동으로 열린 장치에 보낼 수 없습니다. 장치가 닫히기를 기다리" -"고 다시 시도하십시오." +"자동 열기 장치에서 지정한 명령을 수행할 수 없습니다. 장치가 닫힐 때까지 기다" +"렸다가 다시 시도하십시오." #: winmm.rc:103 msgid "" "The filename is invalid. Make sure the filename is not longer than 8 " "characters, followed by a period and an extension." msgstr "" -"이 파일 이름은 올바르지 않습니다. 파일 이름이 점과 확장자를 더해서 8자보다 길" -"지 않은지 확인하십시오." +"파일 이름이 잘못되었습니다. 파일 이름이 8 문자를 넘지 않고, 점과 확장명이 있" +"는지 확인하십시오." #: winmm.rc:104 msgid "" "Cannot specify extra characters after a string enclosed in quotation marks." -msgstr "인용부호로 둘러 싼 문자 뒤에 추가 문자를 지정할 수 없습니다." +msgstr "문자열을 따옴표로 닫은 후에는 문자를 더 지정할 수 없습니다." #: winmm.rc:105 msgid "" "The specified device is not installed on the system. Use the Drivers option " "in Control Panel to install the device." msgstr "" -"지정된 장치는 시스템에 설치되어 있지 않습니다. 제어판에서 드라이버 옵션을 사" -"용해서 장치를 설치하십시오." +"지정한 장치가 시스템에 설치되지 않았습니다. 제어판에서 드라이버 옵션을 사용하" +"여 장치를 설치하십시오." #: winmm.rc:106 msgid "" "Cannot access the specified file or MCI device. Try changing directories or " "restarting your computer." msgstr "" -"지정된 파일이나 MCI 장치에 접근할 수 없습니다. 디렉터리를 바꾸거나 컴퓨터를 " +"지정한 파일이나 MCI 장치에 접근할 수 없습니다. 디렉터리를 바꾸거나 컴퓨터를 " "다시 시작하십시오." #: winmm.rc:107 @@ -10483,104 +10468,105 @@ msgid "" "Cannot access the specified file or MCI device because the application " "cannot change directories." msgstr "" -"프로그램이 디렉터리를 바꿀 수 없기 때문에 지정된 특정한 파일이나 MCI장치에 접" -"근할 수 없습니다." +"프로그램이 디렉터리를 바꿀 수 없기 때문에 지정한 파일이나 MCI장치에 접근할 " +"수 없습니다." #: winmm.rc:108 msgid "" "Cannot access specified file or MCI device because the application cannot " "change drives." msgstr "" -"프로그램이 디렉터리를 바꿀 수 없기 때문에 지정한 파일이나 MCI장치에 접근할 " +"프로그램이 드라이브를 바꿀 수 없기 때문에 지정한 파일이나 MCI 장치에 접근할 " "수 없습니다." #: winmm.rc:109 msgid "Specify a device or driver name that is less than 79 characters." -msgstr "79자보다 적게 장치나 드라이버 이름을 지정하십시오." +msgstr "장치나 드라이버 이름을 79자 미만으로 지정하십시오." #: winmm.rc:110 msgid "Specify a device or driver name that is less than 69 characters." -msgstr "69자보다 적게 장치나 드라이버 이름을 지정하십시오." +msgstr "장치나 드라이버 이름을 69자 미만으로 지정하십시오." #: winmm.rc:111 msgid "" "The specified command requires an integer parameter. Please provide one." -msgstr "지정된 명령은 정수 매개 변수를 요구합니다. 이것을 지정하십시오." +msgstr "" +"지정한 명령에는 정수 매개변수가 필요합니다. 올바른 매개변수를 지정하십시오." #: winmm.rc:112 msgid "" "All wave devices that can play files in the current format are in use. Wait " "until a wave device is free, and then try again." msgstr "" -"현재 형식의 파일을 재생하는 모든 웨이브 장치는 사용중입니다. 웨이브 장치가 자" -"유롭게 될 때 다시 시도하십시오." +"현재 형식으로 파일을 재생할 수 있는 모든 웨이브 장치가 사용 중입니다. 웨이브 " +"장치를 사용할 수 있을 때까지 기다린 다음 다시 시도하십시오." #: winmm.rc:113 msgid "" "Cannot set the current wave device for play back because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"사용중이므로 현재 웨이브 장치를 플레이 백으로 설정할 수 없습니다. 장치가 자유" -"롭게 될때까지 기다리고, 다시 시도하십시오." +"현재 웨이브 장치가 사용 중이므로 재생하도록 설정할 수 없습니다. 장치를 사용" +"할 수 있을 때까지 기다린 다음 다시 시도하십시오." #: winmm.rc:114 msgid "" "All wave devices that can record files in the current format are in use. " "Wait until a wave device is free, and then try again." msgstr "" -"현재 형식의 파일을 녹음하는 모든 웨이브 장치는 사용중입니다. 웨이브 장치가 자" -"유롭게 될 때 다시 시도하십시오." +"파일을 현재 형식으로 녹음할 수 있는 모든 웨이브 장치가 사용 중입니다. 웨이브 " +"장치를 사용할 수 있을 때까지 기다린 다음 다시 시도하십시오." #: winmm.rc:115 msgid "" "Cannot set the current wave device for recording because it is in use. Wait " "until the device is free, and then try again." msgstr "" -"사용중이므로 현재 웨이브 장치를 녹음으로 설정할 수 없습니다. 장치가 자유롭게 " -"될때까지 기다리고, 다시 시도하십시오." +"현재 웨이브 장치가 사용 중이므로 녹음하도록 설정할 수 없습니다. 장치를 사용" +"할 수 있을 때까지 기다린 다음 다시 시도하십시오." #: winmm.rc:116 msgid "Any compatible waveform playback device may be used." -msgstr "어떤 호환성이 있는 웨이브폼 플레이백 장치도 사용될수 있습니다." +msgstr "모든 호환 가능한 웨이브폼 재생 장치를 사용할 수 있습니다." #: winmm.rc:117 msgid "Any compatible waveform recording device may be used." -msgstr "어떤 호환성이 있는 웨이브폼 녹음 장치도 사용될수 있습니다." +msgstr "모든 호환 가능한 웨이브폼 녹음 장치를 사용할 수 있습니다." #: winmm.rc:118 msgid "" "No wave device that can play files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"현재 형식의 파일을 재생할 수 있는 어떤 웨이브 장치도 없습니다. 드라이버 옵션" -"에서 웨이브 장치를 설치하십시오." +"현재 형식으로 파일을 재생할 수 있는 웨이브 장치가 설치되지 않았습니다. [드라" +"이버] 옵션을 사용하여 웨이브 장치를 설치하십시오." #: winmm.rc:119 msgid "" "The device you are trying to play to cannot recognize the current file " "format." -msgstr "재생하려는 장치는 현재 파일 형식을 인식할 수 없습니다." +msgstr "재생하려는 장치에서 현재 파일 형식을 인식할 수 없습니다." #: winmm.rc:120 msgid "" "No wave device that can record files in the current format is installed. Use " "the Drivers option to install the wave device." msgstr "" -"현재 형식의 파일을 녹음할 수 있는 어떤 웨이브 장치도 없습니다. 드라이버 옵션" -"에서 웨이브 장치를 설치하십시오." +"현재 형식으로 파일을 기록할 수 있는 웨이브 장치가 설치되지 않았습니다. [드라" +"이버] 옵션을 사용하여 웨이브 장치를 설치하십시오." #: winmm.rc:121 msgid "" "The device you are trying to record from cannot recognize the current file " "format." -msgstr "녹음하려는 장치는 현재 파일 형식을 인식할 수 없습니다." +msgstr "녹음하려는 장치에서 현재 파일 형식을 인식할 수 없습니다." #: winmm.rc:126 msgid "" "The time formats of the \"song pointer\" and SMPTE are mutually exclusive. " "You can't use them together." msgstr "" -"\"sont pointer\"와 SMPTE의 시간 형식은 상호 배타적입니다. 함께 쓸 수 없습니" +"\"song pointer\"와 SMPTE의 시간 형식은 상호 배타적입니다. 함께 쓸 수 없습니" "다." #: winmm.rc:128 @@ -10588,64 +10574,64 @@ msgid "" "The specified MIDI port is already in use. Wait until it is free; then try " "again." msgstr "" -"지정된 MIDI 포트는 이미 사용중입니다. 자유롭게 될 때까지 기다리고 다시 시도" -"하십시오." +"저정한 MIDI 포트는 이미 사용 중입니다. 사용할 수 있을 때까지 기다른 다음 다" +"시 시도하십시오." #: winmm.rc:131 msgid "" "The specified MIDI device is not installed on the system. Use the Drivers " "option from the Control Panel to install a MIDI device." msgstr "" -"지정된 MIDI 장치는 시스템에 설치되어 있지 않습니다. 제어판에서 장치 옵션을 사" -"용해서 MIDI 장치를 설치하십시오." +"지정한 MIDI 장치는 시스템에 설치되어 있지 않습니다. 제어판에서 [드라이버] 옵" +"션을 사용해서 MIDI 장치를 설치하십시오." #: winmm.rc:130 msgid "An error occurred with the specified port." -msgstr "지정된 포트에 오류가 발생했습니다." +msgstr "지정한 포트에 오류가 발생했습니다." #: winmm.rc:133 msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications; then, try again." msgstr "" -"모든 멀티미디어 타이머를 다른 프로그램이 사용하고 있습니다. 최소한 하나의 프" -"로그램을 끝내고 다시 시도하십시오." +"모든 멀티미디어 타이머는 다른 프로그램에서 사용되고 있습니다. 이들 프로그램 " +"중 하나를 종료한 다음 다시 시도하십시오." #: winmm.rc:132 msgid "The system doesn't have a current MIDI port specified." -msgstr "이 시스템은 현재 열거된 MIDI포트를 가지고 있지 않습니다." +msgstr "시스템에 현재 MIDI 포트가 지정되어 있지 않습니다." #: winmm.rc:127 msgid "" "The system has no installed MIDI devices. Use the Drivers option from the " "Control Panel to install a MIDI driver." msgstr "" -"시스템에 설치된 MIDI 장치가 없습니다. 제어판의 드라이버 옵션을 사용하여 MIDI " -"드라이버를 설치하십시오." +"시스템에 MIDI 장치가 설치되어 있지 않습니다. 제어판에서 [드라이버] 옵션을 사" +"용해서 MIDI 드라이버를 설치하십시오." #: winmm.rc:122 msgid "There is no display window." -msgstr "어떤 디스플레이 창도 없습니다." +msgstr "디스플레이 창이 없습니다." #: winmm.rc:123 msgid "Could not create or use window." -msgstr "창을 사용하거나 만들 수 없습니다." +msgstr "창을 만들거나 사용할 수 없습니다." #: winmm.rc:124 msgid "" "Cannot read the specified file. Make sure the file is still present, or " "check your disk or network connection." msgstr "" -"지정한 파일을 읽을 수 없습니다. 파일이 아직 있는지 확인하거나 디스크 또는 네" -"트워크 연결을 확인하십시오." +"지정한 파일을 읽을 수 없습니다. 파일이 있는지 확인하거나, 디스크나 네트워크 " +"연결을 확인하십시오." #: winmm.rc:125 msgid "" "Cannot write to the specified file. Make sure you have enough disk space or " "are still connected to the network." msgstr "" -"지정된 파일에 쓸 수 없습니다. 디스크 공간이 충분한지 확인하거나 네트워크에 연" -"결되어 있는지 확인하십시오." +"지정한 파일에 쓸 수 없습니다. 디스크 용량이 충분한 지 또는 네트워크 연결이 되" +"었는지 확인하십시오." #: winmm.rc:136 msgid "Wine Sound Mapper" @@ -10661,7 +10647,7 @@ msgstr "주 볼륨" #: winmm.rc:139 msgid "Mute" -msgstr "소거" +msgstr "음소거" #: winspool.rc:37 msgid "Print to File" @@ -10901,7 +10887,7 @@ msgstr "LDAP 프로토콜의 이 버전은 그 작업을 지원하지 않습니 #: wldap32.rc:125 msgid "Specified control was not found in message" -msgstr "지정된 제어는 메시지에서 발견할 수 없습니다" +msgstr "지정한 제어는 메시지에서 발견할 수 없습니다" #: wldap32.rc:126 msgid "No result present in message" @@ -11333,7 +11319,7 @@ msgid "" "list, so parameter 2 becomes parameter 1 and so on. It has no effect if\n" "called from the command line.\n" msgstr "" -"SHIFT는 배치 파일 안에서 매개 변수 리스트의 처음 하나를 제거 위해서\n" +"SHIFT는 배치 파일 안에서 매개변수 리스트의 처음 하나를 제거 위해서\n" "사용합니다. 매개변수 2가 매개변수 1이 되는 식입니다. 이것은 명령 라인에서\n" "사용했을 경우에는 아무 영향이 없습니다.\n" @@ -11490,7 +11476,7 @@ msgstr "" "\n" "매개변수 없는 ASSOC는 현재 파일 연결을 표시합니다\n" "만약 파일 확장자만 사용된다면, 현재 연결 상태를 표시합니다.\n" -"등호(=) 부호 다음에 파일 유형이 지정되지 않으면 현재 연결을\n" +"등호(=) 부호 다음에 파일 유형을 지정하지 않으면 현재 연결을\n" "제거합니다.\n" #: cmd.rc:300 @@ -11514,7 +11500,7 @@ msgstr "" "표시합니다.\n" "만약 파일 형식만 사용한다면, 연결된 열기 명령 문자열을 표시합니다\n" "(연결이 있다면).\n" -"등호(=) 부호 다음에 열기 명령이 지정되지 않으면 지정된 파일 형식에 연결된\n" +"등호(=) 부호 다음에 열기 명령을 지정하지 않으면 지정한 파일 형식에 연결된\n" "명령어 문자열을 제거합니다.\n" #: cmd.rc:303 @@ -11640,7 +11626,7 @@ msgstr "" "TYPE 텍스트 파일의 내용 보기\n" "VER CMD 현재 버전 보기\n" "VOL 디스크 장치의 불륨 레이블 보기\n" -"XCOPY 원본 파일이나 디렉터리 구조를 대상으로 복사함\n" +"XCOPY 원본 파일이나 디렉터리 구조를 대상에 복사함\n" "EXIT CMD 닫기\n" "\n" "HELP <명령>을 치면 그 명령의 상세한 정보를 표시합니다.\n" @@ -11887,7 +11873,7 @@ msgstr "이더넷" #: ipconfig.rc:35 msgid "Connection-specific DNS suffix" -msgstr "연결에 지정된 DNS 접미사" +msgstr "연결별 DNS 접미사" #: ipconfig.rc:36 msgid "IPv4 address" @@ -12485,7 +12471,7 @@ msgstr "전문가 모드(&E)" #: oleview.rc:65 msgid "&Hidden component categories" -msgstr "컴포넌트 분류 숨기기(&H)" +msgstr "구성 요소 분류 숨기기(&H)" #: oleview.rc:67 oleview.rc:89 winefile.rc:65 wordpad.rc:71 wordpad.rc:272 msgid "&Toolbar" @@ -12617,7 +12603,7 @@ msgstr "선택된 객체의 인스턴트 만들기" #: oleview.rc:111 msgid "Create an instance of the selected object on a specific machine" -msgstr "지정된 머신의 선택된 객체의 인스턴트 만들기" +msgstr "지정한 머신의 선택된 객체의 인스턴트 만들기" #: oleview.rc:112 msgid "Release the currently selected object instance" @@ -12638,7 +12624,7 @@ msgstr "전문가와 초보자 모드 전환e" #: oleview.rc:120 msgid "" "Toggle the display of component categories that are not meant to be visible" -msgstr "컴포넌트 목록 보기(보이지 않더라도)" +msgstr "구성 요소 목록 보기(보이지 않더라도)" #: oleview.rc:121 msgid "Show or hide the toolbar" @@ -12977,7 +12963,7 @@ msgid "" "\n" msgstr "" "문법:\n" -" REG [명령] [매개 변수]\n" +" REG [명령] [매개변수]\n" "\n" "지원하는 명령:\n" " ADD | DELETE | IMPORT | EXPORT | QUERY\n" @@ -13019,7 +13005,7 @@ msgstr "reg: 원격 컴퓨터에 액세스할 수 없습니다\n" #: reg.rc:43 msgid "" "reg: The system was unable to find the specified registry key or value\n" -msgstr "reg: 시스템에서 지정된 레지스트리 키 또는 값을 찾을 수 없습니다\n" +msgstr "reg: 시스템에서 지정한 레지스트리 키 또는 값을 찾을 수 없습니다\n" #: reg.rc:44 msgid "reg: Unsupported registry data type [%1]\n" @@ -13063,7 +13049,7 @@ msgstr "레지스트리 키 '%1'을 제거하시겠습니까?" #: reg.rc:57 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg : 옵션 [/d] 다음에 유효한 문자열이 있어야 합니다.\n" +msgstr "reg : 옵션 [/d] 다음에 유효한 문자열이 있어야 합니다\n" #: reg.rc:58 msgid "" @@ -13078,7 +13064,7 @@ msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" -"reg: 지정된 작업을 완료할 수 없습니다. 예기치 않은 오류가 발생했습니다.\n" +"reg: 지정한 작업을 완료할 수 없습니다. 예기치 않은 오류가 발생했습니다.\n" #: reg.rc:60 msgid "Search complete. Number of matches found: %1!d!\n" @@ -13290,30 +13276,29 @@ msgstr "다중 문자열 편집" #: regedit.rc:159 msgid "Contains commands for working with the whole registry" -msgstr "전체 레지스트리 작업 명령이 포함되어 있습니다" +msgstr "전체 레지스트리 작업 명령이 들어 있습니다" #: regedit.rc:160 msgid "Contains commands for editing values or keys" -msgstr "값 또는 키 편집에 대한 명령이 포함되어 있습니다" +msgstr "값 또는 키 편집에 대한 명령이 들어 있습니다" #: regedit.rc:161 msgid "Contains commands for customizing the registry window" -msgstr "레지스트리 창 사용자 정의 명령이 포함되어 있습니다" +msgstr "레지스트리 창 사용자 정의 명령이 들어 있습니다" #: regedit.rc:162 msgid "Contains commands for accessing frequently used keys" -msgstr "자주 사용되는 키에 액세스하는 명령이 포함되어 있습니다" +msgstr "자주 사용되는 키에 액세스하는 명령이 들어 있습니다" #: regedit.rc:163 msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"레지스트리 편집기에 대한 도움말 및 정보를 표시하기 위한 명령이 포함되어 있습" -"니다" +"레지스트리 편집기에 대한 도움말 및 정보를 표시하기 위한 명령이 들어 있습니다" #: regedit.rc:164 msgid "Contains commands for creating new keys or values" -msgstr "새 키 또는 값을 만드는 명령이 포함되어 있습니다" +msgstr "새 키 또는 값을 만드는 명령이 들어 있습니다" #: regedit.rc:149 msgid "Data" @@ -13436,9 +13421,9 @@ msgstr "" " /R:user.dat 수정할 user.dat 파일의 위치입니다.\n" " Compatible with any other switch. Ignored.\n" " /C 레지스트리 파일의 내용을 가져옵니다.\n" -" /D 지정된 레지스트리 키를 제거합니다.\n" -" /E 지정된 레지스트리 키의 내용을 파일로 내보냅니다.\n" -" 키가 지정되지 않은 경우 전체 레지스트리를 내보냅니다.\n" +" /D 지정한 레지스트리 키를 제거합니다.\n" +" /E 지정한 레지스트리 키의 내용을 파일로 내보냅니다.\n" +" 키를 지정하지 않은 경우 전체 레지스트리를 내보냅니다.\n" " /S 메시지를 출력하지 않습니다.\n" " /V GUI를 고급 모드로 실행합니다. Ignored.\n" " /? 이 정보를 출력하고 끝냅니다.\n" @@ -13462,11 +13447,11 @@ msgstr "도움말을 보려면 \"regedit /?\"를 입력하십시오.\n" #: regedit.rc:411 msgid "regedit: No filename was specified.\n" -msgstr "regedit: 파일 이름이 지정되지 않았습니다.\n" +msgstr "regedit: 파일 이름을 지정하지 않았습니다.\n" #: regedit.rc:412 msgid "regedit: No registry key was specified for removal.\n" -msgstr "regedit: 제거할 레지스트리 키가 지정되지 않았습니다.\n" +msgstr "regedit: 제거할 레지스트리 키를 지정하지 않았습니다.\n" #: regedit.rc:413 msgid "regedit: The file '%1' was not found.\n" @@ -13497,7 +13482,7 @@ msgstr "" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: [\\%1!c!](은)는 알수 없는 제어 문자입니다\n" +msgstr "regedit: [\\%1!c!](은)는 알 수 없는 제어 문자입니다\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" @@ -13589,7 +13574,7 @@ msgstr "키, 값, 데이터에서 텍스트 문자열을 찾습니다" #: regedit.rc:197 msgid "Finds next occurrence of text specified in previous search" -msgstr "이전 검색에서 지정한 텍스트의 다음 위치를 찾습니다" +msgstr "이전에 지정한 찾기 텍스트의 다음 위치를 검색합니다" #: regedit.rc:169 msgid "Modifies the value's data" @@ -13794,12 +13779,12 @@ msgid "" "specified file.\n" "ShellExecuteEx failed" msgstr "" -"프로그램을 실행할 수 없거나, 지정된 파일에 연결된 프로그램이 없습니다.\n" +"프로그램을 실행할 수 없거나, 지정한 파일에 연결된 프로그램이 없습니다.\n" "ShellExecuteEx 실패" #: start.rc:60 msgid "Could not translate the specified Unix filename to a DOS filename." -msgstr "지정된 Unix 파일 이름을 DOS 파일 이름으로 바꿀 수 없습니다." +msgstr "지정한 Unix 파일 이름을 DOS 파일 이름으로 바꿀 수 없습니다." #: taskkill.rc:30 msgid "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" @@ -14709,7 +14694,7 @@ msgstr "" " --help 지금 보고 있는 정보를 출력합니다.\n" " --list 실행한 Wine에 설치된 모든 프로그램의 목록을 출력합니다.\n" " --remove {GUID} 지정한 프로그램을 제거합니다. 프로그램의 GUID를 알아\n" -" 내기 위해서는 '--list' 옵션을 사용하십시오.\n" +" 내려면 '--list' 옵션을 사용하십시오.\n" " [옵션 없음] 옵션없이 실행하면 uninstaller의 GUI 버전이 시작됩니다.\n" "\n" @@ -14793,8 +14778,8 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Wine은 각각의 프로그램에 대해 다른 Windows 버전을 흉내낼 수 있습니다. 이 탭" -"은 라이브러리 및 그래픽 탭과 연결되어 해당 탭의 시스템 전체 또는 프로그램 별 " -"설정을 바꿀 수 있습니다." +"은 라이브러리 및 그래픽 탭과 연결되어 시스템 전체 또는 프로그램별 설정을 바" +"꿀 수 있습니다." #: winecfg.rc:159 msgid "Add appli&cation..." @@ -15201,8 +15186,8 @@ msgstr "" "드라이브 C 항목을 제거하시겠습니까?\n" "\n" "대부분의 Windows 프로그램은 C 드라이브가 있다고 예상합니다. C 드라이브가 없다" -"면 비정상적인 방법으로 종료합입니다. 계속 진행한다면 반드시 C 드라이브를 다" -"시 만드십시오!" +"면 비정상적인 방법으로 종료합니다. 계속 진행한다면 반드시 C 드라이브를 다시 " +"만드십시오!" #: winecfg.rc:77 msgctxt "Drive letter" @@ -15716,7 +15701,7 @@ msgstr "Wine 파일 관리자 정보(&A)" #: winefile.rc:122 msgid "Select destination" -msgstr "목적지 선택" +msgstr "대상 선택" #: winefile.rc:135 msgid "By File Type" @@ -16354,7 +16339,7 @@ msgstr "inch" #: wordpad.rc:185 msgid "inch" -msgstr "inch" +msgstr "인치" #: wordpad.rc:186 msgctxt "unit: point" @@ -16515,7 +16500,7 @@ msgid "" "\t\tthan source.\n" "\n" msgstr "" -"XCOPY - 파일이나 디렉터리 트리를 목적지로 복사합니다.\n" +"XCOPY - 파일 또는 디렉터리 트리 원본을 대상에 복사합니다.\n" "\n" "구문:\n" "XCOPY 원본 [대상] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" @@ -16545,6 +16530,6 @@ msgstr "" "[/K] 파일 속성을 유지하면서 복사합니다.\n" " 이 옵션이 없으면 속성을 유지하지 않습니다.\n" "[/D | /D:m-d-y]\n" -" 지정된 날짜 후에 수정되거나 새로운 파일을 복사합니다.\n" +" 새 파일이나 지정한 날짜 후에 수정된 파일을 복사합니다.\n" " 날짜를 지정하지 않으면, 원본보다 대상이 오래된 것만 복사합니다.\n" "\n" -- 2.20.0

1 0

[PATCH 1/6] user32/focus: Prevent a recursive activation loop with the activation messages
by Gabriel Ivăncescu 17 Dec '18

17 Dec '18

When activating a window and sending activation messages to the window procedure (i.e. WM_NCACTIVATE and WM_ACTIVATE), we have to avoid a recursive loop by not sending more of these messages or hooks while we are still activating the window. Some applications actually depend on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It may seem a bit strange (and I thought so as well initially), but this is exactly what's needed to match the testcase in the next patch, so this is how Windows does it (yes, including the hooks). Total Commander's Multi-Rename Tool requires this behavior, if you actually click on "Start!" in it. Closing the window then ends up in the recursion, which is only stopped by MAX_WINPROC_RECURSION after a few seconds, but then the listbox's caret is messed up. dlls/user32/focus.c | 44 +++++++++++++++++++++++++++++--------------- dlls/user32/win.h | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c8831..edf9256 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -78,7 +78,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { HWND previous = GetActiveWindow(); BOOL ret; - DWORD old_thread, new_thread; + DWORD winflags, old_thread, new_thread; CBTACTIVATESTRUCT cbt; if (previous == hwnd) @@ -87,16 +87,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) return TRUE; } - /* call CBT hook chain */ - cbt.fMouse = mouse; - cbt.hWndActive = previous; - if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) return FALSE; - - if (IsWindow(previous)) + /* Prevent a recursive activation loop with the app's activation messages */ + winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0); + if (!(winflags & WIN_IS_IN_ACTIVATION)) { - SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); - SendMessageW( previous, WM_ACTIVATE, - MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + ret = FALSE; + + /* call CBT hook chain */ + cbt.fMouse = mouse; + cbt.hWndActive = previous; + if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) + goto clear_flags; + + if (IsWindow(previous)) + { + SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); + SendMessageW( previous, WM_ACTIVATE, + MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + } } SERVER_START_REQ( set_active_window ) @@ -106,9 +114,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) previous = wine_server_ptr_handle( reply->previous ); } SERVER_END_REQ; - if (!ret) return FALSE; + if (!ret) goto clear_flags; if (prev) *prev = previous; - if (previous == hwnd) return TRUE; + if (previous == hwnd) goto clear_flags; if (hwnd) { @@ -116,7 +124,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - if (!IsWindow(hwnd)) return FALSE; + if (!IsWindow(hwnd)) + { + ret = FALSE; + goto clear_flags; + } } old_thread = previous ? GetWindowThreadProcessId( previous, NULL ) : 0; @@ -148,7 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - if (IsWindow(hwnd)) + if (!(winflags & WIN_IS_IN_ACTIVATION) && IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, @@ -173,7 +185,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - return TRUE; +clear_flags: + win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION); + return ret; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f3bdfd3..fa5d1b6 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -80,6 +80,7 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ +#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; -- 2.19.1

2 10

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa 17 Dec '18

17 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 444 +++++++++++++++++++++++++++++---------------------------------- 1 file changed, 207 insertions(+), 237 deletions(-)

1 0

[PATCH] winhttp: Fix handling of WINHTTP_OPTION_SECURITY_FLAGS.
by Hans Leidekker 17 Dec '18

17 Dec '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 15 +++++++-------- dlls/winhttp/tests/winhttp.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 39e8d8233f..82615ad12f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -695,7 +695,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void { case WINHTTP_OPTION_SECURITY_FLAGS: { - DWORD flags = 0; + DWORD flags; int bits; if (!buffer || *buflen < sizeof(flags)) @@ -705,9 +705,7 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void return FALSE; } - flags = 0; - if (hdr->flags & WINHTTP_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; - flags |= request->security_flags; + flags = request->security_flags; if (request->netconn) { bits = netconn_get_cipher_strength( request->netconn ); @@ -929,6 +927,10 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b case WINHTTP_OPTION_SECURITY_FLAGS: { DWORD flags; + static const DWORD accepted = SECURITY_FLAG_IGNORE_CERT_CN_INVALID | + SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | + SECURITY_FLAG_IGNORE_UNKNOWN_CA | + SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE; if (buflen < sizeof(DWORD)) { @@ -937,10 +939,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b } flags = *(DWORD *)buffer; TRACE("0x%x\n", flags); - if (!(flags & (SECURITY_FLAG_IGNORE_CERT_CN_INVALID | - SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | - SECURITY_FLAG_IGNORE_UNKNOWN_CA | - SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE))) + if (flags && (flags & ~accepted)) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3f9125154f..91a9d539aa 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1033,7 +1033,7 @@ static void test_secure_connection(void) { static const char data_start[] = "<!DOCTYPE html PUBLIC"; HINTERNET ses, con, req; - DWORD size, status, policy, bitness, read_size, err, available_size, protocols; + DWORD size, status, policy, bitness, read_size, err, available_size, protocols, flags; BOOL ret; CERT_CONTEXT *cert; WINHTTP_CERTIFICATE_INFO info; @@ -1087,6 +1087,33 @@ static void test_secure_connection(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + flags = 0xdeadbeef; + size = sizeof(flags); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, &size); + ok(ret, "failed to query security flags %u\n", GetLastError()); + ok(!flags, "got %08x\n", flags); + + flags = SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + + flags = SECURITY_FLAG_SECURE; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(!ret, "success\n"); + + flags = SECURITY_FLAG_STRENGTH_STRONG; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(!ret, "success\n"); + + flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | + SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + + flags = 0; + ret = WinHttpSetOption(req, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + ret = WinHttpSetOption(req, WINHTTP_OPTION_CLIENT_CERT_CONTEXT, WINHTTP_NO_CLIENT_CERT_CONTEXT, 0); err = GetLastError(); ok(ret || broken(!ret && err == ERROR_INVALID_PARAMETER) /* winxp */, "failed to set client cert context %u\n", err); -- 2.11.0

1 0

[PATCH] bcrypt: Clear magic bytes on destroy.
by Hans Leidekker 17 Dec '18

17 Dec '18

Based on a patch by Steven Noonan. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 5 ++++- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index c448f63a4d..d3f9f773f9 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -275,6 +275,7 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider( BCRYPT_ALG_HANDLE handle, DWORD fl TRACE( "%p, %08x\n", handle, flags ); if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + alg->hdr.magic = 0; heap_free( alg ); return STATUS_SUCCESS; } @@ -733,7 +734,8 @@ NTSTATUS WINAPI BCryptDestroyHash( BCRYPT_HASH_HANDLE handle ) TRACE( "%p\n", handle ); - if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; + if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_PARAMETER; + hash->hdr.magic = 0; heap_free( hash ); return STATUS_SUCCESS; } @@ -1326,6 +1328,7 @@ NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) TRACE( "%p\n", handle ); if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + key->hdr.magic = 0; return key_destroy( key ); } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index c3f8f3d78a..5240c3bafb 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -293,6 +293,12 @@ static void test_hash(const struct hash_test *test) ret = pBCryptDestroyHash(hash); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = pBCryptDestroyHash(hash); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + ret = pBCryptDestroyHash(NULL); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(alg, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } @@ -1415,8 +1421,17 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); HeapFree(GetProcessHeap(), 0, buf); + ret = pBCryptDestroyKey(NULL); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(aes, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(NULL, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); } static void test_key_import_export(void) -- 2.11.0

1 0

[PATCH] include/sal.h: Add compatibility macros for Visual Studio 10.0.
by Dmitry Timoshkov 17 Dec '18

17 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/include/sal.h b/include/sal.h index 29746c3a03..35f64934f6 100644 --- a/include/sal.h +++ b/include/sal.h @@ -25,12 +25,15 @@ #define _At_buffer_(a, b, c, d) #define _Check_return_ +#define _Check_return_opt_ #define _Deref_out_ +#define _Deref_out_z_ #define _Deref_out_opt_ #define _Deref_out_opt_z_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ +#define _Deref_post_opt_z_cap_(count) #define _Deref_post_valid_ #define _Deref_post_z_ #define _Deref_prepost_opt_z_ @@ -40,10 +43,25 @@ #define _In_ #define _In_bytecount_(count) +#define _In_bytecount_c_(count) +#define _In_bytecount_x_(count) #define _In_count_(count) +#define _In_count_c_(count) +#define _In_count_x_(count) #define _In_opt_ +#define _In_opt_bytecount_(count) +#define _In_opt_bytecount_c_(count) +#define _In_opt_bytecount_x_(count) #define _In_opt_count_(count) +#define _In_opt_count_c_(count) +#define _In_opt_count_x_(count) +#define _In_opt_ptrdiff_count_(count) #define _In_opt_z_ +#define _In_opt_z_count_(count) +#define _In_opt_z_count_c_(count) +#define _In_opt_z_bytecount_(count) +#define _In_opt_z_bytecount_c_(count) +#define _In_ptrdiff_count_(count) #define _In_range_(min, max) #define _In_reads_(count) #define _In_reads_bytes_(count) @@ -53,11 +71,18 @@ #define _In_reads_or_z_opt_(count) #define _In_reads_z_(count) #define _In_z_ +#define _In_z_bytecount_(count) +#define _In_z_bytecount_c_(count) +#define _In_z_count_(count) +#define _In_z_count_c_(count) #define _Inout_ +#define _Inout_bytecap_x_(count) #define _Inout_cap_(count) #define _Inout_opt_ +#define _Inout_opt_cap_c_(count) #define _Inout_opt_z_ +#define _Inout_opt_z_bytecap_(count) #define _Inout_updates_(count) #define _Inout_updates_bytes_(count) #define _Inout_updates_opt_(count) @@ -72,13 +97,37 @@ #define _Out_ #define _Out_bytecap_(count) +#define _Out_bytecap_c_(count) +#define _Out_bytecap_x_(count) #define _Out_bytecapcount_(count) #define _Out_bytecap_post_bytecount_(count1, count2) #define _Out_cap_(count) +#define _Out_cap_c_(count) +#define _Out_cap_m_(count1, count2) +#define _Out_cap_x_(count) #define _Out_cap_post_count_(count1, count2) #define _Out_opt_ +#define _Out_opt_bytecap_(count) +#define _Out_opt_bytecap_c_(count) +#define _Out_opt_bytecap_x_(count) +#define _Out_opt_bytecap_post_bytecount_(count1, count2) +#define _Out_opt_bytecapcount_(count) +#define _Out_opt_cap_(count) +#define _Out_opt_cap_m_(count1, count2) +#define _Out_opt_cap_c_(count) +#define _Out_opt_cap_x_(count) +#define _Out_opt_cap_post_count_(count1, count2) +#define _Out_opt_ptrdiff_cap_(count) +#define _Out_opt_z_bytecap_(count) +#define _Out_opt_z_bytecap_c_(count) +#define _Out_opt_z_bytecap_x_(count) +#define _Out_opt_z_bytecap_post_bytecount_(count1, count2) #define _Out_opt_z_cap_(count) +#define _Out_opt_z_cap_c_(count) +#define _Out_opt_z_cap_m_(count1, count2) +#define _Out_opt_z_cap_x_(count) #define _Out_opt_z_cap_post_count_(count1, count2) +#define _Out_ptrdiff_cap_(count) #define _Out_writes_(count) #define _Out_writes_bytes_(count) #define _Out_writes_bytes_all_(count) @@ -91,8 +140,14 @@ #define _Out_writes_to_(count1, count2) #define _Out_writes_to_opt_(count1, count2) #define _Out_writes_z_(count) +#define _Out_z_bytecap_(count) +#define _Out_z_bytecap_c_(count) +#define _Out_z_bytecap_x_(count) +#define _Out_z_bytecap_post_bytecount_(count1, count2) #define _Out_z_cap_(count) #define _Out_z_cap_c_(count) +#define _Out_z_cap_m_(count1, count2) +#define _Out_z_cap_x_(count) #define _Out_z_cap_post_count_(count1, count2) #define _Outptr_result_buffer_(count) @@ -103,19 +158,24 @@ #define _Param_(p) +#define _Post_count_(count) +#define _Post_count_c_(count) #define _Post_equal_to_(exp) #define _Post_invalid_ #define _Post_maybez_ +#define _Post_ptr_invalid_ #define _Post_readable_size_(count) #define _Post_satisfies_(exp) #define _Post_writable_byte_size_(count) #define _Post_z_ +#define _Pre_cap_for_(count) #define _Pre_maybenull_ #define _Pre_notnull_ #define _Pre_opt_z_ #define _Pre_writable_size_(count) #define _Pre_z_ +#define _Prepost_z_ #define _Printf_format_string_ #define _Printf_format_string_params_(count) @@ -124,6 +184,8 @@ #define _Ret_maybenull_z_ #define _Ret_notnull_ #define _Ret_opt_ +#define _Ret_opt_bytecap_(count) +#define _Ret_opt_bytecap_x_(count) #define _Ret_opt_z_cap_(count) #define _Ret_writes_bytes_maybenull_(count) #define _Ret_z_ -- 2.19.2

1 0

[PATCH] include: Correct IBrowserService.IEGetDisplayName definition
by Alistair Leslie-Hughes 16 Dec '18

16 Dec '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/shdeprecated.idl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 3e1e5e7..9f22e54 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -34,6 +34,12 @@ cpp_quote("#define TLMENUF_BACK 0x00000010") cpp_quote("#define TLMENUF_FORE 0x00000020") cpp_quote("#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE | TLMENUF_INCLUDECURRENT)") +cpp_quote("#ifndef INTERNET_MAX_URL_LENGTH") +cpp_quote("#define INTERNET_MAX_PATH_LENGTH 2048") +cpp_quote("#define INTERNET_MAX_SCHEME_LENGTH 32") +cpp_quote("#define INTERNET_MAX_URL_LENGTH (INTERNET_MAX_SCHEME_LENGTH + sizeof(\"://\") + INTERNET_MAX_PATH_LENGTH)") +cpp_quote("#endif") + [ hidden, local, @@ -214,7 +220,7 @@ interface IBrowserService : IUnknown HRESULT IEGetDisplayName( [in] PCIDLIST_ABSOLUTE pidl, - [out] LPWSTR pwszName, + [out, size_is(INTERNET_MAX_URL_LENGTH)] LPWSTR pwszName, [in] UINT uFlags); HRESULT IEParseDisplayName( -- 1.9.1

1 0

[PATCH] include: Add GetFilePatchSignature definition
by Alistair Leslie-Hughes 16 Dec '18

16 Dec '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/patchapi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/patchapi.h b/include/patchapi.h index 9a62a0f..5adaf0a 100644 --- a/include/patchapi.h +++ b/include/patchapi.h @@ -45,6 +45,12 @@ BOOL WINAPI ApplyPatchToFileA(LPCSTR,LPCSTR,LPCSTR,ULONG); BOOL WINAPI ApplyPatchToFileW(LPCWSTR,LPCWSTR,LPCWSTR,ULONG); #define ApplyPatchToFile WINELIB_NAME_AW(ApplyPatchToFile) +BOOL WINAPI GetFilePatchSignatureA(LPCSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, + PPATCH_RETAIN_RANGE, ULONG, LPSTR); +BOOL WINAPI GetFilePatchSignatureW(LPCWSTR, ULONG, PVOID, ULONG, PPATCH_IGNORE_RANGE, ULONG, + PPATCH_RETAIN_RANGE, ULONG, LPWSTR); +#define GetFilePatchSignature WINELIB_NAME_AW(GetFilePatchSignature) + #ifdef __cplusplus } #endif -- 1.9.1

1 0

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne 16 Dec '18

16 Dec '18

1 0

[PATCH] winegcc: Don't add the prefix's include dir using -isystem.
by Andre Heider 16 Dec '18

16 Dec '18

Always use -I, this fixes the include search path if the prefix is set to '/usr'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46293 Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 87fd661b3f..3424354a6e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -697,7 +697,7 @@ no_compat_defines: strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR : "-I" INCLUDEDIR ); + strarray_add(comp_args, "-I" INCLUDEDIR ); strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); } else if (opts->wine_objdir) -- 2.20.0

1 0

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne 15 Dec '18

15 Dec '18

2 1

[PATCH 1/2] api-ms-win-crt-private-l1-1-0: Update to 10.0.17134.12 (WinBuild.160101.0800)
by Fabian Maurer 14 Dec '18

14 Dec '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- .../api-ms-win-crt-private-l1-1-0.spec | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 60a9258cd1..9bddd3d98b 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -15,6 +15,7 @@ @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) ucrtbase.__C_specific_handler +@ stub __C_specific_handler_noexcept @ cdecl -arch=i386,x86_64,arm,arm64 __CxxDetectRethrow(ptr) ucrtbase.__CxxDetectRethrow @ cdecl -arch=i386,x86_64,arm,arm64 __CxxExceptionFilter(ptr ptr long ptr) ucrtbase.__CxxExceptionFilter @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) ucrtbase.__CxxFrameHandler @@ -44,6 +45,7 @@ @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy @ cdecl __std_exception_destroy(ptr) ucrtbase.__std_exception_destroy +@ stub __std_terminate @ cdecl __std_type_info_compare(ptr ptr) ucrtbase.__std_type_info_compare @ cdecl __std_type_info_destroy_list(ptr) ucrtbase.__std_type_info_destroy_list @ cdecl __std_type_info_hash(ptr) ucrtbase.__std_type_info_hash @@ -51,6 +53,7 @@ @ cdecl __unDName(ptr str long ptr ptr long) ucrtbase.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) ucrtbase.__unDNameEx @ cdecl __uncaught_exception() ucrtbase.__uncaught_exception +@ stub __uncaught_exceptions @ cdecl -arch=i386 -norelay _chkesp() ucrtbase._chkesp @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @@ -87,6 +90,10 @@ @ stub _o__W_Getmonths @ stub _o__W_Gettnames @ stub _o__Wcsftime +@ stub _o____lc_codepage_func +@ stub _o____lc_collate_cp_func +@ stub _o____lc_locale_name_func +@ stub _o____mb_cur_max_func @ stub _o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @@ -135,6 +142,10 @@ @ stub _o___p__wpgmptr @ stub _o___pctype_func @ stub _o___pwctype_func +@ stub _o___std_exception_copy +@ stub _o___std_exception_destroy +@ stub _o___std_type_info_destroy_list +@ stub _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @@ -184,6 +195,7 @@ @ stub _o__cabs @ stub _o__callnewh @ stub _o__calloc_base +@ stub _o__cexit @ stub _o__cgets @ stub _o__cgets_s @ stub _o__cgetws @@ -195,11 +207,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit +@ stub _o__configthreadlocale +@ stub _o__configure_narrow_argv @ stub _o__configure_wide_argv +@ stub _o__controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale +@ stub _o__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -231,6 +247,7 @@ @ stub _o__execve @ stub _o__execvp @ stub _o__execvpe +@ stub _o__exit @ stub _o__expand @ stub _o__fclose_nolock @ stub _o__fcloseall @@ -301,6 +318,8 @@ @ stub _o__get_errno @ stub _o__get_fmode @ stub _o__get_heap_handle +@ stub _o__get_initial_narrow_environment +@ stub _o__get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle @@ -345,7 +364,9 @@ @ stub _o__i64toa_s @ stub _o__i64tow @ stub _o__i64tow_s +@ stub _o__initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) ucrtbase._o__initialize_onexit_table +@ stub _o__initialize_wide_environment @ stub _o__invalid_parameter_noinfo @ stub _o__invalid_parameter_noinfo_noreturn @ stub _o__isatty @@ -617,6 +638,7 @@ @ stub _o__pclose @ stub _o__pipe @ stub _o__popen +@ stub _o__purecall @ stub _o__putc_nolock @ stub _o__putch @ stub _o__putch_nolock @@ -638,9 +660,13 @@ @ stub _o__scalbf @ stub _o__searchenv @ stub _o__searchenv_s +@ stub _o__seh_filter_dll +@ stub _o__seh_filter_exe @ stub _o__set_abort_behavior +@ stub _o__set_app_type @ stub _o__set_doserrno @ stub _o__set_errno +@ stub _o__set_fmode @ stub _o__set_invalid_parameter_handler @ stub _o__set_new_handler @ stub _o__set_new_mode @@ -910,6 +936,7 @@ @ stub _o_erfcl @ stub _o_erff @ stub _o_erfl +@ stub _o_exit @ stub _o_exp @ stub _o_exp2 @ stub _o_exp2f @@ -1026,7 +1053,7 @@ @ stub _o_mbstowcs @ stub _o_mbstowcs_s @ stub _o_mbtowc -@ stub _o_memset +@ stub _o_memcpy_s @ stub _o_modf @ stub _o_modff @ stub _o_nan @@ -1061,6 +1088,7 @@ @ stub _o_remquo @ stub _o_remquof @ stub _o_remquol +@ stub _o_rename @ stub _o_rewind @ stub _o_rint @ stub _o_rintf @@ -1076,6 +1104,7 @@ @ stub _o_scalbnl @ stub _o_set_terminate @ stub _o_setbuf +@ stub _o_setlocale @ stub _o_setvbuf @ stub _o_sin @ stub _o_sinf -- 2.19.2

2 3

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 14 Dec '18

14 Dec '18

1 0

[PATCH] advapi32: Implement RegLoadMUIString cache.
by Akihiro Sagawa 14 Dec '18

14 Dec '18

This fixes a performance regression introduced by 67574e4440ac4d9786e52a669b40197d2a4cb505. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46266 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)

2 1

[PATCH 2/2] comctl32/tests: Add a test to check built-in comctl32 classes.
by Dmitry Timoshkov 14 Dec '18

14 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/misc.c | 58 +++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5e91a8066a..c027852047 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -338,7 +338,7 @@ static void test_LoadIconWithScaleDown(void) FreeLibrary(hinst); } -static void check_class( const char *name, int must_exist, UINT style, UINT ignore ) +static void check_class( const char *name, int must_exist, UINT style, UINT ignore, BOOL v6 ) { WNDCLASSA wc; @@ -347,14 +347,14 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno char buff[64]; HWND hwnd; -todo_wine_if(strcmp(name, "Button") && - strcmp(name, "ComboBox") && - strcmp(name, "Edit") && - strcmp(name, "Static") && - strcmp(name, "ListBox") && - strcmp(name, "ComboLBox")) +todo_wine_if(!strcmp(name, "SysLink") && !must_exist && !v6) + ok( must_exist, "System class %s should %sexist\n", name, must_exist ? "" : "NOT " ); + if (!must_exist) return; + +todo_wine_if(!strcmp(name, "ScrollBar") || (!strcmp(name, "tooltips_class32") && v6)) ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", name, ~wc.style & style, wc.style, style ); +todo_wine_if((!strcmp(name, "tooltips_class32") && v6) || !strcmp(name, "SysLink")) ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", name, wc.style & ~style, wc.style, style ); ok( !wc.hInstance, "System class %s has hInstance %p\n", name, wc.hInstance ); @@ -373,13 +373,40 @@ todo_wine_if(strcmp(name, "Button") && static void test_builtin_classes(void) { /* check style bits */ - check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0 ); - check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0 ); - check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW ); + check_class( "Button", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ComboBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "Edit", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ListBox", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ScrollBar", 1, CS_PARENTDC | CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE ); + check_class( "Static", 1, CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE ); + check_class( "ComboLBox", 1, CS_SAVEBITS | CS_DBLCLKS | CS_DROPSHADOW | CS_GLOBALCLASS, CS_DROPSHADOW, FALSE ); +} + +static void test_comctl32_classes(BOOL v6) +{ + check_class(ANIMATE_CLASSA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_COMBOBOXEXA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(DATETIMEPICK_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_HEADERA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(HOTKEY_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_IPADDRESSA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_LISTVIEWA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(MONTHCAL_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_NATIVEFONTCTLA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_PAGESCROLLERA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(PROGRESS_CLASSA, 1, CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(REBARCLASSNAMEA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(STATUSCLASSNAMEA, 1, CS_DBLCLKS | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(WC_TABCONTROLA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class(TOOLBARCLASSNAMEA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + if (v6) + check_class(TOOLTIPS_CLASSA, 1, CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS | CS_DROPSHADOW, CS_SAVEBITS | CS_HREDRAW | CS_VREDRAW /* XP */, TRUE); + else + check_class(TOOLTIPS_CLASSA, 1, CS_DBLCLKS | CS_GLOBALCLASS | CS_SAVEBITS, CS_HREDRAW | CS_VREDRAW /* XP */, FALSE); + check_class(TRACKBAR_CLASSA, 1, CS_GLOBALCLASS, 0, FALSE); + check_class(WC_TREEVIEWA, 1, CS_DBLCLKS | CS_GLOBALCLASS, 0, FALSE); + check_class(UPDOWN_CLASSA, 1, CS_HREDRAW | CS_VREDRAW | CS_GLOBALCLASS, 0, FALSE); + check_class("SysLink", v6, CS_GLOBALCLASS, 0, FALSE); } START_TEST(misc) @@ -393,9 +420,12 @@ START_TEST(misc) test_GetPtrAW(); test_Alloc(); + test_comctl32_classes(FALSE); + if (!load_v6_module(&ctx_cookie, &hCtx)) return; + test_comctl32_classes(TRUE); test_builtin_classes(); test_LoadIconWithScaleDown(); -- 2.19.2

1 0

[PATCH 1/2] comctl32/tests: Fix a test failure under Windows 7.
by Dmitry Timoshkov 14 Dec '18

14 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/misc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 85f339b1ff..5e91a8066a 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -265,8 +265,7 @@ static void test_LoadIconWithScaleDown(void) /* non-existing filename */ hr = pLoadIconMetric(NULL, nonexisting_fileW, LIM_LARGE, &icon); - todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win7 */, "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); hr = pLoadIconWithScaleDown(NULL, nonexisting_fileW, 32, 32, &icon); -- 2.19.2

1 0

[PATCH v4] msvcr120: Add nexttoward implementation.
by Zebediah Figura 14 Dec '18

14 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45631 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- dlls/msvcr120/msvcr120.spec | 6 +- dlls/msvcr120/tests/msvcr120.c | 89 +++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 6 +- dlls/msvcrt/math.c | 30 +++++++ dlls/ucrtbase/ucrtbase.spec | 6 +- 7 files changed, 133 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 1db7af9177..907fac2f71 100644 --- a/configure.ac +++ b/configure.ac @@ -2746,6 +2746,8 @@ AC_CHECK_FUNCS(\ lroundf \ nearbyint \ nearbyintf \ + nexttoward \ + nexttowardf \ powl \ remainder \ remainderf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 0d645e5587..f5e4fb1f8f 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -297,9 +297,9 @@ @ cdecl nextafter(double double) ucrtbase.nextafter @ cdecl nextafterf(float float) ucrtbase.nextafterf @ cdecl nextafterl(double double) ucrtbase.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) ucrtbase.nexttoward +@ cdecl nexttowardf(float double) ucrtbase.nexttowardf +@ cdecl nexttowardl(double double) ucrtbase.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c9547bcbdf..e2764dc46e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2302,9 +2302,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 79b667e42b..4115c99503 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -127,6 +127,16 @@ static inline float __port_nan(void) } #define NAN __port_nan() +static inline int isnormal(double d) +{ + return _fpclass(d) & (_FPCLASS_PN | _FPCLASS_NN); +} + +static inline int isinf(double d) +{ + return _fpclass(d) & (_FPCLASS_PINF | _FPCLASS_NINF); +} + struct MSVCRT_lconv { char* decimal_point; @@ -192,6 +202,9 @@ static unsigned short (__cdecl *p_wctype)(const char*); static int (__cdecl *p_vsscanf)(const char*, const char *, __ms_va_list valist); static _Dcomplex* (__cdecl *p__Cbuild)(_Dcomplex*, double, double); static double (__cdecl *p_creal)(_Dcomplex); +static double (__cdecl *p_nexttoward)(double, double); +static float (__cdecl *p_nexttowardf)(float, double); +static double (__cdecl *p_nexttowardl)(double, double); /* make sure we use the correct errno */ #undef errno @@ -252,6 +265,9 @@ static BOOL init(void) SET(p_vsscanf, "vsscanf"); SET(p__Cbuild, "_Cbuild"); SET(p_creal, "creal"); + SET(p_nexttoward, "nexttoward"); + SET(p_nexttowardf, "nexttowardf"); + SET(p_nexttowardl, "nexttowardl"); if(sizeof(void*) == 8) { /* 64-bit initialization */ SET(p_critical_section_ctor, "??0critical_section@Concurrency@@QEAA@XZ"); @@ -964,6 +980,78 @@ static void test__Cbuild(void) ok(d == 3.0, "creal returned %lf\n", d); } +static void test_nexttoward(void) +{ + errno_t e; + double d; + float f; + int i; + + struct + { + double source; + double dir; + float f; + double d; + } + tests[] = + { + {0.0, 0.0, 0.0f, 0.0}, + {0.0, 1.0, 1.0e-45f, 5.0e-324}, + {0.0, -1.0, -1.0e-45f, -5.0e-324}, + {2.2250738585072009e-308, 0.0, 0.0f, 2.2250738585072004e-308}, + {2.2250738585072009e-308, 2.2250738585072010e-308, 1.0e-45f, 2.2250738585072009e-308}, + {2.2250738585072009e-308, 1.0, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 0.0, 0.0f, 2.2250738585072009e-308}, + {2.2250738585072014e-308, 2.2250738585072014e-308, 1.0e-45f, 2.2250738585072014e-308}, + {2.2250738585072014e-308, 1.0, 1.0e-45f, 2.2250738585072019e-308}, + {1.0, 2.0, 1.00000012f, 1.0000000000000002}, + {1.0, 0.0, 0.99999994f, 0.9999999999999999}, + {1.0, 1.0, 1.0f, 1.0}, + {0.0, INFINITY, 1.0e-45f, 5.0e-324}, + {FLT_MAX, INFINITY, INFINITY, 3.402823466385289e+038}, + {DBL_MAX, INFINITY, INFINITY, INFINITY}, + {INFINITY, INFINITY, INFINITY, INFINITY}, + {INFINITY, 0, FLT_MAX, DBL_MAX}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + f = p_nexttowardf(tests[i].source, tests[i].dir); + ok(f == tests[i].f, "Test %d: expected %0.8ef, got %0.8ef.\n", i, tests[i].f, f); + + errno = -1; + d = p_nexttoward(tests[i].source, tests[i].dir); + e = errno; + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + if (isnormal(d) || isinf(tests[i].source)) + ok(e == -1, "Test %d: expected no error, got %d.\n", i, e); + else + ok(e == ERANGE, "Test %d: expected ERANGE, got %d.\n", i, e); + + d = p_nexttowardl(tests[i].source, tests[i].dir); + ok(d == tests[i].d, "Test %d: expected %0.16e, got %0.16e.\n", i, tests[i].d, d); + } + + errno = -1; + d = p_nexttoward(NAN, 0); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno -1, got %d.\n", e); + + errno = -1; + d = p_nexttoward(NAN, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); + + errno = -1; + d = p_nexttoward(0, NAN); + e = errno; + ok(_isnan(d), "Expected NAN, got %0.16e.\n", d); + ok(e == -1, "Expected errno ERANGE, got %d.\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -983,4 +1071,5 @@ START_TEST(msvcr120) test_wctype(); test_vsscanf(); test__Cbuild(); + test_nexttoward(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c1f6e0bcf0..706799ce37 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1965,9 +1965,9 @@ @ cdecl nextafter(double double) msvcr120.nextafter @ cdecl nextafterf(float float) msvcr120.nextafterf @ cdecl nextafterl(double double) msvcr120.nextafterl -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) msvcr120.nexttoward +@ cdecl nexttowardf(float double) msvcr120.nexttowardf +@ cdecl nexttowardl(double double) msvcr120.nexttowardl @ stub norm @ stub normf @ stub norml diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d4785d3508..f6050a1c15 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1529,6 +1529,36 @@ float CDECL MSVCRT_nearbyintf(float num) #endif } +/********************************************************************* + * nexttoward (MSVCR120.@) + */ +double CDECL MSVCRT_nexttoward(double num, double next) +{ +#ifdef HAVE_NEXTTOWARD + double ret = nexttoward(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + +/********************************************************************* + * nexttowardf (MSVCR120.@) + */ +float CDECL MSVCRT_nexttowardf(float num, double next) +{ +#ifdef HAVE_NEXTTOWARDF + float ret = nexttowardf(num, next); + if (!isnormal(ret) && !isnan(ret) && !isinf(num)) *MSVCRT__errno() = MSVCRT_ERANGE; + return ret; +#else + FIXME("not implemented\n"); + return 0; +#endif +} + #endif /* _MSVCR_VER>=120 */ /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 6e6cc439d8..3592a569e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2438,9 +2438,9 @@ @ cdecl nextafter(double double) MSVCRT__nextafter @ cdecl nextafterf(float float) MSVCRT__nextafterf @ cdecl nextafterl(double double) MSVCRT__nextafter -@ stub nexttoward -@ stub nexttowardf -@ stub nexttowardl +@ cdecl nexttoward(double double) MSVCRT_nexttoward +@ cdecl nexttowardf(float double) MSVCRT_nexttowardf +@ cdecl nexttowardl(double double) MSVCRT_nexttoward @ stub norm @ stub normf @ stub norml -- 2.19.1

3 3

[PATCH 1/4] msvcrt/tests: Add tests for C locale.
by Daniel Lehman 14 Dec '18

14 Dec '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msvcrt/tests/string.c | 80 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0568bcf5df..e80a51824b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -89,6 +89,12 @@ static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements static int (__cdecl *p_wctob)(wint_t); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); +static int (__cdecl *p_towlower)(wint_t); +static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_towupper)(wint_t); +static int (__cdecl *p__towupper_l)(wint_t, _locale_t); +static _locale_t(__cdecl *p__create_locale)(int, const char*); +static void(__cdecl *p__free_locale)(_locale_t); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); static int (__cdecl *p__atodbl_l)(_CRT_DOUBLE*,char*,_locale_t); @@ -3603,6 +3609,73 @@ static void test___strncnt(void) } } +static void test_C_locale(void) +{ + int i, j; + wint_t ret, exp; + _locale_t locale; + static const char *locales[] = { NULL, "C" }; + + /* C locale only converts case for [a-zA-Z] */ + setlocale(LC_ALL, "C"); + for (i = 0; i <= 0xffff; i++) + { + ret = p_towlower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p_towupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != i) + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + } + + if (!p__towlower_l || !p__towupper_l || !p__create_locale) + { + win_skip("_towlower_l/_towupper_l/_create_locale not available\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(locales); i++) { + locale = locales[i] ? p__create_locale(LC_ALL, locales[i]) : NULL; + + for (j = 0; j <= 0xffff; j++) { + ret = p__towlower_l(j, locale); + if (j >= 'A' && j <= 'Z') + { + exp = j + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + + ret = p__towupper_l(j, locale); + if (j >= 'a' && j <= 'z') + { + exp = j + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + todo_wine_if(ret != j) + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + } + + p__free_locale(locale); + } +} + START_TEST(string) { char mem[100]; @@ -3648,6 +3721,12 @@ START_TEST(string) p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); + p_towlower = (void*)GetProcAddress(hMsvcrt, "towlower"); + p__towlower_l = (void*)GetProcAddress(hMsvcrt, "_towlower_l"); + p_towupper = (void*)GetProcAddress(hMsvcrt, "towupper"); + p__towupper_l = (void*)GetProcAddress(hMsvcrt, "_towupper_l"); + p__create_locale = (void*)GetProcAddress(hMsvcrt, "_create_locale"); + p__free_locale = (void*)GetProcAddress(hMsvcrt, "_free_locale"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); @@ -3730,4 +3809,5 @@ START_TEST(string) test__tcsncoll(); test__tcsnicoll(); test___strncnt(); + test_C_locale(); } -- 2.17.1

4 7

[PATCH] include: Add _Deref_ret_z_ stub definition.
by Dmitry Timoshkov 14 Dec '18

14 Dec '18

Yet another compatibility fix for Visual Studio 12.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index c69f7f9840..29746c3a03 100644 --- a/include/sal.h +++ b/include/sal.h @@ -34,6 +34,7 @@ #define _Deref_post_valid_ #define _Deref_post_z_ #define _Deref_prepost_opt_z_ +#define _Deref_ret_z_ #define _Field_range_(min, max) -- 2.19.2

1 0

[PATCH v2] user32: Dont reset focus if current dialog is a child.
by Alistair Leslie-Hughes 14 Dec '18

14 Dec '18

Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75 The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/dialog.c | 5 +++- dlls/user32/tests/dialog.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0b33a57..72e6eee 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 631f3d3..ff6052f 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -907,6 +907,55 @@ static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, return FALSE; } +static INT_PTR CALLBACK EmptyProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) { + case WM_INITDIALOG: + return TRUE; + } + return FALSE; +} + +HWND hChildDlg = NULL; +static INT_PTR CALLBACK focusChildDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, + LPARAM lParam) +{ + switch (uiMsg) + { + case WM_INITDIALOG: + { + RECT rectHwnd; + struct { + DLGTEMPLATE tmplate; + WORD menu,class,title; + } temp; + + SetFocus( GetDlgItem(hwnd, 200) ); + + GetClientRect(hwnd,&rectHwnd); + temp.tmplate.style = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE | DS_CONTROL | DS_3DLOOK; + temp.tmplate.dwExtendedStyle = 0; + temp.tmplate.cdit = 0; + temp.tmplate.x = 0; + temp.tmplate.y = 0; + temp.tmplate.cx = 0; + temp.tmplate.cy = 0; + temp.menu = temp.class = temp.title = 0; + + hChildDlg = CreateDialogIndirectParamA(g_hinst, &temp.tmplate, + hwnd, (DLGPROC)EmptyProcUserTemplate, 0); + ok(hChildDlg != 0, "Failed to create test dialog.\n"); + + return FALSE; + } + case WM_CLOSE: + DestroyWindow(hChildDlg); + return TRUE; + } + + return FALSE; +} + /* Helper for InitialFocusTest */ static const char * GetHwndString(HWND hw) { @@ -1093,6 +1142,29 @@ static void test_focus(void) DestroyWindow(hDlg); } + + /* Test 6: + * Select textbox's text on creation when WM_INITDIALOG creates a child dialog. */ + { + HWND hDlg; + HRSRC hResource; + HANDLE hTemplate; + DLGTEMPLATE* pTemplate; + HWND edit; + + hResource = FindResourceA(g_hinst,"FOCUS_TEST_DIALOG_3", (LPCSTR)RT_DIALOG); + hTemplate = LoadResource(g_hinst, hResource); + pTemplate = LockResource(hTemplate); + + hDlg = CreateDialogIndirectParamA(g_hinst, pTemplate, NULL, focusChildDlgWinProc, 0); + ok(hDlg != 0, "Failed to create test dialog.\n"); + edit = GetDlgItem(hDlg, 200); + + ok(GetFocus() == edit, "Focus not set to edit, focus=%p, dialog=%p, edit=%p\n", + GetFocus(), hDlg, edit); + + DestroyWindow(hDlg); + } } static void test_GetDlgItemText(void) -- 1.9.1

2 1

[PATCH] winebus.sys: Re-add missing Xbox controller PIDs.
by Kai Krakow 14 Dec '18

14 Dec '18

These were introduced in commit 1333206 and have gone missing in one of the previous cleanup commits. Fixes: ccb06c6 ("winebus: Don't override real VID/PID for controllers.") Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index cee0ae60734..299cec5034d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -53,9 +53,11 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x028f, /* Xbox360 Wireless Controller */ 0x02d1, /* Xbox One Controller */ 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e0, /* Xbox One X Controller */ 0x02e3, /* Xbox One Elite Controller */ 0x02e6, /* Wireless XBox Controller Dongle */ 0x02ea, /* Xbox One S Controller */ + 0x02fd, /* Xbox One S Controller (Firmware 2017) */ 0x0719, /* Xbox 360 Wireless Adapter */ }; -- 2.19.2

1 0

[PATCH] user32: Dont reset focus if current dialog is a child.
by Alistair Leslie-Hughes 14 Dec '18

14 Dec '18

Regression of 44f89322ba8825a8e4851aaaf7de89910701ca75 The standard File Open Dialog, creates an empty WS_EX_CONTROLPARENT child dialog which shouldn't receive focus. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46215 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/dialog.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 0b33a57..72e6eee 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -692,7 +692,10 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, SetFocus( focus ); } else - SetFocus( hwnd ); + { + if (!(template.style & WS_CHILD)) + SetFocus( hwnd ); + } } } -- 1.9.1

3 2

[PATCH] shcore: Fix path string leak for file streams (Valgrind)
by Nikolay Sivov 14 Dec '18

14 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shcore/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a544f27006..ac625fb746 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -839,6 +839,7 @@ static ULONG WINAPI filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->u.file.handle); + heap_free(stream->u.file.path); heap_free(stream); } -- 2.19.2

1 0

[PATCH] kernelbase/tests: Fix some leaks (Valgrind)
by Nikolay Sivov 14 Dec '18

14 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/tests/path.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 7b24f00178..7644c312b7 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -323,6 +323,7 @@ static void test_PathAllocCanonicalize(void) path_maxW[PATHCCH_MAX_CCH - 1] = '\0'; hr = pPathAllocCanonicalize(path_maxW, PATHCCH_ALLOW_LONG_PATHS, &path_outW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + LocalFree(path_outW); /* Check if flags added after Windows 10 1709 are supported */ MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, path_inW, ARRAY_SIZE(path_inW)); @@ -449,12 +450,14 @@ static void test_PathAllocCombine(void) ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\a"), "expect \\a, got %s\n", resultA); + LocalFree(resultW); MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); hr = pPathAllocCombine(NULL, path2W, 0, &resultW); ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); ok(!lstrcmpA(resultA, "\\b"), "expect \\b, got %s\n", resultA); + LocalFree(resultW); hr = pPathAllocCombine(path1W, path2W, 0, NULL); ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); -- 2.19.2

1 0

[PATCH] inetcomm: Fix a leak on DeleteProp() (Valgrind)
by Nikolay Sivov 14 Dec '18

14 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/inetcomm/mimeole.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index cb9ebcc382..a2854be196 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -819,16 +819,21 @@ static void empty_param_list(struct list *list) } } +static void free_header(header_t *header) +{ + list_remove(&header->entry); + PropVariantClear(&header->value); + empty_param_list(&header->params); + heap_free(header); +} + static void empty_header_list(struct list *list) { header_t *header, *cursor2; LIST_FOR_EACH_ENTRY_SAFE(header, cursor2, list, header_t, entry) { - list_remove(&header->entry); - PropVariantClear(&header->value); - empty_param_list(&header->params); - HeapFree(GetProcessHeap(), 0, header); + free_header(header); } } @@ -1232,8 +1237,7 @@ static HRESULT WINAPI MimeBody_DeleteProp( if(found) { - list_remove(&cursor->entry); - HeapFree(GetProcessHeap(), 0, cursor); + free_header(cursor); return S_OK; } } -- 2.19.2

1 0

[PATCH] dwrite/tests: Fix some leaks (Valgrind)
by Nikolay Sivov 14 Dec '18

14 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f752afd08e..aa1562ee32 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1778,6 +1778,7 @@ static void test_CreateFontFace(void) UINT32 count; WCHAR *path; HRESULT hr; + ULONG ref; factory = create_factory(); @@ -1864,6 +1865,8 @@ static void test_CreateFontFace(void) IDWriteFont_Release(font); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); /* IDWriteFactory::CreateFontFace() */ path = create_testfontfile(test_fontfile); @@ -1929,7 +1932,8 @@ todo_wine } IDWriteFontFile_Release(file); - IDWriteFactory_Release(factory); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); DELETE_FONTFILE(path); } @@ -4873,6 +4877,7 @@ static void test_IsMonospacedFont(void) ULONG ref; factory = create_factory(); + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4920,7 +4925,8 @@ static void test_IsMonospacedFont(void) else skip("Courier New font not found.\n"); - ref = IDWriteFontCollection_Release(collection); + IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); } -- 2.19.2

1 0

[PATCH 1/4] usp10/tests: Test width returned with ScriptGetGlyphABCWidth().
by Nikolay Sivov 13 Dec '18

13 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 62 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 8c4b125bae..e907c8c40a 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3403,26 +3403,76 @@ static void test_ScriptGetGlyphABCWidth(HDC hdc) { HRESULT hr; SCRIPT_CACHE sc = NULL; - ABC abc; + HFONT hfont, prev_hfont; + TEXTMETRICA tm; + ABC abc, abc2; + LOGFONTA lf; + WORD glyph; + INT width; + DWORD ret; - hr = ScriptGetGlyphABCWidth(NULL, NULL, 'a', NULL); + glyph = 0; + ret = GetGlyphIndicesA(hdc, "a", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + hr = ScriptGetGlyphABCWidth(NULL, NULL, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, NULL); ok(broken(hr == E_PENDING) || hr == E_INVALIDARG, /* WIN7 */ "expected E_INVALIDARG, got 0x%08x\n", hr); - hr = ScriptGetGlyphABCWidth(NULL, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(NULL, &sc, glyph, &abc); ok(hr == E_PENDING, "expected E_PENDING, got 0x%08x\n", hr); if (0) { /* crashes on WinXP */ - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', NULL); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, NULL); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } - hr = ScriptGetGlyphABCWidth(hdc, &sc, 'a', &abc); + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc2); + ok(ret, "Failed to get char width.\n"); + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + ScriptFreeCache(&sc); + + /* Bitmap font */ + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "System"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + prev_hfont = SelectObject(hdc, hfont); + + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "Failed to get text metrics.\n"); + ok(!(tm.tmPitchAndFamily & TMPF_TRUETYPE), "Unexpected TrueType font.\n"); + ok(tm.tmPitchAndFamily & TMPF_FIXED_PITCH, "Unexpected fixed pitch font.\n"); + + glyph = 0; + ret = GetGlyphIndicesA(hdc, "i", 1, &glyph, 0); + ok(ret == 1, "Failed to get glyph index.\n"); + ok(glyph != 0, "Unexpected glyph index.\n"); + + sc = NULL; + hr = ScriptGetGlyphABCWidth(hdc, &sc, glyph, &abc); + ok(hr == S_OK, "Failed to get glyph width, hr %#x.\n", hr); + ok(abc.abcB != 0, "Unexpected width.\n"); + + ret = GetCharWidthI(hdc, glyph, 1, NULL, &width); + ok(ret, "Failed to get char width.\n"); + abc2.abcA = abc2.abcC = 0; + abc2.abcB = width; + ok(!memcmp(&abc, &abc2, sizeof(abc)), "Unexpected width.\n"); + + SelectObject(hdc, prev_hfont); + DeleteObject(hfont); ScriptFreeCache(&sc); } -- 2.19.2

1 3

[PATCH v2] Add .editorconfig file
by Eberhard Beilharz 13 Dec '18

13 Dec '18

This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/). Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..71dc8633f8 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 4 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false +max_line_length = 100 -- 2.19.2

2 3

Feature Proposal: Implementing an interface to the object manager via shared memory
by Derek Lesho 13 Dec '18

13 Dec '18

Currently, two apps/drivers that I know of, Battleye (BEDaisy.sys) and EasyAnticheat (EasyAntiCheat.sys) utilize the object manager. Right now, we can only emulate this by setting the object pointers to handle values, and interpreting the pointers as such when app passes it to another function. The problem is, not all object pointers are opaque, and some apps (EAC) try to read the contents of the structure even when they documented as being opaque. To get around this, we could try filling in dummy data on a case-per-case basis, but this solution may not hold up on rapidly changing software like anti-cheat software. My proposal is that we utilize shared memory, written to by the object manager in wineserver, and mapped as read only in all of the winedevice processes to implement the kernel's object manager interface. Wineserver would update data in the object structures as necessary, and when an driver calls something like ObReferenceObjectByHandle, we would request a pointer to the simulated structure. I haven't worked out all of the kinks on how practical this would be, and am only getting started with my implementation, but I'm curious what you guys think of this idea. I know shared memory is generally not supposed to be used, but I can't think of anything else that would retain the accuracy.

2 1

[PATCH] riched20: Remove redundant comparison.
by Andrey Gusev 13 Dec '18

13 Dec '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/riched20/para.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7781ff2dce..6eec6b5906 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -132,9 +132,7 @@ void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) { - if (!iter->member.para.next_marked || - (iter->member.para.next_marked && - di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs)) + if (!iter->member.para.next_marked || di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs) { if (iter->member.para.next_marked) { -- 2.17.2

2 1

[PATCH] devenum: Avoid an invalid free (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 5fa2f008dc..efa69195eb 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -419,7 +419,8 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { - CoTaskMemFree(This->name); + if (This->type != DEVICE_DMO) + CoTaskMemFree(This->name); CoTaskMemFree(This); DEVENUM_UnlockModule(); } -- 2.19.2

2 2

[PATCH v2] po: Make tzres resources traslatable.
by Akihiro Sagawa 13 Dec '18

13 Dec '18

In v2, fix broken part. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/tzres/tzres.rc | 6 + po/ar.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/bg.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ca.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/da.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/en.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/eo.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/es.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/fi.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 800 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/hr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/or.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pa.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ro.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/te.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/th.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/wine.pot | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ 47 files changed, 36907 insertions(+)

2 2

[PATCH v3] ole32: Don't free handles that are just copied in the inproc case.
by Huw Davies 13 Dec '18

13 Dec '18

Based on a patch by Zebediah Figura. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/usrmarshal.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5f5e..9f19b66d63 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,29 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char * which the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med) { - TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium); + TRACE("(%s, %p)\n", debugstr_user_flags(flags), med); - ReleaseStgMedium(pStgMedium); + switch (med->tymed) + { + case TYMED_NULL: + case TYMED_FILE: + case TYMED_ISTREAM: + case TYMED_ISTORAGE: + ReleaseStgMedium(med); + break; + case TYMED_HGLOBAL: + case TYMED_GDI: + case TYMED_MFPICT: + case TYMED_ENHMF: + if (LOWORD(*flags) == MSHCTX_INPROC) + med->tymed = TYMED_NULL; + ReleaseStgMedium(med); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) -- 2.18.0

2 2

[PATCH] winex11.drv/window: Sync the window cursor before grabbing it
by Gabriel Ivăncescu 13 Dec '18

13 Dec '18

If a window changes the cursor (e.g. resizing cursor) and then sends the WM_SYSCOMMAND message to resize/move another window in response to something (e.g. a click), and the other window had a different cursor, XGrabPointer will switch the resizing cursor to the other window's cursor, until the mouse is moved, which then syncs back to the respective sizing/move cursor. This results in an annoying "flicker" of the cursor in such cases as it changes from resize cursor->prev cursor->resize cursor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This syncs the cursor so that the window's cursor becomes the sizing cursor (or whatever other cursor is current) before XGrabPointer. I'm experimenting with implementing the resizing grip in the autocomplete listbox exactly like on Windows (for post Wine 4.0) and discovered this in the process, since the resizing grip has to send the resize command to the listbox, but the listbox's cursor is not synced until the mouse is moved (without this patch). dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340..4b5f9f9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2159,6 +2159,7 @@ void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) if (!(data = get_win_data( GetAncestor( hwnd, GA_ROOT )))) return; if (data->whole_window) { + sync_window_cursor( data->whole_window ); XFlush( gdi_display ); XGrabPointer( data->display, data->whole_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, -- 2.19.1

1 0

[PATCH v2] ole32: Call individual UserFree() functions in STGMEDIUM_UserFree().
by Zebediah Figura 13 Dec '18

13 Dec '18

Essentially written by Huw Davies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/usrmarshal.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5f5e..fafdcbb171 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,37 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char * which the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med) { - TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium); + TRACE("(%s, %p)\n", debugstr_user_flags(flags), med); - ReleaseStgMedium(pStgMedium); + switch(med->tymed) + { + case TYMED_NULL: + case TYMED_FILE: + case TYMED_ISTREAM: + case TYMED_ISTORAGE: + ReleaseStgMedium(med); + break; + case TYMED_HGLOBAL: + case TYMED_GDI: + case TYMED_MFPICT: + case TYMED_ENHMF: + if (LOWORD(*flags) == MSHCTX_INPROC) + { + if (med->pUnkForRelease) + { + IUnknown_Release(med->pUnkForRelease); + med->pUnkForRelease = NULL; + } + med->tymed = TYMED_NULL; + } + else + ReleaseStgMedium(med); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) -- 2.14.1

2 1

[PATCH v3] Add .editorconfig file
by Eberhard Beilharz 13 Dec '18

13 Dec '18

This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/). Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..98cac822ec --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 8 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false +max_line_length = 100 -- 2.19.2

1 0

[PATCH] ntdll/tests: Fix a memory leak (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 722ca99d2d..c8a5951b60 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -517,6 +517,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { + RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(path, &nameW, &file_part, NULL); ok(status == tests[i].status || status == tests[i].alt_status, "%s: Expected status %#x, got %#x.\n", tests[i].dos, tests[i].status, status); -- 2.19.2

1 0

[PATCH] mp3dmod: Fix a memory leak (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 90bcf664a2..c9da2b8a35 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -98,6 +98,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) if (!refcount) { + MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); heap_free(This); } -- 2.19.2

1 0

[PATCH] devenum/tests: Fix some memory leaks (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/tests/devenum.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 2a88b48ab8..10ca27a614 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -129,6 +129,7 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); @@ -137,6 +138,7 @@ static void test_devenum(IBindCtx *bind_ctx) } } + IEnumMoniker_Release(enum_cat); ICreateDevEnum_Release(create_devenum); } @@ -466,6 +468,7 @@ static void test_codec(void) * enumerating them will destroy the key */ ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); + VariantClear(&var); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); @@ -589,6 +592,7 @@ static void test_legacy_filter(void) 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); hr = IFilterMapper_UnregisterFilter(mapper, CLSID_TestFilter); @@ -999,6 +1003,7 @@ static void test_vfw(void) ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); } -- 2.19.2

1 0

[PATCH] ole32: Call individual UserFree() functions in STGMEDIUM_UserFree().
by Zebediah Figura 12 Dec '18

12 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/usrmarshal.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5f5e..e2a786098c 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,56 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char * which the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med) { - TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium); + TRACE("(%s, %p)\n", debugstr_user_flags(flags), med); - ReleaseStgMedium(pStgMedium); + switch(med->tymed) + { + case TYMED_NULL: + break; + case TYMED_HGLOBAL: + if (!med->pUnkForRelease) + HGLOBAL_UserFree(flags, &med->u.hGlobal); + break; + case TYMED_FILE: + if (med->u.lpszFileName) + { + if (!med->pUnkForRelease) + DeleteFileW(med->u.lpszFileName); + CoTaskMemFree(med->u.lpszFileName); + } + break; + case TYMED_ISTREAM: + if (med->u.pstm) + IStream_Release(med->u.pstm); + break; + case TYMED_ISTORAGE: + if (med->u.pstg) + IStorage_Release(med->u.pstg); + break; + case TYMED_GDI: + if (!med->pUnkForRelease) + HBITMAP_UserFree(flags, &med->u.hBitmap); + break; + case TYMED_MFPICT: + if (!med->pUnkForRelease) + HMETAFILEPICT_UserFree(flags, &med->u.hMetaFilePict); + break; + case TYMED_ENHMF: + if (!med->pUnkForRelease) + HENHMETAFILE_UserFree(flags, &med->u.hEnhMetaFile); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } + med->tymed = TYMED_NULL; + + if (med->pUnkForRelease) + { + IUnknown_Release(med->pUnkForRelease); + med->pUnkForRelease = NULL; + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) -- 2.14.1

2 2

[PATCH] testbot/SetWinLocale: Automate changing the Windows locales.
by Francois Gouget 12 Dec '18

12 Dec '18

SetWinLocale leverages TestAgent and intl.cpl to automate changing the Windows locales of the specified host: sorting and formatting, system locale, display language, keyboard and location. It can also create locale VMs for the TestBot, that is copies of a base VM that allow the TestBot to run the tests in the specified locale. Then it can recreate a specific locale VM snapshot from the base snapshot, or refresh the snapshots of all the locale VMs of a given base VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- All the locales work on Vista and Windows 7 except for zh-TW which neither accept as a MUI language for some reason (but it's accepted for the formatting, sorting and system locale !). And unlike the locale VMs I created by hand this script also changes the default keyboard layout. So with one command one can create a bunch of VMs for testing different locales. For instance this command would create the complete set for the Vista Ultimate VM: SetWinLocale --vm wvistau64 --add-locales ar_SA:bg_BG:zh_CN:hr_HR:cs_CZ:da_DK:nl_NL:et_EE:fi_FI:fr_FR:el_GR:he_IL:hu_HU:it_IT:ja_JP:ko_KR:lv_LV:lt_LT:nb_NO:pl_PL:pt_BR:pt_PT:ro_RO:ru_RU:sk_SK:sl_SI:sr_RS:es_ES:sv_SE:th_TH:tr_TR:uk_UA Of course right now running such a command for both Ultimate VMs would result in over 70 VMs on the submit page (and on the activity page) which would be quite overwhelming. So there's some further work before unleaching the locales. In the meantime it makes it easier to add a few more locales or to recreate them when needed. testbot/scripts/SetWinLocale | 857 +++++++++++++++++++++++++++++++++++ 1 file changed, 857 insertions(+) create mode 100755 testbot/scripts/SetWinLocale diff --git a/testbot/scripts/SetWinLocale b/testbot/scripts/SetWinLocale new file mode 100755 index 0000000000..e9d024f8e0 --- /dev/null +++ b/testbot/scripts/SetWinLocale @@ -0,0 +1,857 @@ +#!/usr/bin/perl -w +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# +# Sets the locale of the specified Windows machine and, optionally, +# updates or creates a new snapshot of the TestBot VM for it. +# +# Copyright 2018 Francois Gouget +# +# 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 + +use strict; + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } +} + +use WineTestBot::Config; +use WineTestBot::Log; +use WineTestBot::TestAgent; +use WineTestBot::VMs; +use WineTestBot::Utils; + + +# +# Error handling and logging +# + +my $name0 = $0; +$name0 =~ s+^.*/++; + + +sub Warning(@) +{ + print STDERR "$name0:warning: ", @_; +} + +sub Error(@) +{ + print STDERR "$name0:error: ", @_; +} + +my $DryRun; +my $Debug; +sub Debug(@) +{ + print STDERR @_ if ($Debug or $DryRun); +} + +sub Run(@) +{ + Debug("Running '", join("' '", @_), "'\n"); + return 0 if ($DryRun); + + my $Rc = system(@_); + Debug("-> exit code $Rc\n"); + return $Rc; +} + +my $Start = Time(); +sub FatalError(@) +{ + Error( @_); + Debug(Elapsed($Start), " Aborting\n"); + exit(1); +} + + +# +# Country and keyboard tables +# + +my %Countries = ( + "AF" => 3, # Afganistan + "AL" => 6, # Albania + "AM" => 7, # Armenia + "AZ" => 5, # Azerbaijan + "BA" => 25, # Bosnia and Herzegovina + "BE" => 21, # Belgium + "BG" => 35, # Bulgaria + "BN" => 37, # Brunei Darussalam + "BR" => 32, # Brazil + "BY" => 29, # Belarus + "CH" => 223, # Switzerland + "CN" => 45, # China + "CS" => 271, # Serbia + "CZ" => 75, # Czech Republic + "DE" => 94, # Germany + "DK" => 61, # Denmark + "EE" => 70, # Estonia + "EG" => 67, # Egypt + "ES" => 217, # Spain + "ET" => 73, # Ethiopia + "FI" => 77, # Finland + "FO" => 81, # Faroe Islands + "FR" => 84, # France + "GB" => 242, # Great-Britain + "GR" => 98, # Greece + "HR" => 108, # Croatia + "HU" => 109, # Hungary + "ID" => 111, # Indonesia + "IE" => 68, # Ireland + "IL" => 117, # Israel + "IN" => 113, # India + "IR" => 116, # Iran + "IS" => 110, # Iceland + "IT" => 118, # Italy + "JP" => 122, # Japan + "KE" => 129, # Kenya + "KG" => 130, # Kyrgyzstan + "KR" => 134, # Korea + "KZ" => 137, # Kazakhstan + "LT" => 141, # Lithuania + "LV" => 140, # Latvia + "MA" => 159, # Morocco + "MK" => 16618, # Macedonia + "MN" => 154, # Mongolia + "MV" => 165, # Maldives + "MY" => 167, # Malaysia + "NL" => 176, # Netherlands + "NO" => 177, # Norway + "PK" => 190, # Pakistan + "PL" => 191, # Poland + "PT" => 193, # Portugal + "RO" => 200, # Romania + "RU" => 203, # Russia + "SA" => 205, # Saudi Arabia + "SE" => 221, # Sweden + "SI" => 212, # Slovenia + "SK" => 143, # Slovakia + "SN" => 210, # Senegal + "TH" => 227, # Thailand + "TR" => 235, # Turkey + "TW" => 237, # Taiwan + "UA" => 241, # Ukraine + "US" => 244, # USA + "UZ" => 247, # Uzbekistan + "VN" => 251, # Vietnam + "ZA" => 209, # South Africa +); + +my %Keyboards = ( + "af-ZA" => ["0436:00000409"], # Afrikaans - South Africa + "ar-EG" => ["0c01:00000401"], # Arabic - Egypt + "ar-MA" => ["1801:00020401", "040c:0000040c"], # Arabic - Morocco + "be-BY" => ["0423:00000423", "0419:00000419"], # Belarusian - Belarus + "bg-BG" => ["0402:00030402", "0409:00020409"], # Bulgarian - Bulgaria + "br-FR" => ["047e:0000040c"], # Breton - France + "ca-ES" => ["0403:0000040a"], # Catalan - Spain + "cs-CZ" => ["0405:00000405"], # Czech - Czech Republic + "cy-GB" => ["0452:00000452", "0809:00000809"], # Welsh - Great Britain + "da-DK" => ["0406:00000406", "0409:00000406"], # Danish - Denmark + "de-DE" => ["0407:00000407"], # German - Germany + "dv-MV" => ["0465:00000465"], # Divehi - Maldives + "el-GR" => ["0408:00000408"], # Greek - Greece + "en-GB" => ["0809:00000809"], # English - Great Britain + "en-US" => undef, # English - United States + "es-ES" => ["0c0a:0000040a"], # Spanish - Spain + "et-EE" => ["0425:00000425"], # Estonian - Estonia + "eu-ES" => ["042d:0000040a"], # Basque - Basque + "fa-IR" => ["0429:00000429"], # Persian + "fi-FI" => ["040b:0000040b"], # Finnish - Finland + "fo-FO" => ["0438:00000406"], # Faroese - Faroe Islands + "fr-FR" => ["040c:0000040c"], # French - France + "ga-IE" => ["083c:00001809"], # Irish - Ireland + "gd-GB" => ["0491:00011809"], # Scottish Gaelic - Great Britain + "gl-ES" => ["0456:0000040a"], # Galician - Galician + "gu-IN" => ["0447:00000447"], # Gujarati - India (Gujarati Script) + + # Note : Windows >= 8 probably uses 040d:0002040d instead + "he-IL" => ["040d:0000040d"], # Hebrew - Israel + + "hi-IN" => ["0439:00010439"], # Hindi - India + "hr-HR" => ["041a:0000041a"], # Croatian - Croatia + "hu-HU" => ["040e:0000040e"], # Hungarian - Hungary + "hy-AM" => ["042b:0002042b"], # Armenian - Armenia + "id-ID" => ["0421:00000409"], # Indonesian - Indonesia + "is-IS" => ["040f:0000040f"], # Icelandic - Iceland + "it-CH" => ["0810:0000100c", "0810:00000410"], # Italian - Switzerland + "it-IT" => ["0410:00000410"], # Italian - Italy + "ja-JP" => ["0411:{03B5835F-F03C-411B-9CE2-AA23E1171E36}{A76C93D9-5523-4E90-AAFA-4DB112F9AC76}"], # Japanese - Japan + "ka-GE" => ["0437:00010437"], # Georgian - Georgia + "kk-KZ" => ["043f:0000043f"], # Kazakh - Kazakhstan + "kn-IN" => ["044b:0000044b"], # Kannada - India (Kannada Script) + "ko-KR" => ["0412:{A028AE76-01B1-46C2-99C4-ACD9858AE02F}{B5FE1F02-D5F2-4445-9C03-C568F23C99A1}"], # Korean(Extended Wansung) - Korea + "ky-KG" => ["0440:00000440"], # Kyrgyz - Kyrgyzstan + "lt-LT" => ["0427:00010427"], # Lithuanian - Lithuania + + # Note: Windows >= 8 probably uses 0426:00020426 instead + "lv-LV" => ["0426:00000426"], # Latvian - Standard + + "mk-MK" => ["042f:0001042f"], # Macedonian + "ml-IN" => ["044c:0000044c"], # Malayalam - India (Malayalam Script) + "mn-MN" => ["0450:00000450"], # Mongolian (Cyrillic) - Mongolia + "mr-IN" => ["044e:0000044e"], # Marathi - India + "ms-BN" => ["083e:00000409"], # Malay - Brunei + "ms-MY" => ["043e:00000409"], # Malay - Malaysia + "nb-NO" => ["0414:00000414"], # Norwegian - Norway (Bokmal) + "nl-BE" => ["0813:00000813"], # Dutch - Belgium + "nl-NL" => ["0413:00020409"], # Dutch - Netherlands + "or-IN" => ["0448:00000448"], # Odia - India (Odia Script) + "pa-IN" => ["0446:00000446"], # Punjabi - India (Gurmukhi Script) + "pl-PL" => ["0415:00000415"], # Polish - Poland + "pt-BR" => ["0416:00000416"], # Portuguese - Brazil + "pt-PT" => ["0816:00000816"], # Portuguese - Portugal + "ro-RO" => ["0418:00010418"], # Romanian - Romania + "ru-RU" => ["0419:00000419"], # Russian + "sa-IN" => ["044f:00000439"], # Sanskrit - India + "sk-SK" => ["041b:0000041b"], # Slovak - Slovakia + "sl-SI" => ["0424:00000424"], # Slovenian - Slovenia + "sq-AL" => ["041c:0000041c"], # Albanian - Albania + "sr-Latn-RS" => ["241a:0000081a"], # Serbian - Serbia (Latin) + "sv-FI" => ["081d:0000041d"], # Swedish - Finland + "sv-SE" => ["041d:0000041d"], # Swedish - Sweden + "sw-KE" => ["0441:00000409"], # Swahili - Kenya + "ta-IN" => ["0449:00000449"], # Tamil - India + "te-IN" => ["044a:0000044a"], # Telugu - India (Telugu Script) + "th-TH" => ["041e:0000041e"], # Thai - Thailand + "tr-TR" => ["041f:0000041f"], # Turkish - Turkey + "uk-UA" => ["0422:00020422"], # Ukrainian - Ukraine + "ur-PK" => ["0420:00000420"], # Urdu (Islamic Republic of Pakistan) + "zh-CN" => ["0804:00000804"], # Chinese - PRC + "zh-TW" => ["0404:00000404"], # Chinese - Taiwan +); + + +# +# Command line processing +# + +my $Usage; +sub check_opt_val($$) +{ + my ($Option, $Value) = @_; + + if (defined $Value) + { + Error("$Option can only be specified once\n"); + $Usage = 2; # but continue processing this option + } + if (!@ARGV) + { + Error("missing value for $Option\n"); + $Usage = 2; + return undef; + } + return shift @ARGV; +} + +sub check_opt_locale($$) +{ + my ($Option, $Value) = @_; + $Value = check_opt_val($Option, $Value); + if ($Value !~ /^(?:[a-z]{2})-(?:Latn-)?(?:[A-Z]{2})$/) + { + Error("'$Value' is not a valid $Option locale\n"); + $Usage = 2; + return undef; + } + return $Value; +} + +my ($OptHostName, $OptReboot); +my ($OptVM, $OptRefresh, $OptRefreshAll, $OptAddMissing, $OptAddLocales); +my ($OptDefault, $OptLocale, $OptSystem, $OptMUI, $OptCountry, $OptKeyboard); +while (@ARGV) +{ + my $Arg = shift @ARGV; + if ($Arg eq "--help") + { + $Usage = 0; + } + elsif ($Arg eq "--vm") + { + $OptVM = check_opt_val($Arg, $OptVM); + } + elsif ($Arg eq "--refresh") + { + $OptRefresh = 1; + } + elsif ($Arg eq "--refresh-all") + { + $OptRefreshAll = 1; + } + elsif ($Arg eq "--add-missing") + { + $OptAddMissing = 1; + } + elsif ($Arg eq "--add-locales") + { + $OptAddLocales = check_opt_val($Arg, $OptAddLocales); + } + elsif ($Arg eq "--reboot") + { + if (defined $OptReboot and !$OptReboot) + { + Error("--reboot and --no-reboot are incompatible\n"); + $Usage = 2; + } + $OptReboot = 1; + } + elsif ($Arg eq "--no-reboot") + { + if ($OptReboot) + { + Error("--reboot and --no-reboot are incompatible\n"); + $Usage = 2; + } + $OptReboot = 0; + } + elsif ($Arg eq "--default") + { + $OptDefault = check_opt_locale($Arg, $OptDefault); + } + elsif ($Arg eq "--locale") + { + $OptLocale = check_opt_locale($Arg, $OptLocale); + } + elsif ($Arg eq "--system") + { + $OptSystem = check_opt_locale($Arg, $OptSystem); + } + elsif ($Arg eq "--mui") + { + $OptMUI = check_opt_locale($Arg, $OptMUI); + } + elsif ($Arg eq "--keyboard") + { + $OptKeyboard = check_opt_locale($Arg, $OptKeyboard); + } + elsif ($Arg eq "--country") + { + $OptCountry = check_opt_val($Arg, $OptCountry); + } + elsif ($Arg eq "--debug") + { + $Debug = 1; + } + elsif ($Arg eq "--dry-run") + { + $DryRun = 1; + } + elsif ($Arg =~ /^-/) + { + Error("unknown option '$Arg'\n"); + $Usage = 2; + } + elsif (!defined $OptHostName) + { + $OptHostName = $Arg; + } + else + { + Error("unexpected argument '$Arg'\n"); + $Usage = 2; + } +} + +my ($BaseVMName, $VMLocale, %AddLocales, $KeyboardIds, $CountryId); +if (!defined $Usage) +{ + if (defined $OptVM) + { + if ($OptRefresh or $OptRefreshAll or $OptAddMissing or + defined $OptAddLocales) + { + if (defined $OptReboot and !$OptReboot) + { + Error("--no-reboot is incompatible with --refresh, --refresh-all, --add-missing and --add-locales\n"); + $Usage = 2; + } + if (defined $OptDefault or defined $OptLocale or defined $OptMUI or + defined $OptCountry or defined $OptKeyboard) + { + Error("--default, --locale, --mui, --country and --keyboard are incompatible with the VM snapshot options\n"); + $Usage = 2; + } + + # Always reboot Windows before updating a TestBot snapshot + $OptReboot = 1; + } + if ($OptRefresh and + ($OptRefreshAll or $OptAddMissing or defined $OptAddLocales)) + { + Error("--refresh is incompatible with --refresh--all, --add-missing and --add-locales\n"); + $Usage = 2; + } + if ($OptRefreshAll and $OptAddMissing) + { + Error("--refresh-all and --add-missing are mutually incompatible\n"); + $Usage = 2; + } + if (defined $OptAddLocales) + { + foreach my $Locale (split /:/, $OptAddLocales) + { + if ($Locale =~ /^[a-z]{2}_[A-Z]{2}$/) + { + $AddLocales{$Locale} = 1; + } + else + { + Error("'$Locale' is not a valid locale for --add-locales\n"); + $Usage = 2; + last; + } + } + if (!%AddLocales) + { + Error("'$OptAddLocales' does not contain any valid locale\n"); + $Usage = 2; + } + } + + $BaseVMName = $OptVM; + if ($BaseVMName =~ s/_([a-z]{2})_([A-Z]{2})$//) + { + if ($OptRefreshAll) + { + Error("'$OptVM' should not be a locale VM\n"); + $Usage = 2; + } + $VMLocale = "$1_$2"; + $OptDefault = $VMLocale eq "sr_RS" ? "sr-Latn-CS" : "$1-$2"; + } + elsif ($OptRefresh) + { + Error("'$OptVM' is not a locale VM\n"); + $Usage = 2; + } + } + else + { + if ($OptRefresh or $OptRefreshAll or $OptAddMissing or + defined $OptAddLocales) + { + Error("--refresh, --refresh-all, --add-missing and --add-locales can only be used with --vm\n"); + $Usage = 2; + } + if (!defined $OptHostName) + { + Error("you must specify the Windows machine to work on\n"); + $Usage = 2; + } + } + + $OptLocale ||= $OptDefault; + $OptSystem ||= $OptDefault; + $OptMUI ||= $OptDefault; + $OptKeyboard ||= $OptDefault; + if (defined $OptKeyboard) + { + if (!exists $Keyboards{$OptKeyboard}) + { + # intl.cpl automatically pick the appropriate keyboard but, unlike + # for Windows' initial installation, it does not make it the + # default since the system has a keyboard already. + Warning("unknown keyboard '$OptKeyboard'. Letting intl.cpl use its default.\n"); + } + $KeyboardIds = $Keyboards{$OptKeyboard}; + } + if (!defined $OptCountry and defined $OptDefault and + $OptDefault =~ /-([A-Z]{2})$/) + { + $OptCountry = $1; + } + if (defined $OptCountry) + { + if (!exists $Countries{$OptCountry}) + { + Error("unknown country '$OptCountry'\n"); + $Usage = 2; + } + $CountryId = $Countries{$OptCountry}; + } + + if (!defined $OptLocale and !defined $OptSystem and !defined $OptMUI and + !defined $OptKeyboard and !defined $OptCountry and + !$OptRefresh and !$OptRefreshAll and !$OptAddMissing and + !defined $OptAddLocales) + { + Error("you must specify at least one locale to change\n"); + $Usage = 2; + } + + # Two settings only take effect after a reboot: + # - System locale changes. + # - Display language changes only require a log out + log in but that cannot + # be automated so just reboot instead. + $OptReboot = 1 if (!defined $OptReboot and ($OptSystem or $OptMUI)); +} +if (defined $Usage) +{ + if ($Usage) + { + Error("try '$name0 --help' for more information\n"); + exit $Usage; + } + print "Usage: $name0 [options] --vm NAME --refresh\n"; + print "or $name0 [options] --vm NAME [--refresh-all] [--add-locales LOC1:LOC2:...]\n"; + print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME|--vm NAME\n"; + print "\n"; + print "Sets the locale of the specified Windows machine and, optionally, updates or creates a new snapshot ot the TestBot VM for it.\n"; + print "\n"; + print "Where:\n"; + print " --vm NAME Work on the specified TestBot VM.\n"; + print " --refresh Create or update the TestBot VM's snapshot (and VM if needed).\n"; + print " --refresh-all Refresh the locale VMs derived from the specified base VM.\n"; + print " --add-missing Check the locale VMs derived from the specified base VM and\n"; + print " add any missing corresponding snapshots.\n"; + print " --add-locales LOC1:LOC2:... Create new TestBot VMs derived from the specified\n"; + print " base VM for each of the Unix locale in the colon-sperated\n"; + print " list.\n"; + print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; + print " --default LOC Use this Windows locale as the default for the other options.\n"; + print " The locale must be in a form suitable for Windows' intl.cpl\n"; + print " control panel module, that is roughly ll-CC where ll is an\n"; + print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; + print " code.\n"; + print " --locale USR Specifies the user formats (see --defaults).\n"; + print " --system SYS Specifies the system locale (see --defaults).\n"; + print " --mui MUI Specifies the display language (see --defaults).\n"; + print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; + print " --country CTY Specifies the location using only the country part of the\n"; + print " Windows locale (see --defaults).\n"; + print " --debug Show more detailed information about progress.\n"; + print " --dry-run Show what would happen but do nothing.\n"; + print " --help Shows this usage message.\n"; + exit 0; +} + + +# +# Handle the meta options +# + +my $VMs = CreateVMs(); +my $VM = $VMs->GetItem($OptVM); +if ($VM and $VM->Role eq "deleted") +{ + FatalError("'$OptVM' is marked for deletion\n"); +} + +if ($OptRefreshAll or $OptAddMissing) +{ + FatalError("could not find the '$OptVM' virtual machine\n") if (!$VM); + + my $HasLocaleVMs; + foreach my $VM (@{$VMs->GetItems()}) + { + next if ($VM->Role eq "deleted"); + if ($VM->Name =~ /^\Q$OptVM\E_([a-z]{2})_([A-Z]{2})$/) + { + $HasLocaleVMs = 1; + if ($OptRefreshAll or !$VM->GetDomain()->HasSnapshot($VM->IdleSnapshot)) + { + $AddLocales{"$1_$2"} = 1; + } + } + } + FatalError("could not find any locale VM for '$OptVM'\n") if (!$HasLocaleVMs); + if (!%AddLocales) + { + Debug(Elapsed($Start), " Nothing to do!\n"); + exit(0); + } +} + +if (%AddLocales) +{ + my @Failed; + my @Cmd = ("$0", ($Debug ? "--debug" : ()), "--refresh", "--vm"); + foreach my $Locale (sort keys %AddLocales) + { + if (Run(@Cmd, "${OptVM}_$Locale")) + { + push @Failed, $Locale; + } + } + if (@Failed) + { + Error("failed to add/refresh the snapshots for the following locales: @Failed\n"); + exit(1); + } + exit(0); +} + + +# +# Prepare the virtual machine +# + +if ($OptRefresh) +{ + my $BaseVM = $VMs->GetItem($BaseVMName); + if (!$BaseVM) + { + FatalError("could not find the '$BaseVMName' base virtual machine\n"); + } + + if (!$VM) + { + if ($BaseVM->Status ne "maintenance") + { + FatalError("the base VM is not marked for maintenance\n"); + } + if ($DryRun) + { + Warning("'$OptVM' does not exist. Skipping for dry run.\n"); + exit(0); + } + + # Create the localized VM + $VM = $VMs->Add(); + $VM->Name($OptVM); + $VM->SortOrder($BaseVM->SortOrder + 1); + $VM->Type($BaseVM->Type); + $VM->Role("extra"); + $VM->Missions($BaseVM->Missions); + $VM->MissionCaps($BaseVM->MissionCaps); + # All we need is for one VM to be in maintenance mode to prevent the + # TestBot from using this hypervisor domain. The base VM is in maintenance + # mode so that is enough. + $VM->Status("off"); + $VM->VirtURI($BaseVM->VirtURI); + $VM->VirtDomain($BaseVM->VirtDomain); + $VM->IdleSnapshot($BaseVM->IdleSnapshot ."_$VMLocale"); + $VM->Hostname($BaseVM->Hostname); + + my $Description = $BaseVM->Description ." ". LocaleName($Suffix); + my $PropertyDescriptor = $VMs->GetPropertyDescriptorByName("Description"); + if ($PropertyDescriptor->GetMaxLength() < length($Description)) + { + Warning("the $OptVM description is too long. Truncating it.\n"); + $Description = substr($Description, 0, $PropertyDescriptor->GetMaxLength()); + } + $VM->Description($Description); + $VM->Details($BaseVM->Details); + + my ($_ErrKey, $_ErrProperty, $ErrMessage) = $VMs->Save(); + if (defined $ErrMessage) + { + FatalError("could not create the localized VM: $ErrMessage\n"); + } + } + else + { + if ($VM->Status ne "maintenance" and $BaseVM->Status ne "maintenance") + { + FatalError("neither $OptVM nor its base VM are marked for maintenance\n"); + } + if ($VM->Status !~ /^(?:maintenance|off)$/) + { + FatalError("'$OptVM' is neither off nor marked for maintenance\n"); + } + if ($BaseVM->Status !~ /^(?:maintenance|off)$/) + { + FatalError("'$BaseVMName' is neither off nor marked for maintenance\n"); + } + + } + + my $IdleSnapshot = $VM->IdleSnapshot; + if ($VM->GetDomain()->HasSnapshot($IdleSnapshot)) + { + Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); + my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->RemoveSnapshot(); + if (defined $ErrMessage) + { + FatalError("could not remove the $IdleSnapshot snapshot: $ErrMessage\n"); + } + } + + Debug(Elapsed($Start), " Reverting the base VM\n"); + if (Run("$::RootDir/bin/LibvirtTool.pl", "--debug", "revert", $BaseVMName)) + { + # LibvirtTool.pl will have already printed an error message + exit(1); + } +} +elsif (defined $OptVM and !$VM) +{ + FatalError("could not find the '$OptVM' virtual machine\n"); +} + + +# +# Generate the intl.cpl configuration +# + +my @Config = ( + # intl.cpl does not want single quotes on that one line! + "<gs:GlobalizationServices xmlns:gs=\"urn:longhornGlobalizationUnattend\">", + " <gs:UserList>", + " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='true' CopySettingsToSystemAcct='true'/>", + " </gs:UserList>", +); +if ($OptLocale) +{ + push @Config, " ", + " <gs:UserLocale>", + " <gs:Locale Name='$OptLocale' SetAsCurrent='true'/>", + " </gs:UserLocale>"; +} +if ($OptSystem) +{ + push @Config, " ", + " <gs:SystemLocale Name='$OptSystem'/>"; +} +if (defined $CountryId) +{ + push @Config, " ", + " <gs:LocationPreferences>", + " <gs:GeoID Value='$CountryId'/>", + " </gs:LocationPreferences>"; +} +if ($OptMUI) +{ + push @Config, " <gs:MUILanguagePreferences>", + " <gs:MUILanguage Value='$OptMUI'/>", + " </gs:MUILanguagePreferences>"; +} +if ($KeyboardIds) +{ + push @Config, " ", + " <gs:InputPreferences>"; + my $Default = " Default='true'"; + foreach my $Id (@$KeyboardIds) + { + push @Config, " <gs:InputLanguageID Action='add' ID='$Id'$Default/>"; + $Default = ""; + } + push @Config, " </gs:InputPreferences>"; +} +push @Config, "</gs:GlobalizationServices>"; + + +# +# Change the Windows locale using intl.cpl +# + +$OptHostName = $VM->Hostname if ($VM); # For error messages +my $TA = $VM ? $VM->GetAgent() : TestAgent->new($OptHostName, $AgentPort); + +Debug(Elapsed($Start), " Sending the configuration file\n"); +if ($DryRun) +{ + print STDERR join("\n", "locales.xml:", @Config, ""); +} +elsif (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +{ + FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); +} + +# For some reason this only works when run from a batch script! +Debug(Elapsed($Start), " Sending the batch file\n"); +my $Cmd = 'control.exe intl.cpl,,/f:"locales.xml"'; +if ($DryRun) +{ + print STDERR "script.bat: $Cmd\n"; +} +elsif (!$TA->SendFileFromString($Cmd, "script.bat", $TestAgent::SENDFILE_EXE)) +{ + FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); +} + +Debug(Elapsed($Start), " Running intl.cpl\n"); +if (!$DryRun) +{ + my $Pid = $TA->Run(["./script.bat"], 0); + if (!$Pid) + { + FatalError("failed to run intl.cpl\n"); + } + + # Unfortunately the control.exe and/or intl.cpl exit code is unusable so + # there is no way to check for errors + Debug(Elapsed($Start), " Waiting for intl.cpl\n"); + if (!defined $TA->Wait($Pid, 120)) + { + FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); + } + + $TA->Rm("script.bat"); + $TA->Rm("locales.xml"); +} + +if ($OptReboot) +{ + Debug(Elapsed($Start), " Rebooting Windows\n"); + $Cmd = ["shutdown.exe", "/r", "/t", "0"]; + if ($DryRun) + { + print STDERR "Running ", join(" ", @$Cmd), "\n"; + } + else + { + $TA->Run($Cmd, 0); + # Note that we cannot wait for this command since it reboots Windows + } +} + + +# +# Update the virtual machine snapshot +# + +if ($OptRefresh) +{ + # Wait a bit to make sure we don't reconnect before Windows has rebooted. + sleep(30) if (!$DryRun); + + # Allow up to 10 minutes for the shutdown plus reboot. + Debug(Elapsed($Start), " Waiting for Windows to boot\n"); + $TA->SetConnectTimeout(20, 30); + if (!$DryRun and !$TA->Ping()) + { + FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); + } + + # Then wait a good minute after the reboot to make sure all the widgets are + # up and running. + Debug(Elapsed($Start), " Letting Windows warm up\n"); + sleep(60) if (!$DryRun); + + Debug(Elapsed($Start), " Creating the ", $VM->IdleSnapshot, " snapshot\n"); + my $ErrMessage = $DryRun ? undef : $VM->GetDomain()->CreateSnapshot(); + if (defined $ErrMessage) + { + FatalError("could not create the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); + } +} + +Debug(Elapsed($Start), " All done!\n"); +exit(0); -- 2.19.2

1 0

[PATCH] po: Make tzres resources traslatable.
by Akihiro Sagawa 12 Dec '18

12 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/tzres/tzres.rc | 6 + po/ar.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/bg.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ca.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/da.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/en.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/eo.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/es.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/fi.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 800 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/hr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/or.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pa.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ro.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/te.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/th.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/wine.pot | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ 47 files changed, 36907 insertions(+)

2 1

[PATCH] advapi32: Load a resource dll as data file in RegLoadMUIStringW.
by Akihiro Sagawa 12 Dec '18

12 Dec '18

Wine-Bugs: https://bugs.winehq.org/show_bug.cgi?id=46266 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/advapi32/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH] po: Update Ukrainian translation.
by Andrey Gusev 12 Dec '18

12 Dec '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- po/uk.po | 46 +++++++++++++++------------------------------- 1 file changed, 15 insertions(+), 31 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1e0455ae4c..11bf9ad9c3 100644 --- a/po/uk.po +++ b/po/uk.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: 2018-07-15 16:35+0300\n" +"PO-Revision-Date: 2018-12-12 15:58+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -306,25 +306,23 @@ msgstr "Скасування..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "Залишилося %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "Залишилося %1!u! %2 and %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Секунди" +msgstr "сек." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "хв." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "год." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -423,16 +421,12 @@ msgid "&Retry" msgstr "По&втор" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "С&ховати вкладки" +msgstr "Сховати подробиці" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Подробиці" +msgstr "Показати подробиці" #: comctl32.rc:31 cryptui.rc:235 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -2452,16 +2446,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Майстер експорту сертифікатів завершив роботу успішно." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Вибір сховища сертифікатів" +msgstr "Вибір сертифіката" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Виберіть потрібне сховище сертифікатів:" +msgstr "Виберіть потрібний сертифікат" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2992,20 +2982,16 @@ msgstr "" "Увага: Приватний ключ для цього сертифікату не може бути експортований." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Призначена ціль:" +msgstr "Призначення" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Розміщення" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Вибір сховища сертифікатів" +msgstr "Виберіть сертифікат" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -11183,10 +11169,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Помилка: невірний параметр '%c'.\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Помилка: Не вдалось знайти процес \"%1\".\n" +msgstr "Помилка: Не вдалося отримати ім'я хоста: %u.\n" #: hostname.rc:33 msgid "" @@ -14354,11 +14338,11 @@ msgstr "Ко&лір:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типи MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Керування &асоціаціями файлів" #: winecfg.rc:308 msgid "Folders" -- 2.17.2

1 0

[PATCH] windowscodecs: Remove redundant comparison.
by Andrey Gusev 12 Dec '18

12 Dec '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/windowscodecs/imgfactory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index fb235fbbe1..7b1c2298dc 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -506,7 +506,7 @@ static HRESULT create_bitmap_from_source_rect(IWICBitmapSource *piBitmapSource, IWICPixelFormatInfo2 *formatinfo; WICPixelFormatNumericRepresentation format_type; - assert(!rect || (rect && option == WICBitmapCacheOnLoad)); + assert(!rect || option == WICBitmapCacheOnLoad); if (!piBitmapSource || !ppIBitmap) return E_INVALIDARG; -- 2.17.2

1 0

[PATCH v2 1/3] riched20: Extract handling of VK_RETURN into a method
by Fabian Maurer 12 Dec '18

12 Dec '18

This is basically a no-op to make the following fix simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v2: Styling fixes --- dlls/riched20/editor.c | 333 ++++++++++++++++++++++------------------- 1 file changed, 176 insertions(+), 157 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..79c9636a7f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2427,6 +2427,181 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) ME_UpdateLinkAttribute(editor, &start, nChars); } +static BOOL handle_enter(ME_TextEditor *editor) +{ + BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; + + if (editor->bDialogMode) + { + if (ctrl_is_down) + return TRUE; + + if (!(editor->styleFlags & ES_WANTRETURN)) + { + if (editor->hwndParent) + { + DWORD dw; + dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } + } + return TRUE; + } + } + + if (editor->styleFlags & ES_MULTILINE) + { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para = cursor.pPara; + int from, to; + ME_Style *style, *eop_style; + + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return TRUE; + } + + ME_GetSelectionOfs(editor, &from, &to); + if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) + { + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para->member.para.nFlags & MEPF_ROWEND) + { + /* Add a new table row after this row. */ + para = ME_AppendTableRow(editor, para); + para = para->member.para.next_para; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + else if (para == editor->pCursors[1].pPara && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && + !para->member.para.prev_para->member.para.nCharOfs) + { + /* Insert a newline before the table. */ + para = para->member.para.prev_para; + para->member.para.nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + para = editor->pBuffer->pFirst->member.para.next_para; + ME_SetDefaultParaFormat(editor, &para->member.para.fmt); + para->member.para.nFlags = 0; + mark_para_rewrap(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else /* v1.0 - 3.0 */ + { + ME_DisplayItem *para = cursor.pPara; + if (ME_IsInTable(para)) + { + if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { + if (from == to) + { + ME_ContinueCoalescingTransaction(editor); + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else + { + ME_ContinueCoalescingTransaction(editor); + if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + !ME_IsInTable(para->member.para.prev_para)) + { + /* Insert newline before table */ + cursor.pRun = ME_FindItemBack(para, diRun); + if (cursor.pRun) + { + editor->pCursors[0].pRun = cursor.pRun; + editor->pCursors[0].pPara = para->member.para.prev_para; + } + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + } + else + { + editor->pCursors[1] = editor->pCursors[0]; + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + } + + style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; + ME_ContinueCoalescingTransaction(editor); + if (shift_is_down) + ME_InsertEndRowFromCursor(editor, 0); + else + if (!editor->bEmulateVersion10) + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + else + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_CommitCoalescingUndo(editor); + SetCursor(NULL); + + ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); + } + return TRUE; + } + return FALSE; +} + static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) { @@ -2493,163 +2668,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - if (editor->bDialogMode) - { - if (ctrl_is_down) - return TRUE; - - if (!(editor->styleFlags & ES_WANTRETURN)) - { - if (editor->hwndParent) - { - DWORD dw; - dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); - if (HIWORD(dw) == DC_HASDEFID) - { - HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); - if (hwDefCtrl) - { - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); - PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); - } - } - } - return TRUE; - } - } - - if (editor->styleFlags & ES_MULTILINE) - { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; - ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; - int from, to; - ME_Style *style, *eop_style; - - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return TRUE; - } - - ME_GetSelectionOfs(editor, &from, &to); - if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) - { - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) - { - /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - ME_SetDefaultParaFormat(editor, &para->member.para.fmt); - para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) - { - if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) - { - if (from == to) { - ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { - ME_ContinueCoalescingTransaction(editor); - if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) - { - /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); - if (cursor.pRun) { - editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; - } - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - } else { - editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - } - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } - } - - style = ME_GetInsertStyle(editor, 0); - - /* Normally the new eop style is the insert style, however in a list it is copied from the existing - eop style (this prevents the list label style changing when the new eop is inserted). - No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; - else - eop_style = style; - ME_ContinueCoalescingTransaction(editor); - if (shift_is_down) - ME_InsertEndRowFromCursor(editor, 0); - else - if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); - ME_CommitCoalescingUndo(editor); - SetCursor(NULL); - - ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor, FALSE); - ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ - ME_ReleaseStyle(style); - } - return TRUE; - } - break; + return handle_enter(editor); case VK_ESCAPE: if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); -- 2.20.0

2 3

[PATCH v3 3/3] riched32: Handle enter press in WM_CHAR instead of WM_KEYDOWN
by Huw Davies 12 Dec '18

12 Dec '18

From: Fabian Maurer <dark.shadow4(a)web.de> This fixes an old regression when VK_RETURN handling was implemented Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23282 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 16 +++++++++++----- dlls/riched20/tests/editor.c | 29 +++++++++++++++++++++++++++++ dlls/riched32/tests/editor.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 79c9636a7f..9bacc6315d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2668,7 +2668,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - return handle_enter(editor); + if (!editor->bEmulateVersion10) + return handle_enter(editor); + break; case VK_ESCAPE: if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); @@ -2740,6 +2742,12 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, if (editor->bMouseCaptured) return 0; + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return 0; /* FIXME really 0 ? */ + } + if (unicode) wstr = (WCHAR)charCode; else @@ -2748,10 +2756,8 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, MultiByteToWideChar(CP_ACP, 0, &charA, 1, &wstr, 1); } - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return 0; /* FIXME really 0 ? */ - } + if (editor->bEmulateVersion10 && wstr == '\r') + handle_enter(editor); if ((unsigned)wstr >= ' ' || wstr == '\t') { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 782d6d871f..932c8a1d32 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8273,6 +8273,7 @@ static void format_test_result(char *target, const char *src) * inserts CR. If shows that EM_GETTEXTEX with GT_USECRLF == WM_GETTEXT * and also shows that GT_USECRLF has no effect in richedit 1.0, but * does for higher. The same test is cloned in riched32 and riched20. + * Also shows the difference between WM_CHAR/WM_KEYDOWN in v1.0 and higher versions */ static void test_enter(void) { @@ -8353,6 +8354,34 @@ static void test_enter(void) i, resultbuf, expectedbuf); } + /* Show that WM_CHAR is handled differently from WM_KEYDOWN */ + getText.flags = GT_DEFAULT; + getText.codepage = CP_ACP; + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_KEYDOWN, VK_RETURN, 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 2, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T\r"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index a60d21b0ef..dd9773c3f6 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1163,6 +1163,7 @@ static void format_test_result(char *target, const char *src) * inserts CR. If shows that EM_GETTEXTEX with GT_USECRLF == WM_GETTEXT * and also shows that GT_USECRLF has no effect in richedit 1.0, but * does for higher. The same test is cloned in riched32 and riched20. + * Also shows the difference between WM_CHAR/WM_KEYDOWN in v1.0 and higher versions */ static void test_enter(void) { @@ -1241,6 +1242,34 @@ static void test_enter(void) i, resultbuf, expectedbuf); } + /* Show that WM_CHAR is handled differently from WM_KEYDOWN */ + getText.flags = GT_DEFAULT; + getText.codepage = CP_ACP; + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_KEYDOWN, VK_RETURN, 0); + + result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + + result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)""); + ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); + SendMessageW(hwndRichEdit, WM_CHAR, 'T', 0); + SendMessageW(hwndRichEdit, WM_CHAR, '\r', 0); + + SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); + ok(result == 1, "Got %d\n", (int)result); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, "T\r\n"); + result = strcmp(resultbuf, expectedbuf); + ok (result == 0, "[%d] EM_GETTEXTEX, GT_DEFAULT unexpected '%s', expected '%s'\n", i, resultbuf, expectedbuf); + DestroyWindow(hwndRichEdit); } -- 2.18.0

1 0

[PATCH v3 2/3] riched20: Refactor tests testing VK_RETURN
by Huw Davies 12 Dec '18

12 Dec '18

From: Fabian Maurer <dark.shadow4(a)web.de> This is basically a no-op to make the tests and the following additions simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/tests/editor.c | 57 +++++++++++++++--------------------- dlls/riched32/tests/editor.c | 57 +++++++++++++++--------------------- 2 files changed, 46 insertions(+), 68 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e134..782d6d871f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8259,6 +8259,14 @@ static void test_EM_FINDWORDBREAK_A(void) DestroyWindow(hwndRichEdit); } +static void format_test_result(char *target, const char *src) +{ + int i; + for (i = 0; i < strlen(src); i++) + sprintf(target + 2*i, "%02x", src[i] & 0xFF); + target[2*i] = 0; +} + /* * This test attempts to show the effect of enter on a richedit * control v1.0 inserts CRLF whereas for higher versions it only @@ -8285,15 +8293,14 @@ static void test_enter(void) char expectedbuf[1024]; char resultbuf[1024]; HWND hwndRichEdit = new_richedit(NULL); - UINT i,j; - - for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { - - char buf[1024] = {0}; - LRESULT result; - GETTEXTEX getText; - const char *expected; + UINT i; + char buf[1024] = {0}; + GETTEXTEX getText = {sizeof(buf)}; + LRESULT result; + const char *expected; + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) + { /* Set the text to the initial text */ result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testenteritems[i].initialtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); @@ -8307,12 +8314,8 @@ static void test_enter(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); expected = testenteritems[i].expectedwmtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -8320,21 +8323,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 2. Retrieve with EM_GETTEXTEX, GT_DEFAULT */ - getText.cb = sizeof(buf); getText.flags = GT_DEFAULT; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedemtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -8342,21 +8338,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 3. Retrieve with EM_GETTEXTEX, GT_USECRLF */ - getText.cb = sizeof(buf); getText.flags = GT_USECRLF; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedemtextcrlf; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7751d2b402..a60d21b0ef 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1149,6 +1149,14 @@ static void simulate_typing_characters(HWND hwnd, const char* szChars) } } +static void format_test_result(char *target, const char *src) +{ + int i; + for (i = 0; i < strlen(src); i++) + sprintf(target + 2*i, "%02x", src[i] & 0xFF); + target[2*i] = 0; +} + /* * This test attempts to show the effect of enter on a richedit * control v1.0 inserts CRLF whereas for higher versions it only @@ -1173,15 +1181,14 @@ static void test_enter(void) char expectedbuf[1024]; char resultbuf[1024]; HWND hwndRichEdit = new_richedit(NULL); - UINT i,j; - - for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { - - char buf[1024] = {0}; - LRESULT result; - GETTEXTEX getText; - const char *expected; + UINT i; + char buf[1024] = {0}; + GETTEXTEX getText = {sizeof(buf)}; + LRESULT result; + const char *expected; + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) + { /* Set the text to the initial text */ result = SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)testenteritems[i].initialtext); ok (result == 1, "[%d] WM_SETTEXT returned %ld instead of 1\n", i, result); @@ -1195,12 +1202,8 @@ static void test_enter(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0, @@ -1208,21 +1211,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 2. Retrieve with EM_GETTEXTEX, GT_DEFAULT */ - getText.cb = sizeof(buf); getText.flags = GT_DEFAULT; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */), @@ -1230,21 +1226,14 @@ static void test_enter(void) i, resultbuf, expectedbuf); /* 3. Retrieve with EM_GETTEXTEX, GT_USECRLF */ - getText.cb = sizeof(buf); getText.flags = GT_USECRLF; - getText.codepage = CP_ACP; - getText.lpDefaultChar = NULL; - getText.lpUsedDefChar = NULL; + getText.codepage = CP_ACP; buf[0] = 0x00; result = SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); expected = testenteritems[i].expectedtext; - resultbuf[0]=0x00; - for (j = 0; j < (UINT)result; j++) - sprintf(resultbuf+strlen(resultbuf), "%02x", buf[j] & 0xFF); - expectedbuf[0] = '\0'; - for (j = 0; j < strlen(expected); j++) - sprintf(expectedbuf+strlen(expectedbuf), "%02x", expected[j] & 0xFF); + format_test_result(resultbuf, buf); + format_test_result(expectedbuf, expected); result = strcmp(expected, buf); ok (result == 0 || broken(buf[0]==0x00 /* WinNT4 */), -- 2.18.0

1 0

[PATCH v3 1/3] riched20: Extract handling of VK_RETURN into a method
by Huw Davies 12 Dec '18

12 Dec '18

From: Fabian Maurer <dark.shadow4(a)web.de> This is basically a no-op to make the following fix simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 333 ++++++++++++++++++++++------------------- 1 file changed, 176 insertions(+), 157 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..79c9636a7f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2427,6 +2427,181 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) ME_UpdateLinkAttribute(editor, &start, nChars); } +static BOOL handle_enter(ME_TextEditor *editor) +{ + BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; + + if (editor->bDialogMode) + { + if (ctrl_is_down) + return TRUE; + + if (!(editor->styleFlags & ES_WANTRETURN)) + { + if (editor->hwndParent) + { + DWORD dw; + dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } + } + return TRUE; + } + } + + if (editor->styleFlags & ES_MULTILINE) + { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para = cursor.pPara; + int from, to; + ME_Style *style, *eop_style; + + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return TRUE; + } + + ME_GetSelectionOfs(editor, &from, &to); + if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) + { + if (!editor->bEmulateVersion10) /* v4.1 */ + { + if (para->member.para.nFlags & MEPF_ROWEND) + { + /* Add a new table row after this row. */ + para = ME_AppendTableRow(editor, para); + para = para->member.para.next_para; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + else if (para == editor->pCursors[1].pPara && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && + !para->member.para.prev_para->member.para.nCharOfs) + { + /* Insert a newline before the table. */ + para = para->member.para.prev_para; + para->member.para.nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + para = editor->pBuffer->pFirst->member.para.next_para; + ME_SetDefaultParaFormat(editor, &para->member.para.fmt); + para->member.para.nFlags = 0; + mark_para_rewrap(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else /* v1.0 - 3.0 */ + { + ME_DisplayItem *para = cursor.pPara; + if (ME_IsInTable(para)) + { + if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { + if (from == to) + { + ME_ContinueCoalescingTransaction(editor); + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + else + { + ME_ContinueCoalescingTransaction(editor); + if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + !ME_IsInTable(para->member.para.prev_para)) + { + /* Insert newline before table */ + cursor.pRun = ME_FindItemBack(para, diRun); + if (cursor.pRun) + { + editor->pCursors[0].pRun = cursor.pRun; + editor->pCursors[0].pPara = para->member.para.prev_para; + } + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + } + else + { + editor->pCursors[1] = editor->pCursors[0]; + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + } + + style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; + ME_ContinueCoalescingTransaction(editor); + if (shift_is_down) + ME_InsertEndRowFromCursor(editor, 0); + else + if (!editor->bEmulateVersion10) + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + else + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_CommitCoalescingUndo(editor); + SetCursor(NULL); + + ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); + } + return TRUE; + } + return FALSE; +} + static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) { @@ -2493,163 +2668,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - if (editor->bDialogMode) - { - if (ctrl_is_down) - return TRUE; - - if (!(editor->styleFlags & ES_WANTRETURN)) - { - if (editor->hwndParent) - { - DWORD dw; - dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); - if (HIWORD(dw) == DC_HASDEFID) - { - HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); - if (hwDefCtrl) - { - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); - PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); - } - } - } - return TRUE; - } - } - - if (editor->styleFlags & ES_MULTILINE) - { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; - ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; - int from, to; - ME_Style *style, *eop_style; - - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return TRUE; - } - - ME_GetSelectionOfs(editor, &from, &to); - if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) - { - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) - { - /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - ME_SetDefaultParaFormat(editor, &para->member.para.fmt); - para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) - { - if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) - { - if (from == to) { - ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { - ME_ContinueCoalescingTransaction(editor); - if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) - { - /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); - if (cursor.pRun) { - editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; - } - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - } else { - editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - } - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } - } - - style = ME_GetInsertStyle(editor, 0); - - /* Normally the new eop style is the insert style, however in a list it is copied from the existing - eop style (this prevents the list label style changing when the new eop is inserted). - No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; - else - eop_style = style; - ME_ContinueCoalescingTransaction(editor); - if (shift_is_down) - ME_InsertEndRowFromCursor(editor, 0); - else - if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); - ME_CommitCoalescingUndo(editor); - SetCursor(NULL); - - ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor, FALSE); - ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ - ME_ReleaseStyle(style); - } - return TRUE; - } - break; + return handle_enter(editor); case VK_ESCAPE: if (editor->bDialogMode && editor->hwndParent) PostMessageW(editor->hwndParent, WM_CLOSE, 0, 0); -- 2.18.0

1 0

[PATCH vkd3d 5/9] tests: Skip "ps_movc" on Windows AMD drivers.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 6 ++++++ tests/d3d12_crosstest.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c127f6bd1d35..463e3046af66 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -7986,6 +7986,12 @@ static void test_shader_instructions(void) continue; } + if (uint_tests[i].ps == &ps_movc && is_amd_device(context.device)) + { + skip("ps_movc crashes on Windows with AMD GPUs.\n"); + continue; + } + if (current_ps != uint_tests[i].ps) { if (context.pipeline_state) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 00db06407f2f..ee12c891b290 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -294,6 +294,32 @@ static void init_adapter_info(void) IDXGIAdapter_Release(dxgi_adapter); } + +static inline bool is_amd_device(ID3D12Device *device) +{ + DXGI_ADAPTER_DESC desc = {0}; + IDXGIFactory4 *factory; + IDXGIAdapter *adapter; + HRESULT hr; + LUID luid; + + luid = ID3D12Device_GetAdapterLuid(device); + + hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); + + hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter_GetDesc(adapter, &desc); + ok(hr == S_OK, "Failed to get adapter desc, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + } + + IDXGIFactory4_Release(factory); + + return desc.VendorId == 0x1002; +} #else static IUnknown *create_adapter(void) { @@ -301,6 +327,11 @@ static IUnknown *create_adapter(void) } static void init_adapter_info(void) {} + +static inline bool is_amd_device(ID3D12Device *device) +{ + return false; +} #endif static ID3D12Device *create_device(void) -- 2.19.2

2 1

[PATCH vkd3d 6/9] tests: Add test for invalid shader bytecode.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Makefile.am | 4 ++- tests/vkd3d_shader_api.c | 58 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/vkd3d_shader_api.c diff --git a/Makefile.am b/Makefile.am index 86c0184c97a6..a16f7ca42ec9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,8 @@ vkd3d_demos_shaders = \ demos/triangle_vs.h vkd3d_tests = \ - tests/vkd3d_api + tests/vkd3d_api \ + tests/vkd3d_shader_api vkd3d_cross_tests = \ tests/d3d12 \ @@ -137,6 +138,7 @@ AM_DEFAULT_SOURCE_EXT = .c TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ +tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la if BUILD_DEMOS DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c new file mode 100644 index 000000000000..ec439e146ddb --- /dev/null +++ b/tests/vkd3d_shader_api.c @@ -0,0 +1,58 @@ +/* + * Copyright 2018 Józef Kucia 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 "vkd3d_test.h" +#include <vkd3d_shader.h> + +static void test_invalid_shaders(void) +{ + struct vkd3d_shader_code spirv; + int rc; + + static const DWORD ps_break_code[] = + { +#if 0 + ps_4_0 + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + if_z cb0[0].x + mov o0.xyzw, l(1.000000,1.000000,1.000000,1.000000) + break + endif + mov o0.xyzw, l(0,0,0,0) + ret +#endif + 0x43425844, 0x1316702a, 0xb1a7ebfc, 0xf477753e, 0x72605647, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000080, 0x00000040, 0x00000020, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400001f, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x3f800000, 0x3f800000, 0x3f800000, 0x01000002, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const struct vkd3d_shader_code ps_break = {ps_break_code, sizeof(ps_break_code)}; + + rc = vkd3d_shader_compile_dxbc(&ps_break, &spirv, VKD3D_SHADER_STRIP_DEBUG, NULL, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); +} + +START_TEST(vkd3d_shader_api) +{ + run_test(test_invalid_shaders); +} -- 2.19.2

2 1

[PATCH vkd3d 9/9] vkd3d-shader: Avoid BYTE.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index cf6e9f507335..afa002b83616 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -545,8 +545,8 @@ enum vkd3d_shader_type struct vkd3d_shader_version { enum vkd3d_shader_type type; - BYTE major; - BYTE minor; + uint8_t major; + uint8_t minor; }; struct vkd3d_shader_immediate_constant_buffer -- 2.19.2

2 1

[PATCH vkd3d 8/9] vkd3d-shader: Avoid BOOL.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 48 ++++++++++++------------ libs/vkd3d-shader/trace.c | 12 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 22cf57ca9dab..b199749064f5 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -511,9 +511,9 @@ static const enum vkd3d_data_type data_type_table[] = /* VKD3D_SM4_DATA_FLOAT */ VKD3D_DATA_FLOAT, }; -static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); -static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param); static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, @@ -1345,7 +1345,7 @@ void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_v *shader_version = priv->shader_version; } -static BOOL shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, DWORD addressing, struct vkd3d_shader_register_index *reg_idx) { if (addressing & VKD3D_SM4_ADDRESSING_RELATIVE) @@ -1355,7 +1355,7 @@ static BOOL shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p if (!(reg_idx->rel_addr = rel_addr)) { ERR("Failed to get src param for relative addressing.\n"); - return FALSE; + return false; } if (addressing & VKD3D_SM4_ADDRESSING_OFFSET) @@ -1370,10 +1370,10 @@ static BOOL shader_sm4_read_reg_idx(struct vkd3d_sm4_data *priv, const DWORD **p reg_idx->offset = *(*ptr)++; } - return TRUE; + return true; } -static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_register *param, enum vkd3d_shader_src_modifier *modifier) { @@ -1383,7 +1383,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } token = *(*ptr)++; @@ -1407,7 +1407,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } m = *(*ptr)++; @@ -1449,7 +1449,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[0]))) { ERR("Failed to read register index.\n"); - return FALSE; + return false; } } @@ -1464,7 +1464,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[1]))) { ERR("Failed to read register index.\n"); - return FALSE; + return false; } } @@ -1483,7 +1483,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (end - *ptr < 1) { WARN("Invalid ptr %p, end %p.\n", *ptr, end); - return FALSE; + return false; } memcpy(param->u.immconst_uint, *ptr, 1 * sizeof(DWORD)); *ptr += 1; @@ -1494,7 +1494,7 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (end - *ptr < VKD3D_VEC4_SIZE) { WARN("Invalid ptr %p, end %p.\n", *ptr, end); - return FALSE; + return false; } memcpy(param->u.immconst_uint, *ptr, VKD3D_VEC4_SIZE * sizeof(DWORD)); *ptr += 4; @@ -1508,10 +1508,10 @@ static BOOL shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr map_register(priv, param); - return TRUE; + return true; } -static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param) { DWORD token; @@ -1519,14 +1519,14 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } token = **ptr; if (!shader_sm4_read_param(priv, ptr, end, data_type, &src_param->reg, &src_param->modifiers)) { ERR("Failed to read parameter.\n"); - return FALSE; + return false; } if (src_param->reg.type == VKD3DSPR_IMMCONST) @@ -1559,7 +1559,7 @@ static BOOL shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * } } - return TRUE; + return true; } static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *reg) @@ -1579,7 +1579,7 @@ static bool shader_sm4_is_scalar_register(const struct vkd3d_shader_register *re } } -static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, +static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param) { enum vkd3d_shader_src_modifier modifier; @@ -1588,20 +1588,20 @@ static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * if (*ptr >= end) { WARN("Invalid ptr %p >= end %p.\n", *ptr, end); - return FALSE; + return false; } token = **ptr; if (!shader_sm4_read_param(priv, ptr, end, data_type, &dst_param->reg, &modifier)) { ERR("Failed to read parameter.\n"); - return FALSE; + return false; } if (modifier != VKD3DSPSM_NONE) { ERR("Invalid source modifier %#x on destination register.\n", modifier); - return FALSE; + return false; } dst_param->write_mask = (token & VKD3D_SM4_WRITEMASK_MASK) >> VKD3D_SM4_WRITEMASK_SHIFT; @@ -1611,7 +1611,7 @@ static BOOL shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD * dst_param->modifiers = 0; dst_param->shift = 0; - return TRUE; + return true; } static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_shader_instruction *ins) @@ -1756,7 +1756,7 @@ fail: return; } -BOOL shader_sm4_is_end(void *data, const DWORD **ptr) +bool shader_sm4_is_end(void *data, const DWORD **ptr) { struct vkd3d_sm4_data *priv = data; return *ptr == priv->end; @@ -1775,7 +1775,7 @@ BOOL shader_sm4_is_end(void *data, const DWORD **ptr) #define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') #define TAG_RTS0 MAKE_TAG('R', 'T', 'S', '0') -static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) +static bool require_space(size_t offset, size_t count, size_t size, size_t data_size) { return !count || (data_size - offset) / count >= size; } diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index e0cb5bab6aea..8769513d2d1d 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -313,17 +313,17 @@ static void string_buffer_clear(struct vkd3d_string_buffer *buffer) buffer->content_size = 0; } -static BOOL string_buffer_init(struct vkd3d_string_buffer *buffer) +static bool string_buffer_init(struct vkd3d_string_buffer *buffer) { buffer->buffer_size = 32; if (!(buffer->buffer = vkd3d_malloc(buffer->buffer_size))) { ERR("Failed to allocate shader buffer memory.\n"); - return FALSE; + return false; } string_buffer_clear(buffer); - return TRUE; + return true; } static void string_buffer_free(struct vkd3d_string_buffer *buffer) @@ -331,7 +331,7 @@ static void string_buffer_free(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } -static BOOL string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) +static bool string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { unsigned int new_buffer_size = buffer->buffer_size * 2; char *new_buffer; @@ -342,11 +342,11 @@ static BOOL string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; - return FALSE; + return false; } buffer->buffer = new_buffer; buffer->buffer_size = new_buffer_size; - return TRUE; + return true; } static int shader_vaddline(struct vkd3d_string_buffer *buffer, const char *format, va_list args) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index da17e361d4ab..cf6e9f507335 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -774,7 +774,7 @@ struct vkd3d_shader_instruction } declaration; }; -static inline BOOL vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_shader_instruction *ins) +static inline bool vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_shader_instruction *ins) { return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w; } @@ -793,7 +793,7 @@ void shader_sm4_read_header(void *data, const DWORD **ptr, struct vkd3d_shader_version *shader_version) DECLSPEC_HIDDEN; void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; -BOOL shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; +bool shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -- 2.19.2

2 1

[PATCH vkd3d 7/9] vkd3d: Return E_FAIL for invalid shader bytecode.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> On Windows invalid shader bytecode leads to a crash, E_FAIL or E_OUTOFMEMORY error. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index b7ebbdd75bdd..fc09bf9824c1 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -423,12 +423,14 @@ HRESULT hresult_from_vkd3d_result(int vkd3d_result) { case VKD3D_OK: return S_OK; + case VKD3D_ERROR_INVALID_SHADER: + WARN("Invalid shader bytecode.\n"); + /* fall-through */ case VKD3D_ERROR: return E_FAIL; case VKD3D_ERROR_OUT_OF_MEMORY: return E_OUTOFMEMORY; case VKD3D_ERROR_INVALID_ARGUMENT: - case VKD3D_ERROR_INVALID_SHADER: return E_INVALIDARG; case VKD3D_ERROR_NOT_IMPLEMENTED: return E_NOTIMPL; -- 2.19.2

2 1

[PATCH vkd3d 2/9] tests: Add names for shader instruction tests.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 153 ++++++++++++++++++++++++++++---------------------- 1 file changed, 86 insertions(+), 67 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 03308639e4e1..9ec71f4bb74c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5600,10 +5600,18 @@ static void test_bundle_state_inheritance(void) static void test_shader_instructions(void) { + struct named_shader + { + const char *name; + const void *code; + size_t size; + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - const D3D12_SHADER_BYTECODE *current_ps; ID3D12GraphicsCommandList *command_list; + const struct named_shader *current_ps; struct test_context_desc desc; + D3D12_SHADER_BYTECODE shader; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *cb; @@ -5631,7 +5639,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_div = {ps_div_code, sizeof(ps_div_code)}; + static const struct named_shader ps_div = {"div", ps_div_code, sizeof(ps_div_code)}; static const DWORD ps_dot2_code[] = { #if 0 @@ -5653,7 +5661,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_dot2 = {ps_dot2_code, sizeof(ps_dot2_code)}; + static struct named_shader ps_dot2 = {"dot2", ps_dot2_code, sizeof(ps_dot2_code)}; static const DWORD ps_dot3_code[] = { #if 0 @@ -5673,7 +5681,7 @@ static void test_shader_instructions(void) 0x09000010, 0x001020f2, 0x00000000, 0x00208246, 0x00000000, 0x00000000, 0x00208246, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_dot3 = {ps_dot3_code, sizeof(ps_dot3_code)}; + static struct named_shader ps_dot3 = {"dot3", ps_dot3_code, sizeof(ps_dot3_code)}; static const DWORD ps_eq_code[] = { #if 0 @@ -5696,7 +5704,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_eq = {ps_eq_code, sizeof(ps_eq_code)}; + static struct named_shader ps_eq = {"eq", ps_eq_code, sizeof(ps_eq_code)}; static const DWORD ps_ne_code[] = { #if 0 @@ -5719,7 +5727,7 @@ static void test_shader_instructions(void) 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ne = {ps_ne_code, sizeof(ps_ne_code)}; + static struct named_shader ps_ne = {"ne", ps_ne_code, sizeof(ps_ne_code)}; static const DWORD ps_if_code[] = { /* compiled with /Gfp option */ @@ -5745,7 +5753,7 @@ static void test_shader_instructions(void) 0x01000012, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x01000015, 0x0100003e }; - static const D3D12_SHADER_BYTECODE ps_if = {ps_if_code, sizeof(ps_if_code)}; + static struct named_shader ps_if = {"if", ps_if_code, sizeof(ps_if_code)}; static const DWORD ps_if_return_code[] = { #if 0 @@ -5786,7 +5794,7 @@ static void test_shader_instructions(void) 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x00000000, 0x0100003e, 0x01000015, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_if_return = {ps_if_return_code, sizeof(ps_if_return_code)}; + static struct named_shader ps_if_return = {"if_return", ps_if_return_code, sizeof(ps_if_return_code)}; static const DWORD ps_nested_if_code[] = { /* compiled with /Gfp option */ @@ -5828,7 +5836,7 @@ static void test_shader_instructions(void) 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x01000015, 0x01000015, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_nested_if = {ps_nested_if_code, sizeof(ps_nested_if_code)}; + static struct named_shader ps_nested_if = {"nested_if", ps_nested_if_code, sizeof(ps_nested_if_code)}; static const DWORD ps_loop_break_code[] = { #if 0 @@ -5866,7 +5874,7 @@ static void test_shader_instructions(void) 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_loop_break = {ps_loop_break_code, sizeof(ps_loop_break_code)}; + static struct named_shader ps_loop_break = {"loop_break", ps_loop_break_code, sizeof(ps_loop_break_code)}; static const DWORD ps_loop_ret_code[] = { #if 0 @@ -5904,7 +5912,7 @@ static void test_shader_instructions(void) 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_loop_ret = {ps_loop_ret_code, sizeof(ps_loop_ret_code)}; + static struct named_shader ps_loop_ret = {"loop_ret", ps_loop_ret_code, sizeof(ps_loop_ret_code)}; static const DWORD ps_breakc_nz_code[] = { #if 0 @@ -5935,7 +5943,7 @@ static void test_shader_instructions(void) 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_breakc_nz = {ps_breakc_nz_code, sizeof(ps_breakc_nz_code)}; + static struct named_shader ps_breakc_nz = {"breakc_nz", ps_breakc_nz_code, sizeof(ps_breakc_nz_code)}; static const DWORD ps_breakc_z_code[] = { #if 0 @@ -5967,7 +5975,7 @@ static void test_shader_instructions(void) 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_breakc_z = {ps_breakc_z_code, sizeof(ps_breakc_z_code)}; + static struct named_shader ps_breakc_z = {"breakc_z", ps_breakc_z_code, sizeof(ps_breakc_z_code)}; static const DWORD ps_continue_code[] = { #if 0 @@ -6001,7 +6009,7 @@ static void test_shader_instructions(void) 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_continue = {ps_continue_code, sizeof(ps_continue_code)}; + static struct named_shader ps_continue = {"continue", ps_continue_code, sizeof(ps_continue_code)}; static const DWORD ps_continuec_nz_code[] = { #if 0 @@ -6045,7 +6053,7 @@ static void test_shader_instructions(void) 0x05000056, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_continuec_nz = {ps_continuec_nz_code, sizeof(ps_continuec_nz_code)}; + static struct named_shader ps_continuec_nz = {"continuec_nz", ps_continuec_nz_code, sizeof(ps_continuec_nz_code)}; static const DWORD ps_retc_nz_code[] = { #if 0 @@ -6077,7 +6085,7 @@ static void test_shader_instructions(void) 0x01000016, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_retc_nz = {ps_retc_nz_code, sizeof(ps_retc_nz_code)}; + static struct named_shader ps_retc_nz = {"retc_nz", ps_retc_nz_code, sizeof(ps_retc_nz_code)}; static const DWORD ps_src_modifiers_code[] = { #if 0 @@ -6099,7 +6107,7 @@ static void test_shader_instructions(void) 0x00102022, 0x00000000, 0x8020801a, 0x00000081, 0x00000000, 0x00000000, 0x07000036, 0x001020c2, 0x00000000, 0x80208ea6, 0x000000c1, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_src_modifiers = {ps_src_modifiers_code, sizeof(ps_src_modifiers_code)}; + static struct named_shader ps_src_modifiers = {"src_modifiers", ps_src_modifiers_code, sizeof(ps_src_modifiers_code)}; static const DWORD ps_sat_code[] = { #if 0 @@ -6117,7 +6125,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06002036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_sat = {ps_sat_code, sizeof(ps_sat_code)}; + static struct named_shader ps_sat = {"sat", ps_sat_code, sizeof(ps_sat_code)}; static const DWORD ps_min_max_code[] = { #if 0 @@ -6141,7 +6149,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_min_max = {ps_min_max_code, sizeof(ps_min_max_code)}; + static struct named_shader ps_min_max = {"min_max", ps_min_max_code, sizeof(ps_min_max_code)}; static const DWORD ps_ftou_code[] = { #if 0 @@ -6161,7 +6169,7 @@ static void test_shader_instructions(void) 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ftou = {ps_ftou_code, sizeof(ps_ftou_code)}; + static struct named_shader ps_ftou = {"ftou", ps_ftou_code, sizeof(ps_ftou_code)}; static const DWORD ps_ftoi_code[] = { #if 0 @@ -6181,7 +6189,7 @@ static void test_shader_instructions(void) 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ftoi = {ps_ftoi_code, sizeof(ps_ftoi_code)}; + static struct named_shader ps_ftoi = {"ftoi", ps_ftoi_code, sizeof(ps_ftoi_code)}; static const DWORD ps_round_code[] = { #if 0 @@ -6204,7 +6212,7 @@ static void test_shader_instructions(void) 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000043, 0x00102042, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_round = {ps_round_code, sizeof(ps_round_code)}; + static struct named_shader ps_round = {"round", ps_round_code, sizeof(ps_round_code)}; static const DWORD ps_round_ne_code[] = { #if 0 @@ -6222,7 +6230,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000040, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_round_ne = {ps_round_ne_code, sizeof(ps_round_ne_code)}; + static struct named_shader ps_round_ne = {"round_ne", ps_round_ne_code, sizeof(ps_round_ne_code)}; static const DWORD ps_frc_code[] = { #if 0 @@ -6244,7 +6252,7 @@ static void test_shader_instructions(void) 0x00000000, 0x8020800a, 0x00000041, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_frc = {ps_frc_code, sizeof(ps_frc_code)}; + static struct named_shader ps_frc = {"frc", ps_frc_code, sizeof(ps_frc_code)}; static const DWORD ps_exp_code[] = { #if 0 @@ -6264,7 +6272,7 @@ static void test_shader_instructions(void) 0x06000019, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_exp = {ps_exp_code, sizeof(ps_exp_code)}; + static struct named_shader ps_exp = {"exp", ps_exp_code, sizeof(ps_exp_code)}; static const DWORD ps_log_code[] = { #if 0 @@ -6284,7 +6292,7 @@ static void test_shader_instructions(void) 0x0600002f, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_log = {ps_log_code, sizeof(ps_log_code)}; + static struct named_shader ps_log = {"log", ps_log_code, sizeof(ps_log_code)}; static const DWORD ps_rcp_code[] = { #if 0 @@ -6304,7 +6312,7 @@ static void test_shader_instructions(void) 0x06000081, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_rcp = {ps_rcp_code, sizeof(ps_rcp_code)}; + static struct named_shader ps_rcp = {"rcp", ps_rcp_code, sizeof(ps_rcp_code)}; static const DWORD ps_rcp_vector_code[] = { #if 0 @@ -6322,7 +6330,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000081, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_rcp_vector = {ps_rcp_vector_code, sizeof(ps_rcp_vector_code)}; + static struct named_shader ps_rcp_vector = {"rcp_vector", ps_rcp_vector_code, sizeof(ps_rcp_vector_code)}; static const DWORD ps_sincos_code[] = { #if 0 @@ -6341,7 +6349,7 @@ static void test_shader_instructions(void) 0x0700004d, 0x00102032, 0x00000000, 0x0000d000, 0x00208046, 0x00000000, 0x00000000, 0x0700004d, 0x0000d000, 0x001020c2, 0x00000000, 0x00208406, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_sincos = {ps_sincos_code, sizeof(ps_sincos_code)}; + static struct named_shader ps_sincos = {"sincos", ps_sincos_code, sizeof(ps_sincos_code)}; static const DWORD ps_indexable_temp_code[] = { #if 0 @@ -6371,7 +6379,7 @@ static void test_shader_instructions(void) 0x00102072, 0x00000000, 0x04203246, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_indexable_temp = {ps_indexable_temp_code, sizeof(ps_indexable_temp_code)}; + static struct named_shader ps_indexable_temp = {"indexable_temp", ps_indexable_temp_code, sizeof(ps_indexable_temp_code)}; static const DWORD ps_indexable_temp2_code[] = { #if 0 @@ -6411,7 +6419,7 @@ static void test_shader_instructions(void) 0x00000000, 0x04203246, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00102082, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_indexable_temp2 = {ps_indexable_temp2_code, sizeof(ps_indexable_temp2_code)}; + static struct named_shader ps_indexable_temp2 = {"indexable_temp2", ps_indexable_temp2_code, sizeof(ps_indexable_temp2_code)}; static const DWORD ps_bfi_code[] = { #if 0 @@ -6431,7 +6439,7 @@ static void test_shader_instructions(void) 0x0f00008c, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x00208ff6, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_bfi = {ps_bfi_code, sizeof(ps_bfi_code)}; + static struct named_shader ps_bfi = {"bfi", ps_bfi_code, sizeof(ps_bfi_code)}; static const DWORD ps_ibfe_code[] = { #if 0 @@ -6450,7 +6458,7 @@ static void test_shader_instructions(void) 0x0c00008b, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ibfe = {ps_ibfe_code, sizeof(ps_ibfe_code)}; + static struct named_shader ps_ibfe = {"ibfe", ps_ibfe_code, sizeof(ps_ibfe_code)}; static const DWORD ps_ibfe2_code[] = { #if 0 @@ -6473,7 +6481,7 @@ static void test_shader_instructions(void) 0x0900008b, 0x001000f2, 0x00000000, 0x00100006, 0x00000000, 0x00100556, 0x00000000, 0x00100aa6, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ibfe2 = {ps_ibfe2_code, sizeof(ps_ibfe2_code)}; + static struct named_shader ps_ibfe2 = {"ibfe2", ps_ibfe2_code, sizeof(ps_ibfe2_code)}; static const DWORD ps_ubfe_code[] = { #if 0 @@ -6493,7 +6501,7 @@ static void test_shader_instructions(void) 0x00004002, 0x00000004, 0x00000008, 0x00000001, 0x00000001, 0x00208006, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ubfe = {ps_ubfe_code, sizeof(ps_ubfe_code)}; + static struct named_shader ps_ubfe = {"ubfe", ps_ubfe_code, sizeof(ps_ubfe_code)}; static const DWORD ps_bfrev_code[] = { #if 0 @@ -6517,7 +6525,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x0500008d, 0x00102022, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_bfrev = {ps_bfrev_code, sizeof(ps_bfrev_code)}; + static struct named_shader ps_bfrev = {"bfrev", ps_bfrev_code, sizeof(ps_bfrev_code)}; static const DWORD ps_bits_code[] = { #if 0 @@ -6544,7 +6552,7 @@ static void test_shader_instructions(void) 0x06000086, 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x06000088, 0x00102022, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_bits = {ps_bits_code, sizeof(ps_bits_code)}; + static struct named_shader ps_bits = {"bits", ps_bits_code, sizeof(ps_bits_code)}; static const DWORD ps_ishr_code[] = { #if 0 @@ -6564,7 +6572,7 @@ static void test_shader_instructions(void) 0x0900002a, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ishr = {ps_ishr_code, sizeof(ps_ishr_code)}; + static struct named_shader ps_ishr = {"ishr", ps_ishr_code, sizeof(ps_ishr_code)}; static const DWORD ps_ushr_code[] = { #if 0 @@ -6584,7 +6592,7 @@ static void test_shader_instructions(void) 0x09000055, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ushr = {ps_ushr_code, sizeof(ps_ushr_code)}; + static struct named_shader ps_ushr = {"ushr", ps_ushr_code, sizeof(ps_ushr_code)}; static const DWORD ps_ishl_code[] = { #if 0 @@ -6604,7 +6612,7 @@ static void test_shader_instructions(void) 0x09000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ishl = {ps_ishl_code, sizeof(ps_ishl_code)}; + static struct named_shader ps_ishl = {"ishl", ps_ishl_code, sizeof(ps_ishl_code)}; static const DWORD ps_ishl_const_code[] = { #if 0 @@ -6622,7 +6630,7 @@ static void test_shader_instructions(void) 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ishl_const = {ps_ishl_const_code, sizeof(ps_ishl_const_code)}; + static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = { #if 0 @@ -6642,7 +6650,7 @@ static void test_shader_instructions(void) 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x0500003b, 0x001020a2, 0x00000000, 0x00100406, 0x00000000, 0x0600003b, 0x00102052, 0x00000000, 0x00208106, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_not = {ps_not_code, sizeof(ps_not_code)}; + static struct named_shader ps_not = {"not", ps_not_code, sizeof(ps_not_code)}; static const DWORD ps_icmp_code[] = { #if 0 @@ -6667,7 +6675,7 @@ static void test_shader_instructions(void) 0x0020801a, 0x00000000, 0x00000000, 0x09000027, 0x00102082, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_icmp = {ps_icmp_code, sizeof(ps_icmp_code)}; + static struct named_shader ps_icmp = {"icmp", ps_icmp_code, sizeof(ps_icmp_code)}; static const DWORD ps_ucmp_code[] = { #if 0 @@ -6690,7 +6698,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_ucmp = {ps_ucmp_code, sizeof(ps_ucmp_code)}; + static struct named_shader ps_ucmp = {"ucmp", ps_ucmp_code, sizeof(ps_ucmp_code)}; static const DWORD ps_umin_umax_code[] = { #if 0 @@ -6713,7 +6721,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_umin_umax = {ps_umin_umax_code, sizeof(ps_umin_umax_code)}; + static struct named_shader ps_umin_umax = {"umin_umax", ps_umin_umax_code, sizeof(ps_umin_umax_code)}; static const DWORD ps_f16tof32_code[] = { #if 0 @@ -6732,7 +6740,7 @@ static void test_shader_instructions(void) 0x02000068, 0x00000001, 0x06000083, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f16tof32 = {ps_f16tof32_code, sizeof(ps_f16tof32_code)}; + static struct named_shader ps_f16tof32 = {"f16tof32", ps_f16tof32_code, sizeof(ps_f16tof32_code)}; static const DWORD ps_f16tof32_2_code[] = { #if 0 @@ -6755,7 +6763,7 @@ static void test_shader_instructions(void) 0x05000083, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f16tof32_2 = {ps_f16tof32_2_code, sizeof(ps_f16tof32_2_code)}; + static struct named_shader ps_f16tof32_2 = {"f16tof32_2", ps_f16tof32_2_code, sizeof(ps_f16tof32_2_code)}; static const DWORD ps_f32tof16_code[] = { #if 0 @@ -6773,7 +6781,7 @@ static void test_shader_instructions(void) 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000082, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f32tof16 = {ps_f32tof16_code, sizeof(ps_f32tof16_code)}; + static struct named_shader ps_f32tof16 = {"f32tof16", ps_f32tof16_code, sizeof(ps_f32tof16_code)}; static const DWORD ps_f32tof16_2_code[] = { #if 0 @@ -6796,7 +6804,7 @@ static void test_shader_instructions(void) 0x05000082, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_f32tof16_2 = {ps_f32tof16_2_code, sizeof(ps_f32tof16_2_code)}; + static struct named_shader ps_f32tof16_2 = {"f32tof16_2", ps_f32tof16_2_code, sizeof(ps_f32tof16_2_code)}; static const DWORD ps_imad_code[] = { #if 0 @@ -6820,7 +6828,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x00208ea6, 0x00000000, 0x00000001, 0x80208ea6, 0x00000041, 0x00000000, 0x00000002, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_imad = {ps_imad_code, sizeof(ps_imad_code)}; + static struct named_shader ps_imad = {"imad", ps_imad_code, sizeof(ps_imad_code)}; static const DWORD ps_imul_code[] = { #if 0 @@ -6842,7 +6850,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_imul = {ps_imul_code, sizeof(ps_imul_code)}; + static struct named_shader ps_imul = {"imul", ps_imul_code, sizeof(ps_imul_code)}; static const DWORD ps_udiv_code[] = { #if 0 @@ -6866,7 +6874,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x0020800a, 0x00000000, 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010000a, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_udiv = {ps_udiv_code, sizeof(ps_udiv_code)}; + static struct named_shader ps_udiv = {"udiv", ps_udiv_code, sizeof(ps_udiv_code)}; static const DWORD ps_nested_switch_code[] = { #if 0 @@ -6950,7 +6958,7 @@ static void test_shader_instructions(void) 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000002, 0x01000017, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_nested_switch = {ps_nested_switch_code, sizeof(ps_nested_switch_code)}; + static struct named_shader ps_nested_switch = {"nested_switch", ps_nested_switch_code, sizeof(ps_nested_switch_code)}; static const DWORD ps_switch_no_default_code[] = { #if 0 @@ -6982,7 +6990,8 @@ static void test_shader_instructions(void) 0x00000002, 0x00000002, 0x00000002, 0x0100003e, 0x01000017, 0x0100003a, 0x0100003a, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_switch_no_default = {ps_switch_no_default_code, sizeof(ps_switch_no_default_code)}; + static const struct named_shader ps_switch_no_default + = {"switch_no_default", ps_switch_no_default_code, sizeof(ps_switch_no_default_code)}; static const DWORD ps_movc_code[] = { #if 0 @@ -7003,7 +7012,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00102e46, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_movc = {ps_movc_code, sizeof(ps_movc_code)}; + static struct named_shader ps_movc = {"movc", ps_movc_code, sizeof(ps_movc_code)}; static const DWORD ps_swapc0_code[] = { #if 0 @@ -7025,7 +7034,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc0 = {ps_swapc0_code, sizeof(ps_swapc0_code)}; + static struct named_shader ps_swapc0 = {"swapc0", ps_swapc0_code, sizeof(ps_swapc0_code)}; static const DWORD ps_swapc1_code[] = { #if 0 @@ -7047,7 +7056,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000000, 0x00208e46, 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc1 = {ps_swapc1_code, sizeof(ps_swapc1_code)}; + static struct named_shader ps_swapc1 = {"swapc1", ps_swapc1_code, sizeof(ps_swapc1_code)}; static const DWORD ps_swapc2_code[] = { #if 0 @@ -7072,7 +7081,7 @@ static void test_shader_instructions(void) 0x00000000, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc2 = {ps_swapc2_code, sizeof(ps_swapc2_code)}; + static struct named_shader ps_swapc2 = {"swapc2", ps_swapc2_code, sizeof(ps_swapc2_code)}; static const DWORD ps_swapc3_code[] = { #if 0 @@ -7097,7 +7106,7 @@ static void test_shader_instructions(void) 0x00000000, 0x001000f2, 0x00000001, 0x00208e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc3 = {ps_swapc3_code, sizeof(ps_swapc3_code)}; + static struct named_shader ps_swapc3 = {"swapc3", ps_swapc3_code, sizeof(ps_swapc3_code)}; static const DWORD ps_swapc4_code[] = { #if 0 @@ -7121,7 +7130,7 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc4 = {ps_swapc4_code, sizeof(ps_swapc4_code)}; + static struct named_shader ps_swapc4 = {"swapc4", ps_swapc4_code, sizeof(ps_swapc4_code)}; static const DWORD ps_swapc5_code[] = { #if 0 @@ -7145,10 +7154,10 @@ static void test_shader_instructions(void) 0x00000000, 0x00000001, 0x00208e46, 0x00000000, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps_swapc5 = {ps_swapc5_code, sizeof(ps_swapc5_code)}; + static struct named_shader ps_swapc5 = {"swapc5", ps_swapc5_code, sizeof(ps_swapc5_code)}; static const struct { - const D3D12_SHADER_BYTECODE *ps; + const struct named_shader *ps; struct { struct vec4 src0; @@ -7359,7 +7368,7 @@ static void test_shader_instructions(void) static const struct { - const D3D12_SHADER_BYTECODE *ps; + const struct named_shader *ps; union { struct @@ -7917,9 +7926,11 @@ static void test_shader_instructions(void) current_ps = NULL; for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("%u:%s", i, tests[i].ps->name); + if (tests[i].skip_on_warp && use_warp_device) { - skip("Skipping shader test on WARP.\n"); + skip("Skipping shader '%s' test on WARP.\n", tests[i].ps->name); continue; } @@ -7928,8 +7939,10 @@ static void test_shader_instructions(void) if (context.pipeline_state) ID3D12PipelineState_Release(context.pipeline_state); current_ps = tests[i].ps; + shader.pShaderBytecode = current_ps->code; + shader.BytecodeLength = current_ps->size; context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, desc.rt_format, NULL, current_ps, NULL); + context.root_signature, desc.rt_format, NULL, &shader, NULL); } update_buffer_data(cb, 0, sizeof(tests[i].input), &tests[i].input); @@ -7954,6 +7967,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); hr = ID3D12GraphicsCommandList_Close(command_list); ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); @@ -7964,9 +7978,11 @@ static void test_shader_instructions(void) for (i = 0; i < ARRAY_SIZE(uint_tests); ++i) { + vkd3d_test_set_context("%u:%s", i, uint_tests[i].ps->name); + if (uint_tests[i].skip_on_warp && use_warp_device) { - skip("Skipping shader test on WARP.\n"); + skip("Skipping shader '%s' test on WARP.\n", uint_tests[i].ps->name); continue; } @@ -7975,8 +7991,10 @@ static void test_shader_instructions(void) if (context.pipeline_state) ID3D12PipelineState_Release(context.pipeline_state); current_ps = uint_tests[i].ps; + shader.pShaderBytecode = current_ps->code; + shader.BytecodeLength = current_ps->size; context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, desc.rt_format, NULL, current_ps, NULL); + context.root_signature, desc.rt_format, NULL, &shader, NULL); } update_buffer_data(cb, 0, sizeof(uint_tests[i].input), &uint_tests[i].input); @@ -8001,6 +8019,7 @@ static void test_shader_instructions(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + vkd3d_test_set_context(NULL); ID3D12Resource_Release(cb); destroy_test_context(&context); -- 2.19.2

2 1

[PATCH vkd3d 3/9] tests: Detect when WARP is used.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 +- tests/d3d12_crosstest.h | 10 ++++++++-- tests/d3d12_invalid_usage.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9ec71f4bb74c..c127f6bd1d35 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21833,7 +21833,7 @@ START_TEST(d3d12) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_create_device); run_test(test_node_count); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ececd7810329..94aa4e5fc57f 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -267,7 +267,7 @@ static IUnknown *create_adapter(void) return adapter; } -static void print_adapter_info(void) +static void init_adapter_info(void) { IDXGIAdapter *dxgi_adapter; DXGI_ADAPTER_DESC desc; @@ -286,6 +286,12 @@ static void print_adapter_info(void) trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + if (desc.VendorId == 0x1414 && desc.DeviceId == 0x008c) + { + trace("Using WARP device.\n"); + use_warp_device = true; + } + IDXGIAdapter_Release(dxgi_adapter); } #else @@ -294,7 +300,7 @@ static IUnknown *create_adapter(void) return NULL; } -static void print_adapter_info(void) {} +static void init_adapter_info(void) {} #endif static ID3D12Device *create_device(void) diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 5f764eb95fe0..940dea91d4ec 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -154,7 +154,7 @@ START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_invalid_texture_resource_barriers); } -- 2.19.2

2 1

[PATCH vkd3d 4/9] tests: Fix --warp command line option.
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12_crosstest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 94aa4e5fc57f..00db06407f2f 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -254,7 +254,7 @@ static IUnknown *create_adapter(void) hr = CreateDXGIFactory1(&IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create IDXGIFactory4, hr %#x.\n", hr); - if (use_warp_device && !(adapter = create_warp_adapter(factory))) + if (use_warp_device && (adapter = create_warp_adapter(factory))) { IDXGIFactory4_Release(factory); return adapter; -- 2.19.2

2 1

[PATCH vkd3d 1/9] tests: Introduce vkd3d_test_set_context().
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Useful for table-based tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 31 +++++++++++++++++++++++++------ tests/d3d12.c | 3 +++ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index a2649dd64f76..ccc5350a2acb 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -93,6 +93,8 @@ static struct unsigned int todo_level; bool todo_do_loop; + + char context[1024]; } vkd3d_test_state; static bool @@ -116,13 +118,13 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg { if (result) { - printf("%s:%d Todo succeeded: ", vkd3d_test_name, line); + printf("%s:%d%s: Todo succeeded: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_success_count); } else { - printf("%s:%d: Todo: ", vkd3d_test_name, line); + printf("%s:%d%s: Todo: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.todo_count); } @@ -130,12 +132,12 @@ vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list arg else if (result) { if (vkd3d_test_state.debug_level > 1) - printf("%s:%d: Test succeeded.\n", vkd3d_test_name, line); + printf("%s:%d%s: Test succeeded.\n", vkd3d_test_name, line, vkd3d_test_state.context); InterlockedIncrement(&vkd3d_test_state.success_count); } else { - printf("%s:%d: Test failed: ", vkd3d_test_name, line); + printf("%s:%d%s: Test failed: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); InterlockedIncrement(&vkd3d_test_state.failure_count); } @@ -156,7 +158,7 @@ vkd3d_test_skip(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d: Test skipped: ", vkd3d_test_name, line); + printf("%s:%d%s: Test skipped: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); va_end(args); InterlockedIncrement(&vkd3d_test_state.skip_count); @@ -167,7 +169,7 @@ vkd3d_test_trace(unsigned int line, const char *fmt, ...) { va_list args; va_start(args, fmt); - printf("%s:%d: ", vkd3d_test_name, line); + printf("%s:%d%s: ", vkd3d_test_name, line, vkd3d_test_state.context); vprintf(fmt, args); va_end(args); } @@ -304,6 +306,23 @@ static inline void vkd3d_test_end_todo(void) vkd3d_test_state.todo_level >>= 1; } +static inline void vkd3d_test_set_context(const char *fmt, ...) +{ + va_list args; + + if (!fmt) + { + vkd3d_test_state.context[0] = '\0'; + return; + } + + vkd3d_test_state.context[0] = ':'; + va_start(args, fmt); + vsnprintf(&vkd3d_test_state.context[1], sizeof(vkd3d_test_state.context) - 1, fmt, args); + va_end(args); + vkd3d_test_state.context[sizeof(vkd3d_test_state.context) - 1] = '\0'; +} + #define run_test(test_pfn) \ vkd3d_run_test(#test_pfn, test_pfn) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1598910718f4..03308639e4e1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18734,6 +18734,8 @@ static void test_instance_id(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + vkd3d_test_set_context("Test %u", i); + layout_desc[1].InstanceDataStepRate = tests[i].color_step_rate; input_layout.pInputElementDescs = layout_desc; input_layout.NumElements = ARRAY_SIZE(layout_desc); @@ -18784,6 +18786,7 @@ static void test_instance_id(void) ID3D12PipelineState_Release(context.pipeline_state); context.pipeline_state = NULL; } + vkd3d_test_set_context(NULL); ID3D12CommandSignature_Release(command_signature); ID3D12Resource_Release(argument_buffer); -- 2.19.2

2 1

[PATCH vkd3d] vkd3d: Avoid out-of-bounds array access in d3d12_device_CopyDescriptors().
by Józef Kucia 12 Dec '18

12 Dec '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9e3682830684..5bcfc293fdb5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1993,13 +1993,14 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, { dst_idx = 0; ++dst_range_idx; + + if (dst_range_idx >= dst_descriptor_range_count) + return; + dst = d3d12_desc_from_cpu_handle(dst_descriptor_range_offsets[dst_range_idx]); dst_range_size = dst_descriptor_range_sizes ? dst_descriptor_range_sizes[dst_range_idx] : 1; } - if (dst_range_idx >= dst_descriptor_range_count) - break; - d3d12_desc_copy(dst++, src++, device); ++dst_idx; -- 2.19.2

2 1

[PATCH] user32/edit: Don't set caret position when we don't have focus.
by Alistair Leslie-Hughes 12 Dec '18

12 Dec '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/edit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 48c65ea..6f8f412 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1799,9 +1799,14 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { - LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); - TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); - SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + LRESULT res; + + if (es->flags & EF_FOCUSED) + { + res = EDIT_EM_PosFromChar(es, pos, after_wrap); + TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); + SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); + } } @@ -1870,7 +1875,6 @@ static void EDIT_EM_ScrollCaret(EDITSTATE *es) } } - if(es->flags & EF_FOCUSED) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); } -- 1.9.1

3 2

Re: [PATCH] Add .editorconfig file
by Eberhard Beilharz 12 Dec '18

12 Dec '18

Ahh, you're right - I copied the file from another project and changed "tab" to "space" and missed that part! Thanks! Sent an updated patch in a separate email. Eberhard Fabian Maurer <dark.shadow4(a)web.de> wrote on 2018-12-11 at 22:38 +0100: > > According to the official docs, indent_size can not have the value > "space". Is this a typo or did I miss something? > > Regards, > > Fabian Maurer >

1 0

[PATCH] Allow to specify private ld-linux
by probono 12 Dec '18

12 Dec '18

This patch allows to tell Wine to use a privately bundled ld-linux.so.2 (and related glibc and other libraries) instead of looking for them in the host system. This greatly simplifies packaging Wine as a self-standing bundle for Linux (e.g., AppDir, AppImage), making it possible to run Wine without installation, even on 64-bit systems on which 32-bit compatibility libraries are not installed. The problem statement has been described in more detail by me in https://www.winehq.org/pipermail/wine-devel/2017-November/119906.html The approach was suggested by Alexandre Julliard in https://www.winehq.org/pipermail/wine-devel/2017-November/119944.html All credit for this patch goes to Hackerl, on whose behalf I am posting. Source: https://github.com/Hackerl/wine/commit/4f7f784.patch Discussion: https://github.com/Hackerl/Wine_Appimage/issues/11 From: Hackerl <490021209(a)qq.com> Signed-off-by: Hackerl <490021209(a)qq.com> --- libs/wine/config.c | 21 ++++++++++++++++++++- loader/preloader.c | 10 +++++++--- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 083e263ee3d..e89c2c63a95 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -562,7 +562,26 @@ static void preloader_exec( char **argv, int use_preloader ) free( new_argv ); free( full_name ); } - execv( argv[0], argv ); + else + { + char * wineloader = getenv("WINELDLIBRARY"); + + if (wineloader == NULL) + execv( argv[0], argv ); + + char **last_arg = argv; + + while (*last_arg) last_arg++; + + char ** new_argv = xmalloc( (last_arg - argv + 2) * sizeof(*argv) ); + memcpy( new_argv + 1, argv, (last_arg - argv + 1) * sizeof(*argv) ); + + new_argv[0] = wineloader; + + execv(wineloader, new_argv); + + free( new_argv ); + } } /* exec a wine internal binary (either the wine loader or the wine server) */ diff --git a/loader/preloader.c b/loader/preloader.c index 13a6ad86b20..55af8383773 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1255,7 +1255,7 @@ void* wld_start( void **stack ) { long i, *pargc; char **argv, **p; - char *interp, *reserve = NULL; + char *interp = NULL, *reserve = NULL; struct wld_auxv new_av[8], delete_av[3], *av; struct wld_link_map main_binary_map, ld_so_map; struct wine_preload_info **wine_main_preload_info; @@ -1270,8 +1270,11 @@ void* wld_start( void **stack ) /* skip over the environment */ while (*p) { - static const char res[] = "WINEPRELOADRESERVE="; + static const char res[] = "WINEPRELOADRESERVE=", loader[] = "WINELDLIBRARY="; + if (!wld_strncmp( *p, res, sizeof(res)-1 )) reserve = *p + sizeof(res) - 1; + if (!wld_strncmp( *p, loader, sizeof(loader)-1 )) interp = *p + sizeof(loader) - 1; + p++; } @@ -1323,7 +1326,8 @@ void* wld_start( void **stack ) map_so_lib( argv[1], &main_binary_map ); /* load the ELF interpreter */ - interp = (char *)main_binary_map.l_addr + main_binary_map.l_interp; + if (interp == NULL) + interp = (char *)main_binary_map.l_addr + main_binary_map.l_interp; map_so_lib( interp, &ld_so_map ); /* store pointer to the preload info into the appropriate main binary variable */

2 1

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne 12 Dec '18

12 Dec '18

1 0

[PATCH] imagelist: fix crash with large number of images
by Eberhard Beilharz 11 Dec '18

11 Dec '18

1 0

[PATCH] Add .editorconfig file
by Eberhard Beilharz 11 Dec '18

11 Dec '18

1 0

[PATCH v2 1/2] winebus.sys: Raise priority of device threads.
by Kai Krakow 11 Dec '18

11 Dec '18

This potentially reduces lag and makes the input device initialization faster under CPU load. Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/bus_iohid.c | 1 + dlls/winebus.sys/bus_sdl.c | 2 ++ dlls/winebus.sys/bus_udev.c | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 95077ac0be2..b4f7dabb153 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -410,6 +410,7 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_UNSUCCESSFUL; } + SetThreadPriority(run_loop_handle, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5cf5dddaf05..41f203f6e36 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -976,6 +976,8 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e630d..10b79dcc6b1 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -795,8 +795,9 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) close(private->control_pipe[1]); return STATUS_UNSUCCESSFUL; } - else - return STATUS_SUCCESS; + + SetThreadPriority(private->report_thread, THREAD_PRIORITY_TIME_CRITICAL); + return STATUS_SUCCESS; } static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) @@ -1006,6 +1007,8 @@ static NTSTATUS lnxev_begin_report_processing(DEVICE_OBJECT *device) close(private->base.control_pipe[1]); return STATUS_UNSUCCESSFUL; } + + SetThreadPriority(private->base.report_thread, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } @@ -1462,6 +1465,8 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); -- 2.19.2

3 5

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne 11 Dec '18

11 Dec '18

3 2

[PATCH] po: Update Russian translation.
by Nikolay Sivov 11 Dec '18

11 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/po/ru.po b/po/ru.po index e7c73602e0..b704dc738a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-20 09:26+0300\n" +"PO-Revision-Date: 2018-12-11 15:59+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.9\n" +"X-Generator: Poedit 2.2\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -312,25 +312,23 @@ msgstr "Отмена..." #: browseui.rc:29 msgid "%1!u! %2 remaining" -msgstr "" +msgstr "Осталось %1!u! %2" #: browseui.rc:30 msgid "%1!u! %2 and %3!u! %4 remaining" -msgstr "" +msgstr "Осталось %1!u! %2 и %3!u! %4" #: browseui.rc:31 -#, fuzzy -#| msgid "&Seconds" msgid "seconds" -msgstr "&Секунды" +msgstr "сек." #: browseui.rc:32 msgid "minutes" -msgstr "" +msgstr "мин." #: browseui.rc:33 msgid "hours" -msgstr "" +msgstr "ч." #: comctl32.rc:68 winefile.rc:157 msgid "Properties for %s" @@ -2453,16 +2451,12 @@ msgstr "" "выполнения экспорта." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Выбор хранилища сертификатов" +msgstr "Выбор сертификата" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Выберите хранилище для импорта сертификата:" +msgstr "Выберите сертификат, который хотите использовать" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2992,20 +2986,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Примечание: закрытый ключ этого сертификата не экспортируемый." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Назначения:" +msgstr "Предназначение" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Размещение" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Выбор хранилища сертификатов" +msgstr "Выберите сертификат" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented" @@ -11106,10 +11096,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "Ошибка: неверная опция «%c».\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "Ошибка: не удалось найти Процесс «%1».\n" +msgstr "Ошибка: не удалось получить имя хоста: %u.\n" #: hostname.rc:33 msgid "" @@ -14262,11 +14250,11 @@ msgstr "Цвет:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "Типы MIME" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "Управлять &ассоциациями файлов" #: winecfg.rc:308 msgid "Folders" -- 2.19.2

1 0

[PATCH] user32/scroll: Fix tracking for non-client scrollbars
by Gabriel Ivăncescu 11 Dec '18

11 Dec '18

Non-client scrollbars (SB_HORZ and SB_VERT) don't have their client origin at (0,0) because they can have non-client borders. It is necessary to offset by this origin just as it is done for LBUTTONDOWN. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This fixes, for example, SB_VERT scrollbars that have a non-client area above them (like a title bar) so that when moving the mouse after clicking (hot-tracking), they won't jump by the size of the title bar (which is annoying). dlls/user32/scroll.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 95d9761..d611cf0 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -1095,15 +1095,17 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) { MSG msg; + RECT rect; if (scrollbar != SB_CTL) { - RECT rect; WIN_GetRectangles( hwnd, COORDS_CLIENT, &rect, NULL ); ScreenToClient( hwnd, &pt ); pt.x -= rect.left; pt.y -= rect.top; } + else + rect.left = rect.top = 0; SCROLL_HandleScrollEvent( hwnd, scrollbar, WM_LBUTTONDOWN, pt ); @@ -1115,8 +1117,8 @@ void SCROLL_TrackScrollBar( HWND hwnd, INT scrollbar, POINT pt ) msg.message == WM_MOUSEMOVE || (msg.message == WM_SYSTIMER && msg.wParam == SCROLL_TIMER)) { - pt.x = (short)LOWORD(msg.lParam); - pt.y = (short)HIWORD(msg.lParam); + pt.x = (short)LOWORD(msg.lParam) - rect.left; + pt.y = (short)HIWORD(msg.lParam) - rect.top; SCROLL_HandleScrollEvent( hwnd, scrollbar, msg.message, pt ); } else -- 2.19.1

2 2

[PATCH] comctl32/tests: Use actual text width for ideal button size tests.
by Nikolay Sivov 11 Dec '18

11 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This should fix test failures running on testbot VMs. dlls/comctl32/tests/button.c | 112 ++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 54 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 09ec4a1c0a..ce673af261 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1421,21 +1421,21 @@ static void test_state(void) static void test_bcm_get_ideal_size(void) { - static const WCHAR text2_w[] = {'t', 'e', 'x', 't', '\n', 't', 'e', 'x', 't', 0}; - static const WCHAR text_w[] = {'t', 'e', 'x', 't', 0}; + static const char *button_text2 = "WWWW\nWWWW"; + static const char *button_text = "WWWW"; static const DWORD imagelist_aligns[] = {BUTTON_IMAGELIST_ALIGN_LEFT, BUTTON_IMAGELIST_ALIGN_RIGHT, BUTTON_IMAGELIST_ALIGN_TOP, BUTTON_IMAGELIST_ALIGN_BOTTOM, BUTTON_IMAGELIST_ALIGN_CENTER}; static const DWORD aligns[] = {0, BS_TOP, BS_LEFT, BS_RIGHT, BS_BOTTOM, BS_CENTER, BS_VCENTER, BS_RIGHTBUTTON, WS_EX_RIGHT}; DWORD default_style = WS_TABSTOP | WS_POPUP | WS_VISIBLE; - LONG client_width = 200, client_height = 200; - LONG width, height, line_count; + const LONG client_width = 400, client_height = 200; + LONG image_width, height, line_count, text_width; + HFONT hfont, prev_font; DWORD style, type; BOOL ret; HWND hwnd; HDC hdc; - HFONT hfont; LOGFONTA lf; TEXTMETRICA tm; SIZE size; @@ -1444,11 +1444,12 @@ static void test_bcm_get_ideal_size(void) HICON hicon; HIMAGELIST himl; BUTTON_IMAGELIST biml = {0}; + RECT rect; INT i, j; /* Check for NULL pointer handling */ - hwnd = CreateWindowW(WC_BUTTONW, text_w, BS_PUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, - NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_PUSHBUTTON | default_style, 0, 0, client_width, client_height, + NULL, NULL, 0, NULL); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, 0); ok(!ret, "Expect BCM_GETIDEALSIZE message to return false.\n"); @@ -1458,22 +1459,27 @@ static void test_bcm_get_ideal_size(void) lf.lfHeight = 20; lstrcpyA(lf.lfFaceName, "Tahoma"); hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "Failed to create test font.\n"); /* Get tmHeight */ hdc = GetDC(hwnd); + prev_font = SelectObject(hdc, hfont); GetTextMetricsA(hdc, &tm); + SelectObject(hdc, prev_font); + DrawTextA(hdc, button_text, -1, &rect, DT_CALCRECT); + text_width = rect.right - rect.left; ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); - /* XP and 2003 doesn't support command links, getting ideal size with button having only text just return client size on these platforms */ - hwnd = CreateWindowA(WC_BUTTONA, "test", BS_DEFCOMMANDLINK | default_style, 0, 0, client_width, client_height, NULL, + /* XP and 2003 doesn't support command links, getting ideal size with button having only text returns client size on these platforms. */ + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFCOMMANDLINK | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - if (size.cx == client_width && size.cy == client_width) + if (size.cx == client_width && size.cy == client_height) { /* on XP and 2003, buttons with image are not supported */ win_skip("Skipping further tests on XP and 2003\n"); @@ -1482,14 +1488,14 @@ static void test_bcm_get_ideal_size(void) /* Tests for image placements */ /* Prepare bitmap */ - width = 48; + image_width = 48; height = 48; hdc = GetDC(0); - hmask = CreateCompatibleBitmap(hdc, width, height); - hbmp = CreateCompatibleBitmap(hdc, width, height); + hmask = CreateCompatibleBitmap(hdc, image_width, height); + hbmp = CreateCompatibleBitmap(hdc, image_width, height); /* Only bitmap for push button, ideal size should be enough for image and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_BITMAP | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); @@ -1498,9 +1504,9 @@ static void test_bcm_get_ideal_size(void) ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); /* Ideal size contains text rect even show bitmap only */ - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, - max(height, tm.tmHeight)); + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, + size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Image alignments when button has bitmap and text*/ @@ -1508,7 +1514,7 @@ static void test_bcm_get_ideal_size(void) for (j = 0; j < ARRAY_SIZE(aligns); j++) { style = BS_DEFPUSHBUTTON | default_style | aligns[i] | aligns[j]; - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); @@ -1517,25 +1523,25 @@ static void test_bcm_get_ideal_size(void) ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); if (!(style & (BS_CENTER | BS_VCENTER)) || ((style & BS_CENTER) && (style & BS_CENTER) != BS_CENTER) || !(style & BS_VCENTER) || (style & BS_VCENTER) == BS_VCENTER) - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, - width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + image_width + text_width, size.cy, max(height, tm.tmHeight)); else - ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + ok((size.cx >= max(text_width, height) && size.cy >= height + tm.tmHeight), "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, - max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + max(text_width, height), size.cy, height + tm.tmHeight); DestroyWindow(hwnd); } /* Image list alignments */ - himl = pImageList_Create(width, height, ILC_COLOR, 1, 1); + himl = pImageList_Create(image_width, height, ILC_COLOR, 1, 1); pImageList_Add(himl, hbmp, 0); biml.himl = himl; for (i = 0; i < ARRAY_SIZE(imagelist_aligns); i++) { biml.uAlign = imagelist_aligns[i]; - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, - NULL, NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); @@ -1543,16 +1549,16 @@ static void test_bcm_get_ideal_size(void) ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_TOP || biml.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM) - ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + ok((size.cx >= max(text_width, height) && size.cy >= height + tm.tmHeight), "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, - max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + max(text_width, height), size.cy, height + tm.tmHeight); else if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT || biml.uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT) - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, - width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + image_width + text_width, size.cy, max(height, tm.tmHeight)); else - ok(size.cx >= width && size.cy >= height, "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", - biml.uAlign, size.cx, width, size.cy, height); + ok(size.cx >= image_width && size.cy >= height, "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", + biml.uAlign, size.cx, image_width, size.cy, height); DestroyWindow(hwnd); } @@ -1565,7 +1571,7 @@ static void test_bcm_get_ideal_size(void) hicon = CreateIconIndirect(&icon_info); /* Only icon, ideal size should be enough for image and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_ICON | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | BS_ICON | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); @@ -1574,44 +1580,44 @@ static void test_bcm_get_ideal_size(void) ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); /* Ideal size contains text rect even show icons only */ - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Show icon and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, - NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Checkbox */ /* Both bitmap and text for checkbox, ideal size is only enough for text because it doesn't support image(but not image list)*/ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | default_style, 0, 0, client_width, client_height, NULL, - NULL, 0, NULL); + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_AUTOCHECKBOX | default_style, 0, 0, client_width, client_height, + NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx <= width + 4 * tm.tmMaxCharWidth && size.cx >= 4 * tm.tmMaxCharWidth - && size.cy <= max(height, tm.tmHeight) && size.cy >= tm.tmHeight), + ok((size.cx <= image_width + text_width && size.cx >= text_width && size.cy <= max(height, tm.tmHeight) + && size.cy >= tm.tmHeight), "Expect ideal cx %d within range (%d, %d ) and ideal cy %d within range (%d, %d )\n", size.cx, - 4 * tm.tmMaxCharWidth, width + 4 * tm.tmMaxCharWidth, size.cy, tm.tmHeight, max(height, tm.tmHeight)); + text_width, image_width + text_width, size.cy, tm.tmHeight, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Both image list and text for checkbox, ideal size should have enough for image list and text */ biml.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); @@ -1619,13 +1625,13 @@ static void test_bcm_get_ideal_size(void) ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); /* Only bitmap for checkbox, ideal size should have enough for image and text */ - hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, button_text, BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); @@ -1633,8 +1639,8 @@ static void test_bcm_get_ideal_size(void) ZeroMemory(&size, sizeof(size)); ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); - ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), - "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + ok((size.cx >= image_width + text_width && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, image_width + text_width, size.cy, max(height, tm.tmHeight)); DestroyWindow(hwnd); @@ -1673,7 +1679,7 @@ static void test_bcm_get_ideal_size(void) style = line_count > 1 ? type | BS_MULTILINE : type; style |= default_style; - hwnd = CreateWindowW(WC_BUTTONW, (line_count == 2 ? text2_w : text_w), style, 0, 0, client_width, + hwnd = CreateWindowA(WC_BUTTONA, (line_count == 2 ? button_text2 : button_text), style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); ok(hwnd != NULL, "Expect hwnd not NULL\n"); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); @@ -1696,11 +1702,9 @@ static void test_bcm_get_ideal_size(void) } else { - width = 0; height = line_count == 2 ? 2 * tm.tmHeight : tm.tmHeight; - ok(size.cx >= width && size.cy >= height, - "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, width, size.cy, - height); + ok(size.cx >= 0 && size.cy >= height, "Style 0x%08x expect ideal cx %d >= 0 and ideal cy %d >= %d\n", + style, size.cx, size.cy, height); } DestroyWindow(hwnd); } -- 2.19.2

1 0

[PATCH] cryptui: Avoid an unneeded strlen() call.
by Francois Gouget 11 Dec '18

11 Dec '18

--- There is obviously no issue with str being NULL (plus in the two call places right now this parameter cannot actually be NULL). dlls/cryptui/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a1004192cf6..41938f5177b 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -3497,7 +3497,7 @@ static void set_general_cert_properties(HWND hwnd, struct edit_cert_data *data) static void set_cert_string_property(PCCERT_CONTEXT cert, DWORD prop, LPWSTR str) { - if (str && strlenW(str)) + if (str && *str) { CRYPT_DATA_BLOB blob; -- 2.19.2

1 1

[PATCH] winetest: Tweak the wording of an error message.
by Francois Gouget 11 Dec '18

11 Dec '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Tweaking this error message was suggested in Wine bug 43880 (but is not going to fix that issue). https://bugs.winehq.org/show_bug.cgi?id=43880 programs/winetest/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 56044095f3d..3d6cc660ec8 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1437,7 +1437,7 @@ int main( int argc, char *argv[] ) } if (failures > FAILURES_LIMIT) report( R_WARNING, - "%d tests failed, there's probably something broken with your setup.\n" + "%d tests failed. There is probably something broken with your setup.\n" "You need to address this before submitting results.", failures ); if (build_id[0] && nr_of_skips <= SKIP_LIMIT && failures <= FAILURES_LIMIT && -- 2.19.2

1 0

[PATCH] testbot: Add LibvirtDomain::HasSnapshot().
by Francois Gouget 11 Dec '18

11 Dec '18

It is needed by WineRunReconfig.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I forgot that this function is in another unsubmitted patch. This broke the build VM update. So I'm updating it to make sure the patches are tested against the current Wine. testbot/lib/WineTestBot/LibvirtDomain.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 8435793615..f1e2c8fcb9 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -176,6 +176,14 @@ sub _GetSnapshot($$) return (_eval_err() || "Snapshot '$SnapshotName' not found", undef, undef); } +sub HasSnapshot($$) +{ + my ($self, $SnapshotName) = @_; + + my ($ErrMessage, $Domain, $Snapshot) = $self->_GetSnapshot($SnapshotName); + return $ErrMessage ? 0 : 1; +} + sub GetSnapshotName($) { my ($self) = @_; -- 2.19.2

1 0

[PATCH 1/2] winebus.sys: Raise priority of device threads.
by Kai Krakow 10 Dec '18

10 Dec '18

This potentially reduces lag and makes the input device initialization faster under CPU load. Signed-off-by: Kai Krakow <kai(a)kaishome.de> --- dlls/winebus.sys/bus_iohid.c | 1 + dlls/winebus.sys/bus_sdl.c | 2 ++ dlls/winebus.sys/bus_udev.c | 9 +++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 95077ac0be2..b4f7dabb153 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -410,6 +410,7 @@ NTSTATUS WINAPI iohid_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registr return STATUS_UNSUCCESSFUL; } + SetThreadPriority(run_loop_handle, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5cf5dddaf05..41f203f6e36 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -976,6 +976,8 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 64b245e630d..10b79dcc6b1 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -795,8 +795,9 @@ static NTSTATUS begin_report_processing(DEVICE_OBJECT *device) close(private->control_pipe[1]); return STATUS_UNSUCCESSFUL; } - else - return STATUS_SUCCESS; + + SetThreadPriority(private->report_thread, THREAD_PRIORITY_TIME_CRITICAL); + return STATUS_SUCCESS; } static NTSTATUS hidraw_set_output_report(DEVICE_OBJECT *device, UCHAR id, BYTE *report, DWORD length, ULONG_PTR *written) @@ -1006,6 +1007,8 @@ static NTSTATUS lnxev_begin_report_processing(DEVICE_OBJECT *device) close(private->base.control_pipe[1]); return STATUS_UNSUCCESSFUL; } + + SetThreadPriority(private->base.report_thread, THREAD_PRIORITY_TIME_CRITICAL); return STATUS_SUCCESS; } @@ -1462,6 +1465,8 @@ NTSTATUS WINAPI udev_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry goto error; } + SetThreadPriority(events[1], THREAD_PRIORITY_TIME_CRITICAL); + result = WaitForMultipleObjects(2, events, FALSE, INFINITE); CloseHandle(events[0]); CloseHandle(events[1]); -- 2.19.2

2 3

[PATCH 1/3] riched20: Extract handling of VK_RETURN into a method
by Fabian Maurer 10 Dec '18

10 Dec '18

This is basically a no-op to make the following fix simpler Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/riched20/editor.c | 322 +++++++++++++++++++++-------------------- 1 file changed, 168 insertions(+), 154 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..9142fd917d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2427,6 +2427,171 @@ static void ME_UpdateSelectionLinkAttribute(ME_TextEditor *editor) ME_UpdateLinkAttribute(editor, &start, nChars); } +static INT handle_enter(ME_TextEditor *editor) +{ + BOOL ctrl_is_down = GetKeyState(VK_CONTROL) & 0x8000; + BOOL shift_is_down = GetKeyState(VK_SHIFT) & 0x8000; + + if (editor->bDialogMode) + { + if (ctrl_is_down) + return TRUE; + + if (!(editor->styleFlags & ES_WANTRETURN)) + { + if (editor->hwndParent) + { + DWORD dw; + dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); + if (HIWORD(dw) == DC_HASDEFID) + { + HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); + if (hwDefCtrl) + { + SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); + PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); + } + } + } + return TRUE; + } + } + + if (editor->styleFlags & ES_MULTILINE) + { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; + ME_Cursor cursor = editor->pCursors[0]; + ME_DisplayItem *para = cursor.pPara; + int from, to; + ME_Style *style, *eop_style; + + if (editor->styleFlags & ES_READONLY) + { + MessageBeep(MB_ICONERROR); + return TRUE; + } + + ME_GetSelectionOfs(editor, &from, &to); + if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) + { + if (!editor->bEmulateVersion10) { /* v4.1 */ + if (para->member.para.nFlags & MEPF_ROWEND) { + /* Add a new table row after this row. */ + para = ME_AppendTableRow(editor, para); + para = para->member.para.next_para; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + else if (para == editor->pCursors[1].pPara && + cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && + para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && + !para->member.para.prev_para->member.para.nCharOfs) + { + /* Insert a newline before the table. */ + para = para->member.para.prev_para; + para->member.para.nFlags &= ~MEPF_ROWSTART; + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + para = editor->pBuffer->pFirst->member.para.next_para; + ME_SetDefaultParaFormat(editor, &para->member.para.fmt); + para->member.para.nFlags = 0; + mark_para_rewrap(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[1] = editor->pCursors[0]; + para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); + ME_CheckTablesForCorruption(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } else { /* v1.0 - 3.0 */ + ME_DisplayItem *para = cursor.pPara; + if (ME_IsInTable(para)) + { + if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) + { + if (from == to) { + ME_ContinueCoalescingTransaction(editor); + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } else { + ME_ContinueCoalescingTransaction(editor); + if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && + !ME_IsInTable(para->member.para.prev_para)) + { + /* Insert newline before table */ + cursor.pRun = ME_FindItemBack(para, diRun); + if (cursor.pRun) { + editor->pCursors[0].pRun = cursor.pRun; + editor->pCursors[0].pPara = para->member.para.prev_para; + } + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + ME_InsertTextFromCursor(editor, 0, &endl, 1, + editor->pCursors[0].pRun->member.run.style); + } else { + editor->pCursors[1] = editor->pCursors[0]; + para = ME_AppendTableRow(editor, para); + editor->pCursors[0].pPara = para; + editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); + editor->pCursors[0].nOffset = 0; + editor->pCursors[1] = editor->pCursors[0]; + } + ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor, FALSE); + return TRUE; + } + } + } + + style = ME_GetInsertStyle(editor, 0); + + /* Normally the new eop style is the insert style, however in a list it is copied from the existing + eop style (this prevents the list label style changing when the new eop is inserted). + No extra ref is taken here on eop_style. */ + if (para->member.para.fmt.wNumbering) + eop_style = para->member.para.eop_run->style; + else + eop_style = style; + ME_ContinueCoalescingTransaction(editor); + if (shift_is_down) + ME_InsertEndRowFromCursor(editor, 0); + else + if (!editor->bEmulateVersion10) + ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + else + ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_CommitCoalescingUndo(editor); + SetCursor(NULL); + + ME_UpdateSelectionLinkAttribute(editor); + ME_UpdateRepaint(editor, FALSE); + ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ + ME_ReleaseStyle(style); + } + return TRUE; + } + return -1; +} + static BOOL ME_KeyDown(ME_TextEditor *editor, WORD nKey) { @@ -2493,161 +2658,10 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: - if (editor->bDialogMode) { - if (ctrl_is_down) - return TRUE; - - if (!(editor->styleFlags & ES_WANTRETURN)) - { - if (editor->hwndParent) - { - DWORD dw; - dw = SendMessageW(editor->hwndParent, DM_GETDEFID, 0, 0); - if (HIWORD(dw) == DC_HASDEFID) - { - HWND hwDefCtrl = GetDlgItem(editor->hwndParent, LOWORD(dw)); - if (hwDefCtrl) - { - SendMessageW(editor->hwndParent, WM_NEXTDLGCTL, (WPARAM)hwDefCtrl, TRUE); - PostMessageW(hwDefCtrl, WM_KEYDOWN, VK_RETURN, 0); - } - } - } - return TRUE; - } - } - - if (editor->styleFlags & ES_MULTILINE) - { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; - ME_Cursor cursor = editor->pCursors[0]; - ME_DisplayItem *para = cursor.pPara; - int from, to; - ME_Style *style, *eop_style; - - if (editor->styleFlags & ES_READONLY) { - MessageBeep(MB_ICONERROR); - return TRUE; - } - - ME_GetSelectionOfs(editor, &from, &to); - if (editor->nTextLimit > ME_GetTextLength(editor) - (to-from)) - { - if (!editor->bEmulateVersion10) { /* v4.1 */ - if (para->member.para.nFlags & MEPF_ROWEND) { - /* Add a new table row after this row. */ - para = ME_AppendTableRow(editor, para); - para = para->member.para.next_para; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - else if (para == editor->pCursors[1].pPara && - cursor.nOffset + cursor.pRun->member.run.nCharOfs == 0 && - para->member.para.prev_para->member.para.nFlags & MEPF_ROWSTART && - !para->member.para.prev_para->member.para.nCharOfs) - { - /* Insert a newline before the table. */ - para = para->member.para.prev_para; - para->member.para.nFlags &= ~MEPF_ROWSTART; - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - para = editor->pBuffer->pFirst->member.para.next_para; - ME_SetDefaultParaFormat(editor, &para->member.para.fmt); - para->member.para.nFlags = 0; - mark_para_rewrap(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[1] = editor->pCursors[0]; - para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; - ME_CommitCoalescingUndo(editor); - ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { /* v1.0 - 3.0 */ - ME_DisplayItem *para = cursor.pPara; - if (ME_IsInTable(para)) - { - if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) - { - if (from == to) { - ME_ContinueCoalescingTransaction(editor); - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } else { - ME_ContinueCoalescingTransaction(editor); - if (cursor.pRun->member.run.nCharOfs + cursor.nOffset == 0 && - !ME_IsInTable(para->member.para.prev_para)) - { - /* Insert newline before table */ - cursor.pRun = ME_FindItemBack(para, diRun); - if (cursor.pRun) { - editor->pCursors[0].pRun = cursor.pRun; - editor->pCursors[0].pPara = para->member.para.prev_para; - } - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor(editor, 0, &endl, 1, - editor->pCursors[0].pRun->member.run.style); - } else { - editor->pCursors[1] = editor->pCursors[0]; - para = ME_AppendTableRow(editor, para); - editor->pCursors[0].pPara = para; - editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); - editor->pCursors[0].nOffset = 0; - editor->pCursors[1] = editor->pCursors[0]; - } - ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor, FALSE); - return TRUE; - } - } - } - - style = ME_GetInsertStyle(editor, 0); - - /* Normally the new eop style is the insert style, however in a list it is copied from the existing - eop style (this prevents the list label style changing when the new eop is inserted). - No extra ref is taken here on eop_style. */ - if (para->member.para.fmt.wNumbering) - eop_style = para->member.para.eop_run->style; - else - eop_style = style; - ME_ContinueCoalescingTransaction(editor); - if (shift_is_down) - ME_InsertEndRowFromCursor(editor, 0); - else - if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); - ME_CommitCoalescingUndo(editor); - SetCursor(NULL); - - ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor, FALSE); - ME_SaveTempStyle(editor, style); /* set the temp insert style for the new para */ - ME_ReleaseStyle(style); - } - return TRUE; + INT result = handle_enter(editor); + if (result != -1) + return result; } break; case VK_ESCAPE: -- 2.19.2

2 7

[PATCH] testbot/web: Show the mission in the arguments column for Wine VMs.
by Francois Gouget 10 Dec '18

10 Dec '18

When handling a patch Wine VMs don't take arguments except for the mission which specifies what they should do. Also a Wine VM may run multiple tasks only differing in their mission. So this helps identify what each task does. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 25 ++++++++++++++++++++++++- testbot/web/WineTestBot.css | 12 ++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 92f9d19721..1f77804be7 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -32,6 +32,7 @@ use URI::Escape; use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::LogUtils; +use WineTestBot::Missions; use WineTestBot::StepsTasks; use WineTestBot::Utils; use WineTestBot::Engine::Notify; @@ -92,7 +93,11 @@ sub GenerateHeaderCell($$$) my ($self, $CollectionBlock, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "CmdLineArg") + { + print "<th>Arguments / <span class='MissionHeader'>Missions</span></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Execution ended'>Time</a></th>\n"; } @@ -589,6 +594,24 @@ sub GenerateDataCell($$$$$) $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); } } + elsif ($PropertyName eq "CmdLineArg") + { + my $Args = $self->escapeHTML($StepTask->CmdLineArg); + if ($Args eq "" or $StepTask->VM->Type eq "wine") + { + $Args .= "<br>" if ($Args ne ""); + my ($ErrMessage, $Missions) = ParseMissionStatement($StepTask->Missions); + if (defined $ErrMessage) + { + $Args .= "<span class='Mission'>$ErrMessage</span>"; + } + else + { + $Args .= "<span class='Mission'>". $self->escapeHTML(GetTaskMissionDescription($Missions->[0], $StepTask->VM->Type)) ."</span>"; + } + } + print "<td>$Args</td>\n"; + } elsif ($PropertyName eq "Ended") { if (defined $StepTask->Ended) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index df683f863e..1456036c03 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -290,6 +290,18 @@ h2 font-style: italic; } +.MissionHeader +{ + font-size: small; + font-style: italic; +} + +.Mission +{ + font-size: small; + font-style: italic; + color: navy; +} .Screenshot { -- 2.19.2

1 0

[PATCH] testbot: The Job priority is really a niceness field.
by Francois Gouget 10 Dec '18

10 Dec '18

Change the display name so it is shown as a niceness to make it clearer that higher values indicate a lower priority. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index e06f5154d7..4f1c191190 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -73,7 +73,11 @@ sub GenerateHeaderCell($$$) my ($self, $PropertyDescriptor) = @_; my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "Ended") + if ($PropertyName eq "Priority") + { + print "<th><a class='title' title='Higher values indicate a lower priority'>Nice</a></th>\n"; + } + elsif ($PropertyName eq "Ended") { print "<th><a class='title' title='Ended'>Time</a></th>\n"; } -- 2.19.2

1 0

[PATCH] testbot: Sort VMs by name if they have the same role and sort order.
by Francois Gouget 10 Dec '18

10 Dec '18

This makes it possible to add all locale VMs with the same SortOrder value and still have them displayed in a meaningful order. This also allows them to retain a meaningful order even as locales are added or removed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 6a08bc1aea..67705474e8 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -748,12 +748,14 @@ sub SortKeysBySortOrder($$) foreach my $Key (@$Keys) { my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder]; + $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder, $Item->Name]; } my @SortedKeys = sort { my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - return @$soa[0] <=> @$sob[0] || @$soa[1] <=> @$sob[1]; + return @$soa[0] <=> @$sob[0] || + @$soa[1] <=> @$sob[1] || + @$soa[2] cmp @$sob[2]; } @$Keys; return \@SortedKeys; } -- 2.19.2

1 0

[PATCH] testbot/web: Fix showing the local job / task completion time.
by Francois Gouget 10 Dec '18

10 Dec '18

The ShowDateTime() JavaScript call must be on its own line otherwise it's ignored. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 5 +++-- testbot/web/index.pl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 1f77804be7..3e4f94d008 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -621,8 +621,9 @@ sub GenerateDataCell($$$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($StepTask->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 4f1c191190..39fea3e7a3 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -165,8 +165,9 @@ sub GenerateDataCell($$$$) print "<td><a id='$TagId' class='title' title='", strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), "'>", DurationToString($Duration), "</a>\n"; - print "<script type='text/javascript'></script>\n"; + print "<script type='text/javascript'></script>\n"; print "</td>\n"; } else -- 2.19.2

1 0

[PATCH] testbot/WineRunReconfig: Don't fail if the idle snapshot does not exist.
by Francois Gouget 10 Dec '18

10 Dec '18

This simplifies recovery if an error occurred in a previous run that resulted in the snapshot being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunReconfig.pl | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index c903ae3695..11f92c8498 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -458,23 +458,28 @@ FatalTAError(undef, $TAError) if (defined $TAError); if ($NewStatus eq 'completed') { - Debug(Elapsed($Start), " Deleting the old ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->RemoveSnapshot(); - if (defined $ErrMessage) + my $Domain = $VM->GetDomain(); + my $IdleSnapshot = $VM->IdleSnapshot; + if ($Domain->HasSnapshot($IdleSnapshot)) { - # It's not clear if the snapshot is still usable. Rather than try to figure - # it out now, let the next task deal with it. - FatalError("Could not remove the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n", "retry"); + Debug(Elapsed($Start), " Deleting the old $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->RemoveSnapshot(); + if (defined $ErrMessage) + { + # It's not clear if the snapshot is still usable. Rather than try to + # figure it out now, let the next task deal with it. + FatalError("Could not remove the $IdleSnapshot snapshot: $ErrMessage\n", "retry"); + } } - Debug(Elapsed($Start), " Recreating the ", $VM->IdleSnapshot, " snapshot\n"); - $ErrMessage = $VM->GetDomain()->CreateSnapshot(); + Debug(Elapsed($Start), " Recreating the $IdleSnapshot snapshot\n"); + $ErrMessage = $Domain->CreateSnapshot(); if (defined $ErrMessage) { # Without the snapshot the VM is not usable anymore but FatalError() will # just mark it as 'dirty'. It's only the next time it is used that the # problem will be noticed and that it will be taken offline. - FatalError("Could not recreate the ". $VM->IdleSnapshot ." snapshot: $ErrMessage\n"); + FatalError("Could not recreate the $IdleSnapshot snapshot: $ErrMessage\n"); } } -- 2.19.2

1 0

[PATCH resend 1/6] comctl32/listbox: Handle Mouse Wheel scrolling for multi-column listboxes properly
by Gabriel Ivăncescu 10 Dec '18

10 Dec '18

Multi-column listboxes scroll horizontally, so each wheel tick must go an entire page at a time instead of an item at a time. But we have to limit the amount of scrolling in this case to avoid "jumping over" columns, if the window is too small. This matches Windows behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22253 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- These notes apply to all the patches in the series. The calculation has been simplified to just integer arithmetic in all cases, since the division (the only operation with a fractional result) was immediately truncated to integer anyway. Note that the float doesn't help with overflow either. As you can see, it gets assigned to cLineScroll (which is integer) and then gets multiplied back by WHEEL_DELTA, so if the float were to help with overflow, it would overflow on the next line anyway... Anyway, overflow is extremely unlikely (and probably impossible in practice) since WHEEL_DELTA is just 120, and it was already vulnerable to overflow currently. dlls/comctl32/listbox.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..9f56a2f 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2012,9 +2012,11 @@ static LRESULT LISTBOX_HandleHScroll( LB_DESCR *descr, WORD scrollReq, WORD pos static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) { - UINT pulScrollLines = 3; + INT pulScrollLines; + UINT tmp = 3; - SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &pulScrollLines, 0); + SystemParametersInfoW(SPI_GETWHEELSCROLLLINES,0, &tmp, 0); + pulScrollLines = tmp; /* if scrolling changes direction, ignore left overs */ if ((delta < 0 && descr->wheel_remain < 0) || @@ -2025,10 +2027,21 @@ static LRESULT LISTBOX_HandleMouseWheel(LB_DESCR *descr, SHORT delta ) if (descr->wheel_remain && pulScrollLines) { - int cLineScroll; - pulScrollLines = min((UINT) descr->page_size, pulScrollLines); - cLineScroll = pulScrollLines * (float)descr->wheel_remain / WHEEL_DELTA; - descr->wheel_remain -= WHEEL_DELTA * cLineScroll / (int)pulScrollLines; + INT cLineScroll; + if (descr->style & LBS_MULTICOLUMN) + { + pulScrollLines = min((UINT)descr->width / descr->column_width, pulScrollLines); + pulScrollLines = max(1U, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + cLineScroll *= descr->page_size; + } + else + { + pulScrollLines = min((UINT)descr->page_size, pulScrollLines); + cLineScroll = (pulScrollLines * descr->wheel_remain) / WHEEL_DELTA; + descr->wheel_remain -= (cLineScroll * WHEEL_DELTA) / pulScrollLines; + } LISTBOX_SetTopItem( descr, descr->top_item - cLineScroll, TRUE ); } return 0; -- 2.19.1

2 8

[PATCH 3/5] wineps.drv: Add stubs for escapes required by Adobe PageMaker.
by Dmitry Timoshkov 10 Dec '18

10 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 7 ------- dlls/wineps.drv/escape.c | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 3179c97e46..82cf200f4c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1402,9 +1402,7 @@ static void print_something(HDC hdc) strcpy(buf, "deadbeef"); ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); -todo_wine ok(ret == 1, "DOWNLOADHEADER failed\n"); -todo_wine ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); @@ -1464,22 +1462,18 @@ static void test_pscript_printer_dc(void) query = DOWNLOADFACE; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADFACE is not supported\n"); query = OPENCHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "OPENCHANNEL is not supported\n"); query = DOWNLOADHEADER; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "DOWNLOADHEADER is not supported\n"); query = CLOSECHANNEL; ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); -todo_wine ok(ret == 1, "CLOSECHANNEL is not supported\n"); query = POSTSCRIPT_PASSTHROUGH; @@ -1487,7 +1481,6 @@ todo_wine ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); -todo_wine ok(ret == 1, "GETFACENAME failed\n"); trace("face name: %s\n", buf); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 43bbe18bb5..44d790b298 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -97,14 +97,55 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, case CLIP_TO_PATH: case END_PATH: /*case DRAWPATTERNRECT:*/ + + /* PageMaker checks for it */ + case DOWNLOADHEADER: + + /* PageMaker doesn't check for DOWNLOADFACE and GETFACENAME but + * uses them, they are supposed to be supported by any PS printer. + */ + case DOWNLOADFACE: + + /* PageMaker checks for these as a part of process of detecting + * a "fully compatible" PS printer, but doesn't actually use them. + */ + case OPENCHANNEL: + case CLOSECHANNEL: return TRUE; + /* Windows PS driver reports 0, but still supports this escape */ + case GETFACENAME: + return FALSE; /* suppress the FIXME below */ + default: FIXME("QUERYESCSUPPORT(%d) - not supported.\n", num); return FALSE; } } + case OPENCHANNEL: + FIXME("OPENCHANNEL: stub\n"); + return 1; + + case CLOSECHANNEL: + FIXME("CLOSECHANNEL: stub\n"); + return 1; + + case DOWNLOADHEADER: + FIXME("DOWNLOADHEADER: stub\n"); + /* should return name of the downloaded procset */ + *(char *)out_data = 0; + return 1; + + case GETFACENAME: + FIXME("GETFACENAME: stub\n"); + lstrcpynA(out_data, "Courier", cbOutput); + return 1; + + case DOWNLOADFACE: + FIXME("DOWNLOADFACE: stub\n"); + return 1; + case MFCOMMENT: { FIXME("MFCOMMENT(%p, %d)\n", in_data, cbInput); -- 2.19.2

2 1

[PATCH 2/5] gdi32: Trace full contents of DOCINFO in StartDoc.
by Dmitry Timoshkov 10 Dec '18

10 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/printdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/printdrv.c b/dlls/gdi32/printdrv.c index 3cfdc477e6..d2f4076746 100644 --- a/dlls/gdi32/printdrv.c +++ b/dlls/gdi32/printdrv.c @@ -72,9 +72,9 @@ INT WINAPI StartDocW(HDC hdc, const DOCINFOW* doc) INT ret; DC *dc = get_dc_ptr( hdc ); - TRACE("DocName = %s Output = %s Datatype = %s\n", + TRACE("DocName %s, Output %s, Datatype %s, fwType %#x\n", debugstr_w(doc->lpszDocName), debugstr_w(doc->lpszOutput), - debugstr_w(doc->lpszDatatype)); + debugstr_w(doc->lpszDatatype), doc->fwType); if(!dc) return SP_ERROR; -- 2.19.2

2 1

[PATCH 1/5] gdi32/tests: Add a simple test for printing to a PostScript device.
by Dmitry Timoshkov 10 Dec '18

10 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 124 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 123 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5eec74a72c..3179c97e46 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -2,7 +2,7 @@ * Unit tests for dc functions * * Copyright (c) 2005 Huw Davies - * Copyright (c) 2005 Dmitry Timoshkov + * Copyright (c) 2005,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1375,6 +1375,127 @@ static void test_printer_dc(void) DeleteObject( bmp ); } +static void print_something(HDC hdc) +{ + static const char psadobe[10] = "%!PS-Adobe"; + char buf[1024], *p; + char temp_path[MAX_PATH], file_name[MAX_PATH]; + DOCINFOA di; + DWORD ret; + HANDLE hfile; + + GetTempPathA(sizeof(temp_path), temp_path); + GetTempFileNameA(temp_path, "ps", 0, file_name); + + di.cbSize = sizeof(di); + di.lpszDocName = "Let's dance"; + di.lpszOutput = file_name; + di.lpszDatatype = NULL; + di.fwType = 0; + ret = StartDocA(hdc, &di); + ok(ret > 0, "StartDoc failed: %d\n", ret); + + strcpy(buf + 2, "\n% ===> before DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + strcpy(buf, "deadbeef"); + ret = ExtEscape(hdc, DOWNLOADHEADER, 0, NULL, sizeof(buf), buf ); +todo_wine + ok(ret == 1, "DOWNLOADHEADER failed\n"); +todo_wine + ok(strcmp(buf, "deadbeef") != 0, "DOWNLOADHEADER failed\n"); + + strcpy(buf + 2, "\n% ===> after DOWNLOADHEADER <===\n"); + *(WORD *)buf = strlen(buf + 2); + ret = Escape(hdc, POSTSCRIPT_PASSTHROUGH, 0, buf, NULL); + ok(ret == *(WORD *)buf, "POSTSCRIPT_PASSTHROUGH failed: %d\n", ret); + + ret = EndDoc(hdc); + ok(ret == 1, "EndDoc failed\n"); + + hfile = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFile failed\n"); + memset(buf, 0, sizeof(buf)); + ret = ReadFile(hfile, buf, sizeof(buf), &ret, NULL); + ok(ret, "ReadFile failed\n"); + CloseHandle(hfile); + + /* skip the HP PCL language selector */ + buf[sizeof(buf) - 1] = 0; + p = buf; + while (*p) + { + if (!(p[0] == 0x1b && p[1] == '%') && memcmp(p, "@PJL", 4) != 0) + break; + + p = strchr(p, '\n'); + if (!p) break; + + while (*p == '\r' || *p == '\n') p++; + } +todo_wine + ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); + + DeleteFileA(file_name); +} + +static void test_pscript_printer_dc(void) +{ + HDC hdc; + char buf[256]; + DWORD query, ret; + + hdc = create_printer_dc(100, FALSE); + + if (!hdc) return; + + if (!is_postscript_printer(hdc)) + { + skip("Default printer is not a PostScript device\n"); + DeleteDC( hdc ); + return; + } + + query = GETFACENAME; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(!ret, "GETFACENAME is supported\n"); + + query = DOWNLOADFACE; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADFACE is not supported\n"); + + query = OPENCHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "OPENCHANNEL is not supported\n"); + + query = DOWNLOADHEADER; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "DOWNLOADHEADER is not supported\n"); + + query = CLOSECHANNEL; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); +todo_wine + ok(ret == 1, "CLOSECHANNEL is not supported\n"); + + query = POSTSCRIPT_PASSTHROUGH; + ret = Escape(hdc, QUERYESCSUPPORT, sizeof(query), (LPCSTR)&query, NULL); + ok(ret == 1, "POSTSCRIPT_PASSTHROUGH is not supported\n"); + + ret = ExtEscape(hdc, GETFACENAME, 0, NULL, sizeof(buf), buf); +todo_wine + ok(ret == 1, "GETFACENAME failed\n"); + trace("face name: %s\n", buf); + + print_something(hdc); + + DeleteDC(hdc); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1389,4 +1510,5 @@ START_TEST(dc) test_desktop_colorres(); test_gamma(); test_printer_dc(); + test_pscript_printer_dc(); } -- 2.19.2

2 1

[PATCH v4 2/3] comctl32/status: Hide size grip when the parent window is maximized.
by Waritnan Sookbuntherng 10 Dec '18

10 Dec '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v4: Update test. --- dlls/comctl32/status.c | 6 ++++-- dlls/comctl32/tests/status.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cb27ee868c..3bf72fa577 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 00db9f6737..b7b5fb273e 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -682,7 +682,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); /* maximized with right-to-left */ SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); @@ -705,7 +705,7 @@ static void test_sizegrip(void) r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); expect(HTNOWHERE, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); - todo_wine expect(HTCLIENT, r); + expect(HTCLIENT, r); SetWindowLongA(g_hMainWnd, GWL_STYLE, style); DestroyWindow(hwndStatus); -- 2.19.1

1 0

[PATCH v4 3/3] comctl32/status: Checking size grip bounds in x-axis only.
by Waritnan Sookbuntherng 10 Dec '18

10 Dec '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add this commit for checking bounds inclusively. v3: Determine bounds using x-axis only. v4: Update test. --- dlls/comctl32/status.c | 5 +---- dlls/comctl32/tests/status.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3bf72fa577..6ea7d9e997 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1009,10 +1009,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index b7b5fb273e..c7d9989218 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -615,17 +615,17 @@ static void test_sizegrip(void) /* check bounds when not maximized */ r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMRIGHT, r); + expect(HTBOTTOMRIGHT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); expect(HTBOTTOMRIGHT, r); @@ -638,17 +638,17 @@ static void test_sizegrip(void) rc.right = pt.x; r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); expect(HTCLIENT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); - todo_wine expect(HTBOTTOMLEFT, r); + expect(HTBOTTOMLEFT, r); r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); expect(HTBOTTOMLEFT, r); -- 2.19.1

1 0

[PATCH v4 1/3] comctl32/tests: Test status bar size grip behavior and bounds.
by Waritnan Sookbuntherng 10 Dec '18

10 Dec '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add tests. v3: Cover more points. v4: Remove unused leftover uxtheme include and remove macros from the test. --- dlls/comctl32/tests/status.c | 126 +++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..00db9f6737 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -586,6 +586,131 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + LONG style; + RECT rc, rcClient; + POINT pt; + int width, r; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + style = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + width = GetSystemMetrics(SM_CXVSCROLL); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + /* check bounds when not maximized */ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMRIGHT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + expect(HTBOTTOMRIGHT, r); + + /* not maximized and right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + todo_wine expect(HTBOTTOMLEFT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + expect(HTBOTTOMLEFT, r); + + /* maximize with left-to-right */ + SetWindowLongA(g_hMainWnd, GWL_STYLE, style|WS_MAXIMIZE); + SetWindowLongA(hwndStatus, GWL_EXSTYLE, 0); + + GetClientRect(hwndStatus, &rcClient); + + pt.x = rcClient.right; + pt.y = rcClient.top; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x - width; + rc.right = pt.x; + rc.top = pt.y; + + pt.y = rcClient.bottom; + ClientToScreen(hwndStatus, &pt); + rc.bottom = pt.y; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + /* maximized with right-to-left */ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL); + + pt.x = rcClient.right; + ClientToScreen(hwndStatus, &pt); + rc.left = pt.x + width; + rc.right = pt.x; + + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top)); + expect(HTCLIENT, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1)); + expect(HTNOWHERE, r); + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1)); + todo_wine expect(HTCLIENT, r); + + SetWindowLongA(g_hMainWnd, GWL_STYLE, style); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +745,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

1 0

[PATCH] riched32: On VK_RETURN don't add newline into text
by Fabian Maurer 09 Dec '18

09 Dec '18

This fixes an old regression when VK_RETURN handling was implemented Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=23282 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/riched20/editor.c | 2 -- dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ dlls/riched32/tests/editor.c | 19 +++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 99c87bf61d..a9956d5d2f 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2637,8 +2637,6 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) else if (!editor->bEmulateVersion10) ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); - else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); ME_CommitCoalescingUndo(editor); SetCursor(NULL); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e134..b3e8c75fa4 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8920,6 +8920,24 @@ static void test_EM_SELECTIONTYPE(void) DestroyWindow(hwnd); } +static void test_VK_RETURN(void) +{ + HWND hwnd_richedit = new_richedit(NULL); + char buffer[100]; + GETTEXTEX gettex = {sizeof(buffer)}; + int len; + + SendMessageW(hwnd_richedit, WM_CHAR, 'T', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + SendMessageW(hwnd_richedit, WM_CHAR, 'S', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + + len = SendMessageA(hwnd_richedit, EM_GETTEXTEX, &gettex, buffer); + + ok(len == 4, "Got %d\n", len); + ok(strcmp(buffer, "T\rS\r") == 0, "Got %s\n", buffer); +} + START_TEST( editor ) { BOOL ret; @@ -8995,6 +9013,7 @@ START_TEST( editor ) test_eop_char_fmt(); test_para_numbering(); test_EM_SELECTIONTYPE(); + test_VK_RETURN(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging. diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 7751d2b402..8cb28fa773 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -1412,6 +1412,24 @@ static void test_EM_SETSEL(void) DestroyWindow(hwndRichEdit); } +static void test_VK_RETURN(void) +{ + HWND hwnd_richedit = new_richedit(NULL); + char buffer[100]; + GETTEXTEX gettex = {sizeof(buffer)}; + int len; + + SendMessageW(hwnd_richedit, WM_CHAR, 'T', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + SendMessageW(hwnd_richedit, WM_CHAR, 'S', 0); + SendMessageW(hwnd_richedit, WM_KEYDOWN, VK_RETURN, 0); + + len = SendMessageA(hwnd_richedit, EM_GETTEXTEX, &gettex, buffer); + + ok(len == 2, "Got %d\n", len); + ok(strcmp(buffer, "TS") == 0, "Got %s\n", buffer); +} + START_TEST( editor ) { MSG msg; @@ -1440,6 +1458,7 @@ START_TEST( editor ) test_enter(); test_EM_EXSETSEL(); test_EM_SETSEL(); + test_VK_RETURN(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging. -- 2.19.2

2 2

[PATCH] kernel32: Implement RaiseFailFastException
by André Hentschel 09 Dec '18

09 Dec '18

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/except.c | 35 +++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/ntstatus.h | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index c4f7fafabb6..ba195d92835 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -413,6 +413,41 @@ static inline BOOL check_resource_write( void *addr ) } +/******************************************************************* + * UnhandledExceptionFilter (KERNEL32.@) + */ +void WINAPI RaiseFailFastException(EXCEPTION_RECORD *record, CONTEXT *context, DWORD flags) +{ + EXCEPTION_RECORD rec; + CONTEXT ctx; + + if (!context) + { + ctx.ContextFlags = CONTEXT_FULL; + NtGetContextThread(GetCurrentThread(), &ctx); + context = &ctx; + } + + if (!record) + { + rec.ExceptionCode = STATUS_FAIL_FAST_EXCEPTION; + rec.ExceptionFlags = 0; + rec.ExceptionRecord = NULL; + rec.ExceptionAddress = RaiseFailFastException; + rec.NumberParameters = 0; + record = &rec; + } + + if (!NtCurrentTeb()->Peb->BeingDebugged) + { + EXCEPTION_POINTERS epointers; + + epointers.ExceptionRecord = record; + epointers.ContextRecord = context; + start_debugger_atomic(&epointers); + } +} + /******************************************************************* * UnhandledExceptionFilter (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ae7bc886c51..31be1f59785 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1182,7 +1182,7 @@ @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) -# @ stub RaiseFailFastException +@ stdcall RaiseFailFastException(ptr ptr long) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) @ stub ReadConsoleInputExA diff --git a/include/ntstatus.h b/include/ntstatus.h index 735b6c2c41c..d2f08af3283 100644 --- a/include/ntstatus.h +++ b/include/ntstatus.h @@ -939,6 +939,7 @@ #define STATUS_INVALID_TASK_INDEX ((NTSTATUS) 0xC0000501) #define STATUS_THREAD_ALREADY_IN_TASK ((NTSTATUS) 0xC0000502) #define STATUS_CALLBACK_BYPASS ((NTSTATUS) 0xC0000503) +#define STATUS_FAIL_FAST_EXCEPTION ((NTSTATUS) 0xC0000602) #define STATUS_PORT_CLOSED ((NTSTATUS) 0xC0000700) #define STATUS_MESSAGE_LOST ((NTSTATUS) 0xC0000701) #define STATUS_INVALID_MESSAGE ((NTSTATUS) 0xC0000702) -- 2.17.1

2 1

Wine staging 4.0-rc1 release
by Alistair Leslie-Hughes 09 Dec '18

09 Dec '18

Binary 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-rc1 (805 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * dxgi: Implement setting and querying the gamma value of an output. * gdi32/tests: Add some additional tests for ExtExtOut on a path for an EMF DC. * gdi32: ExtTextOut on a path with bitmap font selected shouldn't fail. * gdi32/tests: Explicitly test BeginPath() return value in the metafile path tests. * gdi32: Improve detection of symbol charset for old truetype fonts. * kernelbase: Add semi-stub for PathCchCombineEx. * ntdll: Add RtlAddGrowableFunctionTable stub. * ntdll: Add RtlGrowFunctionTable stub. * ntdll: Add stub for RtlGetUnloadEventTraceEx. * ntoskrnl.exe: Implement KeWaitForMultipleObjects(). * ntoskrnl.exe: Implement KeInitializeEvent(). * ntoskrnl.exe: Implement KeSetEvent(). * ntoskrnl.exe: Implement KeResetEvent(). * ntoskrnl.exe: Implement KeWaitForSingleObject(). * ntoskrnl.exe: Implement KeClearEvent(). * ntoskrnl.exe: Implement KeInitializeSemaphore(). * ntoskrnl.exe: Implement KeReleaseSemaphore() and waiting on semaphores. * ntoskrnl.exe: Implement KeInitializeMutex(). * ntoskrnl.exe: Implement KeReleaseMutex() and waiting on mutexes. * ntoskrnl.exe: Implement KeWaitForMutexObject(). * ntoskrnl.exe/tests: Add some tests for synchronization functions. * ntoskrnl.exe: Implement KeInitializeTimerEx(). * ntoskrnl.exe: Implement KeSetTimerEx() and waiting on timers. * ntoskrnl.exe: Implement KeCancelTimer(). * ntoskrnl.exe/tests: Add tests for waiting on timers. * ntoskrnl.exe: Implement KeDelayExecutionThread(). * oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation. * user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler. * user32/tests: Add a message test for group of radio buttons. * user32: Don't force a combobox repaint on WM_SIZE. * user32/tests: Simplify the test for BM_CLICK on autoradio button by using a dialog. * user32/tests: Add a test for navigating a group of buttons using keyboard events. * user32: Add support for navigating a group of radio buttons using a keyboard. * user32/tests: Add a focus test for an empty dialog that returns TRUE in WM_INITDIALOG. * user32: If there is no dialog controls to set focus to then set focus to dialog itself. * windowscodecs: Use V_UI1() instead of V_UNION() to assign a VT_UI1 variant member. * windowscodecs: Limit number of colors in a palette in BMP decoder. * windowscodecs: find_decoder() should return an error it received from the decoder. * windowscodecs: PNG decoder should return WINCODEC_ERR_UNKNOWNIMAGEFORMAT when image loading fails. * windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format. * windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder. * windowscodecs: Improve stub for IWICBitmapDecoder::GetMetadataQueryReader in the PNG decoder. * windowscodecs/tests: Add some tests for IWICPalette::InitializeFromBitmap. * winhttp: Fix handling of Accept headers. * libs/wine: Do not restrict base address of main thread on 64 bit mac os. * loader: Implement preloader for Mac OS. Added * [45696] shell32: Generate icons from available icons if required. * [46215] user32: File Open Dialog fails to set focus to Filename text box Updated: * ddraw-Rendering_Targets * qwave-QOSCreateHandle * dwrite-FontFallback * winepulse-PulseAudio_Support 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] shell32: Avoid an unneeded strlenW() call.
by Francois Gouget 09 Dec '18

09 Dec '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- Note that command is a buffer and cannot be NULL. dlls/shell32/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index aca02d74888..28f2e36f9a7 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -736,7 +736,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, extension++; if (GetProfileStringW(wExtensions, extension, wszEmpty, command, ARRAY_SIZE(command)) > 0) { - if (strlenW(command) != 0) + if (*command) { strcpyW(lpResult, command); tok = strchrW(lpResult, '^'); /* should be ^.extension? */ -- 2.19.2

2 1

[PATCH] rpcrt4/tests: Make create_server_process() static.
by Francois Gouget 09 Dec '18

09 Dec '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/rpcrt4/tests/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 587dc45333b..89cf514ea1e 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1973,7 +1973,7 @@ static void test_server_listening(void) ok(status == RPC_S_OK, "RpcStringFree\n"); } -HANDLE create_server_process(void) +static HANDLE create_server_process(void) { SECURITY_ATTRIBUTES sec_attr = { sizeof(sec_attr), NULL, TRUE }; HANDLE ready_event; -- 2.19.2

1 0

[PATCH] user32/tests: Make test_LoadImage_working_directory_run() static.
by Francois Gouget 09 Dec '18

09 Dec '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/tests/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 405856c77b7..323db82bc36 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1203,7 +1203,7 @@ static void create_ico_file(const char *filename, const test_icon_entries_t *tes HeapFree(GetProcessHeap(), 0, buf); } -void test_LoadImage_working_directory_run(char *path) +static void test_LoadImage_working_directory_run(char *path) { DWORD bytes_written; HANDLE handle; -- 2.19.2

1 0

[PATCH] dbghelp: Make symt_get_best_at() static.
by Francois Gouget 09 Dec '18

09 Dec '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dbghelp/symbol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c9585c5e714..96a1f8743c4 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -851,7 +851,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* neede by symt_find_nearest */ -int symt_get_best_at(struct module* module, int idx_sorttab) +static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; int idx_sorttab_orig = idx_sorttab; -- 2.19.2

1 0

[PATCH] wined3d: Use NULL instead of casting 0
by Michael Stefaniuc 07 Dec '18

07 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index d4e7cf5b37..0b54d287f3 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -100,7 +100,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */ - GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)0)); + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, NULL)); GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)sizeof(query->map_ptr[0]))); GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); checkGLcall("queue query result"); -- 2.19.2

2 2

[PATCH] ntoskrnl.exe/tests: Use NULL instead of casting 0
by Michael Stefaniuc 07 Dec '18

07 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 17e54cd508..8f41d39747 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -435,7 +435,7 @@ static void test_sync(void) ok(ret == i - 9, "expected %d, got %d\n", i - 9, ret); } - run_thread(mutex_thread, (void *)0); + run_thread(mutex_thread, NULL); ret = wait_single(&test_mutex, 0); ok(ret == 0, "got %#x\n", ret); @@ -445,7 +445,7 @@ static void test_sync(void) ret = KeReleaseMutex(&test_mutex, 0); ok(ret == 0, "got %#x\n", ret); - run_thread(mutex_thread, (void *)0); + run_thread(mutex_thread, NULL); /* test timers */ KeInitializeTimerEx(&timer, NotificationTimer); -- 2.19.2

3 4

[PATCH] configure: Fix building of the preloader on the Mac using Xcode 10 or later.
by Ken Thomases 07 Dec '18

07 Dec '18

The linker that comes with Xcode 10 requires that libSystem be linked for dynamic executables (those using dyld) unless -mmacosx-version-min=10.7 (or earlier) is used. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- This suggests that the future is grim for the approach taken for the Mac preloader. This is a stopgap measure. We've filed a bug with Apple asking that this capability be restored or, failing that, that they provide another way to do the address space reservations we need before system libraries can interfere. The alternative is to revert the Mac preloader implementation. configure.ac | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 08fbc3c..26fc392 100644 --- a/configure.ac +++ b/configure.ac @@ -717,6 +717,7 @@ wine_binary="wine" test "x$enable_win64" != "xyes" || wine_binary="wine64" AC_SUBST(WINELOADER_PROGRAMS,"$wine_binary") libwine_soversion=`expr $libwine_version : '$[[0-9]]*$\..*'` +wine_can_build_preloader=yes case $host_os in cygwin*|mingw32*) @@ -772,9 +773,20 @@ case $host_os in WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7c400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,wine_info.plist" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], - [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS"]) - WINE_TRY_CFLAGS([-Wl,-no_pie], - [WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"]) + [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" + WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, + [WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])])], + [WINE_TRY_CFLAGS([-nostartfiles -nodefaultlibs],, + [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], + [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], + [wine_can_build_preloader=no])])]) + if test "$wine_can_build_preloader" = "yes" + then + WINE_TRY_CFLAGS([-Wl,-no_pie], + [WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"]) + fi if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" then @@ -2110,25 +2122,35 @@ case $build_os in cygwin*|mingw32*) AC_SUBST(TOOLSEXT,".exe") ;; esac +wine_want_preloader=no case $host_os in linux*) case $host_cpu in *i[[3456789]]86*|x86_64*|*aarch64*) - test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") - WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + wine_want_preloader=yes ;; esac ;; darwin*|macosx*) case $host_cpu in *i[[3456789]]86*|x86_64*) - test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") - WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + wine_want_preloader=yes ;; esac ;; esac +if test "$wine_want_preloader" = "yes" +then + if test "$wine_can_build_preloader" = "yes" + then + test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") + WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" + else + WINE_WARNING([can't build Wine preloader; many programs won't work]) + fi +fi + dnl **** Check for functions **** ac_save_CFLAGS="$CFLAGS" -- 2.10.2

1 0

[PATCH] shell32: Use SetRect() instead of open coding it
by Michael Stefaniuc 07 Dec '18

07 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/ebrowser.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 2d5a30aabb..637104c58d 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -314,9 +314,7 @@ static void update_layout(ExplorerBrowserImpl *This) if(navpane_width_actual) { - This->navpane.rc.left = This->navpane.rc.top = 0; - This->navpane.rc.right = navpane_width_actual; - This->navpane.rc.bottom = rc.bottom; + SetRect(&This->navpane.rc, 0, 0, navpane_width_actual, rc.bottom); if(!This->navpane.hwnd_splitter) initialize_navpane(This, This->hwnd_main, &This->navpane.rc); @@ -324,10 +322,8 @@ static void update_layout(ExplorerBrowserImpl *This) else ZeroMemory(&This->navpane.rc, sizeof(RECT)); - This->sv_rc.left = navpane_width_actual; - This->sv_rc.top = 0; - This->sv_rc.right = This->sv_rc.left + shellview_width_actual; - This->sv_rc.bottom = rc.bottom; + SetRect(&This->sv_rc, navpane_width_actual, 0, navpane_width_actual + shellview_width_actual, + rc.bottom); } static void size_panes(ExplorerBrowserImpl *This) -- 2.19.2

1 0

[PATCH] wined3d: Use GL_LINEAR for unsupported filter types.
by Józef Kucia 07 Dec '18

07 Dec '18

Linear filtering is a much more appropriate fallback for more advanced filtering types. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41929 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 85f94899cd60..3441f018f417 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -169,16 +169,16 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 switch (filter) { - case WINED3D_TEXF_LINEAR: - gl_filter = GL_LINEAR; + case WINED3D_TEXF_NONE: + case WINED3D_TEXF_POINT: + gl_filter = GL_NEAREST; break; default: FIXME("Unsupported filter mode %s (%#x).\n", debug_d3dtexturefiltertype(filter), filter); /* fall through */ - case WINED3D_TEXF_NONE: - case WINED3D_TEXF_POINT: - gl_filter = GL_NEAREST; + case WINED3D_TEXF_LINEAR: + gl_filter = GL_LINEAR; break; } -- 2.19.2

3 3

[PATCH] d3dx9/tests: Use SetRectEmpty() instead of open coding it
by Michael Stefaniuc 07 Dec '18

07 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 91e458bbb8..fa874a5ef5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -621,7 +621,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); } - SetRect(&rect, 0, 0, 0, 0); + SetRectEmpty(&rect); height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_LEFT | DT_CALCRECT, 0xffffffff); todo_wine ok(height == tests[i].font_height, "Got unexpected height %u.\n", height); -- 2.19.2

2 1

[PATCH 2/2] secur32: Use VERS-ALL priority string only on recent gnutls versions.
by Jacek Caban 07 Dec '18

07 Dec '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] secur32: Check for supported protocols when loading gnutls.
by Jacek Caban 07 Dec '18

07 Dec '18

We mostly need to know if TLS1.3 is supported before attempting to handle it. It's just in gnutls backend now, so it will not be actually enabled yet. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 38 ++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)

1 0

[PATCH] crypt32: If there is no optional parameters set rgProvParam to NULL in CRYPT_KEY_PROV_INFO.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index e591c4dd45..2d4ce8c10c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -533,14 +533,19 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO info) provNameLen = (lstrlenW(info->pwszProvName) + 1) * sizeof(WCHAR); data += provNameLen; - info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; - data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); - - for (i = 0; i < info->cProvParam; i++) + if (info->cProvParam) { - info->rgProvParam[i].pbData = data; - data += info->rgProvParam[i].cbData; + info->rgProvParam = (PCRYPT_KEY_PROV_PARAM)data; + data += info->cProvParam * sizeof(CRYPT_KEY_PROV_PARAM); + + for (i = 0; i < info->cProvParam; i++) + { + info->rgProvParam[i].pbData = data; + data += info->rgProvParam[i].cbData; + } } + else + info->rgProvParam = NULL; } BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, -- 2.19.2

1 0

[PATCH] secur32: Support older version of gnutls
by Alistair Leslie-Hughes 07 Dec '18

07 Dec '18

Fixes a regression of 5cc5b102c1b0a66aa63b66f43f2da9a1a9d15ab6 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0a49421..57e6635 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -166,7 +166,11 @@ DWORD schan_imp_enabled_protocols(void) BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cred) { gnutls_session_t *s = (gnutls_session_t*)session; +#if GNUTLS_VERSION_MAJOR < 3 + char priority[128] = "NORMAL:%LATEST_RECORD_VERSION", *p; +#else char priority[128] = "NORMAL:%LATEST_RECORD_VERSION:-VERS-ALL", *p; +#endif unsigned i; int err = pgnutls_init(s, cred->credential_use == SECPKG_CRED_INBOUND ? GNUTLS_SERVER : GNUTLS_CLIENT); -- 1.9.1

2 1

[PATCH 5/5] wineps.drv: PostScript header should be written by StartDoc instead of StartPage.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Otherwise a being created file has wrong signature if an application directly injects PostScript code. This patch fixes printing from Adobe PageMaker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/escape.c | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 82cf200f4c..2d9ef1dd88 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1433,7 +1433,6 @@ static void print_something(HDC hdc) while (*p == '\r' || *p == '\n') p++; } -todo_wine ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); DeleteFileA(file_name); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index db73c057ef..12967223ff 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -412,15 +412,14 @@ INT PSDRV_StartPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(!physDev->job.OutOfPage) { FIXME("Already started a page?\n"); return 1; } - if(physDev->job.PageNo++ == 0) { - if(!PSDRV_WriteHeader( dev, physDev->job.doc_name )) - return 0; - } + physDev->job.PageNo++; if(!PSDRV_WriteNewPage( dev )) return 0; @@ -436,6 +435,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(physDev->job.OutOfPage) { FIXME("Already ended a page?\n"); return 1; @@ -498,6 +499,13 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) ClosePrinter(physDev->job.hprinter); return 0; } + + if (!PSDRV_WriteHeader( dev, doc->lpszDocName )) { + WARN("Failed to write header\n"); + ClosePrinter(physDev->job.hprinter); + return 0; + } + physDev->job.banding = FALSE; physDev->job.OutOfPage = TRUE; physDev->job.PageNo = 0; @@ -516,6 +524,8 @@ INT PSDRV_EndDoc( PHYSDEV dev ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); INT ret = 1; + TRACE("%p\n", dev->hdc); + if(!physDev->job.id) { FIXME("hJob == 0. Now what?\n"); return 0; -- 2.19.2

1 0

[PATCH 4/5] wineps.drv: Add support for GETFACENAME and DOWNLOADFACE escapes.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wineps.drv/download.c | 26 ++++++++++++++++++++++++++ dlls/wineps.drv/escape.c | 21 ++++++++++++++++++--- dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index dc77cf1170..86188d2b55 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -259,6 +259,32 @@ static BOOL is_fake_italic( HDC hdc ) return !(mac_style & 2); } +char *PSDRV_get_download_name(PHYSDEV dev, BOOL vertical) +{ + PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + char *ps_name; + LPOUTLINETEXTMETRICA potm; + DWORD len = GetOutlineTextMetricsA(dev->hdc, 0, NULL); + LOGFONTW lf; + + assert(physDev->font.fontloc == Download); + + if (!GetObjectW(GetCurrentObject(dev->hdc, OBJ_FONT), sizeof(lf), &lf)) + return NULL; + + potm = HeapAlloc(GetProcessHeap(), 0, len); + if (!potm) + return NULL; + + GetOutlineTextMetricsA(dev->hdc, len, potm); + + ps_name = NULL; + get_download_name(dev, potm, &ps_name, vertical); + HeapFree(GetProcessHeap(), 0, potm); + + return ps_name; +} + /**************************************************************************** * PSDRV_WriteSetDownloadFont * diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 44d790b298..db73c057ef 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -138,12 +138,27 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, return 1; case GETFACENAME: - FIXME("GETFACENAME: stub\n"); - lstrcpynA(out_data, "Courier", cbOutput); + if (physDev->font.fontloc == Download) + { + char *name = PSDRV_get_download_name(dev, physDev->font.set); + if (name) + { + TRACE("font name: %s\n", debugstr_a(name)); + lstrcpynA(out_data, name, cbOutput); + HeapFree(GetProcessHeap(), 0, name); + } + else + lstrcpynA(out_data, "Courier", cbOutput); + } + else + { + TRACE("font name: %s\n", debugstr_a(physDev->font.fontinfo.Builtin.afm->FontName)); + lstrcpynA(out_data, physDev->font.fontinfo.Builtin.afm->FontName, cbOutput); + } return 1; case DOWNLOADFACE: - FIXME("DOWNLOADFACE: stub\n"); + PSDRV_SetFont(dev, physDev->font.set); return 1; case MFCOMMENT: diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 9cbee65ed8..55f345b87f 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -553,6 +553,7 @@ extern BOOL PSDRV_SelectBuiltinFont(PHYSDEV dev, HFONT hfont, extern BOOL PSDRV_WriteSetBuiltinFont(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) DECLSPEC_HIDDEN; +extern char *PSDRV_get_download_name(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; extern BOOL PSDRV_SelectDownloadFont(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteDownloadGlyphShow(PHYSDEV dev, const WORD *glyphs, UINT count) DECLSPEC_HIDDEN; -- 2.19.2

1 0

[PATCH 2/2] [v2] loader/wine.inf: Add MUI time zone name settings.
by Akihiro Sagawa 07 Dec '18

07 Dec '18

In v2, fix broken patch output. This will fix https://bugs.winehq.org/show_bug.cgi?id=42719 after Japanese translation update. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/tests/time.c | 4 +- loader/wine.inf.in | 198 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 200 insertions(+), 2 deletions(-)

2 1

[PATCH 1/2] [v2] tzres: Add time zone name resource DLL.
by Akihiro Sagawa 07 Dec '18

07 Dec '18

In v2, divide the previous patch into two parts. String IDs are based on SHA1 hash so that we can add another zone name without renumbering. I'm preparing a tool which generate these IDs and time zone information. I'll send it later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 201 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + 5 files changed, 207 insertions(+) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

1 0

[PATCH 9/9] windowscodecs: Add support for converting to 8bppIndexed format to IWICFormatConverter.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/converter.c | 160 +++++++++++++++++++++++++++++---- 1 file changed, 143 insertions(+), 17 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 6e7bb8e781..8be36e2628 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -76,7 +76,7 @@ typedef struct FormatConverter { const struct pixelformatinfo *dst_format, *src_format; WICBitmapDitherType dither; double alpha_threshold; - WICBitmapPaletteType palette_type; + IWICPalette *palette; CRITICAL_SECTION lock; /* must be held when initialized */ } FormatConverter; @@ -1219,11 +1219,96 @@ static HRESULT copypixels_to_8bppGray(struct FormatConverter *This, const WICRec return hr; } +static UINT rgb_to_palette_index(BYTE r, BYTE g, BYTE b, WICColor *colors, UINT count) +{ + UINT best_diff, best_index, i; + + best_diff = ~0; + best_index = 0; + + for (i = 0; i < count; i++) + { + BYTE pal_r, pal_g, pal_b; + UINT diff_r, diff_g, diff_b, diff; + + pal_r = colors[i] >> 16; + pal_g = colors[i] >> 8; + pal_b = colors[i]; + + diff_r = r - pal_r; + diff_g = g - pal_g; + diff_b = b - pal_b; + + diff = diff_r * diff_r + diff_g * diff_g + diff_b * diff_b; + if (diff == 0) return i; + + if (diff < best_diff) + { + best_diff = diff; + best_index = i; + } + } + + return best_index; +} + +static HRESULT copypixels_to_8bppIndexed(struct FormatConverter *This, const WICRect *prc, + UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) +{ + HRESULT hr; + BYTE *srcdata; + WICColor colors[256]; + UINT srcstride, srcdatasize, count; + + if (source_format == format_8bppIndexed) + { + if (prc) + return IWICBitmapSource_CopyPixels(This->source, prc, cbStride, cbBufferSize, pbBuffer); + + return S_OK; + } + + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + hr = IWICPalette_GetColors(This->palette, 256, colors, &count); + if (hr != S_OK) return hr; + if (!count) return WINCODEC_ERR_WRONGSTATE; + + srcstride = 3 * prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + hr = copypixels_to_24bppBGR(This, prc, srcstride, srcdatasize, srcdata, source_format); + if (SUCCEEDED(hr) && prc) + { + INT x, y; + BYTE *src = srcdata, *dst = pbBuffer; + + for (y = 0; y < prc->Height; y++) + { + BYTE *bgr = src; + + for (x = 0; x < prc->Width; x++) + { + dst[x] = rgb_to_palette_index(bgr[2], bgr[1], bgr[0], colors, count); + bgr += 3; + } + src += srcstride; + dst += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + return hr; +} + static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_2bppIndexed, &GUID_WICPixelFormat2bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, - {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, copypixels_to_8bppIndexed}, {format_BlackWhite, &GUID_WICPixelFormatBlackWhite, NULL}, {format_2bppGray, &GUID_WICPixelFormat2bppGray, NULL}, {format_4bppGray, &GUID_WICPixelFormat4bppGray, NULL}, @@ -1300,6 +1385,7 @@ static ULONG WINAPI FormatConverter_Release(IWICFormatConverter *iface) This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); if (This->source) IWICBitmapSource_Release(This->source); + if (This->palette) IWICPalette_Release(This->palette); HeapFree(GetProcessHeap(), 0, This); } @@ -1348,10 +1434,16 @@ static HRESULT WINAPI FormatConverter_GetResolution(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_CopyPalette(IWICFormatConverter *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + FormatConverter *This = impl_from_IWICFormatConverter(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + if (!This->palette) return WINCODEC_ERR_WRONGSTATE; + + return IWICPalette_InitializeFromPalette(palette, This->palette); } static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, @@ -1384,19 +1476,52 @@ static HRESULT WINAPI FormatConverter_CopyPixels(IWICFormatConverter *iface, } static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, - IWICBitmapSource *pISource, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, - IWICPalette *pIPalette, double alphaThresholdPercent, WICBitmapPaletteType paletteTranslate) + IWICBitmapSource *source, REFWICPixelFormatGUID dstFormat, WICBitmapDitherType dither, + IWICPalette *palette, double alpha_threshold, WICBitmapPaletteType palette_type) { FormatConverter *This = impl_from_IWICFormatConverter(iface); const struct pixelformatinfo *srcinfo, *dstinfo; - static INT fixme=0; GUID srcFormat; - HRESULT res=S_OK; + HRESULT res; + + TRACE("(%p,%p,%s,%u,%p,%0.3f,%u)\n", iface, source, debugstr_guid(dstFormat), + dither, palette, alpha_threshold, palette_type); + + if (!palette) + { + res = PaletteImpl_Create(&palette); + if (res != S_OK) return res; + + switch (palette_type) + { + case WICBitmapPaletteTypeCustom: + IWICPalette_Release(palette); + palette = NULL; + res = S_OK; + break; + + case WICBitmapPaletteTypeMedianCut: + { + UINT bpp; + res = get_pixelformat_bpp(dstFormat, &bpp); + if (res == S_OK && bpp <= 8) + res = IWICPalette_InitializeFromBitmap(palette, source, 1 << bpp, FALSE); + break; + } - TRACE("(%p,%p,%s,%u,%p,%0.1f,%u)\n", iface, pISource, debugstr_guid(dstFormat), - dither, pIPalette, alphaThresholdPercent, paletteTranslate); + default: + res = IWICPalette_InitializePredefined(palette, palette_type, FALSE); + break; + } - if (pIPalette && !fixme++) FIXME("ignoring palette\n"); + if (res != S_OK) + { + IWICPalette_Release(palette); + return res; + } + } + else + IWICPalette_AddRef(palette); EnterCriticalSection(&This->lock); @@ -1406,7 +1531,7 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, goto end; } - res = IWICBitmapSource_GetPixelFormat(pISource, &srcFormat); + res = IWICBitmapSource_GetPixelFormat(source, &srcFormat); if (FAILED(res)) goto end; srcinfo = get_formatinfo(&srcFormat); @@ -1427,13 +1552,13 @@ static HRESULT WINAPI FormatConverter_Initialize(IWICFormatConverter *iface, if (dstinfo->copy_function) { - IWICBitmapSource_AddRef(pISource); + IWICBitmapSource_AddRef(source); This->src_format = srcinfo; This->dst_format = dstinfo; This->dither = dither; - This->alpha_threshold = alphaThresholdPercent; - This->palette_type = paletteTranslate; - This->source = pISource; + This->alpha_threshold = alpha_threshold; + This->palette = palette; + This->source = source; } else { @@ -1512,6 +1637,7 @@ HRESULT FormatConverter_CreateInstance(REFIID iid, void** ppv) This->IWICFormatConverter_iface.lpVtbl = &FormatConverter_Vtbl; This->ref = 1; This->source = NULL; + This->palette = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": FormatConverter.lock"); -- 2.19.2

1 0

[PATCH 8/9] gdiplus/tests: Add some tests for GdipInitializePalette.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/tests/image.c | 146 +++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b31f32e1fa..2ec8cf57eb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -34,6 +34,8 @@ static GpStatus (WINAPI *pGdipBitmapGetHistogramSize)(HistogramFormat,UINT*); static GpStatus (WINAPI *pGdipBitmapGetHistogram)(GpBitmap*,HistogramFormat,UINT,UINT*,UINT*,UINT*,UINT*); static GpStatus (WINAPI *pGdipImageSetAbort)(GpImage*,GdiplusAbort*); +static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); + #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) @@ -5339,6 +5341,149 @@ static void test_GdipLoadImageFromStream(void) IStream_Release(stream); } +static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) +{ + BYTE *src; + UINT i, j, scale; + + *width = 256; + *height = 256; + *stride = (*width * 3 + 3) & ~3; + trace("width %d, height %d, stride %d\n", *width, *height, *stride); + + src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + + scale = 256 / *width; + if (!scale) scale = 1; + + for (i = 0; i < *height; i++) + { + for (j = 0; j < *width; j++) + { + src[i * *stride + j*3 + 0] = scale * i; + src[i * *stride + j*3 + 1] = scale * (255 - (i+j)/2); + src[i * *stride + j*3 + 2] = scale * j; + } + } + + return src; +} + +static void test_GdipInitializePalette(void) +{ + GpStatus status; + BYTE *data; + GpBitmap *bitmap; + ColorPalette *palette; + UINT width, height, stride; + + pGdipInitializePalette = (void *)GetProcAddress(GetModuleHandleA("gdiplus.dll"), "GdipInitializePalette"); + if (!pGdipInitializePalette) + { + win_skip("GdipInitializePalette is not supported on this platform\n"); + return; + } + + data = init_bitmap(&width, &height, &stride); + + status = GdipCreateBitmapFromScan0(width, height, stride, PixelFormat24bppRGB, data, &bitmap); + expect(Ok, status); + + palette = GdipAlloc(sizeof(*palette) + sizeof(ARGB) * 255); + + palette->Flags = 0; + palette->Count = 15; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, bitmap); + expect(GenericError, status); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, NULL); + expect(InvalidParameter, status); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeCustom, 16, FALSE, NULL); + expect(Ok, status); + expect(0, palette->Flags); + expect(256, palette->Count); + expect(0x11111111, palette->Entries[0]); + expect(0x11111111, palette->Entries[128]); + expect(0x11111111, palette->Entries[255]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedBW, 0, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x200, palette->Flags); + expect(2, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffffffff, palette->Entries[1]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, NULL); + expect(Ok, status); +todo_wine + expect(0x300, palette->Flags); + expect(16, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffc0c0c0, palette->Entries[8]); + expect(0xff008080, palette->Entries[15]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone8, 1, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x300, palette->Flags); + expect(16, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xffc0c0c0, palette->Entries[8]); + expect(0xff008080, palette->Entries[15]); + + memset(palette->Entries, 0x11, sizeof(ARGB) * 256); + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeFixedHalftone252, 1, FALSE, bitmap); + expect(Ok, status); +todo_wine + expect(0x800, palette->Flags); + expect(252, palette->Count); + expect(0xff000000, palette->Entries[0]); + expect(0xff990066, palette->Entries[128]); + expect(0xffffffff, palette->Entries[251]); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 1, FALSE, bitmap); + expect(InvalidParameter, status); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 2, FALSE, bitmap); + expect(Ok, status); + expect(0, palette->Flags); + expect(2, palette->Count); + + palette->Flags = 0; + palette->Count = 256; + status = pGdipInitializePalette(palette, PaletteTypeOptimal, 16, FALSE, bitmap); + expect(Ok, status); + expect(0, palette->Flags); + expect(16, palette->Count); + + /* passing invalid enumeration palette type crashes under most Windows versions */ + + GdipFree(palette); + GdipDisposeImage((GpImage *)bitmap); +} + START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); @@ -5363,6 +5508,7 @@ START_TEST(image) pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); + test_GdipInitializePalette(); test_png_color_formats(); test_supported_encoders(); test_CloneBitmapArea(); -- 2.19.2

1 0

[PATCH 7/9] gdiplus: Implement GdipInitializePalette.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 108 ++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e0cf6d5d34..ed9d50c058 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -615,7 +615,7 @@ 615 stub GdipGetEffectParameterSize 616 stub GdipGetEffectParameters 617 stdcall GdipSetEffectParameters(ptr ptr long) -618 stub GdipInitializePalette +618 stdcall GdipInitializePalette(ptr long long long ptr) 619 stdcall GdipBitmapCreateApplyEffect(ptr long ptr ptr ptr ptr long ptr ptr) 620 stdcall GdipBitmapApplyEffect(ptr ptr ptr long ptr ptr) 621 stdcall GdipBitmapGetHistogram(ptr long long ptr ptr ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e844cfcc5..8bd723f031 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5636,3 +5636,111 @@ GpStatus WINGDIPAPI GdipBitmapGetHistogramSize(HistogramFormat format, UINT *num *num_of_entries = 256; return Ok; } + +static GpStatus create_optimal_palette(ColorPalette *palette, INT desired, + BOOL transparent, GpBitmap *bitmap) +{ + GpStatus status; + BitmapData data; + HRESULT hr; + IWICImagingFactory *factory; + IWICPalette *wic_palette; + + if (!bitmap) return InvalidParameter; + if (palette->Count < desired) return GenericError; + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &data); + if (status != Ok) return status; + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (hr != S_OK) + { + GdipBitmapUnlockBits(bitmap, &data); + return hresult_to_status(hr); + } + + hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); + if (hr == S_OK) + { + IWICBitmap *bitmap; + + /* PixelFormat24bppRGB actually stores the bitmap bits as BGR. */ + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, data.Width, data.Height, + &GUID_WICPixelFormat24bppBGR, data.Stride, data.Stride * data.Width, data.Scan0, &bitmap); + if (hr == S_OK) + { + hr = IWICPalette_InitializeFromBitmap(wic_palette, (IWICBitmapSource *)bitmap, desired, transparent); + if (hr == S_OK) + { + palette->Flags = 0; + IWICPalette_GetColorCount(wic_palette, &palette->Count); + IWICPalette_GetColors(wic_palette, palette->Count, palette->Entries, &palette->Count); + } + + IWICBitmap_Release(bitmap); + } + + IWICPalette_Release(wic_palette); + } + + IWICImagingFactory_Release(factory); + GdipBitmapUnlockBits(bitmap, &data); + + return hresult_to_status(hr); +} + +/***************************************************************************** + * GdipInitializePalette [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette *palette, + PaletteType type, INT desired, BOOL transparent, GpBitmap *bitmap) +{ + TRACE("(%p,%d,%d,%d,%p)\n", palette, type, desired, transparent, bitmap); + + if (!palette) return InvalidParameter; + + switch (type) + { + case PaletteTypeCustom: + return Ok; + + case PaletteTypeOptimal: + return create_optimal_palette(palette, desired, transparent, bitmap); + + /* WIC palette type enumeration matches these gdiplus enums */ + case PaletteTypeFixedBW: + case PaletteTypeFixedHalftone8: + case PaletteTypeFixedHalftone27: + case PaletteTypeFixedHalftone64: + case PaletteTypeFixedHalftone125: + case PaletteTypeFixedHalftone216: + case PaletteTypeFixedHalftone252: + case PaletteTypeFixedHalftone256: + { + ColorPalette *wic_palette; + GpStatus status = Ok; + + wic_palette = get_palette(NULL, type); + if (!wic_palette) return OutOfMemory; + + if (palette->Count >= wic_palette->Count) + { + palette->Flags = wic_palette->Flags; + palette->Count = wic_palette->Count; + memcpy(palette->Entries, wic_palette->Entries, wic_palette->Count * sizeof(wic_palette->Entries[0])); + } + else + status = GenericError; + + heap_free(wic_palette); + + return status; + } + + default: + FIXME("unknown palette type %d\n", type); + break; + } + + return InvalidParameter; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ad944d6a34..57fa6c64f2 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -266,6 +266,7 @@ GpStatus WINGDIPAPI GdipGraphicsClear(GpGraphics*,ARGB); GpStatus WINGDIPAPI GdipGraphicsSetAbort(GpGraphics*,GdiplusAbort*); GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics*,GpRectF*); GpStatus WINGDIPAPI GdipGetVisibleClipBoundsI(GpGraphics*,GpRect*); +GpStatus WINGDIPAPI GdipInitializePalette(ColorPalette*,PaletteType,INT,BOOL,GpBitmap*); GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics*, BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*); GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*); -- 2.19.2

1 0

[PATCH 6/9] windowscodecs: Implement IWICPalette::InitializeFromBitmap.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Based on median cut implementation created by Sebastian Lackner. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/palette.c | 279 ++++++++++++++++++++++++++++- dlls/windowscodecs/tests/palette.c | 21 +-- 2 files changed, 275 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 89ec9ead11..1c1e85834b 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -1,6 +1,7 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov + * Copyright 2016 Sebastian Lackner * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -446,11 +447,279 @@ static HRESULT WINAPI PaletteImpl_InitializeCustom(IWICPalette *iface, return S_OK; } -static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *iface, - IWICBitmapSource *pISurface, UINT colorCount, BOOL fAddTransparentColor) +#define R_COUNT (1 << 5) +#define R_SHIFT (8 - 5) +#define R_SCALE 2 + +#define G_COUNT (1 << 6) +#define G_SHIFT (8 - 6) +#define G_SCALE 3 + +#define B_COUNT (1 << 5) +#define B_SHIFT (8 - 5) +#define B_SCALE 1 + +struct histogram +{ + unsigned int data[R_COUNT][G_COUNT][B_COUNT]; +}; + +struct box +{ + int r_min, r_max; + int g_min, g_max; + int b_min, b_max; + unsigned int count; + unsigned int score; +}; + +/* count nonzero elements in the histogram range [r_min, r_max] x [g_min, g_max] x [b_min, b_max] */ +static inline unsigned int histogram_count(struct histogram *h, int r_min, int r_max, + int g_min, int g_max, int b_min, int b_max) +{ + unsigned int count = 0; + int r, g, b; + for (r = r_min; r <= r_max; r++) + for (g = g_min; g <= g_max; g++) + for (b = b_min; b <= b_max; b++) + if (h->data[r][g][b] != 0) count++; + return count; +} + +/* compute weighted average color in the range [r_min, r_max] x [g_min, g_max] x [b_min, b_max] */ +static unsigned int histogram_color(struct histogram *h, int r_min, int r_max, + int g_min, int g_max, int b_min, int b_max) +{ + unsigned long long r_sum = 0, g_sum = 0, b_sum = 0; + unsigned int tmp, count = 0; + int r, g, b; + + for (r = r_min; r <= r_max; r++) + for (g = g_min; g <= g_max; g++) + for (b = b_min; b <= b_max; b++) + { + if (!(tmp = h->data[r][g][b])) continue; + r_sum += ((r << R_SHIFT) + ((1 << R_SHIFT) / 2)) * tmp; + g_sum += ((g << G_SHIFT) + ((1 << G_SHIFT) / 2)) * tmp; + b_sum += ((b << B_SHIFT) + ((1 << B_SHIFT) / 2)) * tmp; + count += tmp; + } + + return ((b_sum + (count / 2)) / count) | + ((g_sum + (count / 2)) / count) << 8 | + ((r_sum + (count / 2)) / count) << 16 | 0xff000000; +} + +/* same as histogram_count */ +static inline unsigned int box_count(struct histogram *h, struct box *b) +{ + return histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, b->b_min, b->b_max); +} + +/* same as histogram_color */ +static inline unsigned int box_color(struct histogram *h, struct box *b) +{ + return histogram_color(h, b->r_min, b->r_max, b->g_min, b->g_max, b->b_min, b->b_max); +} + +/* compute score used to determine best split (also called "volume") */ +static inline unsigned int box_score(struct box *b) +{ + unsigned int tmp, sum = 0; + tmp = ((b->r_max - b->r_min) << R_SHIFT) * R_SCALE; sum += tmp * tmp; + tmp = ((b->g_max - b->g_min) << G_SHIFT) * G_SCALE; sum += tmp * tmp; + tmp = ((b->b_max - b->b_min) << B_SHIFT) * B_SCALE; sum += tmp * tmp; + return sum; +} + +/* attempt to shrink a box */ +static void shrink_box(struct histogram *h, struct box *b) +{ + int i; + for (i = b->r_min; i <= b->r_max; i++) + if (histogram_count(h, i, i, b->g_min, b->g_max, b->b_min, b->b_max)) { b->r_min = i; break; } + for (i = b->r_max; i >= b->r_min; i--) + if (histogram_count(h, i, i, b->g_min, b->g_max, b->b_min, b->b_max)) { b->r_max = i; break; } + for (i = b->g_min; i <= b->g_max; i++) + if (histogram_count(h, b->r_min, b->r_max, i, i, b->b_min, b->b_max)) { b->g_min = i; break; } + for (i = b->g_max; i >= b->g_min; i--) + if (histogram_count(h, b->r_min, b->r_max, i, i, b->b_min, b->b_max)) { b->g_max = i; break; } + for (i = b->b_min; i <= b->b_max; i++) + if (histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, i, i)) { b->b_min = i; break; } + for (i = b->b_max; i >= b->b_min; i--) + if (histogram_count(h, b->r_min, b->r_max, b->g_min, b->g_max, i, i)) { b->b_max = i; break; } + b->count = box_count(h, b); + b->score = box_score(b); +} + +/* helper for split_box */ +static inline void set_avg(int *min, int *max) +{ + int avg = (*min + *max) / 2; + *min = avg + 1; + *max = avg; +} + +/* split a box based on the best axis */ +static void split_box(struct histogram *h, struct box *b1, struct box *b2) +{ + int r = ((b1->r_max - b1->r_min) << R_SHIFT) * R_SCALE; + int g = ((b1->g_max - b1->g_min) << G_SHIFT) * G_SCALE; + int b = ((b1->b_max - b1->b_min) << B_SHIFT) * B_SCALE; + + *b2 = *b1; + + if (r > g) + { + if (b > r) set_avg(&b1->b_min, &b2->b_max); + else set_avg(&b1->r_min, &b2->r_max); + } + else + { + if (b > g) set_avg(&b1->b_min, &b2->b_max); + else set_avg(&b1->g_min, &b2->g_max); + } + + shrink_box(h, b1); + shrink_box(h, b2); +} + +/* find box suitable for split based on count */ +static struct box *find_box_max_count(struct box *b, int count) +{ + struct box *best = NULL; + for (; count--; b++) + if (b->score && (!best || b->count > best->count)) best = b; + return best; +} + +/* find box suitable for split based on score */ +static struct box *find_box_max_score(struct box *b, int count) +{ + struct box *best = NULL; + for (; count--; b++) + if (b->score && (!best || b->score > best->score)) best = b; + return best; +} + +/* compute color map with at most 'desired' colors + * image must be in 24bpp BGR format and colors are returned in 0xAARRGGBB format */ +static int median_cut(unsigned char *image, unsigned int width, unsigned int height, + unsigned int stride, int desired, unsigned int *colors) +{ + struct box boxes[256]; + struct histogram *h; + unsigned int x, y; + unsigned char *p; + struct box *b1, *b2; + int numboxes, i; + + if (!(h = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*h)))) + return 0; + + for (y = 0; y < height; y++) + for (x = 0, p = image + y * stride; x < width; x++, p += 3) + h->data[p[2] >> R_SHIFT][p[1] >> G_SHIFT][p[0] >> B_SHIFT]++; + + numboxes = 1; + boxes[0].r_min = 0; boxes[0].r_max = R_COUNT - 1; + boxes[0].g_min = 0; boxes[0].g_max = G_COUNT - 1; + boxes[0].b_min = 0; boxes[0].b_max = B_COUNT - 1; + shrink_box(h, &boxes[0]); + + while (numboxes <= desired / 2) + { + if (!(b1 = find_box_max_count(boxes, numboxes))) break; + b2 = &boxes[numboxes++]; + split_box(h, b1, b2); + } + while (numboxes < desired) + { + if (!(b1 = find_box_max_score(boxes, numboxes))) break; + b2 = &boxes[numboxes++]; + split_box(h, b1, b2); + } + + for (i = 0; i < numboxes; i++) + colors[i] = box_color(h, &boxes[i]); + + HeapFree(GetProcessHeap(), 0, h); + return numboxes; +} + + +static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, + IWICBitmapSource *source, UINT desired, BOOL add_transparent) { - FIXME("(%p,%p,%u,%i): stub\n", iface, pISurface, colorCount, fAddTransparentColor); - return E_NOTIMPL; + IWICImagingFactory *factory = NULL; + IWICBitmap *rgb24_bitmap = NULL; + IWICBitmapSource *rgb24_source; + IWICBitmapLock *lock = NULL; + WICPixelFormatGUID format; + HRESULT hr; + UINT width, height, stride, size, actual_number_of_colors; + BYTE *src; + WICColor colors[256]; + + TRACE("(%p,%p,%u,%d)\n", palette, source, desired, add_transparent); + + if (!source || desired < 2 || desired > 256) + return E_INVALIDARG; + + hr = IWICBitmapSource_GetPixelFormat(source, &format); + if (hr != S_OK) return hr; + + /* For interoperability with gdiplus where PixelFormat24bppRGB actully stored + * as BGR (and there is no a corresponding RGB format) we have to use 24bppBGR + * to avoid format conversions. + */ + if (!IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR)) + { + hr = WICConvertBitmapSource(&GUID_WICPixelFormat24bppBGR, source, &rgb24_source); + if (hr != S_OK) return hr; + } + else + rgb24_source = source; + + hr = ImagingFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) goto fail; + + hr = IWICImagingFactory_CreateBitmapFromSource(factory, rgb24_source, WICBitmapCacheOnLoad, &rgb24_bitmap); + if (hr != S_OK) goto fail; + + hr = IWICBitmap_Lock(rgb24_bitmap, NULL, WICBitmapLockRead, &lock); + if (hr != S_OK) goto fail; + + IWICBitmapLock_GetSize(lock, &width, &height); + IWICBitmapLock_GetStride(lock, &stride); + IWICBitmapLock_GetDataPointer(lock, &size, &src); + + actual_number_of_colors = median_cut(src, width, height, stride, add_transparent ? desired - 1 : desired, colors); + TRACE("actual number of colors: %u\n", actual_number_of_colors); + + if (actual_number_of_colors) + { + if (add_transparent) colors[actual_number_of_colors++] = 0; + + hr = IWICPalette_InitializeCustom(palette, colors, actual_number_of_colors); + } + else + hr = E_OUTOFMEMORY; + +fail: + if (lock) + IWICBitmapLock_Release(lock); + + if (rgb24_bitmap) + IWICBitmap_Release(rgb24_bitmap); + + if (factory) + IWICImagingFactory_Release(factory); + + if (rgb24_source != source) + IWICBitmapSource_Release(rgb24_source); + + return hr; } static HRESULT WINAPI PaletteImpl_InitializeFromPalette(IWICPalette *iface, diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 3b9f68535b..5bb25fa427 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -577,48 +577,34 @@ static void test_palette_from_bitmap(void) ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 0, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 1, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 257, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, NULL, 16, FALSE); -todo_wine ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, FALSE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ + count = 0; hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); -} hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, TRUE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ count = 0; hr = IWICPalette_GetColorCount(palette, &count); ok(hr == S_OK, "GetColorCount error %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); -} /* without trasparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, FALSE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ type = -1; hr = IWICPalette_GetType(palette, &type); ok(hr == S_OK, "GetType error %#x\n", hr); @@ -632,14 +618,10 @@ if (hr == S_OK) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[count - 1] != 0, "expected !0, got %08x\n", color[count - 1]); -} /* with trasparent color */ hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, TRUE); -todo_wine ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); -if (hr == S_OK) -{ type = -1; hr = IWICPalette_GetType(palette, &type); ok(hr == S_OK, "GetType error %#x\n", hr); @@ -653,7 +635,6 @@ if (hr == S_OK) ok(hr == S_OK, "GetColors error %#x\n", hr); ok(ret == count, "expected %u, got %u\n", count, ret); ok(color[count - 1] == 0, "expected 0, got %08x\n", color[count - 1]); -} IWICPalette_Release(palette); IWICBitmap_Release(bitmap); -- 2.19.2

1 0

[PATCH 5/9] windowscodecs/tests: Add some tests for IWICPalette::InitializeFromBitmap.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/palette.c | 158 ++++++++++++++++++++++++++--- 1 file changed, 143 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/tests/palette.c b/dlls/windowscodecs/tests/palette.c index 27bf7c80d1..3b9f68535b 100644 --- a/dlls/windowscodecs/tests/palette.c +++ b/dlls/windowscodecs/tests/palette.c @@ -1,6 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers - * Copyright 2012 Dmitry Timoshkov + * Copyright 2012,2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,9 +27,10 @@ #include "wincodec.h" #include "wine/test.h" +static IWICImagingFactory *factory; + static void test_custom_palette(void) { - IWICImagingFactory *factory; IWICPalette *palette, *palette2; HRESULT hr; WICBitmapPaletteType type=0xffffffff; @@ -38,11 +39,6 @@ static void test_custom_palette(void) WICColor colors[4]; BOOL boolresult; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; - hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(SUCCEEDED(hr), "CreatePalette failed, hr=%x\n", hr); if (SUCCEEDED(hr)) @@ -207,8 +203,6 @@ static void test_custom_palette(void) IWICPalette_Release(palette2); IWICPalette_Release(palette); } - - IWICImagingFactory_Release(factory); } static void generate_gray16_palette(DWORD *entries, UINT count) @@ -451,7 +445,6 @@ static void test_predefined_palette(void) { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 } }, { WICBitmapPaletteTypeFixedHalftone256, 0, 0, 256, { 0 }, 1 } }; - IWICImagingFactory *factory; IWICPalette *palette; HRESULT hr; WICBitmapPaletteType type; @@ -459,10 +452,6 @@ static void test_predefined_palette(void) BOOL bret; WICColor color[256]; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); - ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); - hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeCustom, FALSE); @@ -538,16 +527,155 @@ static void test_predefined_palette(void) IWICPalette_Release(palette); } +} - IWICImagingFactory_Release(factory); +static BYTE *init_bitmap(UINT *width, UINT *height, UINT *stride) +{ + BYTE *src; + UINT i, j, scale; + + *width = 256; + *height = 256; + *stride = (*width * 3 + 3) & ~3; + trace("width %d, height %d, stride %d\n", *width, *height, *stride); + + src = HeapAlloc(GetProcessHeap(), 0, *stride * *height); + + scale = 256 / *width; + if (!scale) scale = 1; + + for (i = 0; i < *height; i++) + { + for (j = 0; j < *width; j++) + { + src[i * *stride + j*3 + 0] = scale * i; + src[i * *stride + j*3 + 1] = scale * (255 - (i+j)/2); + src[i * *stride + j*3 + 2] = scale * j; + } + } + + return src; +} + +static void test_palette_from_bitmap(void) +{ + HRESULT hr; + BYTE *data; + IWICBitmap *bitmap; + IWICPalette *palette; + WICBitmapPaletteType type; + UINT width, height, stride, count, ret; + WICColor color[257]; + + data = init_bitmap(&width, &height, &stride); + + hr = IWICImagingFactory_CreateBitmapFromMemory(factory, width, height, &GUID_WICPixelFormat24bppRGB, + stride, stride * height, data, &bitmap); + ok(hr == S_OK, "CreateBitmapFromMemory error %#x\n", hr); + + hr = IWICImagingFactory_CreatePalette(factory, &palette); + ok(hr == S_OK, "CreatePalette error %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 0, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 1, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 257, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, NULL, 16, FALSE); +todo_wine + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, FALSE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); +} + + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 2, TRUE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 2, "expected 2, got %u\n", count); +} + + /* without trasparent color */ + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, FALSE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + memset(color, 0, sizeof(color)); + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[count - 1] != 0, "expected !0, got %08x\n", color[count - 1]); +} + + /* with trasparent color */ + hr = IWICPalette_InitializeFromBitmap(palette, (IWICBitmapSource *)bitmap, 16, TRUE); +todo_wine + ok(hr == S_OK, "InitializeFromBitmap error %#x\n", hr); +if (hr == S_OK) +{ + type = -1; + hr = IWICPalette_GetType(palette, &type); + ok(hr == S_OK, "GetType error %#x\n", hr); + ok(type == WICBitmapPaletteTypeCustom, "expected WICBitmapPaletteTypeCustom, got %#x\n", type); + count = 0; + hr = IWICPalette_GetColorCount(palette, &count); + ok(hr == S_OK, "GetColorCount error %#x\n", hr); + ok(count == 16, "expected 16, got %u\n", count); + memset(color, 0xff, sizeof(color)); + hr = IWICPalette_GetColors(palette, count, color, &ret); + ok(hr == S_OK, "GetColors error %#x\n", hr); + ok(ret == count, "expected %u, got %u\n", count, ret); + ok(color[count - 1] == 0, "expected 0, got %08x\n", color[count - 1]); +} + + IWICPalette_Release(palette); + IWICBitmap_Release(bitmap); + + HeapFree(GetProcessHeap(), 0, data); } START_TEST(palette) { + HRESULT hr; + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + test_custom_palette(); test_predefined_palette(); + test_palette_from_bitmap(); + + IWICImagingFactory_Release(factory); CoUninitialize(); } -- 2.19.2

1 0

[PATCH 4/9] windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the JPEG encoder.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index a060d569f8..54f77a7220 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -412,10 +412,14 @@ static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI JpegDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI JpegDecoder_GetPreview(IWICBitmapDecoder *iface, -- 2.19.2

1 0

[PATCH 3/9] windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the PNG decoder.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 786d8360e0..7050c95121 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -842,10 +842,14 @@ static HRESULT WINAPI PngDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI PngDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, -- 2.19.2

1 0

[PATCH 2/9] windowscodecs: Implement IWICBitmapDecoder::GetMetadataQueryReader in the TIFF decoder.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 95a39cdbfb..93af5594a7 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -694,8 +694,12 @@ static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, static HRESULT WINAPI TiffDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, IWICMetadataQueryReader **ppIMetadataQueryReader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIMetadataQueryReader); + + if (!ppIMetadataQueryReader) return E_INVALIDARG; + + *ppIMetadataQueryReader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI TiffDecoder_GetPreview(IWICBitmapDecoder *iface, -- 2.19.2

1 0

[PATCH 1/9] windowscodecs: Add registration for GUID_WICPixelFormat32bppGrayFloat pixel format.
by Dmitry Timoshkov 07 Dec '18

07 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 7b0fbf8089..9a580c67c5 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1736,6 +1736,8 @@ static BYTE const channel_mask_16bit2[] = { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, static BYTE const channel_mask_16bit3[] = { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 }; static BYTE const channel_mask_16bit4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff }; +static BYTE const channel_mask_32bit[] = { 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static BYTE const channel_mask_5bit[] = { 0x1f, 0x00 }; static BYTE const channel_mask_5bit2[] = { 0xe0, 0x03 }; static BYTE const channel_mask_5bit3[] = { 0x00, 0x7c }; @@ -1752,6 +1754,8 @@ static BYTE const * const channel_masks_8bit[] = { channel_mask_8bit, static BYTE const * const channel_masks_16bit[] = { channel_mask_16bit, channel_mask_16bit2, channel_mask_16bit3, channel_mask_16bit4}; +static BYTE const * const channel_masks_32bit[] = { channel_mask_32bit }; + static BYTE const * const channel_masks_BGRA5551[] = { channel_mask_5bit, channel_mask_5bit2, channel_mask_5bit3, channel_mask_5bit4 }; @@ -1946,6 +1950,17 @@ static struct regsvr_pixelformat const pixelformat_list[] = { WICPixelFormatNumericRepresentationUnsignedInteger, 1 }, + { &GUID_WICPixelFormat32bppGrayFloat, + "The Wine Project", + "32bpp GrayFloat", + NULL, /* no version */ + &GUID_VendorMicrosoft, + 32, /* bitsperpixel */ + 1, /* channel count */ + channel_masks_32bit, + WICPixelFormatNumericRepresentationFloat, + 1 + }, { &GUID_WICPixelFormat48bppRGB, "The Wine Project", "48bpp RGB", -- 2.19.2

1 0

Pointers to develop direct hardware access
by Peter Cost 06 Dec '18

06 Dec '18

I'm new to wine and tried to get the Sonic core Scope software to work under wine. The problem I ran into is that there is no support for the used PCI hardware. (Sonic core/Creamware Scope PCI card) I researched the net and found that wine does not support hardware that does not have a proper Linux driver. Found a reference to ReactOS but a test with that ended in the well known blue screen. So I'm looking into making this possible myself but need some pointers on where to start. My thought on this is to create some layer between the actual hardware and wine running the Scope driver. Tried to fool the system by adding the PCI enumerations for this card to the wine registry, but the driver installer still says no hardware found. I have the Scope hardware and the windows software. (Currently using windows xp 32bit) I'm a reasonable skilled programmer with many years of experience in both the hardware and the software world. Thanks for any pointers

2 1

Using zlib.h in test / license header
by Andreas Maier 06 Dec '18

06 Dec '18

Hello, i've ported a test from the ReactOS-Project to wine. The PatchBot-test failed because there is no zlib.h. The test includes 2 zlib-compressed pdb-files. They are needed for the test. PatchBot-Log: https://testbot.winehq.org/JobDetails.pl?Key=45310#k101 Isn't it possible to use zlib.h for tests or did i something wrong? Btw.: (Maybe a silly question ..) Is it possible to keep the original license header of this file (from reactos-project)? /Andy

2 2

[PATCH] secur32: Use -VERS-ALL gnutls priority string to disable not enabled protocols.
by Jacek Caban 06 Dec '18

06 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46161 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] schannel.h: Add DTLS defines.
by Jacek Caban 06 Dec '18

06 Dec '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/schannel.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)

1 0

[PATCH] loader: Check if the preloader overlaps the reserved range on the Mac.
by Ken Thomases 06 Dec '18

06 Dec '18

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- loader/preloader_mac.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 1d88062..83d24af 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -48,6 +48,7 @@ #ifdef HAVE_MACH_O_LOADER_H #include <mach/thread_status.h> #include <mach-o/loader.h> +#include <mach-o/ldsyms.h> #endif #include "main.h" @@ -98,6 +99,8 @@ void __stack_chk_fail(void) { return; } static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header +#define target_segment_command segment_command +#define TARGET_LC_SEGMENT LC_SEGMENT #define target_thread_state_t i386_thread_state_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__eip @@ -184,6 +187,8 @@ __ASM_GLOBAL_FUNC( start, static const size_t page_size = 0x1000; static const size_t page_mask = 0xfff; #define target_mach_header mach_header_64 +#define target_segment_command segment_command_64 +#define TARGET_LC_SEGMENT LC_SEGMENT_64 #define target_thread_state_t x86_thread_state64_t #ifdef __DARWIN_UNIX03 #define target_thread_ip(x) (x)->__rip @@ -376,6 +381,36 @@ static __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char wld_exit(1); } +static int preloader_overlaps_range( const void *start, const void *end ) +{ + intptr_t slide = p_dyld_get_image_slide(&_mh_execute_header); + struct load_command *cmd = (struct load_command*)(&_mh_execute_header + 1); + int i; + + for (i = 0; i < _mh_execute_header.ncmds; ++i) + { + if (cmd->cmd == TARGET_LC_SEGMENT) + { + struct target_segment_command *seg = (struct target_segment_command*)cmd; + const void *seg_start = (const void*)(seg->vmaddr + slide); + const void *seg_end = (const char*)seg_start + seg->vmsize; + + if (end > seg_start && start <= seg_end) + { + char segname[sizeof(seg->segname) + 1]; + memcpy(segname, seg->segname, sizeof(seg->segname)); + segname[sizeof(segname) - 1] = 0; + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %s segment %p-%p\n", + start, end, segname, seg_start, seg_end ); + return 1; + } + } + cmd = (struct load_command*)((char*)cmd + cmd->cmdsize); + } + + return 0; +} + /* * preload_reserve * @@ -406,7 +441,8 @@ static void preload_reserve( const char *str ) else if (result) goto error; /* single value '0' is allowed */ /* sanity checks */ - if (end <= start) start = end = NULL; + if (end <= start || preloader_overlaps_range(start, end)) + start = end = NULL; /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) @@ -562,6 +598,11 @@ void *wld_start( void *stack, int *is_unix_thread ) p++; } + LOAD_POSIX_DYLD_FUNC( dlopen ); + LOAD_POSIX_DYLD_FUNC( dlsym ); + LOAD_POSIX_DYLD_FUNC( dladdr ); + LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); + /* reserve memory that Wine needs */ if (reserve) preload_reserve( reserve ); for (i = 0; preload_info[i].size; i++) @@ -576,11 +617,6 @@ void *wld_start( void *stack, int *is_unix_thread ) if (!map_region( &builtin_dlls )) builtin_dlls.size = 0; - LOAD_POSIX_DYLD_FUNC( dlopen ); - LOAD_POSIX_DYLD_FUNC( dlsym ); - LOAD_POSIX_DYLD_FUNC( dladdr ); - LOAD_MACHO_DYLD_FUNC( _dyld_get_image_slide ); - /* load the main binary */ if (!(mod = pdlopen( argv[1], RTLD_NOW ))) fatal_error( "%s: could not load binary\n", argv[1] ); -- 2.10.2

3 5

[PATCH 3/3] tzres: Add time zone name resource DLL and use it.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

This will fix https://bugs.winehq.org/show_bug.cgi?id=42719 after Japanese translation update. String IDs are based on SHA1 hash so that we can add another zone name without renumbering. I'm preparing a tool which generate these IDs and time zone information. I'll send it later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ntdll/tests/time.c | 4 +- dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

2 1

[PATCH 2/3] [v2] kernel32: Resolve an MUI time zone name.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

In v2, use RegLoadMUIString as suggested. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 54 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 11 deletions(-)

1 0

[PATCH 1/3] ntdll: Use an MUI time zone name if available.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 6/7] kernel32: Resolve an indirect string in time zone names.
by Akihiro Sagawa 06 Dec '18

06 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/kernel_private.h | 2 + dlls/kernel32/resource.c | 96 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 28 ++++++++++++ 3 files changed, 126 insertions(+)

2 4

[PATCH] wine_call_on_stack:Avoid missing semi-colon in the declaration.
by Denil Verghese 06 Dec '18

06 Dec '18

A missing semi-colon is added. Signed-off-by: Denil Verghese <denilverghese(a)gmail.com> --- libs/wine/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index d5ce07aceb..29e9091789 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -126,7 +126,7 @@ __declspec(naked) int wine_call_on_stack( int (*func)(void *), void *arg, void * __asm call [ecx]; __asm mov esp, esi; __asm pop esi; - __asm pop ebp + __asm pop ebp; __asm ret; } #elif defined(__x86_64__) && defined(__GNUC__) -- 2.16.2.windows.1

1 0

[PATCH 8/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in PNG encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e5a59cf9..786d8360e0 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1979,11 +1979,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GU return S_OK; } -static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICPngEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 7/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in TIFF encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 01d62d925d..95a39cdbfb 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1921,11 +1921,22 @@ static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICTiffEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 6/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 451d725eb8..a060d569f8 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1392,11 +1392,22 @@ static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, G return S_OK; } -static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICJpegEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 5/8] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in BMP encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 8e2bbe8091..3b77517a8d 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -510,11 +510,22 @@ static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICBmpEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI BmpEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.19.2

1 0

[PATCH 4/8] windowscodecs: Implement IWICBitmapEncoderInfo::GetFileExtensions.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 86707e1253..d0c2c690ca 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -898,8 +898,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetMimeTypes(IWICBitmapEncoderInfo *ifac static HRESULT WINAPI BitmapEncoderInfo_GetFileExtensions(IWICBitmapEncoderInfo *iface, UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, fileextensions_valuename, + cchFileExtensions, wzFileExtensions, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_DoesSupportAnimation(IWICBitmapEncoderInfo *iface, -- 2.19.2

1 0

[PATCH 3/8] windowscodecs: Add support for palette image formats to BMP encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 47 ++++++++++++++++++++++------ dlls/windowscodecs/info.c | 8 ++++- dlls/windowscodecs/regsvr.c | 4 +++ dlls/windowscodecs/tests/converter.c | 11 +++++-- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index b8783a499e..8e2bbe8091 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct bmp_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; + UINT colors; /* palette size */ DWORD compression; DWORD redmask; DWORD greenmask; @@ -45,13 +47,18 @@ struct bmp_pixelformat { }; static const struct bmp_pixelformat formats[] = { - {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, - {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, + {&GUID_WICPixelFormat24bppBGR, 24, 0, BI_RGB}, + {&GUID_WICPixelFormatBlackWhite, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat1bppIndexed, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat2bppIndexed, 2, 4, BI_RGB}, + {&GUID_WICPixelFormat4bppIndexed, 4, 16, BI_RGB}, + {&GUID_WICPixelFormat8bppIndexed, 8, 256, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, 0, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, 0, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 0, BI_RGB}, #if 0 /* Windows doesn't seem to support this one. */ - {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, + {&GUID_WICPixelFormat32bppBGRA, 32, 0, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, #endif {NULL} }; @@ -182,9 +189,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface if (!This->initialized || This->bits) return WINCODEC_ERR_WRONGSTATE; + if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormatBlackWhite)) + *pPixelFormat = GUID_WICPixelFormat1bppIndexed; + else if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) + *pPixelFormat = GUID_WICPixelFormat4bppIndexed; + for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } @@ -207,6 +219,7 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, IWICPalette *palette) { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; TRACE("(%p,%p)\n", iface, palette); @@ -215,7 +228,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; - return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + if (hr == S_OK) + { + UINT i; + for (i = 0; i < This->colors; i++) + This->palette[i] |= 0xff000000; /* BMP palette has no alpha */ + } + return hr; } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -330,8 +350,8 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5SizeImage = This->stride*This->height; bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; - bih.bV5ClrUsed = 0; - bih.bV5ClrImportant = 0; + bih.bV5ClrUsed = (This->format->bpp <= 8) ? This->colors : 0; + bih.bV5ClrImportant = bih.bV5ClrUsed; if (This->format->compression == BI_BITFIELDS) { @@ -348,6 +368,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; + bfh.bfOffBits += bih.bV5ClrUsed * sizeof(WICColor); pos.QuadPart = 0; hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); @@ -361,6 +382,14 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) if (FAILED(hr)) return hr; if (byteswritten != info_size) return E_FAIL; + /* write the palette */ + if (This->format->colors) + { + hr = IStream_Write(This->stream, This->palette, This->colors * sizeof(WICColor), &byteswritten); + if (FAILED(hr)) return hr; + if (byteswritten != This->colors * sizeof(WICColor)) return E_FAIL; + } + hr = IStream_Write(This->stream, This->bits, bih.bV5SizeImage, &byteswritten); if (FAILED(hr)) return hr; if (byteswritten != bih.bV5SizeImage) return E_FAIL; diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107e99..86707e1253 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2461,6 +2461,12 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn return hr; } +static BOOL is_1bpp_format(const WICPixelFormatGUID *format) +{ + return IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite) || + IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed); +} + HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst) { HRESULT res; @@ -2476,7 +2482,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma res = IWICBitmapSource_GetPixelFormat(pISrc, &srcFormat); if (FAILED(res)) return res; - if (IsEqualGUID(&srcFormat, dstFormat)) + if (IsEqualGUID(&srcFormat, dstFormat) || (is_1bpp_format(&srcFormat) && is_1bpp_format(dstFormat))) { IWICBitmapSource_AddRef(pISrc); *ppIDst = pISrc; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index ca02ff98f8..7b0fbf8089 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1347,6 +1347,10 @@ static GUID const * const bmp_encode_formats[] = { &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL }; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 44a2c08147..8e0fb7759b 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -804,6 +804,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -814,6 +816,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -824,6 +828,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -834,6 +840,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) { + ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -1492,8 +1500,6 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_BlackWhite, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, @@ -1504,7 +1510,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); -} test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR"); -- 2.19.2

1 0

[PATCH 2/8] windowscodecs: Add support for palette image formats to TIFF encoder.
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/regsvr.c | 5 +++++ dlls/windowscodecs/tests/converter.c | 3 --- dlls/windowscodecs/tiffformat.c | 32 ++++++++++++++++++++++++++-- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 6f781b812b..7650c755ba 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -182,7 +182,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (FAILED(hr)) { ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr); - return hr; + return E_NOTIMPL; } stride = (bpp * width + 7)/8; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3f53591552..ca02ff98f8 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,9 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index df3cf3be30..44a2c08147 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -1510,8 +1510,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1520,7 +1518,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 81c6394a52..01d62d925d 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -469,7 +476,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) break; default: FIXME("unhandled indexed bit count %u\n", bps); - return E_FAIL; + return E_NOTIMPL; } break; case 4: /* Transparency mask */ @@ -1408,6 +1415,9 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1579,9 +1589,12 @@ static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *ifac return WINCODEC_ERR_WRONGSTATE; } + if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormat2bppIndexed)) + *pPixelFormat = GUID_WICPixelFormat4bppIndexed; + for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } @@ -1690,6 +1703,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; } -- 2.19.2

1 0

[PATCH 1/8] windowscodecs/tests: Add tests for encoding 2bpp/4bpp images with a palette. (v3)
by Dmitry Timoshkov 06 Dec '18

06 Dec '18

v2: Fix test failures under Windows. v3: Don't mark 2bpp tests as broken. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/converter.c | 323 ++++++++++++++++++++++----- 1 file changed, 267 insertions(+), 56 deletions(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 1e557a7fb8..df3cf3be30 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -316,6 +316,20 @@ static const struct bitmap_data testdata_BlackWhite = { static const struct bitmap_data testdata_1bppIndexed = { &GUID_WICPixelFormat1bppIndexed, 1, bits_1bpp, 32, 2, 96.0, 96.0}; +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_2bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_2bppIndexed = { + &GUID_WICPixelFormat2bppIndexed, 2, bits_2bpp, 16, 2, 96.0, 96.0}; + +/* some encoders (like BMP) require data to be 4-bytes aligned */ +static const BYTE bits_4bpp[] = { + 0x55,0x55,0x55,0x55, + 0xaa,0xaa,0xaa,0xaa}; +static const struct bitmap_data testdata_4bppIndexed = { + &GUID_WICPixelFormat4bppIndexed, 4, bits_4bpp, 8, 2, 96.0, 96.0}; + static const BYTE bits_8bpp[] = { 0,1,2,3, 4,5,6,7}; @@ -632,64 +646,204 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o } } -static void check_bmp_format(IStream *stream, const struct bitmap_data *data) +static void load_stream(IUnknown *reader, IStream *stream) { - BITMAPFILEHEADER bfh; - BITMAPINFOHEADER bih; HRESULT hr; - ULONG len; + IWICPersistStream *persist; +#ifdef WORDS_BIGENDIAN + DWORD persist_options = WICPersistOptionBigEndian; +#else + DWORD persist_options = WICPersistOptionLittleEndian; +#endif - hr = IStream_Read(stream, &bfh, sizeof(bfh), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + hr = IUnknown_QueryInterface(reader, &IID_IWICPersistStream, (void **)&persist); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); - hr = IStream_Read(stream, &bih, sizeof(bih), &len); - ok(hr == S_OK, "Failed to read file header, hr %#x.\n", hr); + hr = IWICPersistStream_LoadEx(persist, stream, NULL, persist_options); + ok(hr == S_OK, "LoadEx failed, hr=%x\n", hr); - ok(bfh.bfType == 0x4d42, "Unexpected header type, %#x.\n", bfh.bfType); - ok(bfh.bfSize != 0, "Unexpected bitmap size %d.\n", bfh.bfSize); - ok(bfh.bfReserved1 == 0, "Unexpected bfReserved1 field.\n"); - ok(bfh.bfReserved2 == 0, "Unexpected bfReserved2 field.\n"); + IWICPersistStream_Release(persist); +} - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed) - || IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) +static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT id, value; + struct + { + USHORT byte_order; + USHORT version; + ULONG dir_offset; + } tiff; + LARGE_INTEGER pos; + UINT count, i; + int width, height, bps, photo, samples, colormap; + struct { - /* TODO: test with actual palette size */ - ok(bfh.bfOffBits > sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); + int id, *value; + } tag[] = + { + { 0x100, &width }, { 0x101, &height }, { 0x102, &bps }, + { 0x106, &photo }, { 0x115, &samples }, { 0x140, &colormap } + }; + + memset(&tiff, 0, sizeof(tiff)); + hr = IStream_Read(stream, &tiff, sizeof(tiff), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + ok(tiff.byte_order == MAKEWORD('I','I') || tiff.byte_order == MAKEWORD('M','M'), + "wrong TIFF byte order mark %02x\n", tiff.byte_order); + ok(tiff.version == 42, "wrong TIFF version %u\n", tiff.version); + + pos.QuadPart = tiff.dir_offset; + hr = IStream_Seek(stream, pos, SEEK_SET, NULL); + ok(hr == S_OK, "IStream_Seek error %#x\n", hr); + + hr = CoCreateInstance(&CLSID_WICIfdMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void **)&reader); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + load_stream((IUnknown *)reader, stream); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount error %#x\n", hr); + ok(count != 0, "wrong count %u\n", count); + + for (i = 0; i < sizeof(tag)/sizeof(tag[0]); i++) + { + PropVariantInit(&id); + PropVariantInit(&value); + + id.vt = VT_UI2; + U(id).uiVal = tag[i].id; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK || (tag[i].id == 0x140 && hr == WINCODEC_ERR_PROPERTYNOTFOUND), + "GetValue(%04x) error %#x\n", tag[i].id, hr); + if (hr == S_OK) + { + ok(value.vt == VT_UI2 || value.vt == VT_UI4 || value.vt == (VT_UI2 | VT_VECTOR), "wrong vt: %d\n", value.vt); + tag[i].value[0] = U(value).uiVal; + } + else + tag[i].value[0] = -1; } - else - ok(bfh.bfOffBits == sizeof(bfh) + sizeof(bih), "Unexpected data offset %d, format %s.\n", - bfh.bfOffBits, wine_dbgstr_guid(data->format)); - - ok(bih.biSize == sizeof(bih), "Unexpected header size %d.\n", bih.biSize); - ok(bih.biWidth == data->width, "Unexpected bitmap width %d.\n", bih.biWidth); - ok(bih.biHeight == data->height, "Unexpected bitmap height %d.\n", bih.biHeight); - ok(bih.biPlanes == 1, "Unexpected planes count %d.\n", bih.biPlanes); - - if (IsEqualGUID(data->format, &GUID_WICPixelFormat1bppIndexed)) - ok(bih.biBitCount == 1, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat8bppIndexed)) - ok(bih.biBitCount == 8, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - else if (IsEqualGUID(data->format, &GUID_WICPixelFormat32bppBGR)) - ok(bih.biBitCount == 32, "Unexpected bit count %u, format %s.\n", bih.biBitCount, - wine_dbgstr_guid(data->format)); - - ok(bih.biCompression == BI_RGB, "Unexpected compression mode %u.\n", bih.biCompression); -todo_wine - ok(bih.biSizeImage == 0, "Unexpected image size %d.\n", bih.biSizeImage); - ok(bih.biXPelsPerMeter == 3780 || broken(bih.biXPelsPerMeter == 0) /* XP */, "Unexpected horz resolution %d.\n", - bih.biXPelsPerMeter); - ok(bih.biYPelsPerMeter == 3780 || broken(bih.biYPelsPerMeter == 0) /* XP */, "Unexpected vert resolution %d.\n", - bih.biYPelsPerMeter); - /* FIXME: test actual data */ + IWICMetadataReader_Release(reader); + + if (IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 1, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(width == 32, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 1, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 6, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(width == 8, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 4, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 48, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 8, "wrong bps %d\n", bps); + ok(photo == 3, "wrong photometric %d\n", photo); + ok(samples == 1, "wrong samples %d\n", samples); + ok(colormap == 768, "wrong colormap %d\n", colormap); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat24bppBGR)) + { + ok(width == 4, "wrong width %u\n", width); + ok(height == 2, "wrong height %u\n", height); + + ok(bps == 3, "wrong bps %d\n", bps); + ok(photo == 2, "wrong photometric %d\n", photo); + ok(samples == 3, "wrong samples %d\n", samples); + ok(colormap == -1, "wrong colormap %d\n", colormap); + } + else + ok(0, "unknown TIFF pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) +static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) { - /* FIXME */ + HRESULT hr; + BITMAPFILEHEADER bfh; + BITMAPV5HEADER bih; + + memset(&bfh, 0, sizeof(bfh)); + hr = IStream_Read(stream, &bfh, sizeof(bfh), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + ok(bfh.bfType == 0x4d42, "wrong BMP signature %02x\n", bfh.bfType); + ok(bfh.bfReserved1 == 0, "wrong bfReserved1 %02x\n", bfh.bfReserved1); + ok(bfh.bfReserved2 == 0, "wrong bfReserved2 %02x\n", bfh.bfReserved2); + + memset(&bih, 0, sizeof(bih)); + hr = IStream_Read(stream, &bih, sizeof(bih), NULL); + ok(hr == S_OK, "IStream_Read error %#x\n", hr); + + if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) + { + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 1, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 4, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 8, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 256, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 256, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) + { + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); + ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); + + ok(bih.bV5Planes == 1, "wrong Planes %d\n", bih.bV5Planes); + ok(bih.bV5BitCount == 32, "wrong BitCount %d\n", bih.bV5BitCount); + ok(bih.bV5ClrUsed == 0, "wrong ClrUsed %d\n", bih.bV5ClrUsed); + ok(bih.bV5ClrImportant == 0, "wrong ClrImportant %d\n", bih.bV5ClrImportant); + } + else + ok(0, "unknown BMP pixel format %s\n", wine_dbgstr_guid(format)); } static unsigned be_uint(unsigned val) @@ -746,6 +900,28 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(png.filter == 0, "wrong filter %d\n", png.filter); ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); } + else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(be_uint(png.width) == 16, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 2, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } + else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(be_uint(png.width) == 8, "wrong width %u\n", be_uint(png.width)); + ok(be_uint(png.height) == 2, "wrong height %u\n", be_uint(png.height)); + + ok(png.bit_depth == 4, "wrong bit_depth %d\n", png.bit_depth); + ok(png.color_type == 3, "wrong color_type %d\n", png.color_type); + ok(png.compression == 0, "wrong compression %d\n", png.compression); + ok(png.filter == 0, "wrong filter %d\n", png.filter); + ok(png.interlace == 0, "wrong interlace %d\n", png.interlace); + } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { ok(be_uint(png.width) == 4, "wrong width %u\n", be_uint(png.width)); @@ -772,7 +948,7 @@ static void check_png_format(IStream *stream, const WICPixelFormatGUID *format) ok(0, "unknown PNG pixel format %s\n", wine_dbgstr_guid(format)); } -static void check_bitmap_format(IStream *stream, const CLSID *encoder, const struct bitmap_data *dst) +static void check_bitmap_format(IStream *stream, const CLSID *encoder, const WICPixelFormatGUID *format) { HRESULT hr; LARGE_INTEGER pos; @@ -782,11 +958,11 @@ static void check_bitmap_format(IStream *stream, const CLSID *encoder, const str ok(hr == S_OK, "IStream_Seek error %#x\n", hr); if (IsEqualGUID(encoder, &CLSID_WICPngEncoder)) - check_png_format(stream, dst->format); + check_png_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICBmpEncoder)) - check_bmp_format(stream, dst); + check_bmp_format(stream, format); else if (IsEqualGUID(encoder, &CLSID_WICTiffEncoder)) - check_tiff_format(stream, dst->format); + check_tiff_format(stream, format); else ok(0, "unknown encoder %s\n", wine_dbgstr_guid(encoder)); @@ -979,8 +1155,10 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls memcpy(&pixelformat, srcs[i]->format, sizeof(GUID)); hr = IWICBitmapFrameEncode_SetPixelFormat(frameencode, &pixelformat); ok(SUCCEEDED(hr), "SetPixelFormat failed, hr=%x\n", hr); - ok(IsEqualGUID(&pixelformat, dsts[i]->format), "SetPixelFormat changed the format to %s (%s)\n", - wine_dbgstr_guid(&pixelformat), name); + ok(IsEqualGUID(&pixelformat, dsts[i]->format) || + (IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)) || + (IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2 && IsEqualGUID(&pixelformat, &GUID_WICPixelFormat4bppIndexed)), + "SetPixelFormat changed the format to %s (%s)\n", wine_dbgstr_guid(&pixelformat), name); hr = IWICBitmapFrameEncode_SetSize(frameencode, srcs[i]->width, srcs[i]->height); ok(SUCCEEDED(hr), "SetSize failed, hr=%x\n", hr); @@ -1015,6 +1193,8 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(SUCCEEDED(hr), "WriteSource(%dx%d) failed, hr=%x (%s)\n", rc->Width, rc->Height, hr, name); else ok(hr == S_OK || + (hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && srcs[i]->bpp == 2) || + (hr == E_NOTIMPL && IsEqualGUID(clsid_encoder, &CLSID_WICTiffEncoder) && srcs[i]->bpp == 2) || broken(hr == E_INVALIDARG && IsEqualGUID(clsid_encoder, &CLSID_WICBmpEncoder) && IsEqualGUID(srcs[i]->format, &GUID_WICPixelFormatBlackWhite)) /* XP */, "WriteSource(NULL) failed, hr=%x (%s)\n", hr, name); } @@ -1046,7 +1226,7 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls hr = IWICBitmapEncoder_Commit(encoder); ok(SUCCEEDED(hr), "Commit failed, hr=%x\n", hr); - check_bitmap_format(stream, clsid_encoder, dsts[0]); + check_bitmap_format(stream, clsid_encoder, dsts[0]->format); } if (SUCCEEDED(hr)) @@ -1106,7 +1286,12 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(ret == count, "expected %u, got %u\n", count, ret); if (IsEqualGUID(clsid_decoder, &CLSID_WICPngDecoder)) { - ok(count == 256 || count == 2 /* newer libpng versions */, "expected 256, got %u (%s)\n", count, name); + /* Newer libpng versions don't accept larger palettes than the declared + * bit depth, so we need to generate the palette of the correct length. + */ + ok(count == 256 || (dsts[i]->bpp == 1 && count == 2) || + (dsts[i]->bpp == 2 && count == 4) || (dsts[i]->bpp == 4 && count == 16), + "expected 256, got %u (%s)\n", count, name); ok(colors[0] == 0x11111111, "got %08x (%s)\n", colors[0], name); ok(colors[1] == 0x22222222, "got %08x (%s)\n", colors[1], name); @@ -1114,8 +1299,11 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls { ok(colors[2] == 0x33333333, "got %08x (%s)\n", colors[2], name); ok(colors[3] == 0x44444444, "got %08x (%s)\n", colors[3], name); - ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); - ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + if (count > 4) + { + ok(colors[4] == 0x55555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0, "got %08x (%s)\n", colors[5], name); + } } } else if (IsEqualGUID(clsid_decoder, &CLSID_WICBmpDecoder) || @@ -1133,6 +1321,17 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) + { + ok(count == 16, "expected 16, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); + ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); + } else { ok(count == 2, "expected 2, got %u (%s)\n", count, name); @@ -1284,6 +1483,10 @@ START_TEST(converter) &testdata_BlackWhite, &CLSID_WICPngDecoder, "PNG encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICPngEncoder, &testdata_1bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICPngEncoder, + &testdata_2bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICPngEncoder, + &testdata_4bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICPngEncoder, &testdata_8bppIndexed, &CLSID_WICPngDecoder, "PNG encoder 8bppIndexed"); test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, @@ -1295,6 +1498,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICBmpEncoder, + &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICBmpEncoder, + &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); } @@ -1307,6 +1514,10 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in { test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); + test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, + &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 2bppIndexed"); + test_encoder(&testdata_4bppIndexed, &CLSID_WICTiffEncoder, + &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); } -- 2.19.2

1 0

[PATCH 3/3] mpr: Implement support for deleting persistent connections.
by Pierre Schweitzer 06 Dec '18

06 Dec '18

-- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

1 0

[PATCH] shlwapi: Remove unused fields.
by Nikolay Sivov 06 Dec '18

06 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/regstream.c | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 31df82aa8d..decc1f666d 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -39,16 +39,10 @@ typedef struct { IStream IStream_iface; LONG ref; - HKEY hKey; LPBYTE pbBuffer; DWORD dwLength; DWORD dwPos; DWORD dwMode; - union { - LPSTR keyNameA; - LPWSTR keyNameW; - }u; - BOOL bUnicode; } ISHRegStream; static inline ISHRegStream *impl_from_IStream(IStream *iface) @@ -105,35 +99,6 @@ static ULONG WINAPI IStream_fnRelease(IStream *iface) if (!refCount) { - TRACE(" destroying SHReg IStream (%p)\n",This); - - if (This->hKey) - { - /* write back data in REG_BINARY */ - if (This->dwMode == STGM_READWRITE || This->dwMode == STGM_WRITE) - { - if (This->dwLength) - { - if (This->bUnicode) - RegSetValueExW(This->hKey, This->u.keyNameW, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - else - RegSetValueExA(This->hKey, This->u.keyNameA, 0, REG_BINARY, - (const BYTE *) This->pbBuffer, This->dwLength); - } - else - { - if (This->bUnicode) - RegDeleteValueW(This->hKey, This->u.keyNameW); - else - RegDeleteValueA(This->hKey, This->u.keyNameA); - } - } - - RegCloseKey(This->hKey); - } - - HeapFree(GetProcessHeap(),0,This->u.keyNameA); HeapFree(GetProcessHeap(),0,This->pbBuffer); HeapFree(GetProcessHeap(),0,This); return 0; @@ -384,13 +349,10 @@ static ISHRegStream *IStream_Create(HKEY hKey, LPBYTE pbBuffer, DWORD dwLength) { regStream->IStream_iface.lpVtbl = &rstvt; regStream->ref = 1; - regStream->hKey = hKey; regStream->pbBuffer = pbBuffer; regStream->dwLength = dwLength; regStream->dwPos = 0; regStream->dwMode = STGM_READWRITE; - regStream->u.keyNameA = NULL; - regStream->bUnicode = FALSE; } TRACE ("Returning %p\n", regStream); return regStream; -- 2.19.2

1 0

[PATCH] setupapi: Always return device info from SetupDiGetDeviceInterfaceDetail() if requested.
by Zebediah Figura 06 Dec '18

06 Dec '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 14 ++++++++------ dlls/setupapi/tests/devinst.c | 7 +++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index c1e1251cdc..fbc8900229 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2653,9 +2653,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2664,6 +2661,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } @@ -2708,9 +2709,6 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA else DeviceInterfaceDetailData->DevicePath[0] = '\0'; - if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) - copy_device_data(device_data, iface->device); - ret = TRUE; } else @@ -2719,6 +2717,10 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA *RequiredSize = bytesNeeded; SetLastError(ERROR_INSUFFICIENT_BUFFER); } + + if (device_data && device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + copy_device_data(device_data, iface->device); + return ret; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index b73af781d1..886957fe19 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -764,6 +764,13 @@ static void test_device_iface_detail(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); ok(size == expectedsize, "Got unexpected size %d.\n", size); + memset(&device, 0, sizeof(device)); + device.cbSize = sizeof(device); + ret = SetupDiGetDeviceInterfaceDetailW(set, &iface, NULL, 0, &size, &device); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + ok(IsEqualGUID(&device.ClassGuid, &guid), "Got unexpected class %s.\n", wine_dbgstr_guid(&device.ClassGuid)); + heap_free(detail); SetupDiDestroyDeviceInfoList(set); } -- 2.14.1

1 0

[PATCH] setupapi: Use strtoulW().
by Zebediah Figura 06 Dec '18

06 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 5685dc3bff..38da640878 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1412,29 +1412,6 @@ BOOL WINAPI SetupDiCreateDeviceInfoA(HDEVINFO DeviceInfoSet, const char *name, return ret; } -static DWORD SETUPDI_DevNameToDevID(LPCWSTR devName) -{ - LPCWSTR ptr; - int devNameLen = lstrlenW(devName); - DWORD devInst = 0; - BOOL valid = TRUE; - - TRACE("%s\n", debugstr_w(devName)); - for (ptr = devName; valid && *ptr && ptr - devName < devNameLen; ) - { - if (isdigitW(*ptr)) - { - devInst *= 10; - devInst |= *ptr - '0'; - ptr++; - } - else - valid = FALSE; - } - TRACE("%d\n", valid ? devInst : 0xffffffff); - return valid ? devInst : 0xffffffff; -} - /*********************************************************************** * SetupDiCreateDeviceInfoW (SETUPAPI.@) */ @@ -1483,14 +1460,16 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const LIST_FOR_EACH_ENTRY(device, &set->devices, struct device, entry) { const WCHAR *instance_str = strrchrW(device->instanceId, '\\'); + WCHAR *endptr; if (instance_str) instance_str++; else instance_str = device->instanceId; - instance_id = SETUPDI_DevNameToDevID(instance_str); - if (instance_id != 0xffffffff && instance_id > highest_id) - highest_id = instance_id; + + instance_id = strtoulW(instance_str, &endptr, 10); + if (*instance_str && !*endptr) + highest_id = max(highest_id, instance_id); } if (snprintfW(id, ARRAY_SIZE(id), formatW, name, highest_id + 1) == -1) -- 2.14.1

1 0

[PATCH] testbot/TestAgent: Don't append a '\0' when sending data.
by Francois Gouget 06 Dec '18

06 Dec '18

_SendString() is used to both send data, typically the content of files, and perl strings. In the first case $Type is 'd', and in the latter 's' and a trailing '\0' is added to match the C convention. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/TestAgent.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 8957b9f829..a128e347e4 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -791,10 +791,12 @@ sub _SendUInt64($$$) sub _SendString($$$;$) { my ($self, $Name, $Str, $Type) = @_; + $Type ||= 's'; + debug(" SendString('$Name', '$Str', '$Type')\n"); - debug(" SendString('$Name', '$Str')\n"); - $Str .= "\0"; - return $self->_SendEntryHeader($Name, $Type || 's', length($Str)) && + # Add a trailing '\0' to strings to match the C convention. + $Str .= "\0" if ($Type eq 's'); + return $self->_SendEntryHeader($Name, $Type, length($Str)) && $self->_SendRawData($Name, $Str); } -- 2.19.2

1 0

[PATCH] Add ext-ms-win-ntuser-misc-l1-2-0
by Alistair Leslie-Hughes 05 Dec '18

05 Dec '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- configure | 17 ++------ configure.ac | 1 + dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in | 2 + .../ext-ms-win-ntuser-misc-l1-2-0.spec | 48 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 56 insertions(+), 13 deletions(-) create mode 100755 dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in create mode 100644 dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec diff --git a/configure b/configure index 99adcfb..f3c7678 100755 --- a/configure +++ b/configure @@ -1272,6 +1271,7 @@ enable_ext_ms_win_ntuser_draw_l1_1_0 enable_ext_ms_win_ntuser_gui_l1_3_0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 enable_ext_ms_win_ntuser_message_l1_1_1 +enable_ext_ms_win_ntuser_misc_l1_2_0 enable_ext_ms_win_ntuser_misc_l1_5_1 enable_ext_ms_win_ntuser_mouse_l1_1_0 enable_ext_ms_win_ntuser_private_l1_1_1 @@ -19461,6 +19451,7 @@ wine_fn_config_makefile dlls/ext-ms-win-ntuser-draw-l1-1-0 enable_ext_ms_win_ntu wine_fn_config_makefile dlls/ext-ms-win-ntuser-gui-l1-3-0 enable_ext_ms_win_ntuser_gui_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-keyboard-l1-3-0 enable_ext_ms_win_ntuser_keyboard_l1_3_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-message-l1-1-1 enable_ext_ms_win_ntuser_message_l1_1_1 +wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-2-0 enable_ext_ms_win_ntuser_misc_l1_2_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-misc-l1-5-1 enable_ext_ms_win_ntuser_misc_l1_5_1 wine_fn_config_makefile dlls/ext-ms-win-ntuser-mouse-l1-1-0 enable_ext_ms_win_ntuser_mouse_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-ntuser-private-l1-1-1 enable_ext_ms_win_ntuser_private_l1_1_1 diff --git a/configure.ac b/configure.ac index 187101f..d9fe858 100644 --- a/configure.ac +++ b/configure.ac @@ -3301,6 +3301,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-gui-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-keyboard-l1-3-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-misc-l1-5-1) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in new file mode 100755 index 0000000..6424097 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/Makefile.in @@ -0,0 +1,2 @@ +MODULE = ext-ms-win-ntuser-misc-l1-2-0.dll + diff --git a/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec new file mode 100644 index 0000000..917984a --- /dev/null +++ b/dlls/ext-ms-win-ntuser-misc-l1-2-0/ext-ms-win-ntuser-misc-l1-2-0.spec @@ -0,0 +1,48 @@ +@ stdcall AttachThreadInput(long long long) user32.AttachThreadInput +@ stdcall CloseClipboard() user32.CloseClipboard +@ stub CloseGestureInfoHandle +@ stdcall DrawTextExW(long wstr long ptr long ptr) user32.DrawTextExW +@ stdcall DrawTextW(long wstr long ptr long) user32.DrawTextW +@ stdcall EmptyClipboard() user32.EmptyClipboard +@ stdcall EnableScrollBar(long long long) user32.EnableScrollBar +@ stdcall ExitWindowsEx(long long) user32.ExitWindowsEx +@ stdcall GetClipboardData(long) user32.GetClipboardData +@ stdcall GetClipboardFormatNameW(long ptr long) user32.GetClipboardFormatNameW +@ stdcall GetClipboardOwner() user32.GetClipboardOwner +@ stdcall GetGestureConfig(long long long ptr ptr long) user32.GetGestureConfig +@ stdcall GetGestureInfo(long ptr) user32.GetGestureInfo +@ stdcall GetGuiResources(long long) user32.GetGuiResources +@ stdcall GetRawInputData(ptr long ptr ptr long) user32.GetRawInputData +@ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) user32.GetRawInputDeviceInfoW +@ stdcall GetRawInputDeviceList(ptr ptr long) user32.GetRawInputDeviceList +@ stdcall GetScrollBarInfo(long long ptr) user32.GetScrollBarInfo +@ stdcall GetScrollInfo(long long ptr) user32.GetScrollInfo +@ stdcall GetScrollPos(long long) user32.GetScrollPos +@ stdcall GetTouchInputInfo(long long ptr long) user32.GetTouchInputInfo +@ stdcall GetUserObjectSecurity(long ptr ptr long ptr) user32.GetUserObjectSecurity +@ stub GetWindowFeedbackSetting +@ stdcall IsClipboardFormatAvailable(long) user32.IsClipboardFormatAvailable +@ stdcall IsTouchWindow(long ptr) user32.IsTouchWindow +@ stdcall KillTimer(long long) user32.KillTimer +@ stdcall MessageBeep(long) user32.MessageBeep +@ stdcall OpenClipboard(long) user32.OpenClipboard +@ stdcall RegisterClipboardFormatA(str) user32.RegisterClipboardFormatA +@ stdcall RegisterClipboardFormatW(wstr) user32.RegisterClipboardFormatW +@ stdcall RegisterDeviceNotificationW(long ptr long) user32.RegisterDeviceNotificationW +@ stdcall RegisterRawInputDevices(ptr long long) user32.RegisterRawInputDevices +@ stdcall ScrollWindowEx(long long long ptr ptr long ptr long) user32.ScrollWindowEx +@ stdcall SetClipboardData(long long) user32.SetClipboardData +@ stdcall SetCoalescableTimer(long long long ptr long) user32.SetCoalescableTimer +@ stdcall SetScrollInfo(long long ptr long) user32.SetScrollInfo +@ stdcall SetScrollPos(long long long long) user32.SetScrollPos +@ stdcall SetScrollRange(long long long long long) user32.SetScrollRange +@ stdcall SetTimer(long long long ptr) user32.SetTimer +@ stdcall SetUserObjectSecurity(long ptr ptr) user32.SetUserObjectSecurity +@ stub SetWindowFeedbackSetting +@ stdcall ShowScrollBar(long long long) user32.ShowScrollBar +@ stdcall ShutdownBlockReasonCreate(long wstr) user32.ShutdownBlockReasonCreate +@ stdcall ShutdownBlockReasonDestroy(long) user32.ShutdownBlockReasonDestroy +@ stdcall TabbedTextOutW(long long long wstr long long ptr long) user32.TabbedTextOutW +@ stdcall UnregisterDeviceNotification(long) user32.UnregisterDeviceNotification +@ stdcall WaitForInputIdle(long long) user32.WaitForInputIdle +@ stdcall WinHelpW(long wstr long long) user32.WinHelpW diff --git a/tools/make_specfiles b/tools/make_specfiles index 2b38aed..edc317d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -384,6 +384,7 @@ my @dll_groups = "ext-ms-win-ntuser-gui-l1-3-0", "ext-ms-win-ntuser-keyboard-l1-3-0", "ext-ms-win-ntuser-message-l1-1-1", + "ext-ms-win-ntuser-misc-l1-2-0", "ext-ms-win-ntuser-misc-l1-5-1", "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", -- 1.9.1

1 0

[PATCH v2 1/3] loader: Fix building of the preloader on Mac.
by Ken Thomases 05 Dec '18

05 Dec '18

Don't reference the Linux-specific variables preloader_start and preloader_end in the shared code. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- v2: Avoid a platform #ifdef in the shared code Set up infrastructure for eventual implementation of overlap check on Mac loader/preloader.c | 19 ++++++++++++------- loader/preloader.h | 1 + loader/preloader_mac.c | 5 +++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 3b1f5ad..9f2fbc3 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -1049,6 +1049,17 @@ static int is_in_preload_range( const struct wld_auxv *av, int type ) return 0; } +int preloader_overlaps_range( const void *start, const void *end ) +{ + if ((char *)end > preloader_start && (char *)start <= preloader_end) + { + wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", + start, end, preloader_start, preloader_end ); + return 1; + } + return 0; +} + /* set the process name if supported */ static void set_process_name( int argc, char *argv[] ) { @@ -1316,14 +1327,8 @@ void preload_reserve( const char *str, struct wine_preload_info *preload_info, s else if (result) goto error; /* single value '0' is allowed */ /* sanity checks */ - if (end <= start) start = end = NULL; - else if ((char *)end > preloader_start && - (char *)start <= preloader_end) - { - wld_printf( "WINEPRELOADRESERVE range %p-%p overlaps preloader %p-%p\n", - start, end, preloader_start, preloader_end ); + if (end <= start || preloader_overlaps_range(start, end)) start = end = NULL; - } /* check for overlap with low memory areas */ for (i = 0; preload_info[i].size; i++) diff --git a/loader/preloader.h b/loader/preloader.h index 2c2262e..b944a09 100644 --- a/loader/preloader.h +++ b/loader/preloader.h @@ -51,6 +51,7 @@ extern __attribute__((format(printf,1,2))) void wld_printf(const char *fmt, ... extern __attribute__((noreturn,format(printf,1,2))) void fatal_error(const char *fmt, ... ); extern void preload_reserve( const char *str, struct wine_preload_info *preload_info, size_t page_mask ); +extern int preloader_overlaps_range( const void *start, const void *end ); /* remove a range from the preload list */ static inline void remove_preload_range( int i, struct wine_preload_info *preload_info ) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index d008270..5e9f9fc 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -374,6 +374,11 @@ static int map_region( struct wine_preload_info *info ) return 0; } +int preloader_overlaps_range( const void *start, const void *end ) +{ + return 0; +} + static inline void get_dyld_func( const char *name, void **func ) { _dyld_func_lookup( name, func ); -- 2.10.2

1 2

[PATCH v3 1/3] comctl32/tests: Test status bar size grip behavior and bounds.
by Waritnan Sookbuntherng 05 Dec '18

05 Dec '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add tests. v3: Cover more points. --- dlls/comctl32/tests/status.c | 85 ++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index d78bd20262..074e637801 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -20,6 +20,7 @@ #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" @@ -586,6 +587,89 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void test_sizegrip(void) +{ + HWND hwndStatus; + LONG style; + RECT rcClient, rcGripper; + POINT pt; + int width, r; + + hwndStatus = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, + 0, 0, 100, 100, g_hMainWnd, NULL, NULL, NULL); + + style = GetWindowLongPtrA(g_hMainWnd, GWL_STYLE); + GetClientRect(hwndStatus, &rcClient); + + width = GetSystemMetrics(SM_CXVSCROLL); + + rcGripper = rcClient; + rcGripper.left = rcClient.right - width; + +#define SETWNDLONG(MAXIMIZE, RTL) \ + do \ + { \ + SetWindowLongA(g_hMainWnd, GWL_STYLE, (MAXIMIZE) ? style|WS_MAXIMIZE : style); \ + SetWindowLongA(hwndStatus, GWL_EXSTYLE, (RTL) ? WS_EX_LAYOUTRTL : 0); \ + } while (0) + +#define TEST_NCHITTEST(X, Y, EXPECT) \ + do \ + { \ + pt.x = (X); \ + pt.y = (Y); \ + ClientToScreen(hwndStatus, &pt); \ + r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(pt.x, pt.y)); \ + ok((EXPECT) == r, "expect WM_NCHITTEST " #EXPECT " got %#x\n", r); \ + } while (0) + + /* check bounds when not maximized */ + SETWNDLONG(FALSE, FALSE); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMRIGHT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMRIGHT); + + /* maximized */ + SETWNDLONG(TRUE, FALSE); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); + todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + + /* not maximized and right-to-left */ + SETWNDLONG(FALSE, TRUE); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMLEFT); + todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMLEFT); + + /* maximized with right-to-left */ + SETWNDLONG(TRUE, TRUE); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); + todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + +#undef TEST_NCHITTEST +#undef SETWNDLONG + + SetWindowLongA(g_hMainWnd, GWL_STYLE, style); + DestroyWindow(hwndStatus); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -620,4 +704,5 @@ START_TEST(status) test_status_ownerdraw(); test_gettext(); test_notify(); + test_sizegrip(); } -- 2.19.1

2 1

[PATCH 2/9] windowscodecs: Add support for palette image formats to TIFF encoder.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/regsvr.c | 6 ++++++ dlls/windowscodecs/tests/converter.c | 18 ++++++++++++------ dlls/windowscodecs/tiffformat.c | 26 ++++++++++++++++++++++++++ 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 3f53591552..05c8f03a3d 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1211,6 +1211,8 @@ static GUID const * const tiff_decode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, @@ -1370,6 +1372,10 @@ static GUID const * const tiff_encode_formats[] = { &GUID_WICPixelFormatBlackWhite, &GUID_WICPixelFormat4bppGray, &GUID_WICPixelFormat8bppGray, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGRA, &GUID_WICPixelFormat32bppPBGRA, diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 8072064b48..13c50d7dff 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -752,13 +752,13 @@ static void check_tiff_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { - ok(width == 32, "wrong width %u\n", width); + ok(width == 16, "wrong width %u\n", width); ok(height == 2, "wrong height %u\n", height); - ok(bps == 1, "wrong bps %d\n", bps); + ok(bps == 2, "wrong bps %d\n", bps); ok(photo == 3, "wrong photometric %d\n", photo); ok(samples == 1, "wrong samples %d\n", samples); - ok(colormap == 6, "wrong colormap %d\n", colormap); + ok(colormap == 12, "wrong colormap %d\n", colormap); } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { @@ -1341,6 +1341,15 @@ static void test_multi_encoder(const struct bitmap_data **srcs, const CLSID* cls ok(colors[4] == 0xff555555, "got %08x (%s)\n", colors[4], name); ok(colors[5] == 0xff000000, "got %08x (%s)\n", colors[5], name); } + else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat2bppIndexed)) + { + ok(count == 4, "expected 4, got %u (%s)\n", count, name); + + ok(colors[0] == 0xff111111, "got %08x (%s)\n", colors[0], name); + ok(colors[1] == 0xff222222, "got %08x (%s)\n", colors[1], name); + ok(colors[2] == 0xff333333, "got %08x (%s)\n", colors[2], name); + ok(colors[3] == 0xff444444, "got %08x (%s)\n", colors[3], name); + } else if (IsEqualGUID(dsts[i]->format, &GUID_WICPixelFormat4bppIndexed)) { ok(count == 16, "expected 16, got %u (%s)\n", count, name); @@ -1530,8 +1539,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in test_encoder(&testdata_BlackWhite, &CLSID_WICTiffEncoder, &testdata_BlackWhite, &CLSID_WICTiffDecoder, "TIFF encoder BlackWhite"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_1bppIndexed, &CLSID_WICTiffEncoder, &testdata_1bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 1bppIndexed"); test_encoder(&testdata_2bppIndexed, &CLSID_WICTiffEncoder, @@ -1540,7 +1547,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICTiffEncoder, &testdata_8bppIndexed, &CLSID_WICTiffDecoder, "TIFF encoder 8bppIndexed"); -} test_encoder(&testdata_24bppBGR, &CLSID_WICTiffEncoder, &testdata_24bppBGR, &CLSID_WICTiffDecoder, "TIFF encoder 24bppBGR"); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 81c6394a52..62476a9bb9 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -461,6 +462,12 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->bpp = bps; switch (bps) { + case 1: + decode_info->format = &GUID_WICPixelFormat1bppIndexed; + break; + case 2: + decode_info->format = &GUID_WICPixelFormat2bppIndexed; + break; case 4: decode_info->format = &GUID_WICPixelFormat4bppIndexed; break; @@ -1408,6 +1415,10 @@ static const struct tiff_encode_format formats[] = { {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {&GUID_WICPixelFormat1bppIndexed, 3, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat2bppIndexed, 3, 2, 1, 2, 0, 0, 0}, + {&GUID_WICPixelFormat4bppIndexed, 3, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppIndexed, 3, 8, 1, 8, 0, 0, 0}, {0} }; @@ -1690,6 +1701,21 @@ static HRESULT WINAPI TiffFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, pTIFFSetField(This->parent->tiff, TIFFTAG_YRESOLUTION, (float)This->yres); } + if (This->format->bpp <= 8 && This->colors && !IsEqualGUID(This->format->guid, &GUID_WICPixelFormatBlackWhite)) + { + uint16 red[256], green[256], blue[256]; + UINT i; + + for (i = 0; i < This->colors; i++) + { + red[i] = (This->palette[i] >> 8) & 0xff00; + green[i] = This->palette[i] & 0xff00; + blue[i] = (This->palette[i] << 8) & 0xff00; + } + + pTIFFSetField(This->parent->tiff, TIFFTAG_COLORMAP, red, green, blue); + } + This->info_written = TRUE; } -- 2.17.1

2 6

[PATCH] jscript: Add Array.prototype.forEach implementation.
by Jacek Caban 05 Dec '18

05 Dec '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/array.c | 45 ++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/es5.js | 24 ++++++++++++++++- 3 files changed, 68 insertions(+), 2 deletions(-)

1 0

IMFSourceReader ReadSample Implementation
by Ahmed Elsayed 05 Dec '18

05 Dec '18

Could you please add "IMFSourceReader ReadSample Implementation" to the list of things that need to be done in Wine 4.0? Applications affected by This bug:Danganronpa V3: Killing Harmony Resident Evil 7: Biohazard For more info: https://bugs.winehq.org/show_bug.cgi?id=43814 https://bugs.winehq.org/show_bug.cgi?id=46133 Ahmed Elsayed ahmed.com(a)aol.com

2 1

[PATCH] ntoskrnl.exe: Drop the WINE_ prefix from debug functions
by Michael Stefaniuc 05 Dec '18

05 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2b3b2ec0ef..aea7d4446c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3323,8 +3323,7 @@ static HMODULE load_driver_module( const WCHAR *name ) if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) { - WINE_TRACE( "%s: relocating from %p to %p\n", - wine_dbgstr_w(name), (char *)module - delta, module ); + TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); while (rel < end && rel->SizeOfBlock) { @@ -3379,7 +3378,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey )) { - WINE_ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); + ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); return NULL; } @@ -3435,7 +3434,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn } RegCloseKey( driver_hkey ); - WINE_TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); + TRACE( "loading driver %s\n", wine_dbgstr_w(str) ); module = load_driver_module( str ); HeapFree( GetProcessHeap(), 0, path ); @@ -3473,12 +3472,12 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08x\n", driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); - WINE_TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); - WINE_TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); - WINE_TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); - WINE_TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); + TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); + TRACE( "- DriverInit = %p\n", driver_object->DriverInit ); + TRACE( "- DriverStartIo = %p\n", driver_object->DriverStartIo ); + TRACE( "- DriverUnload = %p\n", driver_object->DriverUnload ); for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - WINE_TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); + TRACE( "- MajorFunction[%d] = %p\n", i, driver_object->MajorFunction[i] ); return status; } -- 2.19.2

1 0

[PATCH] shcore: Print the debugstr instead of the pointer to it
by Michael Stefaniuc 05 Dec '18

05 Dec '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index c5b98569e2..a544f27006 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2285,7 +2285,7 @@ DWORD WINAPI SHSetValueA(HKEY hkey, const char *subkey, const char *value, */ DWORD WINAPI SHRegSetPathA(HKEY hkey, const char *subkey, const char *value, const char *path, DWORD flags) { - FIXME("(%p, %s, %s, %p, %#x) - semi-stub\n", hkey, debugstr_a(subkey), + FIXME("(%p, %s, %s, %s, %#x) - semi-stub\n", hkey, debugstr_a(subkey), debugstr_a(value), debugstr_a(path), flags); /* FIXME: PathUnExpandEnvStringsA() */ -- 2.19.2

1 0

[PATCH] winepulse.drv: Avoid unnecessary use of ceil function
by Alex Henrie 05 Dec '18

05 Dec '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winepulse.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8d57f1a45a..0823af6341 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -28,7 +28,6 @@ #include <stdarg.h> #include <unistd.h> -#include <math.h> #include <stdio.h> #include <errno.h> @@ -1400,7 +1399,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, period_bytes = pa_frame_size(&This->ss) * MulDiv(period, This->ss.rate, 10000000); if (duration < 20000000) - This->bufsize_frames = ceil((duration / 10000000.) * fmt->nSamplesPerSec); + This->bufsize_frames = (duration * fmt->nSamplesPerSec + 9999999) / 10000000; else This->bufsize_frames = 2 * fmt->nSamplesPerSec; This->bufsize_bytes = This->bufsize_frames * pa_frame_size(&This->ss); -- 2.19.2

2 2

[PATCH 7/7] tzres: Add time zone name resource DLL and use it.
by Akihiro Sagawa 05 Dec '18

05 Dec '18

This will fix https://bugs.winehq.org/show_bug.cgi?id=42719 after Japanese translation update. String IDs are based on SHA1 hash so that we can add another zone name without changing existing IDs. I'm preparing a tool which generate these IDs and time zone information. I'll send it later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ntdll/tests/time.c | 4 +- dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 201 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 198 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

2 1

[PATCH 5/7] kernel32: Use an indirect time zone name in GetTimeZoneInformationForYear.
by Akihiro Sagawa 05 Dec '18

05 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/time.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

2 1

[PATCH 4/7] ntdll: Use an indirect time zone name if available.
by Akihiro Sagawa 05 Dec '18

05 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/time.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

1 0

[PATCH 3/7] loader/wine.inf: Update display names as seen in mapping tables.
by Akihiro Sagawa 05 Dec '18

05 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- loader/wine.inf.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)

1 0

[PATCH 2/7] loader/wine.inf: Remove non-standard Chile Standard Time.
by Akihiro Sagawa 05 Dec '18

05 Dec '18

Use Pacific SA Standard Time, instead. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- loader/wine.inf.in | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)

1 0

[PATCH 1/7] loader/wine.inf: Remove obsolete time zone entries.
by Akihiro Sagawa 05 Dec '18

05 Dec '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- loader/wine.inf.in | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)

1 0

[PATCH] winetest: Add GUI to display results of individual tests
by Isira Seneviratne 05 Dec '18

05 Dec '18

1 0

[PATCH] testbot/web: Show the job and task run time.
by Francois Gouget 05 Dec '18

05 Dec '18

The run time is shown instead of the end time, though the latter is still visible as a tooltip. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Knowing how long a test took, particularly for individual tasks, seems more useful and meaningful than knowing when it ended (even if you can derive the former from the latter by doing enough math in your head). .../lib/ObjectModel/CGI/CollectionBlock.pm | 19 +++++++--- testbot/web/JobDetails.pl | 35 +++++++++++++++++++ testbot/web/index.pl | 35 +++++++++++++++++++ 3 files changed, 84 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 105280e30e..f9e590c808 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -81,12 +81,21 @@ function Pad2(n) { return n < 10 ? '0' + n : n; } -function ShowDateTime(Sec1970) + +function ShowDateTime(Sec1970, Id, Attr) { var Dt = new Date(Sec1970 * 1000); - document.write(Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + - Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + - Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds())); + var Pretty = Dt.getFullYear() + '/' + Pad2(Dt.getMonth() + 1) + '/' + + Pad2(Dt.getDate()) + ' ' + Pad2(Dt.getHours()) + ':' + + Pad2(Dt.getMinutes()) + ':' + Pad2(Dt.getSeconds()) + if (Id != null) + { + document.getElementById(Id).setAttribute(Attr || "title", Pretty); + } + else + { + document.write(Pretty); + } } //--></script> EOF @@ -450,7 +459,7 @@ sub GetDisplayValue($$$) { if (defined($Value)) { -$Value = + $Value = "<noscript><div>" . strftime("%Y/%m/%d %H:%M:%S", localtime($Value)) . "</div></noscript>\n" . "<script type='text/javascript'></script>\n"; + print "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($CollectionBlock, $StepTask, $PropertyDescriptor, $DetailsPage); diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 37b41eae8a..99d7b70bfd 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -24,10 +24,12 @@ package JobStatusBlock; use ObjectModel::CGI::CollectionBlock; our @ISA = qw(ObjectModel::CGI::CollectionBlock); +use POSIX qw(strftime); use URI::Escape; use WineTestBot::Branches; use WineTestBot::Users; +use WineTestBot::Utils; @@ -66,6 +68,21 @@ sub DisplayProperty($$) return $self->SUPER::DisplayProperty($PropertyDescriptor); } +sub GenerateHeaderCell($$$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName() + if ($PropertyName eq "Ended") + { + print "<th><a class='title' title='Ended'>Time</a></th>\n"; + } + else + { + return $self->SUPER::GenerateHeaderCell($PropertyDescriptor); + } +} + sub GetDisplayValue($$$) { my ($self, $Item, $PropertyDescriptor) = @_; @@ -135,6 +152,24 @@ sub GenerateDataCell($$$$) } print "</a></td>\n"; } + elsif ($PropertyName eq "Ended") + { + if (defined $Item->Ended) + { + my $Duration = $Item->Ended - $Item->Submitted; + my $TagId = "E". $Item->Id; + print "<td><a id='$TagId' class='title' title='", + strftime("%Y/%m/%d %H:%M:%S", localtime($Item->Ended)), + "'>", DurationToString($Duration), "</a>\n"; + print "<script type='text/javascript'></script>\n"; + print "</td>\n"; + } + else + { + print "<td> </td>\n"; + } + } else { $self->SUPER::GenerateDataCell($Item, $PropertyDescriptor, $DetailsPage); -- 2.19.2

1 0

[PATCH 1/2] dwmapi: return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes
by Louis Lenders 05 Dec '18

05 Dec '18

This versioh is with tests; Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee067122..eb06d15507 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..a97b405c34 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.1

1 1

[PATCH] dwmapi: return DWM_E_COMPOSITIONDISABLED instead of E_NOTIMPL in DwmGetTransportAttributes
by Louis Lenders 05 Dec '18

05 Dec '18

Fixes crash in Valil.Chess.WinFX See https://www.winehq.org/pipermail/wine-bugs/2018-December/504413.html On my windows 7 laptop it returns DWM_E_COMPOSITIONDISABLED if I disble the DWM service via services.msc. I` ll send a test hereafter but unsure how useful it is, because the testbots (wvista and win7) don`t return DWM_E_COMPOSITIONDISABLED; Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/dwmapi/dwmapi_main.c | 2 +- include/winerror.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index c1ee067122..eb06d15507 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -146,7 +146,7 @@ HRESULT WINAPI DwmGetTransportAttributes(BOOL *pfIsRemoting, BOOL *pfIsConnected { FIXME("(%p, %p, %p) stub\n", pfIsRemoting, pfIsConnected, pDwGeneration); - return E_NOTIMPL; + return DWM_E_COMPOSITIONDISABLED; } /********************************************************************** diff --git a/include/winerror.h b/include/winerror.h index d78c91e84e..a97b405c34 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -3090,6 +3090,8 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) #define WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY _HRESULT_TYPEDEF_(0x80072f8e) #define WININET_E_DECODING_FAILED _HRESULT_TYPEDEF_(0x80072f8f) +#define DWM_E_COMPOSITIONDISABLED _HRESULT_TYPEDEF_(0x80263001) + #define D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS _HRESULT_TYPEDEF_(0x887c0001) #define D3D11_ERROR_FILE_NOT_FOUND _HRESULT_TYPEDEF_(0x887c0002) #define D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS _HRESULT_TYPEDEF_(0x887c0003) -- 2.17.1

1 0

[PATCH] comctl32/listview: Fix NM_CLICK notification when clicking on checkboxes.
by Nikolay Sivov 05 Dec '18

05 Dec '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c5978b37a5..1230c55d5c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10238,7 +10238,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN { if ((infoPtr->dwLvExStyle & LVS_EX_CHECKBOXES) && (lvHitTestInfo.flags & LVHT_ONITEMSTATEICON)) { + notify_click(infoPtr, NM_CLICK, &lvHitTestInfo); toggle_checkbox_state(infoPtr, nItem); + infoPtr->bLButtonDown = FALSE; return 0; } -- 2.19.2

1 0

[PATCH] winsta: Implement WinStationTerminateProcess
by Alexandre Badalo 05 Dec '18

05 Dec '18

Signed-off-by: Alexandre Badalo <alexandre9099(a)gmail.com> --- dlls/winsta/main.c | 17 +++++++++++++++++ dlls/winsta/winsta.h | 1 + dlls/winsta/winsta.spec | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 7568310aea..87ce8a12c6 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -105,3 +105,20 @@ BOOLEAN WINAPI WinStationEnumerateW( HANDLE server, PSESSIONIDW *sessionids, ULO SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + +BOOLEAN WINAPI WinStationTerminateProcess(HANDLE handle, + ULONG processId, + DWORD exit_code) +{ + NTSTATUS status; + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + status = NtTerminateProcess( handle, exit_code ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} diff --git a/dlls/winsta/winsta.h b/dlls/winsta/winsta.h index d908aa855c..494af2875f 100644 --- a/dlls/winsta/winsta.h +++ b/dlls/winsta/winsta.h @@ -95,5 +95,6 @@ BOOLEAN WINAPI WinStationGetProcessSid(HANDLE,ULONG,FILETIME *,PVOID,PULONG); BOOLEAN WINAPI WinStationQueryInformationW(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG); BOOLEAN WINAPI WinStationRegisterConsoleNotification(HANDLE,HWND,ULONG); BOOLEAN WINAPI WinStationUnRegisterConsoleNotification(HANDLE,HWND); +BOOLEAN WINAPI WinStationTerminateProcess(HANDLE,ULONG,ULONG); #endif /* _WINSTA_H */ diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 1f38a238f0..1bfb46f4b9 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -68,7 +68,7 @@ @ stub WinStationShadow @ stub WinStationShadowStop @ stub WinStationShutdownSystem -@ stub WinStationTerminateProcess +@ stdcall WinStationTerminateProcess(ptr long long) @ stdcall WinStationUnRegisterConsoleNotification(ptr ptr) @ stdcall WinStationVirtualOpen(ptr ptr ptr) @ stub WinStationWaitSystemEvent @@ -92,4 +92,4 @@ @ stub _WinStationUpdateClientCachedCredentials @ stub _WinStationUpdateSettings @ stub _WinStationUpdateUserConfig -@ stub _WinStationWaitForConnect +@ stub _WinStationWaitForConnect \ No newline at end of file -- 2.19.1

3 2

[PATCH] ntdll: Add NtSetDebugFilterState stub
by Alexandre Badalo 05 Dec '18

05 Dec '18

Signed-off-by: Alexandre Badalo <alexandre9099(a)gmail.com> --- dlls/ntdll/nt.c | 8 ++++++++ dlls/ntdll/ntdll.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5c711ef25b..3d92e343c1 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3155,3 +3155,11 @@ NTSTATUS WINAPI NtSetLdtEntries(ULONG selector1, ULONG entry1_low, ULONG entry1_ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS WINAPI NtSetDebugFilterState(ULONG ComponentId, + ULONG Level, + BOOLEAN State) +{ + FIXME("(%u, %u, %u): stub\n", ComponentId, Level, State); + + return STATUS_SUCCESS; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1b0bd7f53f..0ba056bca2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -332,7 +332,7 @@ # @ stub NtSetBootEntryOrder # @ stub NtSetBootOptions @ stdcall NtSetContextThread(long ptr) -@ stub NtSetDebugFilterState +@ stdcall NtSetDebugFilterState(long long long) @ stub NtSetDefaultHardErrorPort @ stdcall NtSetDefaultLocale(long long) @ stdcall NtSetDefaultUILanguage(long) -- 2.19.1

2 1

[PATCH 9/9] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in the PNG encoder.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/pngformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index c0e5a59cf9..786d8360e0 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -1979,11 +1979,22 @@ static HRESULT WINAPI PngEncoder_GetContainerFormat(IWICBitmapEncoder *iface, GU return S_OK; } -static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI PngEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICPngEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI PngEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.17.1

1 0

[PATCH 8/9] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in the JPEG encoder.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index a060d569f8..192c6c691b 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -412,10 +412,14 @@ static HRESULT WINAPI JpegDecoder_CopyPalette(IWICBitmapDecoder *iface, } static HRESULT WINAPI JpegDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface, - IWICMetadataQueryReader **ppIMetadataQueryReader) + IWICMetadataQueryReader **reader) { - FIXME("(%p,%p): stub\n", iface, ppIMetadataQueryReader); - return E_NOTIMPL; + FIXME("(%p,%p): stub\n", iface, reader); + + if (!reader) return E_INVALIDARG; + + *reader = NULL; + return WINCODEC_ERR_UNSUPPORTEDOPERATION; } static HRESULT WINAPI JpegDecoder_GetPreview(IWICBitmapDecoder *iface, -- 2.17.1

1 0

[PATCH 7/9] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in TIFF encoder.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tiffformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 62476a9bb9..b7e4a45bfe 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1919,11 +1919,22 @@ static HRESULT WINAPI TiffEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI TiffEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICTiffEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI TiffEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.17.1

1 0

[PATCH 6/9] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in JPEG encoder.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/jpegformat.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 451d725eb8..a060d569f8 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1392,11 +1392,22 @@ static HRESULT WINAPI JpegEncoder_GetContainerFormat(IWICBitmapEncoder *iface, G return S_OK; } -static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI JpegEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICJpegEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI JpegEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.17.1

1 0

[PATCH 4/9] windowscodecs: Implement IWICBitmapEncoder::GetEncoderInfo in BMP encoder.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index 35130e7d5a..186a7ac1d7 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -507,11 +507,22 @@ static HRESULT WINAPI BmpEncoder_GetContainerFormat(IWICBitmapEncoder *iface, return S_OK; } -static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, - IWICBitmapEncoderInfo **ppIEncoderInfo) +static HRESULT WINAPI BmpEncoder_GetEncoderInfo(IWICBitmapEncoder *iface, IWICBitmapEncoderInfo **info) { - FIXME("(%p,%p): stub\n", iface, ppIEncoderInfo); - return E_NOTIMPL; + IWICComponentInfo *comp_info; + HRESULT hr; + + TRACE("%p,%p\n", iface, info); + + if (!info) return E_INVALIDARG; + + hr = CreateComponentInfo(&CLSID_WICBmpEncoder, &comp_info); + if (hr == S_OK) + { + hr = IWICComponentInfo_QueryInterface(comp_info, &IID_IWICBitmapEncoderInfo, (void **)info); + IWICComponentInfo_Release(comp_info); + } + return hr; } static HRESULT WINAPI BmpEncoder_SetColorContexts(IWICBitmapEncoder *iface, -- 2.17.1

1 0

[PATCH 5/9] windowscodecs: Implement IWICBitmapEncoderInfo::GetFileExtensions.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 86707e1253..d0c2c690ca 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -898,8 +898,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetMimeTypes(IWICBitmapEncoderInfo *ifac static HRESULT WINAPI BitmapEncoderInfo_GetFileExtensions(IWICBitmapEncoderInfo *iface, UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchFileExtensions, wzFileExtensions, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, fileextensions_valuename, + cchFileExtensions, wzFileExtensions, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_DoesSupportAnimation(IWICBitmapEncoderInfo *iface, -- 2.17.1

1 0

[PATCH 3/9] windowscodecs: Add support for palette image formats to BMP encoder.
by Dmitry Timoshkov 05 Dec '18

05 Dec '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/bmpencode.c | 44 ++++++++++++++++++++++------ dlls/windowscodecs/info.c | 8 ++++- dlls/windowscodecs/regsvr.c | 5 ++++ dlls/windowscodecs/tests/converter.c | 13 ++++++-- 4 files changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index b8783a499e..35130e7d5a 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Vincent Povirk for CodeWeavers + * Copyright 2016 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); struct bmp_pixelformat { const WICPixelFormatGUID *guid; UINT bpp; + UINT colors; /* palette size */ DWORD compression; DWORD redmask; DWORD greenmask; @@ -45,13 +47,18 @@ struct bmp_pixelformat { }; static const struct bmp_pixelformat formats[] = { - {&GUID_WICPixelFormat24bppBGR, 24, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR555, 16, BI_RGB}, - {&GUID_WICPixelFormat16bppBGR565, 16, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, - {&GUID_WICPixelFormat32bppBGR, 32, BI_RGB}, + {&GUID_WICPixelFormat24bppBGR, 24, 0, BI_RGB}, + {&GUID_WICPixelFormatBlackWhite, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat1bppIndexed, 1, 2, BI_RGB}, + {&GUID_WICPixelFormat2bppIndexed, 2, 4, BI_RGB}, + {&GUID_WICPixelFormat4bppIndexed, 4, 16, BI_RGB}, + {&GUID_WICPixelFormat8bppIndexed, 8, 256, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR555, 16, 0, BI_RGB}, + {&GUID_WICPixelFormat16bppBGR565, 16, 0, BI_BITFIELDS, 0xf800, 0x7e0, 0x1f, 0}, + {&GUID_WICPixelFormat32bppBGR, 32, 0, BI_RGB}, #if 0 /* Windows doesn't seem to support this one. */ - {&GUID_WICPixelFormat32bppBGRA, 32, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, + {&GUID_WICPixelFormat32bppBGRA, 32, 0, BI_BITFIELDS, 0xff0000, 0xff00, 0xff, 0xff000000}, #endif {NULL} }; @@ -184,11 +191,13 @@ static HRESULT WINAPI BmpFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface for (i=0; formats[i].guid; i++) { - if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + if (IsEqualGUID(formats[i].guid, pPixelFormat)) break; } if (!formats[i].guid) i = 0; + else if (IsEqualGUID(pPixelFormat, &GUID_WICPixelFormatBlackWhite)) + i = 2; /* GUID_WICPixelFormat1bppIndexed */ This->format = &formats[i]; memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); @@ -207,6 +216,7 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, IWICPalette *palette) { BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; TRACE("(%p,%p)\n", iface, palette); @@ -215,7 +225,14 @@ static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_NOTINITIALIZED; - return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + hr = IWICPalette_GetColors(palette, 256, This->palette, &This->colors); + if (hr == S_OK) + { + UINT i; + for (i = 0; i < This->colors; i++) + This->palette[i] |= 0xff000000; /* BMP palette has no alpha */ + } + return hr; } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -330,8 +347,8 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5SizeImage = This->stride*This->height; bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; - bih.bV5ClrUsed = 0; - bih.bV5ClrImportant = 0; + bih.bV5ClrUsed = (This->format->bpp <= 8) ? This->colors : 0; + bih.bV5ClrImportant = bih.bV5ClrUsed; if (This->format->compression == BI_BITFIELDS) { @@ -348,6 +365,7 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bfh.bfSize = sizeof(BITMAPFILEHEADER) + info_size + bih.bV5SizeImage; bfh.bfOffBits = sizeof(BITMAPFILEHEADER) + info_size; + bfh.bfOffBits += bih.bV5ClrUsed * sizeof(WICColor); pos.QuadPart = 0; hr = IStream_Seek(This->stream, pos, STREAM_SEEK_SET, NULL); @@ -361,6 +379,14 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) if (FAILED(hr)) return hr; if (byteswritten != info_size) return E_FAIL; + /* write the palette */ + if (This->format->colors) + { + hr = IStream_Write(This->stream, This->palette, This->colors * sizeof(WICColor), &byteswritten); + if (FAILED(hr)) return hr; + if (byteswritten != This->colors * sizeof(WICColor)) return E_FAIL; + } + hr = IStream_Write(This->stream, This->bits, bih.bV5SizeImage, &byteswritten); if (FAILED(hr)) return hr; if (byteswritten != bih.bV5SizeImage) return E_FAIL; diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index e131107e99..86707e1253 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2461,6 +2461,12 @@ HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnkn return hr; } +static BOOL is_1bpp_format(const WICPixelFormatGUID *format) +{ + return IsEqualGUID(format, &GUID_WICPixelFormatBlackWhite) || + IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed); +} + HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitmapSource *pISrc, IWICBitmapSource **ppIDst) { HRESULT res; @@ -2476,7 +2482,7 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma res = IWICBitmapSource_GetPixelFormat(pISrc, &srcFormat); if (FAILED(res)) return res; - if (IsEqualGUID(&srcFormat, dstFormat)) + if (IsEqualGUID(&srcFormat, dstFormat) || (is_1bpp_format(&srcFormat) && is_1bpp_format(dstFormat))) { IWICBitmapSource_AddRef(pISrc); *ppIDst = pISrc; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 05c8f03a3d..7600de3099 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1347,6 +1347,11 @@ static GUID const * const bmp_encode_formats[] = { &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR, &GUID_WICPixelFormat32bppBGR, + &GUID_WICPixelFormatBlackWhite, + &GUID_WICPixelFormat1bppIndexed, + &GUID_WICPixelFormat2bppIndexed, + &GUID_WICPixelFormat4bppIndexed, + &GUID_WICPixelFormat8bppIndexed, NULL }; diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 13c50d7dff..0d37b72397 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -814,6 +814,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) if (IsEqualGUID(format, &GUID_WICPixelFormat1bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 32, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -824,6 +826,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat2bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 16, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -834,6 +838,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat4bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 8, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -844,6 +850,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat8bppIndexed)) { + ok(bfh.bfOffBits == 0x0436, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -854,6 +862,8 @@ static void check_bmp_format(IStream *stream, const WICPixelFormatGUID *format) } else if (IsEqualGUID(format, &GUID_WICPixelFormat32bppBGR)) { + ok(bfh.bfOffBits == 0x0036, "wrong bfOffBits %02x\n", bfh.bfOffBits); + ok(bih.bV5Width == 4, "wrong width %u\n", bih.bV5Width); ok(bih.bV5Height == 2, "wrong height %u\n", bih.bV5Height); @@ -1521,8 +1531,6 @@ START_TEST(converter) test_encoder(&testdata_24bppBGR, &CLSID_WICPngEncoder, &testdata_24bppBGR, &CLSID_WICPngDecoder, "PNG encoder 24bppBGR"); -if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in Wine */ -{ test_encoder(&testdata_BlackWhite, &CLSID_WICBmpEncoder, &testdata_1bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder BlackWhite"); test_encoder(&testdata_1bppIndexed, &CLSID_WICBmpEncoder, @@ -1533,7 +1541,6 @@ if (!strcmp(winetest_platform, "windows")) /* FIXME: enable once implemented in &testdata_4bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 4bppIndexed"); test_encoder(&testdata_8bppIndexed, &CLSID_WICBmpEncoder, &testdata_8bppIndexed, &CLSID_WICBmpDecoder, "BMP encoder 8bppIndexed"); -} test_encoder(&testdata_32bppBGR, &CLSID_WICBmpEncoder, &testdata_32bppBGR, &CLSID_WICBmpDecoder, "BMP encoder 32bppBGR"); -- 2.17.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel