July 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 3.13
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: website Branch: master Commit: 44ca8b25da0d82fea485301b9386a72f7de6793c URL: https://source.winehq.org/git/website.git/?a=commit;h=44ca8b25da0d82fea4853… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 19:14:48 2018 +0200 Wine release 3.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018072001.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2018072001.xml b/news/en/2018072001.xml new file mode 100644 index 0000000..90b1eea --- /dev/null +++ b/news/en/2018072001.xml @@ -0,0 +1,18 @@ +<news> +<date>July 20, 2018</date> +<title>Wine 3.13 Released</title> +<body> + The Wine development release 3.13 is now available. + <a href="{$root}/announce/3.13">What's new</a> in this release: +<ul> + <li>Vulkan support on macOS using MoltenVK.</li> + <li>Initial support for performance data in the registry.</li> + <li>Mono engine updated with some bug fixes.</li> + <li>Support for fetching BIOS information on Linux.</li> + <li>GnuTLS also used on macOS when available.</li> + <li>Improvements in the standard Task Dialog.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : wine/vulkan.h: Properly declare enum values that use value attribute in spec.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 427f3599103cf07de45e6dc008dbbd5dcc5f183b URL: https://source.winehq.org/git/wine.git/?a=commit;h=427f3599103cf07de45e6dc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 20 12:49:06 2018 +0200 wine/vulkan.h: Properly declare enum values that use value attribute in spec. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 +++++++----- include/wine/vulkan.h | 5 ++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a7dc040..fe742b7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2490,11 +2490,12 @@ class VkRegistry(object): self.enums = OrderedDict(sorted(enums.items())) def _process_require_enum(self, enum_elem, ext=None): + if "extends" in enum_elem.keys(): + enum = self.types[enum_elem.attrib["extends"]]["data"] + if "bitpos" in enum_elem.keys(): # We need to add an extra value to an existing enum type. # E.g. VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG to VkFormatFeatureFlagBits. - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] enum.add(VkEnumValue(enum_elem.attrib["name"], 1 << int(enum_elem.attrib["bitpos"]), hex=True)) elif "offset" in enum_elem.keys(): @@ -2512,12 +2513,13 @@ class VkRegistry(object): if direction is not None: value = -value - type_name = enum_elem.attrib["extends"] - enum = self.types[type_name]["data"] enum.add(VkEnumValue(enum_elem.attrib["name"], value)) elif "value" in enum_elem.keys(): - self.consts.append(VkConstant(enum_elem.attrib.get("name"), enum_elem.attrib.get("value"))) + enum.add(VkEnumValue(enum_elem.attrib["name"], int(enum_elem.attrib["value"]))) + + elif "value" in enum_elem.keys(): + self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) def _parse_extensions(self, root): """ Parse extensions section and pull in any types and commands for this extensioin. """ diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 965e26f..31e8e5c 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -94,7 +94,6 @@ #define VK_EXT_DEPTH_RANGE_UNRESTRICTED_EXTENSION_NAME "VK_EXT_depth_range_unrestricted" #define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_SPEC_VERSION 1 #define VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME "VK_KHR_sampler_mirror_clamp_to_edge" -#define VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE 4 #define VK_IMG_FILTER_CUBIC_SPEC_VERSION 1 #define VK_IMG_FILTER_CUBIC_EXTENSION_NAME "VK_IMG_filter_cubic" #define VK_AMD_RASTERIZATION_ORDER_SPEC_VERSION 1 @@ -143,14 +142,12 @@ #define VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME "VK_KHR_device_group_creation" #define VK_KHR_PUSH_DESCRIPTOR_SPEC_VERSION 2 #define VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME "VK_KHR_push_descriptor" -#define VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR 1 #define VK_KHR_16BIT_STORAGE_SPEC_VERSION 1 #define VK_KHR_16BIT_STORAGE_EXTENSION_NAME "VK_KHR_16bit_storage" #define VK_KHR_INCREMENTAL_PRESENT_SPEC_VERSION 1 #define VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME "VK_KHR_incremental_present" #define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_SPEC_VERSION 1 #define VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME "VK_KHR_descriptor_update_template" -#define VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR 1 #define VK_NV_CLIP_SPACE_W_SCALING_SPEC_VERSION 1 #define VK_NV_CLIP_SPACE_W_SCALING_EXTENSION_NAME "VK_NV_clip_space_w_scaling" #define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION 1 @@ -706,6 +703,7 @@ typedef enum VkDescriptorType typedef enum VkDescriptorUpdateTemplateType { VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET = 0, + VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR = 1, VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_MAX_ENUM = 0x7fffffff, } VkDescriptorUpdateTemplateType; @@ -1481,6 +1479,7 @@ typedef enum VkSamplerAddressMode VK_SAMPLER_ADDRESS_MODE_MIRRORED_REPEAT = 1, VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE = 2, VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER = 3, + VK_SAMPLER_ADDRESS_MODE_MIRROR_CLAMP_TO_EDGE = 4, VK_SAMPLER_ADDRESS_MODE_MAX_ENUM = 0x7fffffff, } VkSamplerAddressMode;

1 0

Stefan Dösinger : msvcp140: Implement _Temp_get.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 17c203ea86fa9f7b1739c638c9ca20f34b8c9d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c203ea86fa9f7b1739c638… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 20 10:51:54 2018 +0200 msvcp140: Implement _Temp_get. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 26 ++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 6 ++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e705e1e..57d0277 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3718,7 +3718,7 @@ @ stub _Strxfrm @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get -@ stub _Temp_get +@ cdecl _Temp_get(ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 06ea11d..fdec429 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -178,6 +178,7 @@ static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); +static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); @@ -260,6 +261,7 @@ static BOOL init(void) SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); + SET(p_Temp_get, "_Temp_get"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); SET(p_Unlink, "_Unlink"); @@ -1060,6 +1062,29 @@ static void test_Unlink(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +static void test_Temp_get(void) +{ + WCHAR path[MAX_PATH + 1], temp_path[MAX_PATH]; + WCHAR *retval; + DWORD len; + + GetTempPathW(ARRAY_SIZE(temp_path), temp_path); + + /* This crashes on Windows, the input pointer is not validated. */ + if (0) + { + retval = p_Temp_get(NULL); + ok(!retval, "_Temp_get(): Got %p\n", retval); + } + + memset(path, 0xaa, sizeof(path)); + retval = p_Temp_get(path); + ok(retval == path, "_Temp_get(): Got %p, expected %p\n", retval, path); + ok(!wcscmp(path, temp_path), "Expected path %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(path)); + len = wcslen(path); + todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1078,5 +1103,6 @@ START_TEST(msvcp140) test_Stat(); test_dir_operation(); test_Unlink(); + test_Temp_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fb9d668..1e7c481 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15734,6 +15734,12 @@ enum file_type __cdecl _Lstat(WCHAR const* path, int* permissions) return _Stat(path, permissions); } +WCHAR * __cdecl _Temp_get(WCHAR *dst) +{ + GetTempPathW(MAX_PATH, dst); + return dst; +} + /* ??1_Winit(a)std@@QAE(a)XZ */ /* ??1_Winit(a)std@@QAE(a)XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4)

1 0

Stefan Dösinger : msvcp120: Tr2:: _Rename_wchar NULL ptr handling differs from tr2::_Rename.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 84b2d69a76dbaa5fec4b31c9cc2d375722894b0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b2d69a76dbaa5fec4b31c9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 19 21:14:16 2018 +0200 msvcp120: Tr2::_Rename_wchar NULL ptr handling differs from tr2::_Rename. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 58 +++++++++++++++++++++++++++++++++++++----- dlls/msvcp90/ios.c | 3 --- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index a130827..db9517d 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1474,9 +1474,8 @@ static void test_tr2_sys__Rename(void) BY_HANDLE_FILE_INFORMATION info1, info2; char temp_path[MAX_PATH], current_path[MAX_PATH]; LARGE_INTEGER file_size; - WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; - WCHAR testW2[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','w',0}; - struct { + static const WCHAR testW[] = {'t','r','2','_','t','e','s','t','_','d','i','r','/','f','1',0}; + static const struct { char const *old_path; char const *new_path; int val; @@ -1488,6 +1487,29 @@ static void test_tr2_sys__Rename(void) { "tr2_test_dir\\f1_rename", "tr2_test_dir\\??invalid_name>>", ERROR_INVALID_NAME }, { "tr2_test_dir\\not_exist_file", "tr2_test_dir\\not_exist_rename", ERROR_FILE_NOT_FOUND } }; + static const WCHAR f1_renameW[] = + {'t','r','2','_','t','e','s','t','_','d','i','r','\\','f','1','_','r','e','n','a','m','e',0}; + static const WCHAR f1_rename2W[] = + {'t','r','2','_','t','e','s','t','_','d','i','r','\\','f','1','_','r','e','n','a','m','e','2',0}; + static const WCHAR not_existW[] = + {'t','r','2','_','t','e','s','t','_','d','i','r','\\','n','o','t','_','e','x','i','s','t',0}; + static const WCHAR not_exist2W[] = + {'t','r','2','_','t','e','s','t','_','d','i','r','\\','n','o','t','_','e','x','i','s','t','2',0}; + static const WCHAR invalidW[] = + {'t','r','2','_','t','e','s','t','_','d','i','r','\\','?','?','i','n','v','a','l','i','d','>',0}; + static const struct { + const WCHAR *old_path; + const WCHAR *new_path; + int val; + } testsW[] = { + { testW, f1_renameW, ERROR_SUCCESS }, + { testW, NULL, ERROR_FILE_NOT_FOUND }, /* Differs from the A version */ + { testW, f1_renameW, ERROR_FILE_NOT_FOUND }, + { NULL, f1_rename2W, ERROR_PATH_NOT_FOUND }, /* Differs from the A version */ + { f1_renameW, invalidW, ERROR_INVALID_NAME }, + { not_existW, not_exist2W, ERROR_FILE_NOT_FOUND }, + { not_existW, invalidW, ERROR_FILE_NOT_FOUND } + }; memset(current_path, 0, MAX_PATH); GetCurrentDirectoryA(MAX_PATH, current_path); @@ -1538,10 +1560,34 @@ static void test_tr2_sys__Rename(void) ok(ret == ERROR_ALREADY_EXISTS, "test_tr2_sys__Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret); ok(p_tr2_sys__File_size("tr2_test_dir\\f1") == 7, "test_tr2_sys__Rename(): expect: 7, got %s\n", wine_dbgstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1"))); ok(p_tr2_sys__File_size("tr2_test_dir\\f1_rename") == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n",wine_dbgstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1_rename"))); - ret = p_tr2_sys__Rename_wchar(testW, testW2); - ok(ret == ERROR_SUCCESS, "tr2_sys__Rename_wchar(): expect: ERROR_SUCCESS, got %d\n", ret); - ok(DeleteFileW(testW2), "expect fw to exist\n"); + ok(DeleteFileA("tr2_test_dir\\f1_rename"), "expect f1_rename to exist\n"); + + for(i=0; i<ARRAY_SIZE(testsW); i++) { + errno = 0xdeadbeef; + if(testsW[i].val == ERROR_SUCCESS) { + h1 = CreateFileW(testsW[i].old_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + ok(h1 != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(GetFileInformationByHandle(h1, &info1), "GetFileInformationByHandle failed\n"); + CloseHandle(h1); + } + SetLastError(0xdeadbeef); + ret = p_tr2_sys__Rename_wchar(testsW[i].old_path, testsW[i].new_path); + ok(ret == testsW[i].val, "test_tr2_sys__Rename_wchar(): test %d expect: %d, got %d\n", i+1, testsW[i].val, ret); + ok(errno == 0xdeadbeef, "test_tr2_sys__Rename_wchar(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); + if(ret == ERROR_SUCCESS) { + h2 = CreateFileW(testsW[i].new_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + ok(h2 != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(GetFileInformationByHandle(h2, &info2), "GetFileInformationByHandle failed\n"); + CloseHandle(h2); + ok(info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow, + "test_tr2_sys__Rename_wchar(): test %d expect two files equivalent\n", i+1); + } + } + ok(DeleteFileA("tr2_test_dir\\f1_rename"), "expect f1_rename to exist\n"); ret = p_tr2_sys__Remove_dir("tr2_test_dir"); ok(ret == 1, "test_tr2_sys__Remove_dir(): expect %d got %d\n", 1, ret); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 1e7c481..6a82db6 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15630,9 +15630,6 @@ int __cdecl tr2_sys__Rename_wchar(WCHAR const* old_path, WCHAR const* new_path) { TRACE("(%s %s)\n", debugstr_w(old_path), debugstr_w(new_path)); - if(!old_path || !new_path) - return ERROR_INVALID_PARAMETER; - if(MoveFileExW(old_path, new_path, MOVEFILE_COPY_ALLOWED)) return ERROR_SUCCESS; return GetLastError();

1 0

Stefan Dösinger : msvcp140: Export _Rename.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 1604cdae9085194ebfffee279cb986aa82bc6937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1604cdae9085194ebfffee27… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 19 21:14:17 2018 +0200 msvcp140: Export _Rename. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 57d0277..f999e9a 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3694,7 +3694,7 @@ @ cdecl -ret64 _Query_perf_frequency() @ cdecl _Read_dir(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl _Remove_dir(wstr) tr2_sys__Remove_dir_wchar -@ stub _Rename +@ cdecl _Rename(wstr wstr) tr2_sys__Rename_wchar @ stub _Resize @ stub _Set_last_write_time @ stub _Sinh diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index fdec429..aefec6b 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -176,6 +176,7 @@ static int (__cdecl *p_Make_dir)(WCHAR const*); static void* (__cdecl *p_Open_dir)(WCHAR*, WCHAR const*, int *, enum file_type*); static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); +static int (__cdecl *p_Rename)(WCHAR const*, WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); @@ -259,6 +260,7 @@ static BOOL init(void) SET(p_Open_dir, "_Open_dir"); SET(p_Read_dir, "_Read_dir"); SET(p_Remove_dir, "_Remove_dir"); + SET(p_Rename, "_Rename"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); SET(p_Temp_get, "_Temp_get"); @@ -1085,6 +1087,100 @@ static void test_Temp_get(void) todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); } +static void test_Rename(void) +{ + int ret, i; + HANDLE file, h1, h2; + BY_HANDLE_FILE_INFORMATION info1, info2; + WCHAR temp_path[MAX_PATH], current_path[MAX_PATH]; + LARGE_INTEGER file_size; + static const WCHAR wine_test_dirW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r',0}; + static const WCHAR f1W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1',0}; + static const WCHAR f1_renameW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1','_','r','e','n','a','m','e',0}; + static const WCHAR f1_rename2W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','f','1','_','r','e','n','a','m','e','2',0}; + static const WCHAR not_existW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','n','o','t','_','e','x','i','s','t',0}; + static const WCHAR not_exist2W[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','n','o','t','_','e','x','i','s','t','2',0}; + static const WCHAR invalidW[] = + {'w','i','n','e','_','t','e','s','t','_','d','i','r','\\','?','?','i','n','v','a','l','i','d','>',0}; + static const struct { + const WCHAR *old_path; + const WCHAR *new_path; + int val; + } tests[] = { + { f1W, f1_renameW, ERROR_SUCCESS }, + { f1W, NULL, ERROR_FILE_NOT_FOUND }, + { f1W, f1_renameW, ERROR_FILE_NOT_FOUND }, + { NULL, f1_rename2W, ERROR_PATH_NOT_FOUND }, + { f1_renameW, invalidW, ERROR_INVALID_NAME }, + { not_existW, not_exist2W, ERROR_FILE_NOT_FOUND }, + { not_existW, invalidW, ERROR_FILE_NOT_FOUND } + }; + + memset(current_path, 0, MAX_PATH); + GetCurrentDirectoryW(MAX_PATH, current_path); + memset(temp_path, 0, MAX_PATH); + GetTempPathW(MAX_PATH, temp_path); + ok(SetCurrentDirectoryW(temp_path), "SetCurrentDirectoryW to temp_path failed\n"); + ret = p_Make_dir(wine_test_dirW); + + ok(ret == 1, "_Make_dir(): expect 1 got %d\n", ret); + file = CreateFileW(f1W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + ret = p_Rename(f1W, f1W); + todo_wine ok(ERROR_SUCCESS == ret, "_Rename(): expect: ERROR_SUCCESS, got %d\n", ret); + for(i=0; i<ARRAY_SIZE(tests); i++) { + errno = 0xdeadbeef; + if(tests[i].val == ERROR_SUCCESS) { + h1 = CreateFileW(tests[i].old_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + ok(h1 != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(GetFileInformationByHandle(h1, &info1), "GetFileInformationByHandle failed\n"); + CloseHandle(h1); + } + SetLastError(0xdeadbeef); + ret = p_Rename(tests[i].old_path, tests[i].new_path); + ok(ret == tests[i].val, "_Rename(): test %d expect: %d, got %d\n", i+1, tests[i].val, ret); + ok(errno == 0xdeadbeef, "_Rename(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); + if(ret == ERROR_SUCCESS) { + h2 = CreateFileW(tests[i].new_path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, 0); + ok(h2 != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + ok(GetFileInformationByHandle(h2, &info2), "GetFileInformationByHandle failed\n"); + CloseHandle(h2); + ok(info1.nFileIndexHigh == info2.nFileIndexHigh + && info1.nFileIndexLow == info2.nFileIndexLow, + "test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1); + } + } + + file = CreateFileW(f1W, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + file_size.QuadPart = 7; + ok(SetFilePointerEx(file, file_size, NULL, FILE_BEGIN), "SetFilePointerEx failed\n"); + ok(SetEndOfFile(file), "SetEndOfFile failed\n"); + CloseHandle(file); + ret = p_Rename(f1W, f1_renameW); + ok(ret == ERROR_ALREADY_EXISTS, "_Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret); + ok(p_File_size(f1W) == 7, "_Rename(): expect: 7, got %s\n", + wine_dbgstr_longlong(p_File_size(f1W))); + ok(p_File_size(f1_renameW) == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n", + wine_dbgstr_longlong(p_File_size(f1_renameW))); + + ok(DeleteFileW(f1_renameW), "expect f1_rename to exist\n"); + ok(DeleteFileW(f1W), "expect f1 to exist\n"); + ret = p_Remove_dir(wine_test_dirW); + ok(ret == 1, "_Remove_dir(): expect %d got %d\n", 1, ret); + ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1104,5 +1200,6 @@ START_TEST(msvcp140) test_dir_operation(); test_Unlink(); test_Temp_get(); + test_Rename(); FreeLibrary(msvcp); }

1 0

Hans Leidekker : bcrypt: Default to building with GnuTLS support on macOS, if present.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 8b8a32f7a8e72658e14c3fe0972009dead59bfa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8a32f7a8e72658e14c3fe0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 20 14:51:14 2018 +0200 bcrypt: Default to building with GnuTLS support on macOS, if present. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 5 ++--- dlls/bcrypt/gnutls.c | 2 +- dlls/bcrypt/macos.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 851767d..4edfbdd 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -815,7 +815,6 @@ void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE * } #endif - #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 BOOL key_is_symmetric( struct key *key ) { @@ -1421,14 +1420,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT gnutls_uninitialize(); #endif break; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index f191d2c..f5bc0e5 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -42,7 +42,7 @@ #include "wine/library.h" #include "wine/unicode.h" -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +#ifdef HAVE_GNUTLS_CIPHER_INIT WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); WINE_DECLARE_DEBUG_CHANNEL(winediag); diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 94d5dbd..a6eaee8 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -41,7 +41,7 @@ #include "wine/library.h" #include "wine/unicode.h" -#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +#if defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 && !defined(HAVE_GNUTLS_CIPHER_INIT) WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags )

1 0

Tag wine-3.13 : Alexandre Julliard : Release 3.13
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: refs/tags/wine-3.13 Tag: a76943b2a484424331863178ba5a016409274d13 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a76943b2a484424331863178ba5… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 19:12:26 2018 +0200 Release 3.13

1 0

Alexandre Julliard : Release 3.13.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 25cc380b8ed41652b135657ef7651beef2f20ae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25cc380b8ed41652b135657e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 19:12:26 2018 +0200 Release 3.13. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 601 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 5 files changed, 338 insertions(+), 286 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=25cc380b8ed41652b135…

1 0

Fabian Maurer : user32/menu: Release menu in HiliteMenuItem() to avoid deadlock.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: a9ac425a903968f74f074eba06863b913ba7dffc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9ac425a903968f74f074eba… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jul 20 16:29:43 2018 +0200 user32/menu: Release menu in HiliteMenuItem() to avoid deadlock. MENU_SelectItem sends a message, and we must not hold the lock when that happens Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index bae4500..3b1e3f2 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3859,17 +3859,23 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, { POPUPMENU *menu; UINT pos; + HMENU handle_menu; + UINT focused_item; TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); if (!(menu = find_menu_item(hMenu, wItemID, wHilite, &pos))) return FALSE; - if (menu->FocusedItem != pos) + handle_menu = menu->obj.handle; + focused_item = menu->FocusedItem; + release_menu_ptr(menu); + + if (focused_item != pos) { - MENU_HideSubPopups( hWnd, menu->obj.handle, FALSE, 0 ); - MENU_SelectItem( hWnd, menu->obj.handle, pos, TRUE, 0 ); + MENU_HideSubPopups( hWnd, handle_menu, FALSE, 0 ); + MENU_SelectItem( hWnd, handle_menu, pos, TRUE, 0 ); } - release_menu_ptr(menu); + return TRUE; }

1 0

