March 2018 - Wine-commits - list.winehq.org

Józef Kucia : winevulkan: Avoid goto in wine_vkCreateInstance().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 12bbfe9b115bb9ad09148fe2a17ce22df79890d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12bbfe9b115bb9ad09148fe2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:57 2018 +0200 winevulkan: Avoid goto in wine_vkCreateInstance(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 7a7a334..e4c04df 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -596,12 +596,10 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate memory for instance\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + return VK_ERROR_OUT_OF_HOST_MEMORY; } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; @@ -611,7 +609,8 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, if (res != VK_SUCCESS) { ERR("Failed to create instance, res=%d\n", res); - goto err; + wine_vk_instance_free(object); + return res; } /* Load all instance functions we are aware of. Note the loader takes care @@ -625,23 +624,20 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, /* Cache physical devices for vkEnumeratePhysicalDevices within the instance as * each vkPhysicalDevice is a dispatchable object, which means we need to wrap - * the native physical device and present those the application. + * the native physical devices and present those to the application. * Cleanup happens as part of wine_vkDestroyInstance. */ res = wine_vk_instance_load_physical_devices(object); if (res != VK_SUCCESS) { - ERR("Failed to cache physical devices, res=%d\n", res); - goto err; + ERR("Failed to load physical devices, res=%d\n", res); + wine_vk_instance_free(object); + return res; } *instance = object; TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); return VK_SUCCESS; - -err: - wine_vk_instance_free(object); - return res; } void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *allocator)

1 0