Fabian Maurer : wrc: Don' t crash when parsing COMBOBOX element without style.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: c0dfdbcf7b07d5f456a4669cf215f77135484e47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0dfdbcf7b07d5f456a4669c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Jul 20 17:33:12 2018 +0200 wrc: Don't crash when parsing COMBOBOX element without style. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 0f73f90..8196e9f 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -1969,7 +1969,7 @@ static control_t *ins_ctrl(int type, int special_style, control_t *ctrl, control defaultstyle |= LBS_NOTIFY | WS_BORDER; break; case CT_COMBOBOX: - if (!(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) + if (!ctrl->gotstyle || !(ctrl->style->or_mask & (CBS_SIMPLE | CBS_DROPDOWN | CBS_DROPDOWNLIST))) defaultstyle |= CBS_SIMPLE; break; case CT_STATIC:

1 0

Hans Leidekker : bcrypt: Move the ASN1 buffer functions to gnutls.c.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: b6cb27ea4c38f51eda556d458b83e6d83ebcc15e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6cb27ea4c38f51eda556d45… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 20 14:51:15 2018 +0200 bcrypt: Move the ASN1 buffer functions to gnutls.c. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 12 ----- dlls/bcrypt/bcrypt_main.c | 97 --------------------------------------- dlls/bcrypt/gnutls.c | 103 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 109 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 11c8b30..a40f9d1 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -105,18 +105,6 @@ VOID WINAPI A_SHAInit(SHA_CTX *ctx); VOID WINAPI A_SHAUpdate(SHA_CTX *ctx, const UCHAR *buffer, UINT size); VOID WINAPI A_SHAFinal(SHA_CTX *ctx, PULONG result); -struct buffer -{ - BYTE *buffer; - DWORD length; - DWORD pos; - BOOL error; -}; - -void buffer_init( struct buffer * ) DECLSPEC_HIDDEN; -void buffer_free( struct buffer * ) DECLSPEC_HIDDEN; -void buffer_append_asn1_r_s( struct buffer *, BYTE *, DWORD, BYTE *, DWORD ) DECLSPEC_HIDDEN; - #define MAGIC_ALG (('A' << 24) | ('L' << 16) | ('G' << 8) | '0') #define MAGIC_HASH (('H' << 24) | ('A' << 16) | ('S' << 8) | 'H') #define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 4edfbdd..2b9ae0b 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -718,103 +718,6 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) -void buffer_init( struct buffer *buffer ) -{ - buffer->buffer = NULL; - buffer->length = 0; - buffer->pos = 0; - buffer->error = FALSE; -} - -void buffer_free( struct buffer *buffer ) -{ - heap_free( buffer->buffer ); -} - -static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) -{ - if (!len) return; - - if (buffer->pos + len > buffer->length) - { - DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); - BYTE *new_buffer; - - if (!(new_buffer = heap_realloc( buffer->buffer, new_length ))) - { - ERR( "out of memory\n" ); - buffer->error = TRUE; - return; - } - - buffer->buffer = new_buffer; - buffer->length = new_length; - } - - memcpy( &buffer->buffer[buffer->pos], data, len ); - buffer->pos += len; -} - -static void buffer_append_byte( struct buffer *buffer, BYTE value ) -{ - buffer_append( buffer, &value, sizeof(value) ); -} - -static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) -{ - DWORD num_bytes; - - if (length < 128) - { - buffer_append_byte( buffer, length ); - return; - } - - if (length <= 0xff) num_bytes = 1; - else if (length <= 0xffff) num_bytes = 2; - else if (length <= 0xffffff) num_bytes = 3; - else num_bytes = 4; - - buffer_append_byte( buffer, 0x80 | num_bytes ); - while (num_bytes--) buffer_append_byte( buffer, length >> (num_bytes * 8) ); -} - -static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) -{ - DWORD leading_zero = (*data & 0x80) != 0; - - buffer_append_byte( buffer, 0x02 ); /* tag */ - buffer_append_asn1_length( buffer, len + leading_zero ); - if (leading_zero) buffer_append_byte( buffer, 0 ); - buffer_append( buffer, data, len ); -} - -static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) -{ - if (content->error) - { - buffer->error = TRUE; - return; - } - - buffer_append_byte( buffer, 0x30 ); /* tag */ - buffer_append_asn1_length( buffer, content->pos ); - buffer_append( buffer, content->buffer, content->pos ); -} - -void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) -{ - struct buffer value; - - buffer_init( &value ); - buffer_append_asn1_integer( &value, r, r_len ); - buffer_append_asn1_integer( &value, s, s_len ); - buffer_append_asn1_sequence( buffer, &value ); - buffer_free( &value ); -} -#endif - #if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 BOOL key_is_symmetric( struct key *key ) { diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index f5bc0e5..69276be 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -215,6 +215,109 @@ void gnutls_uninitialize(void) libgnutls_handle = NULL; } +struct buffer +{ + BYTE *buffer; + DWORD length; + DWORD pos; + BOOL error; +}; + +static void buffer_init( struct buffer *buffer ) +{ + buffer->buffer = NULL; + buffer->length = 0; + buffer->pos = 0; + buffer->error = FALSE; +} + +static void buffer_free( struct buffer *buffer ) +{ + heap_free( buffer->buffer ); +} + +static void buffer_append( struct buffer *buffer, BYTE *data, DWORD len ) +{ + if (!len) return; + + if (buffer->pos + len > buffer->length) + { + DWORD new_length = max( max( buffer->pos + len, buffer->length * 2 ), 64 ); + BYTE *new_buffer; + + if (!(new_buffer = heap_realloc( buffer->buffer, new_length ))) + { + ERR( "out of memory\n" ); + buffer->error = TRUE; + return; + } + + buffer->buffer = new_buffer; + buffer->length = new_length; + } + + memcpy( &buffer->buffer[buffer->pos], data, len ); + buffer->pos += len; +} + +static void buffer_append_byte( struct buffer *buffer, BYTE value ) +{ + buffer_append( buffer, &value, sizeof(value) ); +} + +static void buffer_append_asn1_length( struct buffer *buffer, DWORD length ) +{ + DWORD num_bytes; + + if (length < 128) + { + buffer_append_byte( buffer, length ); + return; + } + + if (length <= 0xff) num_bytes = 1; + else if (length <= 0xffff) num_bytes = 2; + else if (length <= 0xffffff) num_bytes = 3; + else num_bytes = 4; + + buffer_append_byte( buffer, 0x80 | num_bytes ); + while (num_bytes--) buffer_append_byte( buffer, length >> (num_bytes * 8) ); +} + +static void buffer_append_asn1_integer( struct buffer *buffer, BYTE *data, DWORD len ) +{ + DWORD leading_zero = (*data & 0x80) != 0; + + buffer_append_byte( buffer, 0x02 ); /* tag */ + buffer_append_asn1_length( buffer, len + leading_zero ); + if (leading_zero) buffer_append_byte( buffer, 0 ); + buffer_append( buffer, data, len ); +} + +static void buffer_append_asn1_sequence( struct buffer *buffer, struct buffer *content ) +{ + if (content->error) + { + buffer->error = TRUE; + return; + } + + buffer_append_byte( buffer, 0x30 ); /* tag */ + buffer_append_asn1_length( buffer, content->pos ); + buffer_append( buffer, content->buffer, content->pos ); +} + +static void buffer_append_asn1_r_s( struct buffer *buffer, BYTE *r, DWORD r_len, BYTE *s, DWORD s_len ) +{ + struct buffer value; + + buffer_init( &value ); + buffer_append_asn1_integer( &value, r, r_len ); + buffer_append_asn1_integer( &value, s, s_len ); + buffer_append_asn1_sequence( buffer, &value ); + buffer_free( &value ); +} + NTSTATUS key_set_property( struct key *key, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) { if (!strcmpW( prop, BCRYPT_CHAINING_MODE ))

1 0

Michael Stefaniuc : vbscript: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: b4a24c65755629807a1572dbe9bf714c4be601db URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4a24c65755629807a1572db… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:34 2018 +0200 vbscript: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 2 +- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript_main.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a5df54a..87adeca 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -334,7 +334,7 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR o return E_OUTOFMEMORY; memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); - ptr = title_buf + sizeof(vbscriptW)/sizeof(WCHAR)-1; + ptr = title_buf + ARRAY_SIZE(vbscriptW)-1; *ptr++ = ':'; *ptr++ = ' '; @@ -2446,7 +2446,7 @@ HRESULT init_global(script_ctx_t *ctx) HRESULT hres; ctx->global_desc.ctx = ctx; - ctx->global_desc.builtin_prop_cnt = sizeof(global_props)/sizeof(*global_props); + ctx->global_desc.builtin_prop_cnt = ARRAY_SIZE(global_props); ctx->global_desc.builtin_props = global_props; hres = get_typeinfo(GlobalObj_tid, &ctx->global_desc.typeinfo); @@ -2462,7 +2462,7 @@ HRESULT init_global(script_ctx_t *ctx) return hres; ctx->err_desc.ctx = ctx; - ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); + ctx->err_desc.builtin_prop_cnt = ARRAY_SIZE(err_props); ctx->err_desc.builtin_props = err_props; hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index b0fac48..571854d 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -179,7 +179,7 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) static int check_keywords(parser_ctx_t *ctx) { - int min = 0, max = sizeof(keywords)/sizeof(keywords[0])-1, r, i; + int min = 0, max = ARRAY_SIZE(keywords)-1, r, i; while(min <= max) { i = (min+max)/2; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 9c0c4c1..e72eadf 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -236,7 +236,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_FAIL; } - assert(argn < sizeof(args)/sizeof(*args)); + assert(argn < ARRAY_SIZE(args)); for(i=0; i < argn; i++) { if(V_VT(dp->rgvarg+dp->cArgs-i-1) == (VT_BYREF|VT_VARIANT)) @@ -647,7 +647,7 @@ HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **re return E_OUTOFMEMORY; desc->ctx = ctx; - desc->builtin_prop_cnt = sizeof(procedure_props)/sizeof(*procedure_props); + desc->builtin_prop_cnt = ARRAY_SIZE(procedure_props); desc->builtin_props = procedure_props; desc->value_func = &code->main_code; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 7b7161c..786b7fb 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -87,7 +87,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) { + for(i = 0; i < ARRAY_SIZE(typeinfos); i++) { if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); }

1 0

Alexandre Julliard : winedump: Print the imports thunk address also for 64-bit.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 5f34d56dcb4b4890827c86eaa5fb24d717553466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f34d56dcb4b4890827c86ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 20 11:55:04 2018 +0200 winedump: Print the imports thunk address also for 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 1d5b825..7bbb576 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1186,11 +1186,11 @@ static void dump_dir_exceptions(void) } -static void dump_image_thunk_data64(const IMAGE_THUNK_DATA64 *il) +static void dump_image_thunk_data64(const IMAGE_THUNK_DATA64 *il, DWORD thunk_rva) { /* FIXME: This does not properly handle large images */ const IMAGE_IMPORT_BY_NAME* iibn; - for (; il->u1.Ordinal; il++) + for (; il->u1.Ordinal; il++, thunk_rva += sizeof(LONGLONG)) { if (IMAGE_SNAP_BY_ORDINAL64(il->u1.Ordinal)) printf(" %4u <by ordinal>\n", (DWORD)IMAGE_ORDINAL64(il->u1.Ordinal)); @@ -1200,7 +1200,7 @@ static void dump_image_thunk_data64(const IMAGE_THUNK_DATA64 *il) if (!iibn) printf("Can't grab import by name info, skipping to next ordinal\n"); else - printf(" %4u %s %x\n", iibn->Hint, iibn->Name, (DWORD)il->u1.AddressOfData); + printf(" %4u %s %x\n", iibn->Hint, iibn->Name, thunk_rva); } } } @@ -1256,7 +1256,7 @@ static void dump_dir_imported_functions(void) else { if(PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - dump_image_thunk_data64((const IMAGE_THUNK_DATA64*)il); + dump_image_thunk_data64((const IMAGE_THUNK_DATA64*)il, importDesc->FirstThunk); else dump_image_thunk_data32(il, 0, importDesc->FirstThunk); printf("\n"); @@ -1344,7 +1344,7 @@ static void dump_dir_delay_imported_functions(void) else { if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - dump_image_thunk_data64((const IMAGE_THUNK_DATA64 *)il); + dump_image_thunk_data64((const IMAGE_THUNK_DATA64 *)il, importDesc->ImportAddressTableRVA); else dump_image_thunk_data32(il, offset, importDesc->ImportAddressTableRVA); printf("\n");

1 0

Serge Gautherie : shell32: Fix 2 MSVC warnings about flags.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 535f2f9e663b7b3db3147960942d3b4934e1ce07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535f2f9e663b7b3db3147960… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu Jul 19 22:52:03 2018 +0200 shell32: Fix 2 MSVC warnings about flags. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/ebrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 3e89b90..28219e8 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1102,7 +1102,7 @@ static void test_basics(void) IShellBrowser *psb; FOLDERSETTINGS fs; ULONG lres; - DWORD flags; + EXPLORER_BROWSER_OPTIONS flags; HDWP hdwp; RECT rc; HRESULT hr;

1 0

Chip Davis : shell32: Don't use Carbon on Mac OS to find the Trash.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: efac5d0672728f1b6d85d28aafced14223aecf16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efac5d0672728f1b6d85d28a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Thu Jul 19 15:50:48 2018 -0500 shell32: Don't use Carbon on Mac OS to find the Trash. Due to a weird interaction between Wine and (what I believe to be) os_log/os_signpost, we can't use FSPathMakeRef() (nor any other function that calls that) from a Wine process. We also can't use the NSSearchPathForDirectoriesInDomains() function. Setting aside the fact that it's Objective-C (something we can work around, given that NS and CF types are toll-free bridged), a) support for getting the Trash folder was only added in 10.8 (when FSFindFolder() was deprecated), and b) it doesn't even support volume-specific Trash folders. For now, just hardcode the paths to the Trash folder. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/trash.c | 148 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 104 insertions(+), 44 deletions(-) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 7bc035f..fc75c17 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -22,24 +22,18 @@ #include "config.h" -#ifdef HAVE_CORESERVICES_CORESERVICES_H -#define GetCurrentThread MacGetCurrentThread -#define LoadResource MacLoadResource -#include <CoreServices/CoreServices.h> -#undef GetCurrentThread -#undef LoadResource -#undef DPRINTF -#endif - #include <stdarg.h> #include <stdio.h> #include <fcntl.h> #include <errno.h> #include <time.h> +#include <sys/types.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#include <sys/types.h> +#ifdef HAVE_SYS_MOUNT_H +# include <sys/mount.h> +#endif #include <stdlib.h> #ifdef HAVE_UNISTD_H # include <unistd.h> @@ -47,6 +41,9 @@ #ifdef HAVE_DIRENT_H # include <dirent.h> #endif +#ifdef HAVE_PWD_H +# include <pwd.h> +#endif #include "windef.h" #include "winbase.h" @@ -109,44 +106,116 @@ HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) return S_OK; } -#ifdef HAVE_CORESERVICES_CORESERVICES_H +#ifdef __APPLE__ + +static char *TRASH_GetTrashPath(const char *unix_path, const char **base_name) +{ + struct statfs stfs, home_stfs; + struct passwd *user = getpwuid(geteuid()); + char *trash_path; + size_t name_size; + + if (statfs(unix_path, &stfs) == -1) + return NULL; + if (statfs(user->pw_dir, &home_stfs) == -1) + return NULL; + + *base_name = strrchr(unix_path, '/'); + if (!*base_name) + *base_name = unix_path; + else + ++*base_name; + name_size = lstrlenA(*base_name); + + /* If the file exists on the same volume as the user's home directory, + * we can use the User domain Trash folder. Otherwise, we have to use + * <volume>/.Trashes/<uid>. + */ + if (memcmp(&stfs.f_fsid, &home_stfs.f_fsid, sizeof(fsid_t)) == 0) + { + size_t home_size = lstrlenA(user->pw_dir); + trash_path = heap_alloc(home_size + sizeof("/.Trash/") + name_size); + if (!trash_path) + return NULL; + memcpy(trash_path, user->pw_dir, home_size); + memcpy(trash_path+home_size, "/.Trash", sizeof("/.Trash")); + } + else + { + size_t vol_size = lstrlenA(stfs.f_mntonname); + /* 10 for the maximum length of a 32-bit integer + 1 for the \0 */ + size_t trash_size = vol_size + sizeof("/.Trashes/") + 10 + 1 + name_size + 1; + trash_path = heap_alloc(trash_size); + if (!trash_path) + return NULL; + snprintf(trash_path, trash_size, "%s/.Trashes/%u", stfs.f_mntonname, geteuid()); + } + return trash_path; +} BOOL TRASH_CanTrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; - FSRef ref; - FSCatalogInfo catalogInfo; + char *unix_path, *trash_path; + const char *base_name; + BOOL can_trash; + struct stat st; TRACE("(%s)\n", debugstr_w(wszPath)); + if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; - - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } + can_trash = stat(trash_path, &st) == 0; + if (!can_trash && errno == ENOENT) + { + /* Recursively create the Trash folder. */ + char *p = trash_path; + if (*p == '/') ++p; + while ((p = strchr(p, '/')) != NULL) + { + *p = '\0'; + if (mkdir(trash_path, 0755) == -1 && errno != EEXIST) + { + heap_free(unix_path); + heap_free(trash_path); + return FALSE; + } + *p++ = '/'; + } + can_trash = TRUE; + } heap_free(unix_path); - if (status == noErr) - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalogInfo, NULL, - NULL, NULL); - if (status == noErr) - status = FSFindFolder(catalogInfo.volume, kTrashFolderType, - kCreateFolder, &ref); - - return (status == noErr); + heap_free(trash_path); + return can_trash; } BOOL TRASH_TrashFile(LPCWSTR wszPath) { - char *unix_path; - OSStatus status; + char *unix_path, *trash_path; + const char *base_name; + int res; TRACE("(%s)\n", debugstr_w(wszPath)); if (!(unix_path = wine_get_unix_file_name(wszPath))) return FALSE; + if (!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + { + heap_free(unix_path); + return FALSE; + } - status = FSPathMoveObjectToTrashSync(unix_path, NULL, kFSFileOperationSkipPreflight); + lstrcatA(trash_path, "/"); + lstrcatA(trash_path, base_name); + + res = rename(unix_path, trash_path); heap_free(unix_path); - return (status == noErr); + heap_free(trash_path); + return (res != -1); } /* TODO: @@ -186,10 +255,8 @@ HRESULT TRASH_GetDetails(const char *trash_path, const char *name, WIN32_FIND_DA HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { WCHAR volume_path[MAX_PATH]; - char *unix_path, trash_path[MAX_PATH]; - FSCatalogInfo catalog_info; - OSStatus status; - FSRef ref; + char *unix_path, *trash_path; + const char *base_name; struct dirent *entry; DIR *dir; LPITEMIDLIST *ret; @@ -211,15 +278,8 @@ HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) if(!(unix_path = wine_get_unix_file_name(volume_path))) return E_OUTOFMEMORY; - status = FSPathMakeRef((UInt8*)unix_path, &ref, NULL); - heap_free(unix_path); - if(status != noErr) return E_FAIL; - status = FSGetCatalogInfo(&ref, kFSCatInfoVolume, &catalog_info, NULL, NULL, NULL); - if(status != noErr) return E_FAIL; - status = FSFindFolder(catalog_info.volume, kTrashFolderType, kCreateFolder, &ref); - if(status != noErr) return E_FAIL; - status = FSRefMakePath(&ref, (UInt8*)trash_path, MAX_PATH); - if(status != noErr) return E_FAIL; + if(!(trash_path = TRASH_GetTrashPath(unix_path, &base_name))) + return E_OUTOFMEMORY; if(!(dir = opendir(trash_path))) return E_FAIL; ret = heap_alloc(ret_size * sizeof(*ret)); @@ -282,7 +342,7 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return E_NOTIMPL; } -#else /* HAVE_CORESERVICES_CORESERVICES_H */ +#else /* __APPLE__ */ static CRITICAL_SECTION TRASH_Creating; static CRITICAL_SECTION_DEBUG TRASH_Creating_Debug = @@ -790,4 +850,4 @@ HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) return S_OK; } -#endif /* HAVE_CORESERVICES_CORESERVICES_H */ +#endif /* __APPLE__ */

1 0

Dmitry Timoshkov : kerberos: SpInstanceInit() doesn' t need a special implementation.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 2db0e421ff92031e0e44337bf2d681855d446b0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2db0e421ff92031e0e44337b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 20 13:10:04 2018 +0800 kerberos: SpInstanceInit() doesn't need a special implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 7d532e5..70895c9 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1331,7 +1331,7 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) { - FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + TRACE("%#x,%p,%p\n", version, dll_function_table, user_functions); return STATUS_SUCCESS; }

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: edf6b181c0efd75ffa34d30e63f4124015585285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf6b181c0efd75ffa34d30e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jul 20 08:46:47 2018 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 161d57b..9dc5065 100644 --- a/po/lt.po +++ b/po/lt.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-12 20:53+0300\n" +"PO-Revision-Date: 2018-07-20 08:43+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -404,16 +404,12 @@ msgid "&Retry" msgstr "&Pakartoti" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Slėpti &korteles" +msgstr "Slėpti išsamiau" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Išsamiai" +msgstr "Rodyti išsamiau" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 286cb2fb249cd0ff3e5a41e2a65de41abfe89606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286cb2fb249cd0ff3e5a41e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 20 09:30:07 2018 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5f9e85c..ad07594 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-12 16:25+0300\n" +"PO-Revision-Date: 2018-07-20 09:26+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.8\n" +"X-Generator: Poedit 2.0.9\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -406,16 +406,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:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: wine Branch: master Commit: 8a9d8c9a421028b52f685048524cb1dadc4b50b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9d8c9a421028b52f685048… Author: Mingcong Bai <jeffbai(a)aosc.xyz> Date: Fri Jul 20 22:28:41 2018 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 80 ++++++++++++------------------------------------------------- 1 file changed, 15 insertions(+), 65 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 284491d..0717114 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.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-05-20 10:58+0800\n" +"PO-Revision-Date: 2018-07-20 08:10-0500\n" "Last-Translator: Mingcong Bai <jeffbai(a)aosc.xyz>\n" "Language-Team: Chinese (PRC)\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.5\n" +"X-Generator: Poedit 2.0.9\n" "Plural-Forms: nplurals=1; plural=0;\n" #: appwiz.rc:58 @@ -391,16 +391,12 @@ msgid "&Retry" msgstr "重试(&R)" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "隐藏标签页(&T)" +msgstr "隐藏详情" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "详细资料" +msgstr "显示详情" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -3391,46 +3387,36 @@ msgid "Publishers..." msgstr "发布者..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "局域网连接" +msgstr "连接" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 设置" +msgstr "自动配置" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "使用网络代理自动发现协议 (WPAD)" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "使用自动代理服务器配置 (PAC) 脚本" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "地址" +msgstr "地址：" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "本地服务器(&L)" +msgstr "代理服务器" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "使用代理服务器" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "没有端口" +msgstr "端口：" #: inetcpl.rc:31 msgid "Internet Settings" @@ -12634,10 +12620,8 @@ msgid "Confirm Value Delete" msgstr "确认删除值" #: 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 "您真的要删除注册表键值 '%1' 吗?" +msgstr "您真的要删除选中的注册表键值吗?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14579,7 +14563,7 @@ msgstr "" msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." -msgstr "" +msgstr "您系统中的一个程序崩溃了，但是 WineDbg 无法挂载到进程以获取堆栈回溯。" #: winedbg.rc:41 msgid "(unidentified)" @@ -15439,41 +15423,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" @@ -15535,6 +15484,7 @@ msgstr "" "[/C] 即使拷贝时出现错误，仍然继续。\n" "[/A] 只拷贝有归档属性的文件。\n" "[/M] 只拷贝有归档属性的文件，拷贝后移除归档属性。\n" +"[/K] 同时拷贝文件属性，不指定此参数则不会保存文件属性。\n" "[/D | /D:m-d-y] 拷贝在指定时间后创建或修改的文件。\n" "\t\t如果没有提供日期，将会只拷贝目标位置中比源位置旧的文件。\n" "\n"

1 0

Józef Kucia : libs/vkd3d: Change return_interface() iface parameter type to void pointer.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: 8400832eea6387755e5f6e58ad988d35133c2bfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8400832eea6387755e5f6e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:12 2018 +0200 libs/vkd3d: Change return_interface() iface parameter type to void pointer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 28 +++++++++++++--------------- libs/vkd3d/utils.c | 13 +++++++------ libs/vkd3d/vkd3d_main.c | 5 ++--- libs/vkd3d/vkd3d_private.h | 4 ++-- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5f3161d..aaa4746 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1158,7 +1158,8 @@ static int vkd3d_gpu_va_allocation_compare(const void *k, const void *e) return 0; } -void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) +void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, + D3D12_GPU_VIRTUAL_ADDRESS address) { struct vkd3d_gpu_va_allocation *allocation; int rc; @@ -1345,7 +1346,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandQueue(ID3D12Device *i if (FAILED(hr = d3d12_command_queue_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12CommandQueue_iface, &IID_ID3D12CommandQueue, + return return_interface(&object->ID3D12CommandQueue_iface, &IID_ID3D12CommandQueue, riid, command_queue); } @@ -1362,7 +1363,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandAllocator(ID3D12Devic if (FAILED(hr = d3d12_command_allocator_create(device, type, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12CommandAllocator_iface, &IID_ID3D12CommandAllocator, + return return_interface(&object->ID3D12CommandAllocator_iface, &IID_ID3D12CommandAllocator, riid, command_allocator); } @@ -1379,7 +1380,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateGraphicsPipelineState(ID3D12 if (FAILED(hr = d3d12_pipeline_state_create_graphics(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12PipelineState_iface, + return return_interface(&object->ID3D12PipelineState_iface, &IID_ID3D12PipelineState, riid, pipeline_state); } @@ -1396,7 +1397,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateComputePipelineState(ID3D12D if (FAILED(hr = d3d12_pipeline_state_create_compute(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12PipelineState_iface, + return return_interface(&object->ID3D12PipelineState_iface, &IID_ID3D12PipelineState, riid, pipeline_state); } @@ -1417,7 +1418,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if initial_pipeline_state, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12GraphicsCommandList_iface, + return return_interface(&object->ID3D12GraphicsCommandList_iface, &IID_ID3D12GraphicsCommandList, riid, command_list); } @@ -1624,7 +1625,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateDescriptorHeap(ID3D12Device if (FAILED(hr = d3d12_descriptor_heap_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12DescriptorHeap_iface, + return return_interface(&object->ID3D12DescriptorHeap_iface, &IID_ID3D12DescriptorHeap, riid, descriptor_heap); } @@ -1668,7 +1669,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device * if (FAILED(hr = d3d12_root_signature_create(device, bytecode, bytecode_length, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12RootSignature_iface, + return return_interface(&object->ID3D12RootSignature_iface, &IID_ID3D12RootSignature, riid, root_signature); } @@ -1845,8 +1846,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi desc, initial_state, optimized_clear_value, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12Resource_iface, &IID_ID3D12Resource, - riid, resource); + return return_interface(&object->ID3D12Resource_iface, &IID_ID3D12Resource, riid, resource); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, @@ -1947,8 +1947,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface, if (FAILED(hr = d3d12_fence_create(device, initial_value, flags, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12Fence_iface, &IID_ID3D12Fence, - riid, fence); + return return_interface(&object->ID3D12Fence_iface, &IID_ID3D12Fence, riid, fence); } static HRESULT STDMETHODCALLTYPE d3d12_device_GetDeviceRemovedReason(ID3D12Device *iface) @@ -2096,8 +2095,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateQueryHeap(ID3D12Device *ifac if (FAILED(hr = d3d12_query_heap_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12QueryHeap_iface, - &IID_ID3D12QueryHeap, iid, heap); + return return_interface(&object->ID3D12QueryHeap_iface, &IID_ID3D12QueryHeap, iid, heap); } static HRESULT STDMETHODCALLTYPE d3d12_device_SetStablePowerState(ID3D12Device *iface, BOOL enable) @@ -2121,7 +2119,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandSignature(ID3D12Devic if (FAILED(hr = d3d12_command_signature_create(device, desc, &object))) return hr; - return return_interface((IUnknown *)&object->ID3D12CommandSignature_iface, + return return_interface(&object->ID3D12CommandSignature_iface, &IID_ID3D12CommandSignature, iid, command_signature); } diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 43c8356..87688f7 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -256,19 +256,20 @@ bool is_valid_resource_state(D3D12_RESOURCE_STATES state) return true; } -HRESULT return_interface(IUnknown *iface, REFIID iface_riid, - REFIID requested_riid, void **object) +HRESULT return_interface(void *iface, REFIID iface_iid, + REFIID requested_iid, void **object) { + IUnknown *unknown = iface; HRESULT hr; - if (IsEqualGUID(iface_riid, requested_riid)) + if (IsEqualGUID(iface_iid, requested_iid)) { - *object = iface; + *object = unknown; return S_OK; } - hr = IUnknown_QueryInterface(iface, requested_riid, object); - IUnknown_Release(iface); + hr = IUnknown_QueryInterface(unknown, requested_iid, object); + IUnknown_Release(unknown); return hr; } diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 0e2d422..063a4ca 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -82,8 +82,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, return S_FALSE; } - return return_interface((IUnknown *)&object->ID3D12Device_iface, &IID_ID3D12Device, - iid, device); + return return_interface(&object->ID3D12Device_iface, &IID_ID3D12Device, iid, device); } /* ID3D12RootSignatureDeserializer */ @@ -208,7 +207,7 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s return hr; } - return return_interface((IUnknown *)&object->ID3D12RootSignatureDeserializer_iface, + return return_interface(&object->ID3D12RootSignatureDeserializer_iface, &IID_ID3D12RootSignatureDeserializer, iid, deserializer); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 6858259..2c22467 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -776,8 +776,8 @@ static inline bool is_cpu_accessible_heap(const struct D3D12_HEAP_PROPERTIES *pr return true; } -HRESULT return_interface(IUnknown *iface, REFIID iface_riid, - REFIID requested_riid, void **object) DECLSPEC_HIDDEN; +HRESULT return_interface(void *iface, REFIID iface_iid, + REFIID requested_iid, void **object) DECLSPEC_HIDDEN; const char *debug_vk_extent_3d(VkExtent3D extent) DECLSPEC_HIDDEN; const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN;

1 0

Józef Kucia : include: Add more alignment constants.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: a32648ade904e17e20c5950136c58f1a9064bb4b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a32648ade904e17e20c5950… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:15 2018 +0200 include: Add more alignment constants. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index a0c09ef..34e8697 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -53,9 +53,15 @@ const UINT D3D12_REQ_TEXTURECUBE_DIMENSION = 16384; const UINT D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES = 0xffffffff; const UINT D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT = 8; const UINT D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT = 256; +const UINT D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 4194304; const UINT D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT = 65536; +const UINT D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT = 16; +const UINT D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT = 65536; +const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; +const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; const UINT D3D12_TEXTURE_DATA_PITCH_ALIGNMENT = 256; const UINT D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT = 512; +const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16;

1 0

Józef Kucia : libs/vkd3d: Implement d3d12_device_CreateHeap().
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: d9d37d15632e1e4f63e54e1ec48e88ef356b8aab URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d9d37d15632e1e4f63e54e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:18 2018 +0200 libs/vkd3d: Implement d3d12_device_CreateHeap(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 15 +++- libs/vkd3d/resource.c | 204 +++++++++++++++++++++++++++++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 16 +++- 3 files changed, 230 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 176b0d4..6fa0017 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1853,12 +1853,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommittedResource(ID3D12Devi } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateHeap(ID3D12Device *iface, - const D3D12_HEAP_DESC *desc, REFIID riid, void **heap) + const D3D12_HEAP_DESC *desc, REFIID iid, void **heap) { - FIXME("iface %p, desc %p, riid %s, heap %p stub!\n", - iface, desc, debugstr_guid(riid), heap); + struct d3d12_device *device = impl_from_ID3D12Device(iface); + struct d3d12_heap *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, iid %s, heap %p.\n", + iface, desc, debugstr_guid(iid), heap); + + if (FAILED(hr = d3d12_heap_create(device, desc, &object))) + return hr; + + return return_interface(&object->ID3D12Heap_iface, &IID_ID3D12Heap, iid, heap); } static HRESULT STDMETHODCALLTYPE d3d12_device_CreatePlacedResource(ID3D12Device *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 9fa98b0..1456c4b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -18,6 +18,210 @@ #include "vkd3d_private.h" +/* ID3D12Heap */ +static inline struct d3d12_heap *impl_from_ID3D12Heap(ID3D12Heap *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_heap, ID3D12Heap_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_QueryInterface(ID3D12Heap *iface, + REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + if (IsEqualGUID(iid, &IID_ID3D12Heap) + || IsEqualGUID(iid, &IID_ID3D12Pageable) + || IsEqualGUID(iid, &IID_ID3D12DeviceChild) + || IsEqualGUID(iid, &IID_ID3D12Object) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID3D12Heap_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + ULONG refcount = InterlockedIncrement(&heap->refcount); + + TRACE("%p increasing refcount to %u.\n", heap, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + ULONG refcount = InterlockedDecrement(&heap->refcount); + + TRACE("%p decreasing refcount to %u.\n", heap, refcount); + + if (!refcount) + { + struct d3d12_device *device = heap->device; + + vkd3d_free(heap); + + ID3D12Device_Release(&device->ID3D12Device_iface); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_GetPrivateData(ID3D12Heap *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateData(ID3D12Heap *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateDataInterface(ID3D12Heap *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCHAR *name) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + FIXME("iface %p, name %s stub!\n", iface, debugstr_w(name, heap->device->wchar_size)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d12_heap_GetDevice(ID3D12Heap *iface, + REFIID riid, void **device) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + + return ID3D12Device_QueryInterface(&heap->device->ID3D12Device_iface, riid, device); +} + +static D3D12_HEAP_DESC * STDMETHODCALLTYPE d3d12_heap_GetDesc(ID3D12Heap *iface, + D3D12_HEAP_DESC *desc) +{ + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = heap->desc; + return desc; +} + +static const struct ID3D12HeapVtbl d3d12_heap_vtbl = +{ + /* IUnknown methods */ + d3d12_heap_QueryInterface, + d3d12_heap_AddRef, + d3d12_heap_Release, + /* ID3D12Object methods */ + d3d12_heap_GetPrivateData, + d3d12_heap_SetPrivateData, + d3d12_heap_SetPrivateDataInterface, + d3d12_heap_SetName, + /* ID3D12DeviceChild methods */ + d3d12_heap_GetDevice, + /* ID3D12Heap methods */ + d3d12_heap_GetDesc, +}; + +static HRESULT validate_heap_desc(const D3D12_HEAP_DESC *desc) +{ + if (!desc->SizeInBytes) + { + WARN("Invalid size %"PRIu64".\n", desc->SizeInBytes); + return E_INVALIDARG; + } + + if (desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + && desc->Alignment != D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT) + { + WARN("Invalid alignment %"PRIu64".\n", desc->Alignment); + return E_INVALIDARG; + } + + if (desc->Flags & D3D12_HEAP_FLAG_ALLOW_DISPLAY) + { + WARN("D3D12_HEAP_FLAG_ALLOW_DISPLAY is only for committed resources.\n"); + return E_INVALIDARG; + } + + return S_OK; +} + +static HRESULT d3d12_heap_init(struct d3d12_heap *heap, + struct d3d12_device *device, const D3D12_HEAP_DESC *desc) +{ + HRESULT hr; + + heap->ID3D12Heap_iface.lpVtbl = &d3d12_heap_vtbl; + heap->refcount = 1; + + heap->desc = *desc; + + if (!heap->desc.Properties.CreationNodeMask) + heap->desc.Properties.CreationNodeMask = 1; + if (!heap->desc.Properties.VisibleNodeMask) + heap->desc.Properties.VisibleNodeMask = 1; + + debug_ignored_node_mask(heap->desc.Properties.CreationNodeMask); + debug_ignored_node_mask(heap->desc.Properties.VisibleNodeMask); + + if (!heap->desc.Alignment) + heap->desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + + if (FAILED(hr = validate_heap_desc(&heap->desc))) + return hr; + + heap->device = device; + ID3D12Device_AddRef(&device->ID3D12Device_iface); + + return S_OK; +} + +HRESULT d3d12_heap_create(struct d3d12_device *device, + const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) +{ + struct d3d12_heap *object; + HRESULT hr; + + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_heap_init(object, device, desc))) + { + vkd3d_free(object); + return hr; + } + + TRACE("Created heap %p.\n", object); + + *heap = object; + + return S_OK; +} + static VkImageType vk_image_type_from_d3d12_resource_dimension(D3D12_RESOURCE_DIMENSION dimension) { switch (dimension) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0adc2e4..8efb930 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -180,6 +180,20 @@ struct d3d12_fence HRESULT d3d12_fence_create(struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags, struct d3d12_fence **fence) DECLSPEC_HIDDEN; +/* ID3D12Heap */ +struct d3d12_heap +{ + ID3D12Heap ID3D12Heap_iface; + LONG refcount; + + D3D12_HEAP_DESC desc; + + struct d3d12_device *device; +}; + +HRESULT d3d12_heap_create(struct d3d12_device *device, + const D3D12_HEAP_DESC *desc, struct d3d12_heap **heap) DECLSPEC_HIDDEN; + #define VKD3D_RESOURCE_PUBLIC_FLAGS \ (VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION) #define VKD3D_RESOURCE_EXTERNAL 0x00000004 @@ -766,7 +780,7 @@ bool check_feature_level_support(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDE bool is_valid_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; bool is_write_resource_state(D3D12_RESOURCE_STATES state) DECLSPEC_HIDDEN; -static inline bool is_cpu_accessible_heap(const struct D3D12_HEAP_PROPERTIES *properties) +static inline bool is_cpu_accessible_heap(const D3D12_HEAP_PROPERTIES *properties) { if (properties->Type == D3D12_HEAP_TYPE_DEFAULT) return false;

1 0

Józef Kucia : include: Add ID3D12Heap.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: add556f0eecc8e7e42c54ecba73375d0ea448974 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=add556f0eecc8e7e42c54ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:16 2018 +0200 include: Add ID3D12Heap. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 34e8697..4b967d4 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1606,6 +1606,17 @@ interface ID3D12Pageable : ID3D12DeviceChild } [ + uuid(6b3b2502-6e51-45b3-90ee-9884265e8df3), + object, + local, + pointer_default(unique) +] +interface ID3D12Heap : ID3D12Pageable +{ + D3D12_HEAP_DESC GetDesc(); +} + +[ uuid(696442be-a72e-4059-bc79-5b5c98040fad), object, local,

1 0

Józef Kucia : libs/vkd3d: Factor out debug_ignored_node_mask().
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: cc47b37c1d1f511eb1983795bef0c2cb32521fd1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cc47b37c1d1f511eb198379… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:17 2018 +0200 libs/vkd3d: Factor out debug_ignored_node_mask(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 3 +-- libs/vkd3d/device.c | 7 +++++-- libs/vkd3d/vkd3d_private.h | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d29d18e..4db9967 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4045,8 +4045,7 @@ HRESULT d3d12_command_list_create(struct d3d12_device *device, return E_INVALIDARG; } - if (node_mask && node_mask != 1) - FIXME("Multi-adapter not supported.\n"); + debug_ignored_node_mask(node_mask); if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5d2c91f..176b0d4 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1663,8 +1663,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateRootSignature(ID3D12Device * TRACE("iface %p, node_mask 0x%08x, bytecode %p, bytecode_length %lu, riid %s, root_signature %p.\n", iface, node_mask, bytecode, bytecode_length, debugstr_guid(riid), root_signature); - if (node_mask && node_mask != 1) - FIXME("Ignoring node mask 0x%08x.\n", node_mask); + debug_ignored_node_mask(node_mask); if (FAILED(hr = d3d12_root_signature_create(device, bytecode, bytecode_length, &object))) return hr; @@ -1816,6 +1815,8 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour "resource_descs %p stub!\n", iface, allocation_info, visible_mask, resource_desc_count, resource_descs); + debug_ignored_node_mask(visible_mask); + return allocation_info; } @@ -1825,6 +1826,8 @@ static D3D12_HEAP_PROPERTIES * STDMETHODCALLTYPE d3d12_device_GetCustomHeapPrope FIXME("iface %p, heap_properties %p, node_mask 0x%08x, heap_type %#x stub!\n", iface, heap_properties, node_mask, heap_type); + debug_ignored_node_mask(node_mask); + return heap_properties; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e9ee06a..0adc2e4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -786,6 +786,12 @@ const char *debug_vk_memory_heap_flags(VkMemoryHeapFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; const char *debug_vk_queue_flags(VkQueueFlags flags) DECLSPEC_HIDDEN; +static inline void debug_ignored_node_mask(unsigned int mask) +{ + if (mask && mask != 1) + FIXME("Ignoring node mask 0x%08x.\n", mask); +} + HRESULT hresult_from_vk_result(VkResult vr) DECLSPEC_HIDDEN; HRESULT hresult_from_vkd3d_result(int vkd3d_result) DECLSPEC_HIDDEN;

1 0

Józef Kucia : tests: Add more tests for D3D12CreateDevice() with device set to NULL.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: 21f1489b8879da12d3dd53b5514324b7fbe8dcc2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=21f1489b8879da12d3dd53b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:13 2018 +0200 tests: Add more tests for D3D12CreateDevice() with device set to NULL. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e2337c4..83dc8f9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1082,6 +1082,10 @@ static void test_create_device(void) hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, NULL, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12DeviceChild, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);

1 0

Józef Kucia : libs/vkd3d: Introduce d3d12_resource_validate_desc().
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: vkd3d Branch: master Commit: a5a17c22f1bbc56074e5adc3e5272d6f33640a1d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5a17c22f1bbc56074e5adc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 20 14:30:14 2018 +0200 libs/vkd3d: Introduce d3d12_resource_validate_desc(). Share D3D12_RESOURCE_DESC validation code between CreateCommittedResource() and GetCopyableFootprints(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 34 +++++------------------------ libs/vkd3d/resource.c | 53 +++++++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index aaa4746..5d2c91f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1964,7 +1964,8 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i UINT64 base_offset, D3D12_PLACED_SUBRESOURCE_FOOTPRINT *layouts, UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes) { - static const struct vkd3d_format vkd3d_format_unknown = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; + static const struct vkd3d_format vkd3d_format_unknown + = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int width, height, depth, array_size; @@ -1995,35 +1996,10 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - /* FIXME: We should probably share D3D12_RESOURCE_DESC validation with CreateCommittedResource(). */ - switch (desc->Dimension) + if (FAILED(d3d12_resource_validate_desc(desc))) { - case D3D12_RESOURCE_DIMENSION_BUFFER: - if (desc->Format != DXGI_FORMAT_UNKNOWN || desc->Layout != D3D12_TEXTURE_LAYOUT_ROW_MAJOR - || desc->Height != 1 || desc->DepthOrArraySize != 1 || desc->MipLevels != 1 - || desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality != 0 - || (desc->Alignment != 0 && desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)) - { - WARN("Invalid parameters for a buffer resource.\n"); - return; - } - break; - - case D3D12_RESOURCE_DIMENSION_TEXTURE1D: - if (desc->Height != 1) - { - WARN("1D texture with a height of %u.\n", desc->Height); - return; - } - break; - - case D3D12_RESOURCE_DIMENSION_TEXTURE2D: - case D3D12_RESOURCE_DIMENSION_TEXTURE3D: - break; - - default: - WARN("Invalid resource dimension %#x.\n", desc->Dimension); - return; + WARN("Invalid resource desc.\n"); + return; } array_size = d3d12_resource_desc_get_layer_count(desc); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index fb84e4b..9fa98b0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -648,21 +648,43 @@ struct d3d12_resource *unsafe_impl_from_ID3D12Resource(ID3D12Resource *iface) return impl_from_ID3D12Resource(iface); } -static HRESULT validate_buffer_desc(const D3D12_RESOURCE_DESC *desc) +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) { - if (desc->MipLevels != 1) + switch (desc->Dimension) { - WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); - return E_INVALIDARG; - } + case D3D12_RESOURCE_DIMENSION_BUFFER: + if (desc->MipLevels != 1) + { + WARN("Invalid miplevel count %u for buffer.\n", desc->MipLevels); + return E_INVALIDARG; + } - return S_OK; -} + if (desc->Format != DXGI_FORMAT_UNKNOWN || desc->Layout != D3D12_TEXTURE_LAYOUT_ROW_MAJOR + || desc->Height != 1 || desc->DepthOrArraySize != 1 + || desc->SampleDesc.Count != 1 || desc->SampleDesc.Quality != 0 + || (desc->Alignment != 0 && desc->Alignment != D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT)) + { + WARN("Invalid parameters for a buffer resource.\n"); + return E_INVALIDARG; + } + break; -static HRESULT validate_texture_desc(D3D12_RESOURCE_DESC *desc) -{ - if (!desc->MipLevels) - desc->MipLevels = max_miplevel_count(desc); + case D3D12_RESOURCE_DIMENSION_TEXTURE1D: + if (desc->Height != 1) + { + WARN("1D texture with a height of %u.\n", desc->Height); + return E_INVALIDARG; + } + break; + + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + break; + + default: + WARN("Invalid resource dimension %#x.\n", desc->Dimension); + return E_INVALIDARG; + } return S_OK; } @@ -717,11 +739,12 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st resource->gpu_address = 0; resource->flags = 0; + if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc))) + return hr; + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: - if (FAILED(hr = validate_buffer_desc(&resource->desc))) - return hr; if (FAILED(hr = vkd3d_create_buffer(device, heap_properties, heap_flags, &resource->desc, &resource->u.vk_buffer))) return hr; @@ -743,8 +766,8 @@ static HRESULT d3d12_committed_resource_init(struct d3d12_resource *resource, st case D3D12_RESOURCE_DIMENSION_TEXTURE1D: case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D: - if (FAILED(hr = validate_texture_desc(&resource->desc))) - return hr; + if (!resource->desc.MipLevels) + resource->desc.MipLevels = max_miplevel_count(desc); resource->flags |= VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; if (FAILED(hr = vkd3d_create_image(resource, device, heap_properties, heap_flags))) return hr; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2c22467..e9ee06a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -223,6 +223,8 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour return resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER; } +HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc) DECLSPEC_HIDDEN; + HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags, const D3D12_RESOURCE_DESC *desc, D3D12_RESOURCE_STATES initial_state,

1 0

Francois Gouget : testbot/WineSendLog: Show the task command in the summary.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: tools Branch: master Commit: f7a65d3a5f348681fa302335b83fdc587cb1830e URL: https://source.winehq.org/git/tools.git/?a=commit;h=f7a65d3a5f348681fa30233… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 20 09:02:39 2018 +0200 testbot/WineSendLog: Show the task command in the summary. Otherwise when a job involves running many test units, possibly from multiple modules, it's hard to know which ones succeeded and which ones failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 537778a..368d830 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -258,7 +258,7 @@ MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline -VM Status Number of test failures +VM Status Failures Command EOF foreach my $Key (@SortedKeys) { @@ -268,9 +268,12 @@ EOF $TestFailures = "" if (!defined $TestFailures); my $Status = $StepTask->Status; $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); + my $Cmd = ""; + $Cmd = $StepTask->FileName ." " if ($StepTask->FileType =~ /^exe/); + $Cmd .= $StepTask->CmdLineArg if (defined $StepTask->CmdLineArg); - printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status, - $TestFailures; + printf $Sendmail "%-20s %-8s %-8s %s\n", $StepTask->VM->Name, $Status, + $TestFailures, $Cmd; } print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n";

1 0

Francois Gouget : testbot/WineSendLog: Replace completed with a more explicit status.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: tools Branch: master Commit: 093141f912eebdf622eedd2d74390fa06644f657 URL: https://source.winehq.org/git/tools.git/?a=commit;h=093141f912eebdf622eedd2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 20 09:02:15 2018 +0200 testbot/WineSendLog: Replace completed with a more explicit status. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 8885e20..537778a 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -258,17 +258,18 @@ MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline -VM Status Number of test failures +VM Status Number of test failures EOF foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); + my $TestFailures = $StepTask->TestFailures; - if (! defined($TestFailures)) - { - $TestFailures = ""; - } - printf $Sendmail "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, + $TestFailures = "" if (!defined $TestFailures); + my $Status = $StepTask->Status; + $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); + + printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status, $TestFailures; }

1 0

Francois Gouget : testbot/WineSendLog: Sort the tasks in numeric order.
by Alexandre Julliard July 20, 2018

July 20, 2018

Module: tools Branch: master Commit: 204af99a5cb7ee319448d0ca2965c73cf5af2352 URL: https://source.winehq.org/git/tools.git/?a=commit;h=204af99a5cb7ee319448d0c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 20 09:01:34 2018 +0200 testbot/WineSendLog: Sort the tasks in numeric order. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index e2c823a..8885e20 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -214,7 +214,7 @@ sub SendLog($) } my $StepsTasks = CreateStepsTasks(undef, $Job); - my @SortedKeys = sort @{$StepsTasks->GetKeys()}; + my @SortedKeys = sort { $a <=> $b } @{$StepsTasks->GetKeys()}; my $JobURL = ($UseSSL ? "https://" : "http://") . "$WebHostName/JobDetails.pl?Key=". $Job->GetKey();

1 0

Piotr Caban : msvcp90: Don't set failbit in basic_istream::tellg.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 98bc9fdaa431f274fe3a9fc538b0b562c6fad981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98bc9fdaa431f274fe3a9fc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 19 17:59:55 2018 +0200 msvcp90: Don't set failbit in basic_istream::tellg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42304 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 11 ----------- dlls/msvcp90/tests/ios.c | 8 ++++++++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3f85997..fb9d668 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8823,9 +8823,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo if(basic_istream_char_sentry_create(this, TRUE)) { basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -8842,9 +8839,6 @@ fpos_mbstatet* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpo basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_char_setstate(base, IOSTATE_failbit); #endif return ret; @@ -10398,9 +10392,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f if(basic_istream_wchar_sentry_create(this, TRUE)) { basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); }else { ret->off = -1; ret->pos = 0; @@ -10417,8 +10408,6 @@ fpos_mbstatet* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, f basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && MBSTATET_TO_INT(&ret->state)==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); #endif return ret; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 8a91117..970b17a 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1857,6 +1857,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_char_vbase_dtor, &ss); call_func1(p_basic_string_char_dtor, &str); @@ -1884,6 +1888,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); call_func1(p_basic_string_wchar_dtor, &wstr);

1 0

Jacek Caban : winegcc: Check also for unsuffixed lib/ dir in get_lib_dir.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 551d0971c54896f286e41a39217094a477363d49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=551d0971c54896f286e41a39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 19 16:50:33 2018 +0200 winegcc: Check also for unsuffixed lib/ dir in get_lib_dir. Wine uses lib/ and lib64/ by default. This fixes -m32 handling in such configuration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5d604d2..931ac53 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -458,7 +458,12 @@ static char *get_lib_dir( struct options *opts ) while (p > buffer && p[-1] == '/') p--; strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; - if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; + if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) + { + p -= 2; + strcpy( p, libwine ); + if (check_platform( opts, buffer )) goto found; + } if (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64) { strcpy( p, "32" );

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for expando button.
by Alexandre Julliard July 19, 2018

July 19, 2018

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for expanded information.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: ec11805139dc4a97fe6fd3b13fca23bbff7d3f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec11805139dc4a97fe6fd3b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:04 2018 +0800 comctl32/taskdialog: Add support for expanded information. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1c32a4b..db278ca 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -62,6 +62,7 @@ struct taskdialog_info INT radio_button_count; HWND *command_links; INT command_link_count; + HWND expanded_info; HWND *buttons; INT button_count; HWND default_button; @@ -74,6 +75,7 @@ struct taskdialog_info LONG v_spacing; } m; INT selected_radio_id; + BOOL expanded; }; struct button_layout_info @@ -530,6 +532,18 @@ static void taskdialog_add_command_links(struct taskdialog_info *dialog_info) } } +static void taskdialog_add_expanded_info(struct taskdialog_info *dialog_info) +{ + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + + if (!taskconfig->pszExpandedInformation) return; + + dialog_info->expanded = taskconfig->dwFlags & TDF_EXPANDED_BY_DEFAULT; + dialog_info->expanded_info = taskdialog_create_label(dialog_info, taskconfig->pszExpandedInformation, + dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); + ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); +} + static void taskdialog_add_button(struct taskdialog_info *dialog_info, HWND *button, INT_PTR id, const WCHAR *text, BOOL custom_button) { @@ -644,6 +658,11 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) /* Content */ taskdialog_label_layout(dialog_info, dialog_info->content, main_icon_right, dialog_width, &dialog_height, syslink); + /* Expanded information */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) + taskdialog_label_layout(dialog_info, dialog_info->expanded_info, main_icon_right, dialog_width, &dialog_height, + syslink); + /* Progress bar */ if (dialog_info->progress_bar) { @@ -763,6 +782,10 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(button_layout_infos); Free(line_widths); + /* Expanded information */ + if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) + taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); + /* Add height for spacing, title height and frame height */ dialog_height += v_spacing; dialog_height += GetSystemMetrics(SM_CYCAPTION); @@ -812,6 +835,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_main_icon(dialog_info); taskdialog_add_main_instruction(dialog_info); taskdialog_add_content(dialog_info); + taskdialog_add_expanded_info(dialog_info); taskdialog_add_progress_bar(dialog_info); taskdialog_add_radio_buttons(dialog_info); taskdialog_add_command_links(dialog_info); @@ -926,7 +950,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR { PNMLINK pnmLink = (PNMLINK)lParam; HWND hwndFrom = pnmLink->hdr.hwndFrom; - if ((taskdialog_hyperlink_enabled(dialog_info)) && (hwndFrom == dialog_info->content) + if ((taskdialog_hyperlink_enabled(dialog_info)) + && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info) && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) { taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl);

1 0

Zhiyi Zhang : comctl32/taskdialog: Use window handle to identify control internally.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: d2fb18166d8595d53d45f7d08d535bd3af67c296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2fb18166d8595d53d45f7d0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:03:51 2018 +0800 comctl32/taskdialog: Use window handle to identify control internally. Use window handle to identify control when handling BN_CLICKED notification to support buttons with id larger than 0xFFFF. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 20 ++++++++++++++------ dlls/comctl32/tests/taskdialog.c | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 856a0b3..1c32a4b 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -82,6 +82,8 @@ struct button_layout_info LONG line; }; +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd); + static void taskdialog_du_to_px(struct taskdialog_info *dialog_info, LONG *width, LONG *height) { if (width) *width = MulDiv(*width, dialog_info->m.x_baseunit, 4); @@ -191,6 +193,13 @@ static void taskdialog_enable_button(const struct taskdialog_info *dialog_info, if (hwnd) EnableWindow(hwnd, enable); } +static void taskdialog_click_button(struct taskdialog_info *dialog_info, INT id) +{ + HWND hwnd = taskdialog_find_button(dialog_info->command_links, dialog_info->command_link_count, id); + if (!hwnd) hwnd = taskdialog_find_button(dialog_info->buttons, dialog_info->button_count, id); + if (hwnd) taskdialog_on_button_click(dialog_info, hwnd); +} + static void taskdialog_enable_radio_button(const struct taskdialog_info *dialog_info, INT id, BOOL enable) { HWND hwnd = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, id); @@ -211,8 +220,9 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } -static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, INT command_id) +static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) { + INT command_id = GetWindowLongW(hwnd, GWLP_ID); HWND radio_button; radio_button = taskdialog_find_button(dialog_info->radio_buttons, dialog_info->radio_button_count, command_id); @@ -389,7 +399,6 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo { const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; HWND default_button; - INT id; if (!dialog_info->radio_button_count) return; @@ -402,8 +411,7 @@ static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialo if (default_button) { SendMessageW(default_button, BM_SETCHECK, BST_CHECKED, 0); - id = GetWindowLongW(default_button, GWLP_ID); - taskdialog_on_button_click(dialog_info, id); + taskdialog_on_button_click(dialog_info, default_button); } } @@ -844,7 +852,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR switch (msg) { case TDM_CLICK_BUTTON: - taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + taskdialog_click_button(dialog_info, wParam); break; case TDM_ENABLE_BUTTON: taskdialog_enable_button(dialog_info, wParam, lParam); @@ -899,7 +907,7 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: if (HIWORD(wParam) == BN_CLICKED) { - taskdialog_on_button_click(dialog_info, LOWORD(wParam)); + taskdialog_on_button_click(dialog_info, (HWND)lParam); break; } return FALSE; diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 33d3757..7fb8f3d 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -215,6 +215,20 @@ static const struct message_info msg_return_no_default_radio_button_id_and_flag[ { 0 } }; +static const struct message_info msg_select_negative_id_radio_button[] = +{ + { TDM_CLICK_RADIO_BUTTON, -2, 0 }, + { 0 } +}; + +static const struct message_info msg_return_press_negative_id_radio_button[] = +{ + { TDN_CREATED, 0, 0, S_OK, msg_select_negative_id_radio_button }, + { TDN_RADIO_BUTTON_CLICKED, -2, 0, S_OK, msg_send_click_ok }, + { TDN_BUTTON_CLICKED, IDOK, 0, S_OK, NULL }, + { 0 } +}; + static void init_test_message(UINT message, WPARAM wParam, LPARAM lParam, struct message *msg) { msg->message = WM_TD_CALLBACK; @@ -451,6 +465,11 @@ static void test_buttons(void) info.nDefaultRadioButton = 0xff; info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; run_test(&info, IDOK, 0, msg_return_no_default_radio_button_id_and_flag, "default radio button: no default flag, invalid id"); + + info.nDefaultRadioButton = 0; + info.dwFlags = TDF_NO_DEFAULT_RADIO_BUTTON; + run_test(&info, IDOK, -2, msg_return_press_negative_id_radio_button, + "radio button: manually click radio button with negative id"); } static void test_help(void)

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for footer icon.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 615f3a1fb71594ac62a5d52be0431314af8e6c19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=615f3a1fb71594ac62a5d52b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:34 2018 +0800 comctl32/taskdialog: Add support for footer icon. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 411b8e9..3508dbc 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -67,6 +67,7 @@ struct taskdialog_info HWND expanded_info; HWND expando_button; HWND verification_box; + HWND footer_icon; HWND *buttons; INT button_count; HWND default_button; @@ -446,17 +447,24 @@ static ULONG_PTR taskdialog_get_standard_icon(LPCWSTR icon) static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element, HICON icon) { DWORD flags = dialog_info->taskconfig->dwFlags; + INT cx = 0, cy = 0; HICON hicon; if (!icon) return; - if ((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + if (((flags & TDF_USE_HICON_MAIN) && element == TDIE_ICON_MAIN) + || ((flags & TDF_USE_HICON_FOOTER) && element == TDIE_ICON_FOOTER)) hicon = icon; else { - hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + if (element == TDIE_ICON_FOOTER) + { + cx = GetSystemMetrics(SM_CXSMICON); + cy = GetSystemMetrics(SM_CYSMICON); + } + hicon = LoadImageW(dialog_info->taskconfig->hInstance, (LPCWSTR)icon, IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); if (!hicon) - hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, 0, 0, + hicon = LoadImageW(NULL, (LPCWSTR)taskdialog_get_standard_icon((LPCWSTR)icon), IMAGE_ICON, cx, cy, LR_SHARED | LR_DEFAULTSIZE); } @@ -467,6 +475,8 @@ static void taskdialog_set_icon(struct taskdialog_info *dialog_info, INT element SendMessageW(dialog_info->hwnd, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hicon); SendMessageW(dialog_info->main_icon, STM_SETICON, (WPARAM)hicon, 0); } + else if (element == TDIE_ICON_FOOTER) + SendMessageW(dialog_info->footer_icon, STM_SETICON, (WPARAM)hicon, 0); } static void taskdialog_check_default_radio_buttons(struct taskdialog_info *dialog_info) @@ -718,6 +728,15 @@ static void taskdialog_add_buttons(struct taskdialog_info *dialog_info) dialog_info->button_count = count; } +static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) +{ + if (!dialog_info->taskconfig->u2.hFooterIcon) return; + + dialog_info->footer_icon = + CreateWindowW(WC_STATICW, NULL, WS_CHILD | WS_VISIBLE | SS_ICON, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, 0); + taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -932,6 +951,17 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(button_layout_infos); Free(line_widths); + /* Footer icon */ + if (dialog_info->footer_icon) + { + x = h_spacing; + y = dialog_height + v_spacing; + size.cx = GetSystemMetrics(SM_CXSMICON); + size.cy = GetSystemMetrics(SM_CYSMICON); + SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); + dialog_height = y + size.cy; + } + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1027,6 +1057,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_expando_button(dialog_info); taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); + taskdialog_add_footer_icon(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links)

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for footer text.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 3fcfb9c5cc15c9a3a94c328075fea81545631ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fcfb9c5cc15c9a3a94c3280… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:44 2018 +0800 comctl32/taskdialog: Add support for footer text. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 3508dbc..457a5ff 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -68,6 +68,7 @@ struct taskdialog_info HWND expando_button; HWND verification_box; HWND footer_icon; + HWND footer_text; HWND *buttons; INT button_count; HWND default_button; @@ -737,6 +738,12 @@ static void taskdialog_add_footer_icon(struct taskdialog_info *dialog_info) taskdialog_set_icon(dialog_info, TDIE_ICON_FOOTER, dialog_info->taskconfig->u2.hFooterIcon); } +static void taskdialog_add_footer_text(struct taskdialog_info *dialog_info) +{ + dialog_info->footer_text = taskdialog_create_label(dialog_info, dialog_info->taskconfig->pszFooter, + dialog_info->font, taskdialog_hyperlink_enabled(dialog_info)); +} + static void taskdialog_label_layout(struct taskdialog_info *dialog_info, HWND hwnd, INT start_x, LONG dialog_width, LONG *dialog_height, BOOL syslink) { @@ -766,6 +773,7 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) struct button_layout_info *button_layout_infos; LONG button_min_width, button_height; LONG *line_widths, line_count, align; + LONG footer_icon_right, footer_icon_bottom; LONG x, y; SIZE size; INT i; @@ -952,6 +960,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) Free(line_widths); /* Footer icon */ + footer_icon_right = 0; + footer_icon_bottom = dialog_height; if (dialog_info->footer_icon) { x = h_spacing; @@ -959,9 +969,15 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) size.cx = GetSystemMetrics(SM_CXSMICON); size.cy = GetSystemMetrics(SM_CYSMICON); SetWindowPos(dialog_info->footer_icon, 0, x, y, size.cx, size.cy, SWP_NOZORDER); - dialog_height = y + size.cy; + footer_icon_right = x + size.cx; + footer_icon_bottom = y + size.cy; } + /* Footer text */ + taskdialog_label_layout(dialog_info, dialog_info->footer_text, footer_icon_right, dialog_width, &dialog_height, + syslink); + dialog_height = max(dialog_height, footer_icon_bottom); + /* Expanded information */ if ((taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA) && dialog_info->expanded) taskdialog_label_layout(dialog_info, dialog_info->expanded_info, 0, dialog_width, &dialog_height, syslink); @@ -1058,6 +1074,7 @@ static void taskdialog_init(struct taskdialog_info *dialog_info, HWND hwnd) taskdialog_add_verification_box(dialog_info); taskdialog_add_buttons(dialog_info); taskdialog_add_footer_icon(dialog_info); + taskdialog_add_footer_text(dialog_info); /* Set default button */ if (!dialog_info->default_button && dialog_info->command_links) @@ -1184,7 +1201,8 @@ static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPAR PNMLINK pnmLink = (PNMLINK)lParam; HWND hwndFrom = pnmLink->hdr.hwndFrom; if ((taskdialog_hyperlink_enabled(dialog_info)) - && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info) + && (hwndFrom == dialog_info->content || hwndFrom == dialog_info->expanded_info + || hwndFrom == dialog_info->footer_text) && (pnmLink->hdr.code == NM_CLICK || pnmLink->hdr.code == NM_RETURN)) { taskdialog_notify(dialog_info, TDN_HYPERLINK_CLICKED, 0, (LPARAM)pnmLink->item.szUrl);

1 0

Piotr Caban : msvcp60: Don't set failbit in basic_istream::tellg.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: bb264a0ac63a01954ac2dd6d851e45a642898508 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb264a0ac63a01954ac2dd6d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 19 18:00:04 2018 +0200 msvcp60: Don't set failbit in basic_istream::tellg. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 5 ----- dlls/msvcp60/tests/ios.c | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index fea2ade..8a5813e 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -8347,9 +8347,6 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && ret->state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - return ret; } @@ -9846,8 +9843,6 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), ret, 0, SEEKDIR_cur, OPENMODE_in); - if(ret->off==-1 && ret->pos==0 && ret->state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); return ret; } diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index 1938a51..dc4700d 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1428,6 +1428,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_char_vbase_dtor, &ss); call_func1(p_basic_string_char_dtor, &str); @@ -1453,6 +1457,10 @@ static void test_istream_tellg(void) ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); + if(tests[i].seekoff == -1) { + ok(ss.basic_ios.base.state == IOSTATE_goodbit, + "ss.basic_ios.base.state = %x\n", ss.basic_ios.base.state); + } call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); call_func1(p_basic_string_wchar_dtor, &wstr);