Józef Kucia : winevulkan: Limit vkGetDeviceProcAddr() workaround to broken apps.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 9bf8478cd1ca863bf9851ca75f64802ed880776d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf8478cd1ca863bf9851ca7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:58 2018 +0200 winevulkan: Limit vkGetDeviceProcAddr() workaround to broken apps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 19 ++++++++++++++----- dlls/winevulkan/vulkan_private.h | 6 ++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index e4c04df..886b345 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -580,6 +580,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, } } + object->quirks = phys_dev->instance->quirks; + *device = object; return VK_SUCCESS; } @@ -587,8 +589,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { - struct VkInstance_T *object = NULL; VkInstanceCreateInfo create_info_host; + const VkApplicationInfo *app_info; + struct VkInstance_T *object; VkResult res; TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); @@ -635,6 +638,13 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return res; } + if ((app_info = create_info->pApplicationInfo) && app_info->pApplicationName) + { + if (!strcmp(app_info->pApplicationName, "DOOM") + || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus")) + object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; + } + *instance = object; TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); return VK_SUCCESS; @@ -808,13 +818,12 @@ PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char * * subdevice objects. The games don't actually use the function pointers and if they * did, they would crash as VkInstance / VkPhysicalDevice parameters need unwrapping. * Khronos clarified behavior in the Vulkan spec and expects drivers to get updated, - * however it would require both driver and game fixes. Since it are major titles - * it is not clear what will happen. At least for now we need the hack below. + * however it would require both driver and game fixes. * https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/issues/2323 * https://github.com/KhronosGroup/Vulkan-Docs/issues/655 */ - func = wine_vk_get_instance_proc_addr(name); - if (func) + if (device->quirks & WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR + && (func = wine_vk_get_instance_proc_addr(name))) { WARN("Returning instance function %s.\n", debugstr_a(name)); return func; diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index a7239e7..30ab625 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -34,6 +34,8 @@ #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) #endif +#define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 + struct vulkan_func { const char *name; @@ -70,6 +72,8 @@ struct VkDevice_T struct VkQueue_T **queues; VkDevice device; /* native device */ + + unsigned int quirks; }; struct VkInstance_T @@ -84,6 +88,8 @@ struct VkInstance_T struct VkPhysicalDevice_T **phys_devs; VkInstance instance; /* native instance */ + + unsigned int quirks; }; struct VkPhysicalDevice_T

1 0

Michael Stefaniuc : shell32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 51b065c5c9a12a2f366daff2550976af1817e073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b065c5c9a12a2f366daff2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 29 17:14:10 2018 +0200 shell32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 95ebb92..c976c85 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1959,7 +1959,7 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, ARRAY_SIZE(tempbufW)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); @@ -1968,7 +1968,7 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, ARRAY_SIZE(tempbufW)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); @@ -1977,7 +1977,7 @@ static void test_LocalizedNames(void) hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); - hr = StrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); + hr = StrRetToBufW(&strret, newPIDL, tempbufW, ARRAY_SIZE(tempbufW)); ok (hr == S_OK, "StrRetToBufW failed! hr = %08x\n", hr); ok (!lstrcmpiW(tempbufW, foldernameW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); @@ -4943,7 +4943,8 @@ static void test_SHChangeNotify(BOOL test_new_delivery) SHCNE_ALLEVENTS, WM_USER_NOTIFY, 1, entries); ok(notifyID != 0, "Failed to register a window for change notifications\n"); - for(i = 0; i < sizeof(chnotify_tests) / sizeof(*chnotify_tests); ++i){ + for (i = 0; i < ARRAY_SIZE(chnotify_tests); ++i) + { exp_data = chnotify_tests + i; exp_data->missing_events = exp_data->notify_count; @@ -5135,7 +5136,7 @@ static void test_GetDefaultColumn(void) CoInitialize(NULL); - for (i = 0; i < sizeof(folders)/sizeof(folders[0]); i++) + for (i = 0; i < ARRAY_SIZE(folders); i++) { IShellFolder2 *folder; ULONG sort, display; @@ -5186,7 +5187,7 @@ static void test_GetDefaultSearchGUID(void) CoInitialize(NULL); - for (i = 0; i < sizeof(folders)/sizeof(folders[0]); i++) + for (i = 0; i < ARRAY_SIZE(folders); i++) { IShellFolder2 *folder; GUID guid;

1 0

Michael Stefaniuc : shell32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 250e8437d7770d2ffaf330d39bbbef7cb247d299 URL: https://source.winehq.org/git/wine.git/?a=commit;h=250e8437d7770d2ffaf330d3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 29 17:14:11 2018 +0200 shell32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/shfldr_mycomp.c | 6 +++--- dlls/shell32/shlexec.c | 46 ++++++++++++++++++++++---------------------- dlls/shell32/shlfileop.c | 2 +- dlls/shell32/systray.c | 2 +- 5 files changed, 29 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=250e8437d7770d2ffaf3…

1 0

Michael Stefaniuc : comdlg32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: e2dae70fe0a1bc338dbbbdc9e3b842400a0c278e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2dae70fe0a1bc338dbbbdc9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 29 17:14:12 2018 +0200 comdlg32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index d788d4f..43d5f41 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1641,7 +1641,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) else if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { WCHAR buf[64]; - LoadStringW(COMDLG32_hInstance, IDS_SAVE_AS, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, IDS_SAVE_AS, buf, ARRAY_SIZE(buf)); SetWindowTextW(hwnd, buf); } @@ -1860,9 +1860,9 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) { WCHAR buf[16]; - LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, IDS_SAVE_BUTTON, buf, ARRAY_SIZE(buf)); SetDlgItemTextW(hwnd, IDOK, buf); - LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, IDS_SAVE_IN, buf, ARRAY_SIZE(buf)); SetDlgItemTextW(hwnd, IDC_LOOKINSTATIC, buf); } @@ -2322,7 +2322,8 @@ static void FILEDLG95_MRU_save_filename(LPCWSTR filename) HKEY hkey; /* get the current executable's name */ - if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { + if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path))) + { WARN("GotModuleFileName failed: %d\n", GetLastError()); return; } @@ -2409,7 +2410,8 @@ static void FILEDLG95_MRU_load_filename(LPWSTR stored_path) WCHAR module_path[MAX_PATH], *module_name; /* get the current executable's name */ - if(!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, sizeof(module_path)/sizeof(module_path[0]))) { + if (!GetModuleFileNameW(GetModuleHandleW(NULL), module_path, ARRAY_SIZE(module_path))) + { WARN("GotModuleFileName failed: %d\n", GetLastError()); return; } @@ -2428,10 +2430,10 @@ void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) WCHAR strMsgTitle[MAX_PATH]; WCHAR strMsgText [MAX_PATH]; if (idCaption) - LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle, sizeof(strMsgTitle)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, idCaption, strMsgTitle, ARRAY_SIZE(strMsgTitle)); else strMsgTitle[0] = '\0'; - LoadStringW(COMDLG32_hInstance, idText, strMsgText, sizeof(strMsgText)/sizeof(WCHAR)); + LoadStringW(COMDLG32_hInstance, idText, strMsgText, ARRAY_SIZE(strMsgText)); MessageBoxW(hwnd,strMsgText, strMsgTitle, MB_OK | MB_ICONHAND); } @@ -4128,7 +4130,7 @@ static BOOL BrowseSelectedFolder(HWND hwnd) pidlSelection, SBSP_RELATIVE ) ) ) { WCHAR buf[64]; - LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, sizeof(buf)/sizeof(WCHAR) ); + LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, ARRAY_SIZE(buf)); MessageBoxW( hwnd, buf, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE;

1 0

Michael Stefaniuc : appwiz.cpl: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 30276291fa220e165099dc485de445ca7c0e17c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30276291fa220e165099dc48… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 29 17:14:13 2018 +0200 appwiz.cpl: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/appwiz.cpl/appwiz.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 76f00a0..67bf037 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -171,7 +171,7 @@ static void set_status(DWORD id) HWND status = GetDlgItem(install_dialog, ID_DWL_STATUS); WCHAR buf[64]; - LoadStringW(hInst, id, buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(hInst, id, buf, ARRAY_SIZE(buf)); SendMessageW(status, WM_SETTEXT, 0, (LPARAM)buf); } @@ -514,7 +514,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, }else { WCHAR message[256]; - if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR))) + if(LoadStringW(hInst, IDS_INVALID_SHA, message, ARRAY_SIZE(message))) MessageBoxW(NULL, message, NULL, MB_ICONERROR); } diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dae9df9..af893b8 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -450,10 +450,10 @@ static void InstallProgram(HWND hWnd) WCHAR FilterBufferW[MAX_PATH]; WCHAR FileNameBufferW[MAX_PATH]; - LoadStringW(hInst, IDS_CPL_TITLE, titleW, sizeof(titleW)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_FILTER_INSTALLS, filter_installs, sizeof(filter_installs)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, sizeof(filter_programs)/sizeof(WCHAR)); - LoadStringW(hInst, IDS_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_CPL_TITLE, titleW, ARRAY_SIZE(titleW)); + LoadStringW(hInst, IDS_FILTER_INSTALLS, filter_installs, ARRAY_SIZE(filter_installs)); + LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, ARRAY_SIZE(filter_programs)); + LoadStringW(hInst, IDS_FILTER_ALL, filter_all, ARRAY_SIZE(filter_all)); snprintfW( FilterBufferW, MAX_PATH, filters, filter_installs, 0, 0, filter_programs, 0, 0, filter_all, 0, 0 );