1 0

Zhiyi Zhang : comctl32/taskdialog: Add support for verification box.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: bf6cde92fb954bb6eb94ba9b2822a7cada9b00b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6cde92fb954bb6eb94ba9b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jul 19 11:04:24 2018 +0800 comctl32/taskdialog: Add support for verification box. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 58 ++++++++++++++++- dlls/comctl32/tests/taskdialog.c | 136 +++++++++++++++++++++++++++++++-------- 2 files changed, 166 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf6cde92fb954bb6eb94…

1 0

Daniel Lehman : msvcr110: Create current scheduler in _CurrentScheduler:: _Id.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 05f9db7b95ca0919c579957549e2d8dbaa468cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f9db7b95ca0919c5799575… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jul 18 07:15:45 2018 -0700 msvcr110: Create current scheduler in _CurrentScheduler::_Id. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 15 +++++++++++++++ dlls/msvcrt/scheduler.c | 1 + 2 files changed, 16 insertions(+) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 4b0043b..dcee5c1 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -35,6 +35,8 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); +static unsigned int (CDECL *p_CurrentScheduler_Id)(void); +static unsigned int (CDECL *p__CurrentScheduler__Id)(void); static BOOL init(void) { @@ -50,12 +52,15 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); + p__CurrentScheduler__Id = (void*)GetProcAddress(module, "?_Id(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); return TRUE; } static void test_CurrentScheduler(void) { + unsigned int id; unsigned int ncpus; unsigned int expect; SYSTEM_INFO si; @@ -63,13 +68,23 @@ static void test_CurrentScheduler(void) expect = ~0; ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); ok(ncpus == expect, "expected %x, got %x\n", expect, ncpus); + id = p_CurrentScheduler_Id(); + ok(id == expect, "expected %u, got %u\n", expect, id); GetSystemInfo(&si); expect = si.dwNumberOfProcessors; + /* these _CurrentScheduler calls trigger scheduler creation + if either is commented out, the following CurrentScheduler (no _) tests will still work */ ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); + id = p__CurrentScheduler__Id(); ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(id == 0, "expected 0, got %u\n", id); + + /* these CurrentScheduler tests assume scheduler is created */ ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + id = p_CurrentScheduler_Id(); + ok(id == 0, "expected 0, got %u\n", id); } static void test_setlocale(void) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 6269c98..c6c0fa7 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1071,6 +1071,7 @@ unsigned int __cdecl _CurrentScheduler__GetNumberOfVirtualProcessors(void) unsigned int __cdecl _CurrentScheduler__Id(void) { TRACE("()\n"); + get_current_scheduler(); return CurrentScheduler_Id(); }

1 0

Michael Stefaniuc : secur32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: baf4cb39585000371ceb591d318d1a100e794c90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baf4cb39585000371ceb591d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:32 2018 +0200 secur32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 8 ++++---- dlls/secur32/schannel_gnutls.c | 2 +- dlls/secur32/schannel_macosx.c | 4 ++-- dlls/secur32/secur32.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f0d271e..6d50c97 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -195,7 +195,7 @@ static void read_config(void) if(res == ERROR_SUCCESS) { DWORD type, size, value; - for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_config_keys); i++) { strcpyW(subkey_name, protocol_config_keys[i].key_name); strcatW(subkey_name, clientW); res = RegOpenKeyExW(protocols_key, subkey_name, 0, KEY_READ, &key); @@ -229,7 +229,7 @@ static void read_config(void) } }else { /* No config, enable all known protocols. */ - for(i=0; i < sizeof(protocol_config_keys)/sizeof(*protocol_config_keys); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_config_keys); i++) { if(protocol_config_keys[i].enabled) enabled |= protocol_config_keys[i].prot_client_flag; if(protocol_config_keys[i].disabled_by_default) @@ -986,7 +986,7 @@ static void *get_alg_name(ALG_ID id, BOOL wide) }; unsigned i; - for (i = 0; i < sizeof(alg_name_map)/sizeof(alg_name_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(alg_name_map); i++) if (alg_name_map[i].alg_id == id) return wide ? (void*)alg_name_map[i].nameW : (void*)alg_name_map[i].name; @@ -1545,7 +1545,7 @@ void SECUR32_initSchannelSP(void) goto fail; } - SECUR32_addPackages(provider, sizeof(info) / sizeof(info[0]), NULL, info); + SECUR32_addPackages(provider, ARRAY_SIZE(info), NULL, info); return; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bc3bbaf..05e922d 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -177,7 +177,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre } p = priority + strlen(priority); - for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { *p++ = ':'; *p++ = (cred->enabled_protocols & protocol_priority_flags[i].enable_flag) ? '+' : '-'; strcpy(p, protocol_priority_flags[i].gnutls_flag); diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index a2f4261..bd080dc 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -429,7 +429,7 @@ static const struct cipher_suite cipher_suites[] = { static const struct cipher_suite* get_cipher_suite(SSLCipherSuite cipher_suite) { int i; - for (i = 0; i < sizeof(cipher_suites)/sizeof(cipher_suites[0]); i++) + for (i = 0; i < ARRAY_SIZE(cipher_suites); i++) { if (cipher_suites[i].suite == cipher_suite) return &cipher_suites[i]; @@ -767,7 +767,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } - for(i=0; i < sizeof(protocol_priority_flags)/sizeof(*protocol_priority_flags); i++) { + for(i = 0; i < ARRAY_SIZE(protocol_priority_flags); i++) { if(!(protocol_priority_flags[i].enable_flag & supported_protocols)) continue; diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 9240c10..ec189fd 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -995,7 +995,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( case NameSamCompatible: { WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD size = sizeof(name)/sizeof(name[0]); + DWORD size = ARRAY_SIZE(name); if (GetComputerNameW(name, &size)) { DWORD len = domainInfo->Name.Length + size + 3; @@ -1038,7 +1038,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( DWORD len, size; WCHAR *suffix; - size = sizeof(name) / sizeof(name[0]); + size = ARRAY_SIZE(name); if (!GetComputerNameW(name, &size)) { status = FALSE;

1 0

Michael Stefaniuc : sxs: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 6c6af6412c3247b9b44eead279cbed1ae2751dcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6af6412c3247b9b44eead2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:33 2018 +0200 sxs: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/cache.c | 18 +++++++++--------- dlls/sxs/name.c | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index 791a6ed..3cc26f2 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -103,7 +103,7 @@ static unsigned int build_sxs_path( WCHAR *path ) unsigned int len = GetWindowsDirectoryW( path, MAX_PATH ); memcpy( path + len, winsxsW, sizeof(winsxsW) ); - return len + sizeof(winsxsW) / sizeof(winsxsW[0]) - 1; + return len + ARRAY_SIZE(winsxsW) - 1; } static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const WCHAR *token, @@ -111,7 +111,7 @@ static WCHAR *build_assembly_name( const WCHAR *arch, const WCHAR *name, const W { static const WCHAR fmtW[] = {'%','s','_','%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; - unsigned int buflen = sizeof(fmtW) / sizeof(fmtW[0]); + unsigned int buflen = ARRAY_SIZE(fmtW); WCHAR *ret, *p; buflen += strlenW( arch ); @@ -133,7 +133,7 @@ static WCHAR *build_manifest_path( const WCHAR *arch, const WCHAR *name, const W unsigned int len; if (!(path = build_assembly_name( arch, name, token, version, &len ))) return NULL; - len += sizeof(fmtW) / sizeof(fmtW[0]); + len += ARRAY_SIZE(fmtW); len += build_sxs_path( sxsdir ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) { @@ -150,7 +150,7 @@ static WCHAR *build_policy_name( const WCHAR *arch, const WCHAR *name, const WCH { static const WCHAR fmtW[] = {'%','s','_','%','s','_','%','s','_','n','o','n','e','_','d','e','a','d','b','e','e','f',0}; - unsigned int buflen = sizeof(fmtW) / sizeof(fmtW[0]); + unsigned int buflen = ARRAY_SIZE(fmtW); WCHAR *ret, *p; buflen += strlenW( arch ); @@ -171,7 +171,7 @@ static WCHAR *build_policy_path( const WCHAR *arch, const WCHAR *name, const WCH unsigned int len; if (!(path = build_policy_name( arch, name, token, &len ))) return NULL; - len += sizeof(fmtW) / sizeof(fmtW[0]); + len += ARRAY_SIZE(fmtW); len += build_sxs_path( sxsdir ); len += strlenW( version ); if (!(ret = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) @@ -501,9 +501,9 @@ static WCHAR *build_policy_filename( const WCHAR *arch, const WCHAR *name, const if (!(fullname = build_policy_name( arch, name, token, &len ))) return NULL; len += build_sxs_path( sxsdir ); - len += sizeof(policiesW) / sizeof(policiesW[0]) - 1; + len += ARRAY_SIZE(policiesW) - 1; len += strlenW( version ); - len += sizeof(suffixW) / sizeof(suffixW[0]) - 1; + len += ARRAY_SIZE(suffixW) - 1; if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, fullname ); @@ -572,8 +572,8 @@ static WCHAR *build_manifest_filename( const WCHAR *arch, const WCHAR *name, con if (!(fullname = build_assembly_name( arch, name, token, version, &len ))) return NULL; len += build_sxs_path( sxsdir ); - len += sizeof(manifestsW) / sizeof(manifestsW[0]) - 1; - len += sizeof(suffixW) / sizeof(suffixW[0]) - 1; + len += ARRAY_SIZE(manifestsW) - 1; + len += ARRAY_SIZE(suffixW) - 1; if (!(ret = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) { HeapFree( GetProcessHeap(), 0, fullname ); diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index 74aece2..e109014 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -329,25 +329,25 @@ static HRESULT parse_displayname( struct name *name, const WCHAR *displayname ) while (*q && *q != '=') q++; if (!*q) return E_INVALIDARG; len = q - p; - if (len == sizeof(archW)/sizeof(archW[0]) - 1 && !memcmp( p, archW, len * sizeof(WCHAR) )) + if (len == ARRAY_SIZE(archW) - 1 && !memcmp( p, archW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->arch = parse_value( p, &len ))) return E_INVALIDARG; q += len; } - else if (len == sizeof(tokenW)/sizeof(tokenW[0]) - 1 && !memcmp( p, tokenW, len * sizeof(WCHAR) )) + else if (len == ARRAY_SIZE(tokenW) - 1 && !memcmp( p, tokenW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->token = parse_value( p, &len ))) return E_INVALIDARG; q += len; } - else if (len == sizeof(typeW)/sizeof(typeW[0]) - 1 && !memcmp( p, typeW, len * sizeof(WCHAR) )) + else if (len == ARRAY_SIZE(typeW) - 1 && !memcmp( p, typeW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->type = parse_value( p, &len ))) return E_INVALIDARG; q += len; } - else if (len == sizeof(versionW)/sizeof(versionW[0]) - 1 && !memcmp( p, versionW, len * sizeof(WCHAR) )) + else if (len == ARRAY_SIZE(versionW) - 1 && !memcmp( p, versionW, len * sizeof(WCHAR) )) { p = ++q; if (!(name->version = parse_value( p, &len ))) return E_INVALIDARG;

1 0

Mathew Hodson : msvcp90: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: a1fb71c562c720c75070195b222afc7df5af8da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1fb71c562c720c75070195b… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Wed Jul 18 22:04:17 2018 -0400 msvcp90: Use the ARRAY_SIZE() macro. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index b9fd9d0..a1bec86 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -391,7 +391,7 @@ unsigned short __cdecl wctype(const char *property) }; unsigned int i; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) + for(i = 0; i < ARRAY_SIZE(properties); i++) if(!strcmp(property, properties[i].name)) return properties[i].mask; @@ -2440,7 +2440,7 @@ void __thiscall _vector_base_v4__Internal_throw_exception(void/*_vector_base_v4* TRACE("(%p %lu)\n", this, idx); - if(idx < sizeof(exceptions)/sizeof(exceptions[0])) + if(idx < ARRAY_SIZE(exceptions)) throw_exception(exceptions[idx].type, exceptions[idx].msg); } #endif @@ -2463,7 +2463,7 @@ const char* __cdecl _Syserror_map(int err) TRACE("(%d)\n", err); - for(i=0; i<sizeof(syserror_map)/sizeof(syserror_map[0]); i++) + for(i = 0; i < ARRAY_SIZE(syserror_map); i++) { if(syserror_map[i].err == err) return syserror_map[i].str;

1 0

Michael Stefaniuc : wbemdisp: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: be4cb86b751ced2bdc7788b8365ff17d9a74728a URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4cb86b751ced2bdc7788b8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:35 2018 +0200 wbemdisp: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 4 ++-- dlls/wbemdisp/main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index cdc0ab4..1c7f56a 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1641,7 +1641,7 @@ static HRESULT WINAPI services_DeleteAsync( static BSTR build_query_string( const WCHAR *class ) { static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; - UINT len = strlenW(class) + sizeof(selectW) / sizeof(selectW[0]); + UINT len = strlenW(class) + ARRAY_SIZE(selectW); BSTR ret; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; @@ -2074,7 +2074,7 @@ static BSTR build_resource_string( BSTR server, BSTR namespace ) if (server && *server) len_server = strlenW( server ); else len_server = 1; if (namespace && *namespace) len_namespace = strlenW( namespace ); - else len_namespace = sizeof(defaultW) / sizeof(defaultW[0]) - 1; + else len_namespace = ARRAY_SIZE(defaultW) - 1; if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 9d9b0ad..aff4d50 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -374,7 +374,7 @@ static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindC ULONG *pchEaten, IMoniker **ppmkOut) { static const WCHAR prefixW[] = {'w','i','n','m','g','m','t','s',':',0}; - const DWORD prefix_len = sizeof(prefixW) / sizeof(prefixW[0]) - 1; + const DWORD prefix_len = ARRAY_SIZE(prefixW) - 1; ISWbemLocator *locator = NULL; ISWbemServices *services = NULL; ISWbemObject *obj = NULL;

1 0

Michael Stefaniuc : wintrust: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: c77defede1c199187b0deb642f1f3f2d95121800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c77defede1c199187b0deb64… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:37 2018 +0200 wintrust: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/asn.c | 73 ++++++++++++++++++++++--------------------------- dlls/wintrust/softpub.c | 6 ++-- 2 files changed, 34 insertions(+), 45 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 6406ba3..46525f0 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -673,8 +673,8 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( items[1].pvStructInfo = &algo->Parameters; else items[1].pvStructInfo = &nullBlob; - ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); return ret; } @@ -688,8 +688,8 @@ static BOOL WINAPI CRYPT_AsnEncodeAttributeTypeValue(DWORD dwCertEncodingType, { &typeValue->Value, CRYPT_CopyEncodedBlob, 0 }, }; - return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } struct SPCDigest @@ -708,8 +708,8 @@ static BOOL WINAPI CRYPT_AsnEncodeSPCDigest(DWORD dwCertEncodingType, { &digest->Digest, CRYPT_CopyEncodedBlob, 0 }, }; - return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, @@ -729,8 +729,8 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentEncode(DWORD dwCertEncodingType, { &data->DigestAlgorithm, CRYPT_AsnEncodeSPCDigest, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -996,8 +996,8 @@ BOOL WINAPI WVTAsn1CatMemberInfoEncode(DWORD dwCertEncodingType, { &info->dwCertVersion, CRYPT_AsnEncodeInt, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -1025,8 +1025,8 @@ BOOL WINAPI WVTAsn1CatNameValueEncode(DWORD dwCertEncodingType, { &value->Value, CRYPT_AsnEncodeOctets, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -1084,8 +1084,8 @@ BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoEncode(DWORD dwCertEncodingType, { &criteria->fMeetsCriteria, CRYPT_AsnEncodeBool, 0 }, }; - ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, - items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), + pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT { @@ -1808,9 +1808,8 @@ BOOL WINAPI WVTAsn1SpcPeImageDataDecode(DWORD dwCertEncodingType, offsetof(SPC_PE_IMAGE_DATA, pFile), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -1995,9 +1994,8 @@ static BOOL WINAPI CRYPT_AsnDecodeAttributeTypeValue(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, + return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, typeValue ? typeValue->pszObjId : NULL); } @@ -2019,9 +2017,8 @@ static BOOL WINAPI CRYPT_AsnDecodeAlgorithmId(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, algo ? algo->pszObjId : NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, algo ? algo->pszObjId : NULL); if (ret && pvStructInfo) { TRACE("pszObjId is %p (%s)\n", algo->pszObjId, @@ -2048,9 +2045,8 @@ static BOOL WINAPI CRYPT_AsnDecodeSPCDigest(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, + return CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, digest ? digest->DigestAlgorithm.pszObjId : NULL); } @@ -2076,9 +2072,8 @@ BOOL WINAPI WVTAsn1SpcIndirectDataContentDecode(DWORD dwCertEncodingType, offsetof(SPC_INDIRECT_DATA_CONTENT, DigestAlgorithm.pszObjId), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2174,9 +2169,8 @@ BOOL WINAPI WVTAsn1SpcSpOpusInfoDecode(DWORD dwCertEncodingType, offsetof(SPC_SP_OPUS_INFO, pPublisherInfo), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2256,9 +2250,8 @@ BOOL WINAPI WVTAsn1CatMemberInfoDecode(DWORD dwCertEncodingType, FALSE, FALSE, 0, 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2292,9 +2285,8 @@ BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, offsetof(CAT_NAMEVALUE, Value.pbData), 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { @@ -2367,9 +2359,8 @@ BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoDecode(DWORD dwCertEncodingType, fMeetsCriteria), FALSE, FALSE, 0, 0 }, }; - ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - pvStructInfo, pcbStructInfo, NULL); + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), + pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, NULL); } __EXCEPT_PAGE_FAULT { diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4e8582e..d65d2b6 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -522,11 +522,9 @@ static LPCSTR filetime_to_str(const FILETIME *time) if (!time) return NULL; - GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(time, &sysTime); - GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, - sizeof(date) / sizeof(date[0])); + GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, ARRAY_SIZE(date)); return date; }

1 0

Michael Stefaniuc : oledb32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 3ba9ba7af518b99b977acf14fc3cdc109b747a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba9ba7af518b99b977acf14… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:31 2018 +0200 oledb32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 7d78e9f..6b05ef6 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -328,8 +328,8 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) }; struct mode_propval *prop; - if ((prop = bsearch(src, mode_propvals, sizeof(mode_propvals) / sizeof(*mode_propvals), - sizeof(struct mode_propval), dbmodeprop_compare))) + if ((prop = bsearch(src, mode_propvals, ARRAY_SIZE(mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) { V_VT(dest) = VT_I4; V_I4(dest) = prop->value; @@ -511,7 +511,7 @@ static const struct dbproperty *get_known_dprop_descr(BSTR name) int min, max, n; min = 0; - max = sizeof(dbproperties)/sizeof(struct dbproperty) - 1; + max = ARRAY_SIZE(dbproperties) - 1; while (min <= max) { @@ -662,7 +662,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID WCHAR *start, *progid; int len; - prov += sizeof(providerW)/sizeof(WCHAR)-1; + prov += ARRAY_SIZE(providerW)-1; start = prov; while (*prov && *prov != ';') ++prov;

1 0

Michael Stefaniuc : oleacc: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 3a61d1d51ee976969436cc8cfa98db54ebab8736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a61d1d51ee976969436cc8c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:30 2018 +0200 oleacc: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/client.c | 4 ++-- dlls/oleacc/main.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 5b1f0ee..40e7fbd 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -168,7 +168,7 @@ static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd)) return E_INVALIDARG; - len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name); if(!len) return S_FALSE; @@ -286,7 +286,7 @@ static HRESULT WINAPI Client_get_accKeyboardShortcut(IAccessible *iface, if(convert_child_id(&varID) != CHILDID_SELF) return E_INVALIDARG; - len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name); for(i=0; i<len; i++) { if(name[i] == '&') break; diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 3cfe7c1..b90bc2c 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -109,11 +109,11 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) WCHAR class_name[64]; int i, idx; - if(!RealGetWindowClassW(hwnd, class_name, sizeof(class_name)/sizeof(WCHAR))) + if(!RealGetWindowClassW(hwnd, class_name, ARRAY_SIZE(class_name))) return NULL; TRACE("got window class: %s\n", debugstr_w(class_name)); - for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { if(!strcmpiW(class_name, builtin_classes[i].name)) { accessible_create ret; @@ -128,7 +128,7 @@ static accessible_create get_builtin_accessible_obj(HWND hwnd, LONG objid) idx = SendMessageW(hwnd, WM_GETOBJECT, 0, OBJID_QUERYCLASSNAMEIDX); if(idx) { - for(i=0; i<sizeof(builtin_classes)/sizeof(builtin_classes[0]); i++) { + for(i=0; i<ARRAY_SIZE(builtin_classes); i++) { if(idx == builtin_classes[i].idx) { accessible_create ret; @@ -172,7 +172,7 @@ HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, void **ppObject ) { - WCHAR atom_str[sizeof(lresult_atom_prefix)/sizeof(WCHAR)+3*8+3]; + WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3]; HANDLE server_proc, server_mapping, mapping; DWORD proc_id, size; IStream *stream; @@ -193,11 +193,11 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo if(result != (ATOM)result) return E_FAIL; - if(!GlobalGetAtomNameW(result, atom_str, sizeof(atom_str)/sizeof(WCHAR))) + if(!GlobalGetAtomNameW(result, atom_str, ARRAY_SIZE(atom_str))) return E_FAIL; if(memcmp(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix))) return E_FAIL; - p = atom_str + sizeof(lresult_atom_prefix)/sizeof(WCHAR); + p = atom_str + ARRAY_SIZE(lresult_atom_prefix); proc_id = strtoulW(p, &p, 16); if(*p != ':') return E_FAIL; @@ -247,7 +247,7 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) static const WCHAR atom_fmt[] = {'%','0','8','x',':','%','0','8','x',':','%','0','8','x',0}; static const LARGE_INTEGER seek_zero = {{0}}; - WCHAR atom_str[sizeof(lresult_atom_prefix)/sizeof(WCHAR)+3*8+3]; + WCHAR atom_str[ARRAY_SIZE(lresult_atom_prefix)+3*8+3]; IStream *stream; HANDLE mapping; STATSTG stat; @@ -320,8 +320,8 @@ LRESULT WINAPI LresultFromObject( REFIID riid, WPARAM wParam, LPUNKNOWN pAcc ) } memcpy(atom_str, lresult_atom_prefix, sizeof(lresult_atom_prefix)); - sprintfW(atom_str+sizeof(lresult_atom_prefix)/sizeof(WCHAR), - atom_fmt, GetCurrentProcessId(), HandleToUlong(mapping), stat.cbSize.u.LowPart); + sprintfW(atom_str+ARRAY_SIZE(lresult_atom_prefix), atom_fmt, GetCurrentProcessId(), + HandleToUlong(mapping), stat.cbSize.u.LowPart); atom = GlobalAddAtomW(atom_str); if(!atom) { CloseHandle(mapping);

1 0

Józef Kucia : wined3d: Add GPU information for AMD Radeon RX Vega.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 00abf4222db0fcad92fe5a5af8dbfbb47ff848c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00abf4222db0fcad92fe5a5a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 22:45:00 2018 +0200 wined3d: Add GPU information for AMD Radeon RX Vega. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bb8d5af..68b2a11 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1441,6 +1441,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, /* VMware */ {HW_VENDOR_VMWARE, CARD_VMWARE_SVGA3D, "VMware SVGA 3D (Microsoft Corporation - WDDM)", DRIVER_VMWARE, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a25c296..97badbe 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,6 +2296,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_R9_FURY = 0x7300, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df, + CARD_AMD_RADEON_RX_VEGA = 0x687f, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Józef Kucia : wined3d: Add GPU information for Intel HD Graphics 630.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: wine Branch: master Commit: 5757c2c8c63bc0175556cdb5cf0655ad0e9c94ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=5757c2c8c63bc0175556cdb5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 22:45:01 2018 +0200 wined3d: Add GPU information for Intel HD Graphics 630. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 68b2a11..7d9a5e9 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1517,6 +1517,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 97badbe..ece41eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2497,6 +2497,7 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_HD630 = 0x5912, }; struct wined3d_fbo_ops

1 0

Francois Gouget : testbot: Split the log and report line category detection.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: tools Branch: master Commit: 31bd8278b3f2b45e5520c8590489e5babf94866f URL: https://source.winehq.org/git/tools.git/?a=commit;h=31bd8278b3f2b45e5520c85… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 19 12:10:41 2018 +0200 testbot: Split the log and report line category detection. This avoids false positives for cases such as lines containing 'error:' in test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 8 ++- testbot/lib/WineTestBot/LogUtils.pm | 105 +++++++++++++++++++++++------------- testbot/web/JobDetails.pl | 12 +++-- 3 files changed, 82 insertions(+), 43 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index f1cb74e..e2c823a 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -300,7 +300,9 @@ EOF { $CurrentDll = $1; } - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); if ($Category eq "error") { if ($PrintedDll ne $CurrentDll) @@ -488,7 +490,9 @@ EOF { foreach my $Line (<$LogFile>) { - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); $MessagesFromLog .= $Line if ($Category eq "error"); } close($LogFile); diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index cabd183..e6f9a27 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,8 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogLineCategory +our @EXPORT = qw(GetLogFileNames GetLogLabel + GetLogLineCategory GetReportLineCategory ParseTaskLog ParseWineTestReport); use File::Basename; @@ -80,6 +81,59 @@ sub ParseTaskLog($$) } +=pod +=over 12 + +=item C<GetLogLineCategory()> + +Identifies the category of the given log line: an error message, a Wine +diagnostic line, a TestBot error, etc. + +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. + +=back +=cut + +sub GetLogLineCategory($) +{ + my ($Line) = @_; + + if (# Git errors + $Line =~ /^CONFLICT / or + $Line =~ /^error: patch failed:/ or + $Line =~ /^error: corrupt patch / or + # Build errors + $Line =~ /: error: / or + $Line =~ /^make: [*]{3} No rule to make target / or + $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or + $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or + # Typical perl errors + $Line =~ /^Use of uninitialized value/) + { + return "error"; + } + if ($Line =~ /:winediag:/) + { + return "diag"; + } + if ($Line =~ /^BotError:/ or + $Line =~ /^X Error of failed request: / or + $Line =~ / opcode of failed request: /) + { + return "boterror"; + } + if (# Build messages + $Line =~ /^\+ \S/ or + $Line =~ /^(?:Build|Reconfig|Task): ok/) + { + return "info"; + } + + return "none"; +} + + # # WineTest report parser # @@ -383,23 +437,21 @@ sub ParseWineTestReport($$$$) } -# -# Log querying and formatting -# - =pod =over 12 -=item C<GetLogLineCategory()> +=item C<GetReportLineCategory()> + +Identifies the category of the given test report line: an error message, +a todo, just an informational message or none of these. -Identifies the category of the given log line: an error message, a todo, just -an informational message or none of these. The category can then be used to -decide whether to hide the line or, on the contrary, highlight it. +The category can then be used to decide whether to hide the line or, on +the contrary, highlight it. =back =cut -sub GetLogLineCategory($) +sub GetReportLineCategory($) { my ($Line) = @_; @@ -416,35 +468,11 @@ sub GetLogLineCategory($) $Line =~ /Fatal: test .* does not exist/ or $Line =~ / done $258$/ or $Line =~ /: unhandled exception [0-9a-fA-F]{8} at / or - $Line =~ /^Unhandled exception: / or - # Git errors - $Line =~ /^CONFLICT / or - $Line =~ /^error: patch failed:/ or - $Line =~ /^error: corrupt patch / or - # Build errors - $Line =~ /: error: / or - $Line =~ /^make: [*]{3} No rule to make target / or - $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or - $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or - # Typical perl errors - $Line =~ /^Use of uninitialized value/) + $Line =~ /^Unhandled exception: /) { return "error"; } - if ($Line =~ /:winediag:/) - { - return "diag"; - } - if ($Line =~ /^BotError:/ or - $Line =~ /^X Error of failed request: / or - $Line =~ / opcode of failed request: /) - { - return "boterror"; - } - if ($Line =~ /^\+ \S/ or - $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or - # Build messages - $Line =~ /^(?:Build|Reconfig|Task): ok/) + if ($Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start /) { return "info"; } @@ -452,6 +480,11 @@ sub GetLogLineCategory($) return "none"; } + +# +# Log querying and formatting +# + =pod =over 12 diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3fcec5d..ee4e539 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -245,11 +245,13 @@ highlighted to make the log more readable. =back =cut -sub GetHtmlLine($$$) +sub GetHtmlLine($$$$) { - my ($self, $FullLog, $Line) = @_; + my ($self, $LogName, $FullLog, $Line) = @_; - my $Category = GetLogLineCategory($Line); + my $Category = $LogName =~ /\.report$/ ? + GetReportLineCategory($Line) : + GetLogLineCategory($Line); return undef if ($Category !~ /error/ and !$FullLog); my $Html = $self->escapeHTML($Line); @@ -403,7 +405,7 @@ sub GenerateBody($) $HasLogEntries = 1; chomp $Line; $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); - my $Html = $self->GetHtmlLine($MoreInfo->{Full}, $Line); + my $Html = $self->GetHtmlLine($LogName, $MoreInfo->{Full}, $Line); next if (!defined $Html); if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) @@ -476,7 +478,7 @@ sub GenerateBody($) print "<pre><code>"; $ErrFirst = 0; } - print $self->GetHtmlLine(1, $Line), "\n"; + print $self->GetHtmlLine($ErrName, 1, $Line), "\n"; } close($ErrFile);

1 0

Józef Kucia : include: Add more definitions for D3D12 features.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: vkd3d Branch: master Commit: 6b4b2a35cc8edc7f78f358810f69e96cb589dbe3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6b4b2a35cc8edc7f78f3588… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:39 2018 +0200 include: Add more definitions for D3D12 features. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index ec7df56..a0c09ef 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1516,14 +1516,38 @@ typedef struct D3D12_FEATURE_DATA_FEATURE_LEVELS D3D_FEATURE_LEVEL MaxSupportedFeatureLevel; } D3D12_FEATURE_DATA_FEATURE_LEVELS; +typedef struct D3D12_FEATURE_DATA_ROOT_SIGNATURE +{ + D3D_ROOT_SIGNATURE_VERSION HighestVersion; +} D3D12_FEATURE_DATA_ROOT_SIGNATURE; + +typedef enum D3D_SHADER_MODEL +{ + D3D_SHADER_MODEL_5_1 = 0x51, + D3D_SHADER_MODEL_6_0 = 0x60, +} D3D_SHADER_MODEL; + +typedef struct D3D12_FEATURE_DATA_SHADER_MODEL +{ + D3D_SHADER_MODEL HighestShaderModel; +} D3D12_FEATURE_DATA_SHADER_MODEL; + typedef enum D3D12_FEATURE { D3D12_FEATURE_D3D12_OPTIONS = 0, D3D12_FEATURE_ARCHITECTURE = 1, D3D12_FEATURE_FEATURE_LEVELS = 2, D3D12_FEATURE_FORMAT_SUPPORT = 3, - D3D12_FEATURE_FORMAT_INFO = 4, - D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 5, + D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS = 4, + D3D12_FEATURE_FORMAT_INFO = 5, + D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6, + D3D12_FEATURE_SHADER_MODEL = 7, + D3D12_FEATURE_D3D12_OPTIONS1 = 8, + D3D12_FEATURE_ROOT_SIGNATURE = 12, + D3D12_FEATURE_ARCHITECTURE1 = 16, + D3D12_FEATURE_D3D12_OPTIONS2 = 18, + D3D12_FEATURE_SHADER_CACHE = 19, + D3D12_FEATURE_COMMAND_QUEUE_PRIORITY = 20, } D3D12_FEATURE; typedef struct D3D12_MEMCPY_DEST

1 0

Józef Kucia : libs/vkd3d: Support D3D12_FEATURE_ROOT_SIGNATURE.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: vkd3d Branch: master Commit: b9a090769120202c293fba62728e0461afcda0cf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b9a090769120202c293fba6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:40 2018 +0200 libs/vkd3d: Support D3D12_FEATURE_ROOT_SIGNATURE. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index fb57d76..5f3161d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1597,6 +1597,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_ROOT_SIGNATURE: + { + D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; + FIXME("Root signature version 1_1 not supported yet.\n"); + data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + return S_OK; + } + default: FIXME("Unhandled feature %#x.\n", feature); return E_NOTIMPL;

1 0

Józef Kucia : libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView ().
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: vkd3d Branch: master Commit: 72859f8898945cf5b43dea082968692b6df7df1f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=72859f8898945cf5b43dea0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:41 2018 +0200 libs/vkd3d: Support D3D12_SRV_DIMENSION_TEXTURE2D in d3d12_device_CreateShaderResourceView(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e1a5adf..fb84e4b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1194,6 +1194,15 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { + case D3D12_SRV_DIMENSION_TEXTURE2D: + vk_view_type = VK_IMAGE_VIEW_TYPE_2D; + miplevel_idx = desc->u.Texture2D.MostDetailedMip; + miplevel_count = desc->u.Texture2D.MipLevels; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + if (desc->u.Texture2D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE; miplevel_idx = desc->u.TextureCube.MostDetailedMip;

1 0

Józef Kucia : libs/vkd3d: Return S_FALSE from D3D12CreateDevice() when device is NULL.
by Alexandre Julliard July 19, 2018

July 19, 2018

Module: vkd3d Branch: master Commit: 9ce53b74df1b6417a9e1dd9bdbf5f422a9172dee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9ce53b74df1b6417a9e1dd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 19 14:47:42 2018 +0200 libs/vkd3d: Return S_FALSE from D3D12CreateDevice() when device is NULL. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/vkd3d_main.c | 8 +++++++- tests/d3d12.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 97d642a..0e2d422 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -28,7 +28,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, TRACE("create_info %p, iid %s, device %p.\n", create_info, debugstr_guid(iid), device); - if (!create_info || !device) + if (!create_info) return E_INVALIDARG; if (create_info->type != VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO) { @@ -76,6 +76,12 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, if (FAILED(hr)) return hr; + if (!device) + { + ID3D12Device_Release(&object->ID3D12Device_iface); + return S_FALSE; + } + return return_interface((IUnknown *)&object->ID3D12Device_iface, &IID_ID3D12Device, iid, device); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 6128a40..e2337c4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1080,6 +1080,9 @@ static void test_create_device(void) ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); ID3D12Device_Release(device); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, NULL); + ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_1, &IID_ID3D12Device, (void **)&device); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = D3D12CreateDevice(NULL, D3D_FEATURE_LEVEL_9_2, &IID_ID3D12Device, (void **)&device);

1 0

Daniel Lehman : gdi32/tests: Add test for clipped polygon.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 418514820f03243c192ca5e6dfd0ab00ec740fd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=418514820f03243c192ca5e6… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 13 14:41:55 2018 -0700 gdi32/tests: Add test for clipped polygon. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 80145fc..2356b96 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -1894,6 +1894,31 @@ static void test_all_functions(void) ReleaseDC( 0, hdc ); } +static void test_clipped_polygon_fill(void) +{ + const POINT pts[3] = {{-10, -10}, {10, -5}, {0, 10}}; + HBRUSH brush, oldbrush; + HBITMAP bmp, oldbmp; + HDC hdc, memdc; + COLORREF col; + + hdc = GetDC( 0 ); + memdc = CreateCompatibleDC( hdc ); + bmp = CreateCompatibleBitmap( hdc, 20, 20 ); + brush = CreateSolidBrush( RGB( 0x11, 0x22, 0x33 ) ); + oldbrush = SelectObject( memdc, brush ); + oldbmp = SelectObject( memdc, bmp ); + Polygon( memdc, pts, ARRAY_SIZE(pts) ); + col = GetPixel( memdc, 1, 1 ); + todo_wine ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); + SelectObject( memdc, oldbrush ); + SelectObject( memdc, oldbmp ); + DeleteObject( brush ); + DeleteObject( bmp ); + DeleteDC( memdc ); + ReleaseDC( 0, hdc ); +} + START_TEST(path) { test_path_state(); @@ -1906,5 +1931,6 @@ START_TEST(path) test_rectangle(); test_roundrect(); test_ellipse(); + test_clipped_polygon_fill(); test_all_functions(); }

1 0

Hans Leidekker : bcrypt: Move GnuTLS support to a new file.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 018b695efaaa347e52e6b63ffcfa66f6551333aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=018b695efaaa347e52e6b63f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:20:11 2018 +0200 bcrypt: Move GnuTLS support to a new file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 137 +++++ dlls/bcrypt/bcrypt_main.c | 1189 ++++++++--------------------------------- dlls/bcrypt/gnutls.c | 632 ++++++++++++++++++++++ 4 files changed, 1004 insertions(+), 955 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=018b695efaaa347e52e6…

1 0

Michael Müller : ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: b7f3e26e897838055644fa897e98dcb35a16b8fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7f3e26e897838055644fa89… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 16 20:18:15 2018 -0600 ole32: Support reading VT_BOOL, VT_R8 and VT_I8 into propery storage. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index a259883..0213f31 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1063,6 +1063,10 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, prop->u.bVal = *data; TRACE("Read byte 0x%x\n", prop->u.bVal); break; + case VT_BOOL: + StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.boolVal); + TRACE("Read bool %d\n", prop->u.boolVal); + break; case VT_I2: StorageUtl_ReadWord(data, 0, (WORD*)&prop->u.iVal); TRACE("Read short %d\n", prop->u.iVal); @@ -1081,6 +1085,18 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, StorageUtl_ReadDWord(data, 0, &prop->u.ulVal); TRACE("Read ulong %d\n", prop->u.ulVal); break; + case VT_I8: + StorageUtl_ReadULargeInteger(data, 0, (ULARGE_INTEGER *)&prop->u.hVal); + TRACE("Read long long %s\n", wine_dbgstr_longlong(prop->u.hVal.QuadPart)); + break; + case VT_UI8: + StorageUtl_ReadULargeInteger(data, 0, &prop->u.uhVal); + TRACE("Read ulong long %s\n", wine_dbgstr_longlong(prop->u.uhVal.QuadPart)); + break; + case VT_R8: + memcpy(&prop->u.dblVal, data, sizeof(double)); + TRACE("Read double %f\n", prop->u.dblVal); + break; case VT_LPSTR: { DWORD count;

1 0

Michael Stefaniuc : dswave: Reimplement ParseDescriptor() for DirectSoundWave.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 27dc1d05d79ccb51330225bae2351c39f83ff174 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27dc1d05d79ccb51330225ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 23:55:33 2018 +0200 dswave: Reimplement ParseDescriptor() for DirectSoundWave. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/dswave.c | 167 +++++++-------------------------------------- dlls/dswave/tests/dswave.c | 28 +++++--- 2 files changed, 42 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=27dc1d05d79ccb513302…

1 0

Hans Leidekker : bcrypt: Move macOS support to a new file.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: d265dd88cd93ce6ffe56c9cfd640b064d7c14e29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d265dd88cd93ce6ffe56c9cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:20:12 2018 +0200 bcrypt: Move macOS support to a new file. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_main.c | 180 -------------------------------------- dlls/bcrypt/macos.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d265dd88cd93ce6ffe56…

1 0

Hans Leidekker : msi: Use msi_get_package_code in msi_publish_product_properties.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: ddf762a82f2c578cd3b0d4ff0c13c8a08641a666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddf762a82f2c578cd3b0d4ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 18 11:19:54 2018 +0200 msi: Use msi_get_package_code in msi_publish_product_properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15f1876..29c6827 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4281,10 +4281,8 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) static const WCHAR szClients[] = {'C','l','i','e','n','t','s',0}; static const WCHAR szColon[] = {':',0}; - MSIHANDLE hdb, suminfo; - WCHAR *buffer, *ptr, guids[MAX_PATH], packcode[SQUASHED_GUID_SIZE]; - DWORD langid, size; - UINT r; + WCHAR *buffer, *ptr, *guids, packcode[SQUASHED_GUID_SIZE]; + DWORD langid; buffer = msi_dup_property(package->db, INSTALLPROPERTY_PRODUCTNAMEW); msi_reg_set_val_str(hkey, INSTALLPROPERTY_PRODUCTNAMEW, buffer); @@ -4318,28 +4316,12 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0); msi_reg_set_val_str(hkey, szClients, szColon); - hdb = alloc_msihandle(&package->db->hdr); - if (!hdb) - return ERROR_NOT_ENOUGH_MEMORY; - - r = MsiGetSummaryInformationW(hdb, NULL, 0, &suminfo); - MsiCloseHandle(hdb); - if (r != ERROR_SUCCESS) - goto done; - - size = MAX_PATH; - r = MsiSummaryInfoGetPropertyW(suminfo, PID_REVNUMBER, NULL, NULL, - NULL, guids, &size); - if (r != ERROR_SUCCESS) - goto done; - - ptr = strchrW(guids, ';'); - if (ptr) *ptr = 0; + if (!(guids = msi_get_package_code(package->db))) return ERROR_OUTOFMEMORY; + if ((ptr = strchrW(guids, ';'))) *ptr = 0; squash_guid(guids, packcode); + msi_free( guids); msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGECODEW, packcode); -done: - MsiCloseHandle(suminfo); return ERROR_SUCCESS; }

1 0

Daniel Lehman : msvcr110: Create current scheduler in _CurrentScheduler:: _GetNumberOfVirtualProcessors.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 16f9a9e1224988172c055cd2e276286c62492e7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=16f9a9e1224988172c055cd2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 17 15:49:10 2018 -0700 msvcr110: Create current scheduler in _CurrentScheduler::_GetNumberOfVirtualProcessors. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 4 ++-- dlls/msvcrt/scheduler.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 423b5d2..4b0043b 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -67,9 +67,9 @@ static void test_CurrentScheduler(void) GetSystemInfo(&si); expect = si.dwNumberOfProcessors; ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); - todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); - todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); } static void test_setlocale(void) diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index e4c1861..6269c98 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -1063,6 +1063,7 @@ _Scheduler* __cdecl _CurrentScheduler__Get(_Scheduler *ret) unsigned int __cdecl _CurrentScheduler__GetNumberOfVirtualProcessors(void) { TRACE("()\n"); + get_current_scheduler(); return CurrentScheduler_GetNumberOfVirtualProcessors(); }

1 0

Daniel Lehman : msvcr110/tests: Add GetNumberOfVirtualProcessors tests.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 8ae5352a72508eddb01a7f0b62503981942a6e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ae5352a72508eddb01a7f0b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jul 17 16:23:37 2018 -0700 msvcr110/tests: Add GetNumberOfVirtualProcessors tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index c0a182f..423b5d2 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -33,6 +33,9 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); +static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); +static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); + static BOOL init(void) { HMODULE module; @@ -45,9 +48,30 @@ static BOOL init(void) } p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); + p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); + return TRUE; } +static void test_CurrentScheduler(void) +{ + unsigned int ncpus; + unsigned int expect; + SYSTEM_INFO si; + + expect = ~0; + ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); + ok(ncpus == expect, "expected %x, got %x\n", expect, ncpus); + + GetSystemInfo(&si); + expect = si.dwNumberOfProcessors; + ncpus = p__CurrentScheduler__GetNumberOfVirtualProcessors(); + todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); + ncpus = p_CurrentScheduler_GetNumberOfVirtualProcessors(); + todo_wine ok(ncpus == expect, "expected %u, got %u\n", expect, ncpus); +} + static void test_setlocale(void) { int i; @@ -76,5 +100,6 @@ static void test_setlocale(void) START_TEST(msvcr110) { if (!init()) return; + test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); }

1 0

Alexandre Julliard : user32: Fetch client and window rectangles in a single call.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 3735f36dc94ca68a9344520ac28b2f7d548b0b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3735f36dc94ca68a9344520a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 10:09:55 2018 +0200 user32: Fetch client and window rectangles in a single call. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 665e1c0..66e69f4 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -652,12 +652,12 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) { - RECT client, update; + RECT client, window, update; INT type; /* check if update rgn overlaps with nonclient area */ type = GetRgnBox( whole_rgn, &update ); - WIN_GetRectangles( hwnd, COORDS_SCREEN, 0, &client ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &window, &client ); if ((*flags & UPDATE_NONCLIENT) || update.left < client.left || update.top < client.top || @@ -667,15 +667,10 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) CombineRgn( client_rgn, client_rgn, whole_rgn, RGN_AND ); /* check if update rgn contains complete nonclient area */ - if (type == SIMPLEREGION) + if (type == SIMPLEREGION && EqualRect( &window, &update )) { - RECT window; - GetWindowRect( hwnd, &window ); - if (EqualRect( &window, &update )) - { - DeleteObject( whole_rgn ); - whole_rgn = (HRGN)1; - } + DeleteObject( whole_rgn ); + whole_rgn = (HRGN)1; } } else

1 0

Józef Kucia : d3d10core/tests: Add more tests for multisample resolve.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: 158fa85b8f13d90ac05e675643eb79119671a2e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=158fa85b8f13d90ac05e6756… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 17 11:02:38 2018 +0200 d3d10core/tests: Add more tests for multisample resolve. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8fba7a3..f3c3d86 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16899,6 +16899,47 @@ static void test_multisample_resolve(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, &color, 0xffbf7f40, TRUE}, + + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + &color, 0xffe1bc89, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &green, 0xff00ff00, TRUE}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_TYPELESS, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UNORM, + &color, 0xffbf7f40, TRUE}, }; if (!init_test_context(&test_context))