1 0

Michael Stefaniuc : advapi32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 716103b1bb9947ec93852bf7277c2372eef52a3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=716103b1bb9947ec93852bf7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 29 17:14:14 2018 +0200 advapi32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cc17b80..1df117b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1755,7 +1755,7 @@ static void test_reg_query_value(void) /* unicode - try size in WCHARS */ SetLastError(0xdeadbeef); - size = sizeof(valW) / sizeof(WCHAR); + size = ARRAY_SIZE(valW); ret = RegQueryValueW(subkey, NULL, valW, &size); ok(ret == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError()); @@ -2010,7 +2010,7 @@ static void test_reg_query_info(void) lstrcpyW(expectbufferW, subkey_classW); ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), "classbufferW = %s, expected %s\n", - wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + wine_dbgstr_wn(classbufferW, ARRAY_SIZE(classbufferW)), wine_dbgstr_w(expectbufferW)); memset(classbufferW, 0x55, sizeof(classbufferW)); classlen = 0xdeadbeef; @@ -2021,7 +2021,7 @@ static void test_reg_query_info(void) lstrcpyW(expectbufferW, subkey_classW); ok(!memcmp(classbufferW, expectbufferW, sizeof(classbufferW)), "classbufferW = %s, expected %s\n", - wine_dbgstr_wn(classbufferW, sizeof(classbufferW) / sizeof(WCHAR)), wine_dbgstr_w(expectbufferW)); + wine_dbgstr_wn(classbufferW, ARRAY_SIZE(classbufferW)), wine_dbgstr_w(expectbufferW)); RegDeleteKeyA(subsubkey, ""); RegCloseKey(subsubkey);