1 0

Alexandre Julliard : user32: Make the MonitorFromRect() argument const.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: a36abda77377aba16b0039e1738f4155aa5e9d07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36abda77377aba16b0039e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 18 14:11:32 2018 +0200 user32: Make the MonitorFromRect() argument const. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 2 +- include/winuser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c92d9af..149b483 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3481,7 +3481,7 @@ static BOOL CALLBACK monitor_enum( HMONITOR monitor, HDC hdc, LPRECT rect, LPARA /*********************************************************************** * MonitorFromRect (USER32.@) */ -HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) +HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) { struct monitor_enum_info info; diff --git a/include/winuser.h b/include/winuser.h index a653ef4..8489d05 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3981,7 +3981,7 @@ WINUSERAPI BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); WINUSERAPI BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); #define ModifyMenu WINELIB_NAME_AW(ModifyMenu) WINUSERAPI HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); -WINUSERAPI HMONITOR WINAPI MonitorFromRect(LPRECT,DWORD); +WINUSERAPI HMONITOR WINAPI MonitorFromRect(const RECT*,DWORD); WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD); WINUSERAPI BOOL WINAPI MoveWindow(HWND,INT,INT,INT,INT,BOOL); WINUSERAPI DWORD WINAPI MsgWaitForMultipleObjects(DWORD,const HANDLE*,BOOL,DWORD,DWORD);

1 0