1 0

Michael Stefaniuc : advapi32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: f9fda1e20fdf6700f190d34d50c80005a9aa6e45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9fda1e20fdf6700f190d34d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 29 17:14:15 2018 +0200 advapi32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 44b4bed..087d47f 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2373,7 +2373,7 @@ LSTATUS WINAPI RegSaveKeyW( HKEY hkey, LPCWSTR file, LPSECURITY_ATTRIBUTES sa ) if (!(hkey = get_special_root_hkey( hkey, 0 ))) return ERROR_INVALID_HANDLE; err = GetLastError(); - GetFullPathNameW( file, sizeof(buffer)/sizeof(WCHAR), buffer, &nameW ); + GetFullPathNameW( file, ARRAY_SIZE( buffer ), buffer, &nameW ); for (;;) { @@ -2708,7 +2708,7 @@ LSTATUS WINAPI RegConnectRegistryW( LPCWSTR lpMachineName, HKEY hKey, } else { WCHAR compName[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(compName) / sizeof(WCHAR); + DWORD len = ARRAY_SIZE( compName ); /* MSDN says lpMachineName must start with \\ : not so */ if( lpMachineName[0] == '\\' && lpMachineName[1] == '\\')

1 0

Michael Stefaniuc : comctl32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 11caaa1b45f9968e48788525038a141bf3e185ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=11caaa1b45f9968e48788525… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 29 17:14:16 2018 +0200 comctl32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 56547c6..4c07f0a 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -549,7 +549,7 @@ static void test_button_messages(void) hfont2 = CreateFontIndirectA(&logfont); ok(hfont2 != NULL, "Failed to create Tahoma font\n"); - for (i = 0; i < sizeof(button)/sizeof(button[0]); i++) + for (i = 0; i < ARRAY_SIZE(button); i++) { HFONT prevfont, hfont; MSG msg;

1 0

Louis Lenders : wevtapi: Add stub for EvtExportLog.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: ecbb4fa3ea2d3a9e1d3f560c7e0dea008439db5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecbb4fa3ea2d3a9e1d3f560c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Mar 23 13:23:57 2018 +0100 wevtapi: Add stub for EvtExportLog. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 7 +++++++ dlls/wevtapi/wevtapi.spec | 2 +- include/winevt.h | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index a978437..9c8bb5d 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -122,3 +122,10 @@ BOOL WINAPI EvtNext(EVT_HANDLE result_set, DWORD size, EVT_HANDLE *array, DWORD SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags) +{ + FIXME("(%p %s %s %s %#x) stub!\n", session, debugstr_w(path), debugstr_w(query), debugstr_w(file), flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index ddd2f32..7e6f15d 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -4,7 +4,7 @@ @ stdcall EvtClose(ptr) @ stub EvtCreateBookmark @ stub EvtCreateRenderContext -@ stub EvtExportLog +@ stub EvtExportLog(ptr wstr wstr wstr long) @ stub EvtFormatMessage @ stdcall EvtGetChannelConfigProperty(ptr long long long ptr ptr) @ stub EvtGetEventInfo diff --git a/include/winevt.h b/include/winevt.h index 6d2ef1a..a37954f 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -114,7 +114,8 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); - +BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, + const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, DWORD Flags, DWORD PropertyValueBufferSize,

1 0