Daniel Lehman : gdi32: Update edgetable limits with top and bottom.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: wine Branch: master Commit: e976e179ae07d5c6c4d6854a939844d32f6255dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e976e179ae07d5c6c4d6854a… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jul 13 09:45:39 2018 -0700 gdi32: Update edgetable limits with top and bottom. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 4 ++-- dlls/gdi32/tests/path.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 4899d43..cad6428 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2457,8 +2457,8 @@ static unsigned int REGION_CreateEdgeTable(const INT *Count, INT nbpolygons, REGION_InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock); - if (PrevPt->y > ET->ymax) ET->ymax = PrevPt->y; - if (PrevPt->y < ET->ymin) ET->ymin = PrevPt->y; + if (top->y < ET->ymin) ET->ymin = top->y; + if (bottom->y > ET->ymax) ET->ymax = bottom->y; pETEs++; } } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 2356b96..f4a9d18 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -1910,7 +1910,7 @@ static void test_clipped_polygon_fill(void) oldbmp = SelectObject( memdc, bmp ); Polygon( memdc, pts, ARRAY_SIZE(pts) ); col = GetPixel( memdc, 1, 1 ); - todo_wine ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); + ok( col == RGB( 0x11, 0x22, 0x33 ), "got %06x\n", col ); SelectObject( memdc, oldbrush ); SelectObject( memdc, oldbmp ); DeleteObject( brush );

1 0

Jeremy Newman : update generate_passwd to be stronger
by Jeremy Newman July 18, 2018

July 18, 2018

Module: appdb Branch: master Commit: ca2c14ebead2840510103198f53216a5e3616208 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=ca2c14ebead284051010319… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Jul 18 13:12:38 2018 -0500 update generate_passwd to be stronger mt_rand in PHP is not considered to be cryptographically stong use openssl_random_pseudo_bytes instead --- include/user.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/user.php b/include/user.php index 5a4b428..6626b0e 100644 --- a/include/user.php +++ b/include/user.php @@ -417,16 +417,16 @@ class User { /** * Creates a new random password. */ - public static function generate_passwd($pass_len = 10) + public static function generate_passwd($pass_len = 20) { - $nps = ""; - mt_srand ((double) microtime() * 1000000); - while (strlen($nps)<$pass_len) - { - $c = chr(mt_rand (0,255)); - if (preg_match("/[a-zA-Z0-9]/", $c)) $nps = $nps.$c; + $alphanum = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + $alphanum_length = strlen($alphanum); + $random = openssl_random_pseudo_bytes($pass_len); + $passwd = ''; + for ($i = 0; $i < $pass_len; ++$i) { + $passwd .= $alphanum[ord($random[$i]) % $alphanum_length]; } - return ($nps); + return $passwd; } /**

1 0

Francois Gouget : testbot/Janitor: Only compute the latest file ages when needed.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: tools Branch: master Commit: 381d88c6b01512b40dc04400d9fc475adc955732 URL: https://source.winehq.org/git/tools.git/?a=commit;h=381d88c6b01512b40dc0440… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 18 17:32:25 2018 +0200 testbot/Janitor: Only compute the latest file ages when needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index a9cdd52..18bbc3d 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -310,9 +310,6 @@ if (opendir(my $dh, "$DataDir/latest")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); - $Entry =~ m%^([^/]+)$%; - my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); if ($Entry =~ /^(.*)_[a-z0-9]+\.(?:err|log)$/) { @@ -329,6 +326,9 @@ if (opendir(my $dh, "$DataDir/latest")) Trace "Found a suspicious latest file: $Entry\n"; if ($JobPurgeDays != 0) { + $Entry =~ m%^([^/]+)$%; # untaint + my $FileName = "$DataDir/latest/$1"; + my $Age = int((-M $FileName) + 0.5); if ($Age >= $JobPurgeDays + 7) { DeletePath($FileName);

1 0

Francois Gouget : testbot/WineSendLog: Remove a couple of redundant lines.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: tools Branch: master Commit: eb2dfc6b26d4895a35315fbc500aea46a9a3479b URL: https://source.winehq.org/git/tools.git/?a=commit;h=eb2dfc6b26d4895a35315fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jul 18 17:32:09 2018 +0200 testbot/WineSendLog: Remove a couple of redundant lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 2 -- 1 file changed, 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 51830ad..f1cb74e 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -475,8 +475,6 @@ EOF # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine # so any failure it reported is not caused by this patch. - my $LogFiles = GetLogFileNames($TaskDir); - my $LogName = $LogFiles->[0] || "log"; $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/$LogName", $BaseName, $StepTask->CmdLineArg); }

1 0

Józef Kucia : libs/vkd3d: Process shader stages according to pipeline order.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: d266a5f7d05c9ddf6983e64d3f4d1a2bffcf19c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d266a5f7d05c9ddf6983e64… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:44 2018 +0200 libs/vkd3d: Process shader stages according to pipeline order. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 19e6549..1c550e2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1829,10 +1829,10 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_stages[] = { {VK_SHADER_STAGE_VERTEX_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, VS)}, - {VK_SHADER_STAGE_FRAGMENT_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, PS)}, - {VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, DS)}, {VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, HS)}, + {VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, DS)}, {VK_SHADER_STAGE_GEOMETRY_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, GS)}, + {VK_SHADER_STAGE_FRAGMENT_BIT, offsetof(D3D12_GRAPHICS_PIPELINE_STATE_DESC, PS)}, }; state->ID3D12PipelineState_iface.lpVtbl = &d3d12_pipeline_state_vtbl;

1 0

Józef Kucia : libs/vkd3d: Return E_INVALIDARG for invalid pipeline state desc.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: 7892a1e938463cce4a5591c5d79ffe17c540f961 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7892a1e938463cce4a5591c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:45 2018 +0200 libs/vkd3d: Return E_INVALIDARG for invalid pipeline state desc. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 1c550e2..861f5bb 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1866,7 +1866,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->DSVFormat, true))) { WARN("Invalid DXGI format %#x.\n", desc->DSVFormat); - hr = E_FAIL; + hr = E_INVALIDARG; goto fail; } @@ -1915,7 +1915,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(desc->RTVFormats[i], false))) { WARN("Invalid DXGI format %#x.\n", desc->RTVFormats[i]); - hr = E_FAIL; + hr = E_INVALIDARG; goto fail; } @@ -2007,14 +2007,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format = vkd3d_get_format(e->Format, false))) { WARN("Invalid DXGI format %#x.\n", e->Format); - hr = E_FAIL; + hr = E_INVALIDARG; goto fail; } if (e->InputSlot >= ARRAY_SIZE(graphics->input_rates)) { WARN("Invalid input slot %#x.\n", e->InputSlot); - hr = E_FAIL; + hr = E_INVALIDARG; goto fail; } @@ -2048,7 +2048,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s default: FIXME("Unhandled input slot class %#x on input element %u.\n", e->InputSlotClass, i); - hr = E_FAIL; + hr = E_INVALIDARG; goto fail; } @@ -2056,7 +2056,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s { FIXME("Input slot class %#x on input element %u conflicts with earlier input slot class %#x.\n", e->InputSlotClass, e->InputSlot, graphics->input_rates[e->InputSlot]); - hr = E_FAIL; + hr = E_INVALIDARG; goto fail; } graphics->input_rates[e->InputSlot] = input_rate;

1 0

Józef Kucia : include: Add missing D3D_PRIMITIVE_TOPOLOGY enum values.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: 8d9d910374d36f31272a34a9c568eb27a6c33f66 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8d9d910374d36f31272a34a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:47 2018 +0200 include: Add missing D3D_PRIMITIVE_TOPOLOGY enum values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3dcommon.idl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index a874b6c..8bfa567 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -28,6 +28,42 @@ typedef enum D3D_PRIMITIVE_TOPOLOGY D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5, + D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10, + D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12, + D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13, + D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33, + D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST, + D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST, } D3D_PRIMITIVE_TOPOLOGY; typedef enum D3D_FEATURE_LEVEL

1 0

Józef Kucia : libs/vkd3d-shader: Add debug name for vDomainLocation register.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: 6e8dae9d625bf7e281b1d3f49afe2efefe9a836f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6e8dae9d625bf7e281b1d3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:43 2018 +0200 libs/vkd3d-shader: Add debug name for vDomainLocation register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3260b28..d236db9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2160,6 +2160,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUT: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_TESSCOORD: + snprintf(buffer, buffer_size, "vDomainLocation"); + break; case VKD3DSPR_THREADID: snprintf(buffer, buffer_size, "vThreadID"); break;

1 0

Józef Kucia : libs/vkd3d: Validate PrimitiveTopologyType for PSO with tessellation shaders.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: b7d2278f5706737cfed34a3557827ace6be8e62c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b7d2278f5706737cfed34a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:46 2018 +0200 libs/vkd3d: Validate PrimitiveTopologyType for PSO with tessellation shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 861f5bb..973caee 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1969,22 +1969,43 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (shader_info.uav_counter_mask) FIXME("UAV counters not implemented for graphics pipelines.\n"); - if (shader_stages[i].stage == VK_SHADER_STAGE_FRAGMENT_BIT) - compile_args = &ps_compile_args; - else - compile_args = NULL; + compile_args = NULL; + switch (shader_stages[i].stage) + { + case VK_SHADER_STAGE_VERTEX_BIT: + if ((ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) + { + hr = hresult_from_vkd3d_result(ret); + goto fail; + } + break; + + case VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT: + case VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT: + if (desc->PrimitiveTopologyType != D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH) + { + WARN("D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH must be used with tessellation shaders.\n"); + hr = E_INVALIDARG; + goto fail; + } + break; + + case VK_SHADER_STAGE_GEOMETRY_BIT: + break; + + case VK_SHADER_STAGE_FRAGMENT_BIT: + compile_args = &ps_compile_args; + break; + + default: + hr = E_INVALIDARG; + goto fail; + } if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface, compile_args))) goto fail; - if (shader_stages[i].stage == VK_SHADER_STAGE_VERTEX_BIT - && (ret = vkd3d_shader_parse_input_signature(&dxbc, &input_signature)) < 0) - { - hr = hresult_from_vkd3d_result(ret); - goto fail; - } - ++graphics->stage_count; }

1 0

Józef Kucia : libs/vkd3d-shader: Treat vicp register as regular shader input.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: 054b1e41dd62a60d006c3b8a0cba19e07ad3154d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=054b1e41dd62a60d006c3b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:42 2018 +0200 libs/vkd3d-shader: Treat vicp register as regular shader input. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 11 +++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1755c25..3260b28 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1729,7 +1729,7 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol, symbol->type = VKD3D_SYMBOL_REGISTER; memset(&symbol->key, 0, sizeof(symbol->key)); symbol->key.reg.type = reg->type; - if (reg->type == VKD3DSPR_INPUT && reg->idx[1].offset != ~0u) + if (vkd3d_shader_register_is_input(reg) && reg->idx[1].offset != ~0u) symbol->key.reg.idx = reg->idx[1].offset; else if (reg->type != VKD3DSPR_IMMCONSTBUFFER) symbol->key.reg.idx = reg->idx[0].offset; @@ -2150,6 +2150,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_INPUT: snprintf(buffer, buffer_size, "v%u", idx); break; + case VKD3DSPR_INCONTROLPOINT: + snprintf(buffer, buffer_size, "vicp%u", idx); + break; case VKD3DSPR_OUTPUT: case VKD3DSPR_COLOROUT: snprintf(buffer, buffer_size, "o%u", idx); @@ -3755,10 +3758,10 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi { const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; - if (dst->reg.type != VKD3DSPR_INPUT) - vkd3d_dxbc_compiler_emit_input_register(compiler, dst); - else + if (vkd3d_shader_register_is_input(&dst->reg)) vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + else + vkd3d_dxbc_compiler_emit_input_register(compiler, dst); } static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9eb2c12..b1eadde 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -778,6 +778,11 @@ static inline BOOL vkd3d_shader_instruction_has_texel_offset(const struct vkd3d_ return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w; } +static inline bool vkd3d_shader_register_is_input(const struct vkd3d_shader_register *reg) +{ + return reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT; +} + void vkd3d_shader_trace(void *data) DECLSPEC_HIDDEN; void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size,

1 0

Józef Kucia : libs/vkd3d-shader: Enable arrayed inputs for all shader types.
by Alexandre Julliard July 18, 2018

July 18, 2018

Module: vkd3d Branch: master Commit: faa11182023453ad2f3bfcec840bd185079897c4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=faa11182023453ad2f3bfce… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 18 12:05:41 2018 +0200 libs/vkd3d-shader: Enable arrayed inputs for all shader types. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bfa2bc0..1755c25 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3000,11 +3000,6 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element return NULL; } -static bool vkd3d_dxbc_compiler_is_input_arrayed(struct vkd3d_dxbc_compiler *compiler) -{ - return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY; -} - static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3027,7 +3022,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi assert(!reg->idx[0].rel_addr); assert(!reg->idx[1].rel_addr); - if (vkd3d_dxbc_compiler_is_input_arrayed(compiler)) + if (reg->idx[1].offset != ~0u) { array_size = reg->idx[0].offset; reg_idx = reg->idx[1].offset;

1 0

Michael Stefaniuc : ole32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: d93954bd93ea7633e8938e38744369e79944a3f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d93954bd93ea7633e8938e38… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 21:20:06 2018 +0200 ole32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/classmoniker.c | 6 +++--- dlls/ole32/clipboard.c | 2 +- dlls/ole32/datacache.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/ole2.c | 2 +- dlls/ole32/ole2impl.c | 2 +- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/storage32.c | 9 ++++----- dlls/ole32/usrmarshal.c | 4 ++-- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index ebad794..30a24d2 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -536,14 +536,14 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface, *ppszDisplayName = CoTaskMemAlloc(sizeof(wszClsidPrefix) + (CHARS_IN_GUID-2) * sizeof(WCHAR)); - StringFromGUID2(&This->clsid, *ppszDisplayName+sizeof(wszClsidPrefix)/sizeof(WCHAR)-2, CHARS_IN_GUID); + StringFromGUID2(&This->clsid, *ppszDisplayName+ARRAY_SIZE(wszClsidPrefix)-2, CHARS_IN_GUID); /* note: this overwrites the opening curly bracket of the CLSID string generated above */ memcpy(*ppszDisplayName, wszClsidPrefix, sizeof(wszClsidPrefix)-sizeof(WCHAR)); /* note: this overwrites the closing curly bracket of the CLSID string generated above */ - (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-2] = ':'; - (*ppszDisplayName)[sizeof(wszClsidPrefix)/sizeof(WCHAR)-2+CHARS_IN_GUID-1] = '\0'; + (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-2] = ':'; + (*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-1] = '\0'; TRACE("string is %s\n", debugstr_w(*ppszDisplayName)); return S_OK; diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 919d9e3..cb005d3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1197,7 +1197,7 @@ static HRESULT get_priv_data(ole_priv_data **data) for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) { WCHAR buf[256]; - if (GetClipboardFormatNameW(cf, buf, sizeof(buf) / sizeof(WCHAR))) + if (GetClipboardFormatNameW(cf, buf, ARRAY_SIZE(buf))) TRACE("cf %04x %s\n", cf, debugstr_w(buf)); else TRACE("cf %04x\n", cf); diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b72b8ff..3eff569 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2667,7 +2667,7 @@ static HRESULT WINAPI DataCache_UpdateCache( IOleCache2 *iface, IDataObject *dat } else { - for (i = 0; i < sizeof(view_list) / sizeof(view_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(view_list); i++) { fmt.cfFormat = view_list[i]; fmt.tymed = tymed_from_cf( fmt.cfFormat ); diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index ffbaa61..c1312d1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -1152,7 +1152,7 @@ HRESULT WINAPI MkParseDisplayName(LPBC pbc, LPCOLESTR szDisplayName, *pchEaten = 0; *ppmk = NULL; - if (!strncmpiW(szDisplayName, wszClsidColon, sizeof(wszClsidColon)/sizeof(wszClsidColon[0]))) + if (!strncmpiW(szDisplayName, wszClsidColon, ARRAY_SIZE(wszClsidColon))) { hr = ClassMoniker_CreateFromDisplayName(pbc, szDisplayName, &chEaten, &moniker); if (FAILED(hr) && (hr != MK_E_SYNTAX)) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index c7a9b27..2de9edb 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -967,7 +967,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( LPWSTR pwszOLEVERB; LPWSTR pwszMenuFlags; LPWSTR pwszAttribs; - LONG res = RegEnumKeyW(This->hkeyVerb, This->index, wszSubKey, sizeof(wszSubKey)/sizeof(wszSubKey[0])); + LONG res = RegEnumKeyW(This->hkeyVerb, This->index, wszSubKey, ARRAY_SIZE(wszSubKey)); if (res == ERROR_NO_MORE_ITEMS) { hr = S_FALSE; diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index ccf31fa..fa5777b 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -135,7 +135,7 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf, BOOL if (other_fmts) { - for (i = 0; i < sizeof(fmt_id)/sizeof(fmt_id[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmt_id); i++) { init_fmtetc(&fmt, fmt_id[i], TYMED_ISTORAGE); hr = IDataObject_QueryGetData(data, &fmt); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index a73d23c..9aa945b 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1658,7 +1658,7 @@ static HRESULT create_server(REFCLSID rclsid, HANDLE *process) static const WCHAR embedding[] = { ' ', '-','E','m','b','e','d','d','i','n','g',0 }; HKEY key; HRESULT hres; - WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; + WCHAR command[MAX_PATH+ARRAY_SIZE(embedding)]; DWORD size = (MAX_PATH+1) * sizeof(WCHAR); STARTUPINFOW sinfo; PROCESS_INFORMATION pinfo; @@ -1799,7 +1799,7 @@ static void get_localserver_pipe_name(WCHAR *pipefn, REFCLSID rclsid) { static const WCHAR wszPipeRef[] = {'\\','\\','.','\\','p','i','p','e','\\',0}; strcpyW(pipefn, wszPipeRef); - StringFromGUID2(rclsid, pipefn + sizeof(wszPipeRef)/sizeof(wszPipeRef[0]) - 1, CHARS_IN_GUID); + StringFromGUID2(rclsid, pipefn + ARRAY_SIZE(wszPipeRef) - 1, CHARS_IN_GUID); } /* FIXME: should call to rpcss instead */ diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 51f178b..886d9b9 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5057,7 +5057,7 @@ static HRESULT StorageImpl_LockOne(StorageImpl *This, ULONG start, ULONG end) if (SUCCEEDED(hr)) { - for (j=0; j<sizeof(This->locked_bytes)/sizeof(This->locked_bytes[0]); j++) + for (j = 0; j < ARRAY_SIZE(This->locked_bytes); j++) { if (This->locked_bytes[j] == 0) { @@ -5200,10 +5200,10 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) BlockChainStream_Destroy(This->rootBlockChain); BlockChainStream_Destroy(This->smallBlockDepotChain); - for (i=0; i<BLOCKCHAIN_CACHE_SIZE; i++) + for (i = 0; i < BLOCKCHAIN_CACHE_SIZE; i++) BlockChainStream_Destroy(This->blockChainCache[i]); - for (i=0; i<sizeof(This->locked_bytes)/sizeof(This->locked_bytes[0]); i++) + for (i = 0; i < ARRAY_SIZE(This->locked_bytes); i++) { ULARGE_INTEGER offset, cb; cb.QuadPart = 1; @@ -9369,8 +9369,7 @@ HRESULT WINAPI WriteFmtUserTypeStg( /* get the clipboard format name */ if( cf ) { - n = GetClipboardFormatNameW( cf, szwClipName, - sizeof(szwClipName)/sizeof(szwClipName[0]) ); + n = GetClipboardFormatNameW(cf, szwClipName, ARRAY_SIZE(szwClipName)); szwClipName[n]=0; } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8d36e13..772bff5 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -116,7 +116,7 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF) /* urg! this function is badly designed because it won't tell us how * much space is needed without doing a dummy run of storing the * name into a buffer */ - ret = GetClipboardFormatNameW(*pCF, format, sizeof(format)/sizeof(format[0])-1); + ret = GetClipboardFormatNameW(*pCF, format, ARRAY_SIZE(format)-1); if (!ret) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); size += (ret + 1) * sizeof(WCHAR); @@ -161,7 +161,7 @@ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char * *(DWORD *)pBuffer = *pCF; pBuffer += 4; - len = GetClipboardFormatNameW(*pCF, format, sizeof(format)/sizeof(format[0])-1); + len = GetClipboardFormatNameW(*pCF, format, ARRAY_SIZE(format)-1); if (!len) RaiseException(DV_E_CLIPFORMAT, 0, 0, NULL); len += 1;

1 0

Nikolay Sivov : comctl32/trackbar: Scale thumb size with resolution.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 489c01eeb24ed17e792422071ba05b5e58be81ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=489c01eeb24ed17e79242207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 14:13:03 2018 +0300 comctl32/trackbar: Scale thumb size with resolution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d774823..7cb73ca 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1468,25 +1468,28 @@ TRACKBAR_SetUnicodeFormat (TRACKBAR_INFO *infoPtr, BOOL fUnicode) return bTemp; } +static int get_scaled_metric(const TRACKBAR_INFO *infoPtr, int value) +{ + return MulDiv(value, GetDpiForWindow(infoPtr->hwndSelf), 96); +} static LRESULT TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) { + int client_size; RECT rect; - int clientWidth, clientMetric; - /* initial thumb length */ - clientMetric = (infoPtr->dwStyle & TBS_ENABLESELRANGE) ? 23 : 21; + infoPtr->uThumbLen = get_scaled_metric(infoPtr, infoPtr->dwStyle & TBS_ENABLESELRANGE ? 23 : 21); + GetClientRect(infoPtr->hwndSelf,&rect); - if (infoPtr->dwStyle & TBS_VERT) { - clientWidth = rect.right - rect.left; - } else { - clientWidth = rect.bottom - rect.top; - } - if (clientWidth >= clientMetric) - infoPtr->uThumbLen = clientMetric; + if (infoPtr->dwStyle & TBS_VERT) + client_size = rect.right - rect.left; else - infoPtr->uThumbLen = clientWidth > 9 ? clientWidth - 6 : 4; + client_size = rect.bottom - rect.top; + + if (client_size < infoPtr->uThumbLen) + infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? + client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); TRACKBAR_CalcChannel (infoPtr); TRACKBAR_UpdateThumb (infoPtr);

1 0

Nikolay Sivov : comctl32/taskdialog: Use per-window dpi settings.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 6292c0abdcb7b710914fe731c96eff6c6c219f17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6292c0abdcb7b710914fe731… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 14:13:06 2018 +0300 comctl32/taskdialog: Use per-window dpi settings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4631899..856a0b3 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -316,8 +316,8 @@ static void taskdialog_get_radio_button_size(struct taskdialog_info *dialog_info hfont = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); old_hfont = SelectObject(hdc, hfont); - radio_box_width = 12 * GetDeviceCaps(hdc, LOGPIXELSX) / 96 + 1; - radio_box_height = 12 * GetDeviceCaps(hdc, LOGPIXELSY) / 96 + 1; + radio_box_width = 12 * GetDpiForWindow(hwnd) / 96 + 1; + radio_box_height = 12 * GetDpiForWindow(hwnd) / 96 + 1; GetCharWidthW(hdc, '0', '0', &text_offset); text_offset /= 2;

1 0

Józef Kucia : winevulkan: Avoid FIXMEs for unsupported Vulkan functions.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: a77416c47a3dc61b5553d310e1b0f87ffb7a605f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a77416c47a3dc61b5553d310… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 17 10:40:18 2018 +0200 winevulkan: Avoid FIXMEs for unsupported Vulkan functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 5c156c1..0bb68c2 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -935,7 +935,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * return func; } - TRACE("Function %s not found.\n", debugstr_a(name)); + WARN("Unsupported device function: %s.\n", debugstr_a(name)); return NULL; } @@ -970,7 +970,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const { void *func; - TRACE("%p %s\n", instance, debugstr_a(name)); + TRACE("%p, %s\n", instance, debugstr_a(name)); if (!name) return NULL; @@ -985,7 +985,7 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const } if (!instance) { - FIXME("Global function %s not found.\n", debugstr_a(name)); + WARN("Global function %s not found.\n", debugstr_a(name)); return NULL; } @@ -996,13 +996,13 @@ PFN_vkVoidFunction WINAPI wine_vkGetInstanceProcAddr(VkInstance instance, const func = wine_vk_get_device_proc_addr(name); if (func) return func; - FIXME("Unsupported device or instance function: %s.\n", debugstr_a(name)); + WARN("Unsupported device or instance function: %s.\n", debugstr_a(name)); return NULL; } void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name) { - TRACE("%p %s\n", instance, debugstr_a(name)); + TRACE("%p, %s\n", instance, debugstr_a(name)); /* Initial version of the Vulkan ICD spec required vkGetInstanceProcAddr to be * exported. vk_icdGetInstanceProcAddr was added later to separate ICD calls from

1 0

Alexandre Julliard : user32: Take DPI awareness into account in GetDpiForMonitorInternal().
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 898f4b6c6a20cc3800bd38142da1d02d5a6a948e URL: https://source.winehq.org/git/wine.git/?a=commit;h=898f4b6c6a20cc3800bd3814… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 13:54:40 2018 +0200 user32: Take DPI awareness into account in GetDpiForMonitorInternal(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 34 +++++++++++++++++++++++++++------- dlls/user32/tests/sysparams.c | 22 ++++++++++++++++++++++ dlls/user32/win.c | 8 ++++++-- dlls/user32/win.h | 3 ++- 4 files changed, 57 insertions(+), 10 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e1044e94..c92d9af 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -39,6 +39,7 @@ #include "winerror.h" #include "controls.h" +#include "win.h" #include "user_private.h" #include "wine/gdi_driver.h" #include "wine/unicode.h" @@ -3192,7 +3193,16 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, /********************************************************************** * get_monitor_dpi */ -UINT get_monitor_dpi( HWND hwnd ) +UINT get_monitor_dpi( HMONITOR monitor ) +{ + /* FIXME: use the monitor DPI instead */ + return system_dpi; +} + +/********************************************************************** + * get_win_monitor_dpi + */ +UINT get_win_monitor_dpi( HWND hwnd ) { /* FIXME: use the monitor DPI instead */ return system_dpi; @@ -3324,12 +3334,22 @@ UINT WINAPI GetDpiForSystem(void) */ BOOL WINAPI GetDpiForMonitorInternal( HMONITOR monitor, UINT type, UINT *x, UINT *y ) { - UINT dpi = system_dpi; - - WARN( "(%p, %u, %p, %p): semi-stub\n", monitor, type, x, y ); - - if (x) *x = dpi; - if (y) *y = dpi; + if (type > 2) + { + SetLastError( ERROR_BAD_ARGUMENTS ); + return FALSE; + } + if (!x || !y) + { + SetLastError( ERROR_INVALID_ADDRESS ); + return FALSE; + } + switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) + { + case DPI_AWARENESS_UNAWARE: *x = *y = USER_DEFAULT_SCREEN_DPI; break; + case DPI_AWARENESS_SYSTEM_AWARE: *x = *y = system_dpi; break; + default: *x = *y = get_monitor_dpi( monitor ); break; + } return TRUE; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fec37b6..7903c9a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -46,6 +46,7 @@ static BOOL (WINAPI *pGetProcessDpiAwarenessInternal)(HANDLE,DPI_AWARENESS*); static BOOL (WINAPI *pSetProcessDpiAwarenessInternal)(DPI_AWARENESS); static UINT (WINAPI *pGetDpiForSystem)(void); static UINT (WINAPI *pGetDpiForWindow)(HWND); +static BOOL (WINAPI *pGetDpiForMonitorInternal)(HMONITOR,UINT,UINT*,UINT*); static DPI_AWARENESS_CONTEXT (WINAPI *pGetThreadDpiAwarenessContext)(void); static DPI_AWARENESS_CONTEXT (WINAPI *pSetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static DPI_AWARENESS_CONTEXT (WINAPI *pGetWindowDpiAwarenessContext)(HWND); @@ -3549,6 +3550,26 @@ static void test_dpi_window(void) dpi = pGetDpiForWindow( hwnd ); ok( dpi == (i == DPI_AWARENESS_UNAWARE ? USER_DEFAULT_SCREEN_DPI : real_dpi), "%lu: got %u / %u\n", i, dpi, real_dpi ); + if (pGetDpiForMonitorInternal) + { + BOOL res; + SetLastError( 0xdeadbeef ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 0, &dpi, NULL ); + ok( !res, "succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 3, &dpi, &dpi ); + ok( !res, "succeeded\n" ); + ok( GetLastError() == ERROR_BAD_ARGUMENTS, "wrong error %u\n", GetLastError() ); + SetLastError( 0xdeadbeef ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 3, &dpi, NULL ); + ok( !res, "succeeded\n" ); + ok( GetLastError() == ERROR_BAD_ARGUMENTS, "wrong error %u\n", GetLastError() ); + res = pGetDpiForMonitorInternal( MonitorFromWindow( hwnd, 0 ), 0, &dpi, &dpi ); + ok( res, "failed err %u\n", GetLastError() ); + ok( dpi == (i == DPI_AWARENESS_UNAWARE ? USER_DEFAULT_SCREEN_DPI : real_dpi), + "%lu: got %u / %u\n", i, dpi, real_dpi ); + } msg.hwnd = hwnd; for (j = DPI_AWARENESS_UNAWARE; j <= DPI_AWARENESS_PER_MONITOR_AWARE; j++) { @@ -3660,6 +3681,7 @@ START_TEST(sysparams) pSetProcessDPIAware = (void*)GetProcAddress(hdll, "SetProcessDPIAware"); pGetDpiForSystem = (void*)GetProcAddress(hdll, "GetDpiForSystem"); pGetDpiForWindow = (void*)GetProcAddress(hdll, "GetDpiForWindow"); + pGetDpiForMonitorInternal = (void*)GetProcAddress(hdll, "GetDpiForMonitorInternal"); pSetProcessDpiAwarenessContext = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessContext"); pGetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "GetProcessDpiAwarenessInternal"); pSetProcessDpiAwarenessInternal = (void*)GetProcAddress(hdll, "SetProcessDpiAwarenessInternal"); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 28bc1f6..5f2ac4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2240,11 +2240,15 @@ UINT WINAPI GetDpiForWindow( HWND hwnd ) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } - if (win == WND_DESKTOP) return get_monitor_dpi( GetDesktopWindow() ); + if (win == WND_DESKTOP) + { + POINT pt = { 0, 0 }; + return get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY )); + } if (win != WND_OTHER_PROCESS) { ret = win->dpi; - if (!ret) ret = get_monitor_dpi( hwnd ); + if (!ret) ret = get_win_monitor_dpi( hwnd ); WIN_ReleasePtr( win ); } else diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 15331c3..b6c162a 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -128,7 +128,8 @@ extern void WINPOS_ActivateOtherWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) DECLSPEC_HIDDEN; extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDEN; -extern UINT get_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; +extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; +extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Implement monitor rectangle filtering on the user32 side.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: aac37e8d0b64f487c9fcf538a1a1a73e9cfb8669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aac37e8d0b64f487c9fcf538… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 13:50:26 2018 +0200 user32: Implement monitor rectangle filtering on the user32 side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 75 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 67eb90a..e1044e94 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -21,6 +21,7 @@ #include "config.h" #include <assert.h> +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -3562,49 +3563,79 @@ BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) return ret; } -#ifdef __i386__ -/* Some apps pass a non-stdcall callback to EnumDisplayMonitors, - * so we need a small assembly wrapper to call it. - * MJ's Help Diagnostic expects that %ecx contains the address to the rect. - */ -struct enumdisplaymonitors_lparam +struct enum_mon_data { MONITORENUMPROC proc; LPARAM lparam; + HDC hdc; + POINT origin; + RECT limit; }; -extern BOOL CALLBACK enumdisplaymonitors_callback_wrapper(HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lparam); -__ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, +#ifdef __i386__ +/* Some apps pass a non-stdcall callback to EnumDisplayMonitors, + * so we need a small assembly wrapper to call it. + * MJ's Help Diagnostic expects that %ecx contains the address to the rect. + */ +extern BOOL enum_mon_callback_wrapper( HMONITOR monitor, LPRECT rect, struct enum_mon_data *data ); +__ASM_GLOBAL_FUNC( enum_mon_callback_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "subl $8,%esp\n\t" - "movl 20(%ebp),%eax\n\t" /* struct enumdisplaymonitors_lparam *orig = (struct enumdisplaymonitors_lparam*)lparam */ - "pushl 4(%eax)\n\t" /* push orig->lparam */ - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "pushl 8(%ebp)\n\t" - "movl 16(%ebp),%ecx\n\t" - "call *(%eax)\n\t" /* call orig->proc */ + "movl 16(%ebp),%eax\n\t" /* data */ + "movl 12(%ebp),%ecx\n\t" /* rect */ + "pushl 4(%eax)\n\t" /* data->lparam */ + "pushl %ecx\n\t" /* rect */ + "pushl 8(%eax)\n\t" /* data->hdc */ + "pushl 8(%ebp)\n\t" /* monitor */ + "call *(%eax)\n\t" /* data->proc */ "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret $16" ) + "ret" ) #endif /* __i386__ */ +static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + struct enum_mon_data *data = (struct enum_mon_data *)lp; + RECT monrect = *rect; + + OffsetRect( &monrect, -data->origin.x, -data->origin.y ); + if (!IntersectRect( &monrect, &monrect, &data->limit )) return TRUE; +#ifdef __i386__ + return enum_mon_callback_wrapper( monitor, &monrect, data ); +#else + return data->proc( monitor, data->hdc, &monrect, data->lparam ); +#endif +} + /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { -#ifdef __i386__ - struct enumdisplaymonitors_lparam orig = { proc, lp }; - proc = enumdisplaymonitors_callback_wrapper; - lp = (LPARAM)&orig; -#endif - return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); + struct enum_mon_data data; + + data.proc = proc; + data.lparam = lp; + data.hdc = hdc; + + if (hdc) + { + if (!GetDCOrgEx( hdc, &data.origin )) return FALSE; + if (GetClipBox( hdc, &data.limit ) == ERROR) return FALSE; + } + else + { + data.origin.x = data.origin.y = 0; + data.limit.left = data.limit.top = INT_MIN; + data.limit.right = data.limit.bottom = INT_MAX; + } + if (rect && !IntersectRect( &data.limit, &data.limit, rect )) return TRUE; + return USER_Driver->pEnumDisplayMonitors( 0, NULL, enum_mon_callback, (LPARAM)&data ); }

1 0

Alexandre Julliard : user32: Move monitor functions to sysparams.c.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 2be5b054d3dd48be8105be62b78dab40e1d46cad URL: https://source.winehq.org/git/wine.git/?a=commit;h=2be5b054d3dd48be8105be62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 17 13:49:03 2018 +0200 user32: Move monitor functions to sysparams.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 208 ------------------------------------------------ dlls/user32/sysparams.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+), 208 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2be5b054d3dd48be8105…

1 0

Zhiyi Zhang : user32: Fix menu item rectangle calculation in GetMenuItemRect().
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: a205401b385d06ed8204c5f3ed3abccdebbeb129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a205401b385d06ed8204c5f3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 23:04:38 2018 +0800 user32: Fix menu item rectangle calculation in GetMenuItemRect(). This fixes the menu of BibleWorks 10 not showing up and some todo in tests. Sysmenu is in non-client area. And because MapWindowPoints() should not be used with non-client area coordinates. Doing so results in wrong coordinates for sysmenu item rectangles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 13 +++++++-- dlls/user32/tests/menu.c | 71 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ab1ae9b..bae4500 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -5306,6 +5306,7 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) { POPUPMENU *menu; UINT pos; + RECT window_rect; TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); @@ -5324,9 +5325,17 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) *rect = menu->items[pos].rect; OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); - release_menu_ptr(menu); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + /* Popup menu item draws in the client area */ + if (menu->wFlags & MF_POPUP) MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + else + { + /* Sysmenu draws in the non-client area */ + GetWindowRect(hwnd, &window_rect); + OffsetRect(rect, window_rect.left, window_rect.top); + } + + release_menu_ptr(menu); return TRUE; } diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 7f338ce..6a4990f 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -341,6 +341,62 @@ static void test_getmenubarinfo(void) DestroyWindow(hwnd); } +static void test_GetMenuItemRect(void) +{ + HWND hwnd; + HMENU hmenu; + HMENU popup_hmenu; + RECT window_rect; + RECT item_rect; + POINT client_top_left; + INT caption_height; + BOOL ret; + + hwnd = CreateWindowW((LPCWSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, + NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed with error %d\n", GetLastError()); + hmenu = CreateMenu(); + ok(hmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + popup_hmenu = CreatePopupMenu(); + ok(popup_hmenu != NULL, "CreatePopupMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(popup_hmenu, MF_STRING, 0, "Popup"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA(hmenu, MF_STRING | MF_POPUP, (UINT_PTR)popup_hmenu, "Menu"); + ok(ret, "AppendMenu failed with error %d\n", GetLastError()); + ret = SetMenu(hwnd, hmenu); + ok(ret, "SetMenu failed with error %d\n", GetLastError()); + + /* Get the menu item rectangle of the displayed sysmenu item */ + ret = GetMenuItemRect(hwnd, hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + GetWindowRect(hwnd, &window_rect); + /* Get the screen coordinate of the left top corner of the client rectangle */ + client_top_left.x = 0; + client_top_left.y = 0; + MapWindowPoints(hwnd, 0, &client_top_left, 1); + caption_height = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYCAPTION); + + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right <= window_rect.right, "Expect item_rect.right %d <= %d\n", item_rect.right, window_rect.right); + /* A gap of 1 pixel is added deliberately in commit 75f9e64, so using equal operator would fail on Wine. + * Check that top and bottom are correct with 1 pixel margin tolerance */ + ok(item_rect.top - (window_rect.top + caption_height) <= 1, "Expect item_rect.top %d - %d <= 1\n", item_rect.top, + window_rect.top + caption_height); + ok(item_rect.bottom - (client_top_left.y - 1) <= 1, "Expect item_rect.bottom %d - %d <= 1\n", item_rect.bottom, + client_top_left.y - 1); + + /* Get the item rectangle of the not yet displayed popup menu item. */ + ret = GetMenuItemRect(hwnd, popup_hmenu, 0, &item_rect); + ok(ret, "GetMenuItemRect failed with error %d\n", GetLastError()); + ok(item_rect.left == client_top_left.x, "Expect item_rect.left %d == %d\n", item_rect.left, client_top_left.x); + ok(item_rect.right == client_top_left.x, "Expect item_rect.right %d == %d\n", item_rect.right, client_top_left.x); + ok(item_rect.top == client_top_left.y, "Expect item_rect.top %d == %d\n", item_rect.top, client_top_left.y); + ok(item_rect.bottom == client_top_left.y, "Expect item_rect.bottom %d == %d\n", item_rect.bottom, + client_top_left.y); + + DestroyWindow(hwnd); +} + static void test_system_menu(void) { WCHAR testW[] = {'t','e','s','t',0}; @@ -1734,7 +1790,7 @@ static void test_menu_iteminfo( void ) Only the low word of the dwTypeData is used. Use a magic bitmap here (Word 95 uses this to create its MDI menu buttons) */ TMII_INSMI( MIIM_TYPE, MFT_BITMAP | MFT_RIGHTJUSTIFY, -1, -1, 0, 0, 0, -1, - (HMENU)MAKELONG(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); + (HMENU)MAKELPARAM(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); TMII_GMII ( MIIM_TYPE, 80, MFT_BITMAP | MFT_RIGHTJUSTIFY, 0, 0, 0, 0, 0, 0, HBMMENU_MBAR_CLOSE, 0, HBMMENU_MBAR_CLOSE, NULL, OK, OK ); @@ -1780,7 +1836,7 @@ static void test_menu_iteminfo( void ) Only the low word of the dwTypeData is used. Use a magic bitmap here (Word 95 uses this to create its MDI menu buttons) */ TMII_INSMI( MIIM_TYPE, MFT_BITMAP | MFT_RIGHTJUSTIFY, -1, -1, 0, 0, 0, -1, - (HMENU)MAKELONG(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); + (HMENU)MAKELPARAM(HBMMENU_MBAR_CLOSE, 0x1234), -1, 0, OK ); TMII_GMII ( MIIM_TYPE, 80, MFT_BITMAP | MFT_RIGHTJUSTIFY, 0, 0, 0, 0, 0, 0, HBMMENU_MBAR_CLOSE, 0, HBMMENU_MBAR_CLOSE, NULL, OK, OK ); @@ -2188,15 +2244,15 @@ static struct menu_mouse_tests_s { { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE }, { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */ + { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, FALSE }, /* test 20 */ { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 2}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{2, 1}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, - { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } @@ -4199,6 +4255,7 @@ START_TEST(menu) test_subpopup_locked_by_menu(); test_menu_ownerdraw(); test_getmenubarinfo(); + test_GetMenuItemRect(); test_menu_bmp_and_string(); test_menu_getmenuinfo(); test_menu_setmenuinfo();

1 0

Józef Kucia : vulkan-1/tests: Enumerate queue families.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: adeeb0dc2173cfddab7c03b651b6b51647979ef7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adeeb0dc2173cfddab7c03b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 17 15:05:53 2018 +0200 vulkan-1/tests: Enumerate queue families. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index bf83a28..1d2f66f 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -149,6 +149,28 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void enumerate_device_queues(VkPhysicalDevice vk_physical_device) +{ + VkPhysicalDeviceProperties device_properties; + VkQueueFamilyProperties *properties; + uint32_t i, count; + + vkGetPhysicalDeviceProperties(vk_physical_device, &device_properties); + + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); + properties = heap_calloc(count, sizeof(*properties)); + ok(!!properties, "Failed to allocate memory.\n"); + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); + + for (i = 0; i < count; ++i) + { + trace("Device '%s', queue family %u: flags %#x count %u.\n", + device_properties.deviceName, i, properties[i].queueFlags, properties[i].queueCount); + } + + heap_free(properties); +} + static void test_physical_device_groups(void) { PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR; @@ -248,5 +270,6 @@ START_TEST(vulkan) { test_instance_version(); for_each_device(enumerate_physical_device); + for_each_device(enumerate_device_queues); test_physical_device_groups(); }

1 0

Austin English : ntoskrnl.exe: Add IoReleaseRemoveLockAndWaitEx stub.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 235f6da846093ae04c6024320975ce42a33ba99e URL: https://source.winehq.org/git/wine.git/?a=commit;h=235f6da846093ae04c602432… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jul 16 15:52:32 2018 -0500 ntoskrnl.exe: Add IoReleaseRemoveLockAndWaitEx stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43642 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a061241..80e9b9e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3547,7 +3547,18 @@ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) return TRUE; } +/********************************************************************* + * KeFlushQueuedDpcs (NTOSKRNL.@) + */ void WINAPI KeFlushQueuedDpcs(void) { FIXME("stub!\n"); } + +/********************************************************************* + * IoReleaseRemoveLockAndWaitEx (NTOSKRNL.@) + */ +void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG size) +{ + FIXME("stub: %p %p %u\n", lock, tag, size); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 907fba8..662445a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -436,7 +436,7 @@ @ stdcall IoRegisterPlugPlayNotification(long long ptr ptr ptr ptr ptr) @ stdcall IoRegisterShutdownNotification(ptr) @ stdcall IoReleaseCancelSpinLock(long) -@ stub IoReleaseRemoveLockAndWaitEx +@ stdcall IoReleaseRemoveLockAndWaitEx(ptr ptr long) @ stub IoReleaseRemoveLockEx @ stub IoReleaseVpbSpinLock @ stub IoRemoveShareAccess

1 0

Ken Thomases : dbghelp: Fix loading of Mach-O load commands for 64-bit binaries.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 3ff8fa7ed1d28b38703125b0c8c632410e3fd980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff8fa7ed1d28b38703125b0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 16 15:44:36 2018 -0500 dbghelp: Fix loading of Mach-O load commands for 64-bit binaries. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/macho_module.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 9990850..a29794e 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -89,6 +89,7 @@ struct image_file_map #ifdef HAVE_MACH_O_LOADER_H struct mach_header mach_header; + size_t header_size; /* size of real header in file */ const struct load_command* load_commands; const struct uuid_command* uuid; diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 9401dfb..05130b7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -415,7 +415,7 @@ static const struct load_command* macho_map_load_commands(struct macho_file_map* if (fmap->load_commands == IMAGE_NO_MAP) { fmap->load_commands = (const struct load_command*) macho_map_range( - fmap, sizeof(fmap->mach_header), fmap->mach_header.sizeofcmds, NULL); + fmap, fmap->header_size, fmap->mach_header.sizeofcmds, NULL); TRACE("Mapped load commands: %p\n", fmap->load_commands); } @@ -433,7 +433,7 @@ static void macho_unmap_load_commands(struct macho_file_map* fmap) { TRACE("Unmapping load commands: %p\n", fmap->load_commands); macho_unmap_range(NULL, (const void**)&fmap->load_commands, fmap, - sizeof(fmap->mach_header), fmap->mach_header.sizeofcmds); + fmap->header_size, fmap->mach_header.sizeofcmds); } } @@ -666,6 +666,7 @@ static BOOL macho_map_file(struct process *pcs, const WCHAR *filenameW, ifm->modtype = DMT_MACHO; ifm->addr_size = (pcs->is_64bit) ? 64 : 32; + fmap->header_size = (pcs->is_64bit) ? sizeof(struct mach_header_64) : sizeof(struct mach_header); len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); if (!(filename = HeapAlloc(GetProcessHeap(), 0, len)))

1 0

Vincent Povirk : mscoree: Use upgrade code to find installed Wine Mono version.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: cb6e92d3287e9768b2e535c0b3fa159b19ec26cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb6e92d3287e9768b2e535c0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 16 13:57:29 2018 -0500 mscoree: Use upgrade code to find installed Wine Mono version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45317 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/mscoree_main.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 42f8169..c4876fe 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -669,8 +669,10 @@ static BOOL install_wine_mono(void) { BOOL is_wow64 = FALSE; HMODULE hmsi; + UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); char versionstringbuf[15]; + char productcodebuf[39]; UINT res; DWORD buffer_size; PROCESS_INFORMATION pi; @@ -681,7 +683,7 @@ static BOOL install_wine_mono(void) BOOL ret; static const char* mono_version = "4.7.1"; - static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; + static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; static const WCHAR argsW[] = @@ -703,11 +705,22 @@ static BOOL install_wine_mono(void) return FALSE; } - pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + pMsiEnumRelatedProductsA = (void*)GetProcAddress(hmsi, "MsiEnumRelatedProductsA"); - buffer_size = sizeof(versionstringbuf); + res = pMsiEnumRelatedProductsA(mono_upgrade_code, 0, 0, productcodebuf); - res = pMsiGetProductInfoA(mono_product_code, "VersionString", versionstringbuf, &buffer_size); + if (res == ERROR_SUCCESS) + { + pMsiGetProductInfoA = (void*)GetProcAddress(hmsi, "MsiGetProductInfoA"); + + buffer_size = sizeof(versionstringbuf); + + res = pMsiGetProductInfoA(productcodebuf, "VersionString", versionstringbuf, &buffer_size); + } + else if (res != ERROR_NO_MORE_ITEMS) + { + ERR("MsiEnumRelatedProducts failed, err=%u\n", res); + } FreeLibrary(hmsi);

1 0

Michael Stefaniuc : dmime: Don't crash when DMSegment loads a MIDI file.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: c8e493cb0c16ef28d9109e3b14f63d9587a8f013 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e493cb0c16ef28d9109e3b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 16 23:39:01 2018 +0200 dmime: Don't crash when DMSegment loads a MIDI file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31829 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index dc46069..9a9872b 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -790,10 +790,16 @@ static HRESULT WINAPI seg_IPersistStream_Load(IPersistStream *iface, IStream *st if (!stream) return E_POINTER; - if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF) + if (stream_get_chunk(stream, &riff) != S_OK || + (riff.id != FOURCC_RIFF && riff.id != mmioFOURCC('M','T','h','d'))) return DMUS_E_UNSUPPORTED_STREAM; - stream_reset_chunk_start(stream, &riff); + + if (riff.id == mmioFOURCC('M','T','h','d')) { + FIXME("MIDI file loading not supported\n"); + return S_OK; + } + hr = IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream, &This->dmobj.desc); if (FAILED(hr))

1 0

Nikolay Sivov : comctl32/button: Use per-window dpi settings.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 40298cc69a9966b678ec45ad4d9ca1aea55d33a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40298cc69a9966b678ec45ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 14:13:05 2018 +0300 comctl32/button: Use per-window dpi settings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 507820c..56968f9 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1092,8 +1092,8 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) GetClientRect(infoPtr->hwnd, &client); rbox = rtext = client; - checkBoxWidth = 12 * GetDeviceCaps( hDC, LOGPIXELSX ) / 96 + 1; - checkBoxHeight = 12 * GetDeviceCaps( hDC, LOGPIXELSY ) / 96 + 1; + checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; + checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset );

1 0

Vincent Povirk : appwiz.cpl: Update Wine Mono to 4.7.3.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 36e87e031726499becbf06163ccd7431eedd2e7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=36e87e031726499becbf0616… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 16 13:57:30 2018 -0500 appwiz.cpl: Update Wine Mono to 4.7.3. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45317 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index aede3d0..4e87467 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.7.1" -#define MONO_SHA "2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa" +#define MONO_VERSION "4.7.3" +#define MONO_SHA "d24a8017371c7e8224a1778bb43a113ed7ed9720efd9d0cda175d42db6106d3a" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c4876fe..eda380a 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.7.1"; + static const char* mono_version = "4.7.3"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Zhiyi Zhang : user32/tests: Sleep when sending mouse clicks too fast.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 0b69359a24f91122eef330d537350d9f51ed87ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b69359a24f91122eef330d5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 23:05:14 2018 +0800 user32/tests: Sleep when sending mouse clicks too fast. A thread is used to send test data. If the thread sends mouse clicks before pop-up menu initialization, it would report send input failure and skip the tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 6a4990f..de08283 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2253,7 +2253,7 @@ static struct menu_mouse_tests_s { { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{3, 0}, {0}}, {0}, FALSE, FALSE }, { INPUT_MOUSE, {{1, 0}, {2, 0}, {0}}, {0}, TRUE, FALSE }, - { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, TRUE }, + { INPUT_MOUSE, {{3, 1}, {0}}, {0}, TRUE, FALSE }, { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE }, { -1 } }; @@ -2307,7 +2307,7 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) for (i = 0; menu_tests[i].type != -1; i++) { BOOL ret = TRUE; - int elapsed = 0; + int elapsed; got_input = i && menu_tests[i-1].bMenuVisible; @@ -2316,7 +2316,16 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) send_key(menu_tests[i].wVk[j]); else for (j = 0; menu_tests[i].menu_item_pairs[j].uMenu != 0; j++) - if (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) break; + { + /* Maybe clicking too fast before menu is initialized. Sleep 100 ms and retry */ + elapsed = 0; + while (!(ret = click_menu(hWnd, &menu_tests[i].menu_item_pairs[j]))) + { + if (elapsed > 1000) break; + elapsed += 100; + Sleep(100); + } + } if (!ret) { @@ -2324,6 +2333,8 @@ static DWORD WINAPI test_menu_input_thread(LPVOID lpParameter) PostMessageA( hWnd, WM_CANCELMODE, 0, 0 ); return 0; } + + elapsed = 0; while (menu_tests[i].bMenuVisible != bMenuVisible) { if (elapsed > 200)

1 0

Nikolay Sivov : user32/button: Use per-window dpi settings.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 85d159a408b80613ea1d02a63ac3f908dcf0ee56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d159a408b80613ea1d02a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 17 14:13:04 2018 +0300 user32/button: Use per-window dpi settings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 7684e7f..9255a46 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -842,8 +842,8 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) GetClientRect(hwnd, &client); rbox = rtext = client; - checkBoxWidth = 12 * GetDeviceCaps( hDC, LOGPIXELSX ) / 96 + 1; - checkBoxHeight = 12 * GetDeviceCaps( hDC, LOGPIXELSY ) / 96 + 1; + checkBoxWidth = 12 * GetDpiForWindow( hwnd ) / 96 + 1; + checkBoxHeight = 12 * GetDpiForWindow( hwnd ) / 96 + 1; if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset );

1 0

Michael Stefaniuc : oledlg: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: b03718f09cfad27335b9c13f5eb1152a4794f4b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b03718f09cfad27335b9c13f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 21:20:07 2018 +0200 oledlg: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledlg/insobjdlg.c | 2 +- dlls/oledlg/oledlg_main.c | 8 ++++---- dlls/oledlg/pastespl.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 506196e..00b991e 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -350,7 +350,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) RegOpenKeyExW(HKEY_CLASSES_ROOT, szClsid, 0, KEY_READ, &hkclsids); - while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, sizeof(szclsid)/sizeof(szclsid[0])))) + while (ERROR_SUCCESS == (ret = RegEnumKeyW(hkclsids, index, szclsid, ARRAY_SIZE(szclsid)))) { index++; diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index 8ba9f17..ba5b7c8 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -181,7 +181,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, if (object) IOleObject_EnumVerbs(object, &enumverbs); - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT, resstrW, ARRAY_SIZE(resstrW)); /* no object, or object without enumeration support */ if (!object || !enumverbs) { RemoveMenu(hMenu, uPos, MF_BYPOSITION); @@ -202,7 +202,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, singleverb = get_next_insertable_verb(enumverbs, idmin, idmax, &verb) != S_OK; if (singleverb && !addConvert) { - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_SINGLEVERB_OBJECT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_SINGLEVERB_OBJECT, resstrW, ARRAY_SIZE(resstrW)); args[0] = (DWORD_PTR)firstverb.lpszVerbName; args[1] = (DWORD_PTR)objecttype; @@ -235,7 +235,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, /* convert verb is at the bottom of a popup, separated from verbs */ if (addConvert) { - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_CONVERT, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_CONVERT, resstrW, ARRAY_SIZE(resstrW)); InsertMenuW(submenu, ~0, MF_BYPOSITION|MF_SEPARATOR, 0, NULL); InsertMenuW(submenu, ~0, MF_BYPOSITION|MF_STRING, idConvert, resstrW); } @@ -244,7 +244,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype, *ret_submenu = submenu; /* now submenu is ready, add root entry to original menu, attach submenu */ - LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT_WITH_NAME, resstrW, sizeof(resstrW)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_VERBMENU_OBJECT_WITH_NAME, resstrW, ARRAY_SIZE(resstrW)); args[0] = (DWORD_PTR)objecttype; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY, diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 530c4ed..0b8c8c9 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -182,14 +182,14 @@ static void get_descriptors(HWND hdlg, ps_struct_t *ps_struct) if(ps_struct->source_name == NULL && ps_struct->link_source_name == NULL) { WCHAR buf[200]; - LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_SRC, buf, ARRAY_SIZE(buf)); ps_struct->source_name = strdupW(buf); } if(ps_struct->type_name == NULL && ps_struct->link_type_name == NULL) { WCHAR buf[200]; - LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, IDS_PS_UNKNOWN_TYPE, buf, ARRAY_SIZE(buf)); ps_struct->type_name = strdupW(buf); } } @@ -228,7 +228,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) } /* The native version grabs only the first 20 fmts and we do the same */ - hr = IEnumFORMATETC_Next(penum, sizeof(fmts)/sizeof(fmts[0]), fmts, &fetched); + hr = IEnumFORMATETC_Next(penum, ARRAY_SIZE(fmts), fmts, &fetched); TRACE("got %d formats hr %08x\n", fetched, hr); if(SUCCEEDED(hr)) @@ -431,7 +431,7 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct) res_id = IDS_PS_PASTE_LINK_DATA; } - LoadStringW(OLEDLG_hInstance, res_id, resource_txt, sizeof(resource_txt)/sizeof(WCHAR)); + LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt)); if((ptr = strstrW(resource_txt, percent_s))) { /* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */

1 0

Michael Stefaniuc : ntdll/tests: Avoid temp variables holding ARRAY_SIZE results.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 9f7d802341c9714cc98318805dc45daf438565a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f7d802341c9714cc9831880… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 21:20:05 2018 +0200 ntdll/tests: Avoid temp variables holding ARRAY_SIZE results. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 22f3df9..07fa1cd 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1239,7 +1239,6 @@ static struct { "::1", STATUS_INVALID_PARAMETER, 0, { -1 } }, { ":1", STATUS_INVALID_PARAMETER, 0, { -1 } }, }; -const unsigned int ipv4_testcount = sizeof(ipv4_tests) / sizeof(ipv4_tests[0]); static void init_ip4(IN_ADDR* addr, const int src[4]) { @@ -1284,7 +1283,7 @@ static void test_RtlIpv4StringToAddress(void) */ } - for (i = 0; i < ipv4_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv4_tests); i++) { /* non-strict */ terminator = &dummy; @@ -1361,7 +1360,6 @@ static void test_RtlIpv4StringToAddressEx(void) { "1.2.3.4: 1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, { "1.2.3.4:\t1234", STATUS_INVALID_PARAMETER, { 1, 2, 3, 4 }, 0xdead }, }; - const unsigned int ipv4_ex_testcount = sizeof(ipv4_ex_tests) / sizeof(ipv4_ex_tests[0]); unsigned int i; BOOLEAN strict; @@ -1395,7 +1393,7 @@ static void test_RtlIpv4StringToAddressEx(void) ok(port == 0xdead, "RtlIpv4StringToAddressExA should not touch the port!, port == %x\n", port); /* first we run the non-ex testcases on the ex function */ - for (i = 0; i < ipv4_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv4_tests); i++) { NTSTATUS expect_res = (ipv4_tests[i].flags & ex_fail_4) ? STATUS_INVALID_PARAMETER : ipv4_tests[i].res; @@ -1433,7 +1431,7 @@ static void test_RtlIpv4StringToAddressEx(void) } - for (i = 0; i < ipv4_ex_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv4_ex_tests); i++) { /* Strict is only relevant for the ip address, so make sure that it does not influence the port */ for (strict = 0; strict < 2; strict++) @@ -1726,7 +1724,6 @@ static const struct { "[::]", STATUS_INVALID_PARAMETER, 0, { -1 }, ex_skip_6 }, }; -const unsigned int ipv6_testcount = sizeof(ipv6_tests) / sizeof(ipv6_tests[0]); static void init_ip6(IN6_ADDR* addr, const int src[8]) { @@ -1824,7 +1821,6 @@ static void test_RtlIpv6AddressToString(void) { "2001:0:1234::c1c0:abcd:876", { 0x120, 0, 0x3412, 0, 0, 0xc0c1, 0xcdab, 0x7608 } }, { "2001::ffd3", { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, }; - const size_t testcount = sizeof(tests) / sizeof(tests[0]); unsigned int i; if (!pRtlIpv6AddressToStringA) @@ -1846,7 +1842,7 @@ static void test_RtlIpv6AddressToString(void) ok(result == (LPCSTR)~0 || broken(result == (LPCSTR)len) /* WinXP / Win2k3 */, "got %p, expected %p\n", result, (LPCSTR)~0); - for (i = 0; i < testcount; i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { init_ip6(&ip, tests[i].ip); memset(buffer, '#', sizeof(buffer)); @@ -1927,7 +1923,6 @@ static void test_RtlIpv6AddressToStringEx(void) { "[2001::ffd3%4294949819]:256", 0xffffbbbb, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, { "[2001::ffd3]:256", 0, 1, { 0x120, 0, 0, 0, 0, 0, 0, 0xd3ff } }, }; - const size_t testcount = sizeof(tests) / sizeof(tests[0]); unsigned int i; if (!pRtlIpv6AddressToStringExA) @@ -1968,7 +1963,7 @@ static void test_RtlIpv6AddressToStringEx(void) ok(buffer[0] == '#', "got first char %c (expected '#')\n", buffer[0]); ok(len == 3, "got len %d (expected len 3)\n", len); - for (i = 0; i < testcount; i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { init_ip6(&ip, tests[i].ip); len = sizeof(buffer); @@ -2058,7 +2053,7 @@ static void test_RtlIpv6StringToAddress(void) /* sanity check */ ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); - for (i = 0; i < ipv6_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv6_tests); i++) { init_ip6(&ip, NULL); terminator = (void *)0xdeadbeef; @@ -2222,7 +2217,6 @@ static void test_RtlIpv6StringToAddressEx(void) { "[ff01::8:800:200C:417A/16]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, }; - const unsigned int ipv6_ex_testcount = sizeof(ipv6_ex_tests) / sizeof(ipv6_ex_tests[0]); const char *simple_ip = "::"; unsigned int i; @@ -2291,7 +2285,7 @@ static void test_RtlIpv6StringToAddressEx(void) ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); /* first we run all ip related tests, to make sure someone didnt accidentally reimplement instead of re-use. */ - for (i = 0; i < ipv6_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv6_tests); i++) { ULONG scope = 0xbadf00d; USHORT port = 0xbeef; @@ -2350,7 +2344,7 @@ static void test_RtlIpv6StringToAddressEx(void) } /* now we run scope / port related tests */ - for (i = 0; i < ipv6_ex_testcount; i++) + for (i = 0; i < ARRAY_SIZE(ipv6_ex_tests); i++) { scope = 0xbadf00d; port = 0xbeef;

1 0

Michael Stefaniuc : quartz: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: 53c80a2bd16cfe338a103a8de48d260289cd5f0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=53c80a2bd16cfe338a103a8d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jul 17 21:20:08 2018 +0200 quartz: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/filesource.c | 6 +++--- dlls/quartz/filtermapper.c | 2 +- dlls/quartz/main.c | 4 ++-- dlls/quartz/parser.c | 2 +- dlls/quartz/vmr9.c | 6 +++--- dlls/quartz/waveparser.c | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 564ccd3..6f27c29 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -794,7 +794,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE case ckidSTREAMNAME: TRACE("processing stream name\n"); /* FIXME: this doesn't exactly match native version (we omit the "##)" prefix), but hey... */ - MultiByteToWideChar(CP_ACP, 0, (LPCSTR)(pChunk + 1), pChunk->cb, piOutput.achName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0])); + MultiByteToWideChar(CP_ACP, 0, (LPCSTR)(pChunk + 1), pChunk->cb, piOutput.achName, ARRAY_SIZE(piOutput.achName)); break; case ckidSTREAMHANDLERDATA: FIXME("process stream handler data\n"); diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index bcce0e1..67af560 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -282,7 +282,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * { HKEY hkeyMajor; WCHAR wszMajorKeyName[CHARS_IN_GUID]; - DWORD dwKeyNameLength = sizeof(wszMajorKeyName) / sizeof(wszMajorKeyName[0]); + DWORD dwKeyNameLength = ARRAY_SIZE(wszMajorKeyName); static const WCHAR wszExtensions[] = {'E','x','t','e','n','s','i','o','n','s',0}; if (RegEnumKeyExW(hkeyMediaType, indexMajor, wszMajorKeyName, &dwKeyNameLength, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) @@ -304,7 +304,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * { HKEY hkeyMinor; WCHAR wszMinorKeyName[CHARS_IN_GUID]; - DWORD dwMinorKeyNameLen = sizeof(wszMinorKeyName) / sizeof(wszMinorKeyName[0]); + DWORD dwMinorKeyNameLen = ARRAY_SIZE(wszMinorKeyName); WCHAR wszSourceFilterKeyName[CHARS_IN_GUID]; DWORD dwSourceFilterKeyNameLen = sizeof(wszSourceFilterKeyName); DWORD maxValueLen; @@ -326,7 +326,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * DWORD dwType; WCHAR wszValueName[14]; /* longest name we should encounter will be "Source Filter" */ LPWSTR wszPatternString = HeapAlloc(GetProcessHeap(), 0, maxValueLen); - DWORD dwValueNameLen = sizeof(wszValueName) / sizeof(wszValueName[0]); /* remember this is in chars */ + DWORD dwValueNameLen = ARRAY_SIZE(wszValueName); DWORD dwDataLen = maxValueLen; /* remember this is in bytes */ if (RegEnumValueW(hkeyMinor, indexValue, wszValueName, &dwValueNameLen, NULL, &dwType, (LPBYTE)wszPatternString, &dwDataLen) != ERROR_SUCCESS) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index d189d1d..0d26198 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -703,7 +703,7 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter( * the + 1 is for the separator ('\\'). The -1 is * because CHARS_IN_GUID includes the null terminator */ - nameLen = sizeof(wszDevice)/sizeof(wszDevice[0]) + CHARS_IN_GUID - 1 + 1; + nameLen = ARRAY_SIZE(wszDevice) + CHARS_IN_GUID - 1 + 1; if (szInstance) nameLen += strlenW(szInstance); diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 7c2accb..4575c6e 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -185,7 +185,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) if (IsEqualGUID( &IID_IClassFactory, riid ) || IsEqualGUID( &IID_IUnknown, riid)) { - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) { @@ -313,7 +313,7 @@ DWORD WINAPI AMGetErrorTextA(HRESULT hr, LPSTR buffer, DWORD maxlen) if (!buffer) return 0; - res = AMGetErrorTextW(hr, errorW, sizeof(errorW)/sizeof(*errorW)); + res = AMGetErrorTextW(hr, errorW, ARRAY_SIZE(errorW)); return WideCharToMultiByte(CP_ACP, 0, errorW, res, buffer, maxlen, 0, 0); } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 034bca0..49b0adf 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -109,7 +109,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const IBaseFilterVtbl *Parser_Vtbl, c /* construct input pin */ piInput.dir = PINDIR_INPUT; piInput.pFilter = &pParser->filter.IBaseFilter_iface; - lstrcpynW(piInput.achName, wcsInputPinName, sizeof(piInput.achName) / sizeof(piInput.achName[0])); + lstrcpynW(piInput.achName, wcsInputPinName, ARRAY_SIZE(piInput.achName)); if (!start) start = Parser_ChangeStart; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d9e4f46..5aa9799 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1322,7 +1322,7 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT info->hMon = hmon; info->dwFlags = mi.dwFlags; - lstrcpynW(info->szDevice, mi.szDevice, sizeof(info->szDevice)/sizeof(WCHAR)); + lstrcpynW(info->szDevice, mi.szDevice, ARRAY_SIZE(info->szDevice)); /* FIXME: how to get these values? */ info->szDescription[0] = 0; @@ -1339,7 +1339,7 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT info->hMon = hmon; info->dwFlags = mi.dwFlags; - lstrcpynW(info->szDevice, mi.szDevice, sizeof(info->szDevice)/sizeof(WCHAR)); + lstrcpynW(info->szDevice, mi.szDevice, ARRAY_SIZE(info->szDevice)); /* FIXME: how to get these values? */ info->szDescription[0] = 0; @@ -2958,7 +2958,7 @@ static HRESULT VMR9_SurfaceAllocator_UpdateDeviceReset(VMR9DefaultAllocatorPrese width = This->info.dwWidth; height = This->info.dwHeight; - for (i = 0; i < sizeof(t_vert) / sizeof(t_vert[0]); ++i) + for (i = 0; i < ARRAY_SIZE(t_vert); ++i) { if (i % 2) { diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 0a84fcb..403c052 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -254,8 +254,8 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; - lstrcpynW(piOutput.achName, wcsOutputPinName, sizeof(piOutput.achName) / sizeof(piOutput.achName[0])); - + lstrcpynW(piOutput.achName, wcsOutputPinName, ARRAY_SIZE(piOutput.achName)); + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); pos += sizeof(list);

1 0

Zhiyi Zhang : user32: Return FALSE for invalid handle in IsWindowEnabled() .
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: wine Branch: master Commit: bfe6826a16f5997a8ee119b191874ad077c3d4e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe6826a16f5997a8ee119b1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 16 11:27:47 2018 +0800 user32: Return FALSE for invalid handle in IsWindowEnabled(). GetWindowLong() returns 0 if passed an invalid window handle, causing IsWindowEnabled() to incorrectly report TRUE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 22 ++++++++++++++++++++++ dlls/user32/win.c | 8 ++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d7f8843..94eff5e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -10700,6 +10700,27 @@ static void test_destroy_quit(void) CloseHandle( thread1 ); } +static void test_IsWindowEnabled(void) +{ + BOOL ret; + HWND hwnd; + + ret = IsWindowEnabled(NULL); + ok(!ret, "Expect IsWindowEnabled() return FALSE\n"); + + hwnd = GetDesktopWindow(); + ret = IsWindowEnabled(hwnd); + ok(ret, "Expect IsWindowEnabled() return TRUE\n"); + + hwnd = create_tool_window(WS_CHILD | WS_VISIBLE, hwndMain); + ret = IsWindowEnabled(hwnd); + ok(ret, "Expect IsWindowEnabled() return TRUE\n"); + EnableWindow(hwnd, FALSE); + ret = IsWindowEnabled(hwnd); + ok(!ret, "Expect IsWindowEnabled() return FALSE\n"); + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -10856,6 +10877,7 @@ START_TEST(win) test_hide_window(); test_minimize_window(hwndMain); test_destroy_quit(); + test_IsWindowEnabled(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3535c1b..28bc1f6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2157,9 +2157,13 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) */ BOOL WINAPI IsWindowEnabled(HWND hWnd) { - return !(GetWindowLongW( hWnd, GWL_STYLE ) & WS_DISABLED); -} + LONG ret; + SetLastError(NO_ERROR); + ret = GetWindowLongW( hWnd, GWL_STYLE ); + if (!ret && GetLastError() != NO_ERROR) return FALSE; + return !(ret & WS_DISABLED); +} /*********************************************************************** * IsWindowUnicode (USER32.@)

1 0

Francois Gouget : testbot/WineSendLog: Preserve the newline on the last line of attachments.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: 256f01374da0949d74d6b2111ad78cbac1e71244 URL: https://source.winehq.org/git/tools.git/?a=commit;h=256f01374da0949d74d6b21… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:41:57 2018 +0200 testbot/WineSendLog: Preserve the newline on the last line of attachments. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 9d00391..51830ad 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -388,6 +388,7 @@ EOF my $TaskDir = $StepTask->GetTaskDir(); print $Sendmail <<"EOF"; + --$PART_BOUNDARY Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 @@ -429,7 +430,7 @@ EOF } } - print $Sendmail "--$PART_BOUNDARY--\n"; + print $Sendmail "\n--$PART_BOUNDARY--\n"; close($Sendmail); # This is all for jobs submitted from the website

1 0

Francois Gouget : testbot/WineSendLog: Always show the WebPatches debug information.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: 7ca9d6e7935a0c546364c826ad35766bc65bdba9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7ca9d6e7935a0c546364c82… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:41:54 2018 +0200 testbot/WineSendLog: Always show the WebPatches debug information. Also show the WebPatches result filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index cda724d..9d00391 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -557,9 +557,10 @@ EOF if (defined $Patch->WebPatchId and -d "$DataDir/webpatches") { my $BaseName = "$DataDir/webpatches/" . $Patch->WebPatchId; + Debug("\n-------------------- WebPatches report --------------------\n"); + Debug("-- $BaseName.testbot --\n"); if (open(my $Result, ">", "$BaseName.testbot")) { - Debug("\n-------------------- WebPatches report --------------------\n"); # Only take into account new errors to decide whether the job was # successful or not. DebugTee($Result, "Status: ". ($Messages ? "Failed" : "OK") ."\n");

1 0

Francois Gouget : testbot/WineSendlog: Use a lexical file handle for the sendmail pipe.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: 13de0262332047ee80fbc45f4eae7d6c8f1b49dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=13de0262332047ee80fbc45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:41:43 2018 +0200 testbot/WineSendlog: Use a lexical file handle for the sendmail pipe. Lexical file handles are much simpler to pass around (and generally much cleaner). Also standardize on the 3-parameter open() form. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 87 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ac14e11..9ed8336 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -221,29 +221,30 @@ sub SendLog($) # Debug("-------------------- Developer email --------------------\n"); + my $Sendmail; if ($Debug) { - open(SENDMAIL, ">>&=", 1); + open($Sendmail, ">>&=", 1); } else { - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); } - print SENDMAIL "From: $RobotEMail\n"; - print SENDMAIL "To: $To\n"; + print $Sendmail "From: $RobotEMail\n"; + print $Sendmail "To: $To\n"; my $Subject = "TestBot job " . $Job->Id . " results"; my $Description = $Job->GetDescription(); if ($Description) { $Subject .= ": " . $Description; } - print SENDMAIL "Subject: $Subject\n"; + print $Sendmail "Subject: $Subject\n"; if ($Job->Patch and $Job->Patch->MessageId) { - print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; - print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; } - print SENDMAIL <<"EOF"; + print $Sendmail <<"EOF"; MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="$PART_BOUNDARY" @@ -263,8 +264,8 @@ EOF { $TestFailures = ""; } - printf SENDMAIL "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, - $TestFailures; + printf $Sendmail "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, + $TestFailures; } # Print the job summary @@ -274,7 +275,7 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print SENDMAIL "\n=== ", $StepTask->GetTitle(), " ===\n"; + print $Sendmail "\n=== ", $StepTask->GetTitle(), " ===\n"; my $LogFiles = GetLogFileNames($TaskDir); my $LogName = $LogFiles->[0] || "log"; @@ -298,16 +299,16 @@ EOF { if ($PrintedDll ne $CurrentDll) { - print SENDMAIL "\n$CurrentDll:\n"; + print $Sendmail "\n$CurrentDll:\n"; $PrintedDll = $CurrentDll; } if ($Line =~ m/^[^:]+:([^ ]+)(?::[0-9a-f]+)? done $258$/) { - print SENDMAIL "$1: The test timed out\n"; + print $Sendmail "$1: The test timed out\n"; } else { - print SENDMAIL "$Line\n"; + print $Sendmail "$Line\n"; } $PrintedSomething = 1; } @@ -321,12 +322,12 @@ EOF { if ($First) { - print SENDMAIL "\n"; + print $Sendmail "\n"; $First = !1; } $HasLogEntries = 1; $Line =~ s/\s*$//; - print SENDMAIL "$Line\n"; + print $Sendmail "$Line\n"; $PrintedSomething = 1; } close ERRFILE; @@ -336,15 +337,15 @@ EOF { if (! $HasLogEntries) { - print SENDMAIL "Empty test log and no error message\n"; + print $Sendmail "Empty test log and no error message\n"; } elsif ($StepTask->Type eq "build") { - print SENDMAIL "No build failures found\n"; + print $Sendmail "No build failures found\n"; } else { - print SENDMAIL "No test failures found\n"; + print $Sendmail "No test failures found\n"; } } else @@ -360,12 +361,12 @@ EOF { $HasErrEntries = 1; $Line =~ s/\s*$//; - print SENDMAIL "$Line\n"; + print $Sendmail "$Line\n"; } close ERRFILE; if (! $HasErrEntries) { - print SENDMAIL "No test log and no error message"; + print $Sendmail "No test log and no error message"; } else { @@ -380,15 +381,15 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print SENDMAIL <<"EOF"; + print $Sendmail <<"EOF"; --$PART_BOUNDARY Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit EOF - print SENDMAIL "Content-Disposition: attachment; filename=", - $StepTask->VM->Name, ".log\n\n"; - print SENDMAIL "Not dumping logs in debug mode\n" if ($Debug); + print $Sendmail "Content-Disposition: attachment; filename=", + $StepTask->VM->Name, ".log\n\n"; + print $Sendmail "Not dumping logs in debug mode\n" if ($Debug); my $LogFiles = GetLogFileNames($TaskDir); my $LogName = $LogFiles->[0] || "log"; @@ -399,7 +400,7 @@ EOF while (defined($Line = <LOGFILE>)) { $Line =~ s/\s*$//; - print SENDMAIL "$Line\n" if (!$Debug); + print $Sendmail "$Line\n" if (!$Debug); $PrintSeparator = 1; } close LOGFILE; @@ -412,18 +413,18 @@ EOF { if ($PrintSeparator) { - print SENDMAIL "\n" if (!$Debug); + print $Sendmail "\n" if (!$Debug); $PrintSeparator = !1; } $Line =~ s/\s*$//; - print SENDMAIL "$Line\n" if (!$Debug); + print $Sendmail "$Line\n" if (!$Debug); } close ERRFILE; } } - print SENDMAIL "--$PART_BOUNDARY--\n"; - close(SENDMAIL); + print $Sendmail "--$PART_BOUNDARY--\n"; + close($Sendmail); # This is all for jobs submitted from the website if (!defined $Job->Patch) @@ -506,22 +507,22 @@ EOF { if ($Debug) { - open(SENDMAIL, ">>&=", 1); + open($Sendmail, ">>&=", 1); } else { - open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq"); + open($Sendmail, "|-", "/usr/sbin/sendmail -oi -t -odq"); } - print SENDMAIL "From: $RobotEMail\n"; - print SENDMAIL "To: $To\n"; - print SENDMAIL "Cc: $WinePatchCc\n"; - print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; + print $Sendmail "From: $RobotEMail\n"; + print $Sendmail "To: $To\n"; + print $Sendmail "Cc: $WinePatchCc\n"; + print $Sendmail "Subject: Re: ", $Job->Patch->Subject, "\n"; if ($Job->Patch->MessageId) { - print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; - print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print $Sendmail "References: ", $Job->Patch->MessageId, "\n"; } - print SENDMAIL <<"EOF"; + print $Sendmail <<"EOF"; Hi, @@ -530,12 +531,12 @@ Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at EOF - print SENDMAIL "$WebSite/JobDetails.pl?Key=", + print $Sendmail "$WebSite/JobDetails.pl?Key=", $Job->GetKey(), "\n\n"; - print SENDMAIL "Your paranoid android.\n\n"; + print $Sendmail "Your paranoid android.\n\n"; - print SENDMAIL $Messages; - close SENDMAIL; + print $Sendmail $Messages; + close($Sendmail); } else {

1 0

Francois Gouget : testbot/WineSendLog: Rename the $Result file handle for consistency.
by Alexandre Julliard July 17, 2018

July 17, 2018

Module: tools Branch: master Commit: a95f45f3f5cab245b805610bc46e1db9b0bac745 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a95f45f3f5cab245b805610… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 17 16:41:49 2018 +0200 testbot/WineSendLog: Rename the $Result file handle for consistency. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 9ed8336..bcd62f3 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -551,21 +551,21 @@ EOF if (defined $Patch->WebPatchId and -d "$DataDir/webpatches") { my $BaseName = "$DataDir/webpatches/" . $Patch->WebPatchId; - if (open (my $result, ">", "$BaseName.testbot")) + if (open(my $Result, ">", "$BaseName.testbot")) { Debug("\n-------------------- WebPatches report --------------------\n"); # Only take into account new errors to decide whether the job was # successful or not. - DebugTee($result, "Status: ". ($Messages ? "Failed" : "OK") ."\n"); - DebugTee($result, "Job-ID: ". $Job->Id ."\n"); - DebugTee($result, "URL: $WebSite/JobDetails.pl?Key=". $Job->GetKey() ."\n"); + DebugTee($Result, "Status: ". ($Messages ? "Failed" : "OK") ."\n"); + DebugTee($Result, "Job-ID: ". $Job->Id ."\n"); + DebugTee($Result, "URL: $WebSite/JobDetails.pl?Key=". $Job->GetKey() ."\n"); foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - print $result "\n=== ", $StepTask->GetTitle(), " ===\n"; + print $Result "\n=== ", $StepTask->GetTitle(), " ===\n"; my $LogFiles = GetLogFileNames($TaskDir); my $LogName = $LogFiles->[0] || "log"; @@ -576,7 +576,7 @@ EOF while (defined($Line = <$logfile>)) { $Line =~ s/\s*$//; - print $result "$Line\n"; + print $Result "$Line\n"; $PrintSeparator = 1; } close($logfile); @@ -589,17 +589,17 @@ EOF { if ($PrintSeparator) { - print $result "\n"; + print $Result "\n"; $PrintSeparator = !1; } $Line =~ s/\s*$//; - print $result "$Line\n"; + print $Result "$Line\n"; } close($errfile); } } - print $result "--- END FULL_LOGS ---\n"; - close($result); + print $Result "--- END FULL_LOGS ---\n"; + close($Result); } else {

1 0