wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

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 : 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 : 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

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

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: Avoid goto in wine_vkCreateDevice().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 8fd39cc2cea864f47d307bab839b65e0f2b2ae34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd39cc2cea864f47d307bab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:56 2018 +0200 winevulkan: Avoid goto in wine_vkCreateDevice(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4c9874c..7a7a334 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -531,8 +531,9 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, &create_info_host, NULL /* allocator */, &object->device); if (res != VK_SUCCESS) { - ERR("Failed to create device\n"); - goto err; + ERR("Failed to create device.\n"); + wine_vk_device_free(object); + return res; } object->phys_dev = phys_dev; @@ -559,8 +560,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->queues = heap_calloc(max_queue_families, sizeof(*object->queues)); if (!object->queues) { - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + wine_vk_device_free(object); + return VK_ERROR_OUT_OF_HOST_MEMORY; } for (i = 0; i < create_info_host.queueCreateInfoCount; i++) @@ -573,18 +574,14 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->queues[family_index] = wine_vk_device_alloc_queues(object, family_index, queue_count); if (!object->queues[family_index]) { - res = VK_ERROR_OUT_OF_HOST_MEMORY; ERR("Failed to allocate memory for queues\n"); - goto err; + wine_vk_device_free(object); + return VK_ERROR_OUT_OF_HOST_MEMORY; } } *device = object; return VK_SUCCESS; - -err: - wine_vk_device_free(object); - return res; } VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,

1 0

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

30 Mar '18

Module: wine Branch: master Commit: a8c06b639e3fc42307a066a907f936ab3c2ca647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8c06b639e3fc42307a066a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:55 2018 +0200 winevulkan: Avoid goto in wine_vk_instance_load_physical_devices(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9fa1d39..4c9874c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -341,7 +341,7 @@ static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *instance) { VkResult res; - struct VkPhysicalDevice_T **tmp_phys_devs = NULL; + struct VkPhysicalDevice_T **tmp_phys_devs; uint32_t num_phys_devs = 0; unsigned int i; @@ -362,13 +362,16 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst res = instance->funcs.p_vkEnumeratePhysicalDevices(instance->instance, &num_phys_devs, tmp_phys_devs); if (res != VK_SUCCESS) - goto err; + { + heap_free(tmp_phys_devs); + return res; + } instance->phys_devs = heap_calloc(num_phys_devs, sizeof(*instance->phys_devs)); if (!instance->phys_devs) { - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + heap_free(tmp_phys_devs); + return VK_ERROR_OUT_OF_HOST_MEMORY; } /* Wrap each native physical device handle into a dispatchable object for the ICD loader. */ @@ -378,8 +381,8 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst if (!phys_dev) { ERR("Unable to allocate memory for physical device!\n"); - res = VK_ERROR_OUT_OF_HOST_MEMORY; - goto err; + heap_free(tmp_phys_devs); + return VK_ERROR_OUT_OF_HOST_MEMORY; } instance->phys_devs[i] = phys_dev; @@ -389,10 +392,6 @@ static VkResult wine_vk_instance_load_physical_devices(struct VkInstance_T *inst heap_free(tmp_phys_devs); return VK_SUCCESS; - -err: - heap_free(tmp_phys_devs); - return res; } /* Helper function used for freeing an instance structure. This function supports full

1 0

Józef Kucia : winevulkan: Simplify wine_vk_init().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 46bc42e7a7c9bb6bfdee701c9f5c1742041cfc36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46bc42e7a7c9bb6bfdee701c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:54 2018 +0200 winevulkan: Simplify wine_vk_init(). 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 5f67444..9fa1d39 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -47,7 +47,7 @@ struct wine_vk_structure_header static void *wine_vk_get_global_proc_addr(const char *name); -static const struct vulkan_funcs *vk_funcs = NULL; +static const struct vulkan_funcs *vk_funcs; static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { @@ -261,17 +261,17 @@ static void wine_vk_device_free(struct VkDevice_T *device) static BOOL wine_vk_init(void) { - HDC hdc = GetDC(0); + HDC hdc; - vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + hdc = GetDC(0); + vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); + ReleaseDC(0, hdc); if (!vk_funcs) { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - ReleaseDC(0, hdc); return FALSE; } - ReleaseDC(0, hdc); return TRUE; }

1 0

Józef Kucia : winevulkan: Move some autogenerated code to vulkan_private.h.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: fc1b15f9b02841db3aac58ae4250ae97c8fb0ecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1b15f9b02841db3aac58ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:53 2018 +0200 winevulkan: Move some autogenerated code to vulkan_private.h. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 ------------ dlls/winevulkan/vulkan_private.h | 11 +++++++++++ dlls/winevulkan/vulkan_thunks.h | 12 ------------ 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 66a7525..8cd0b49 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1913,18 +1913,6 @@ class VkGenerator(object): f.write("#ifndef __WINE_VULKAN_THUNKS_H\n") f.write("#define __WINE_VULKAN_THUNKS_H\n\n") - f.write("/* Perform vulkan struct conversion on 32-bit x86 platforms. */\n") - f.write("#if defined(__i386__)\n") - f.write("#define USE_STRUCT_CONVERSION\n") - f.write("#endif\n\n") - - f.write("/* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */\n") - f.write("void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN;\n") - f.write("void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN;\n\n") - - f.write("BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN;\n") - f.write("BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN;\n\n") - # Generate prototypes for device and instance functions requiring a custom implementation. f.write("/* Functions for which we have custom implementations outside of the thunks. */\n") for vk_func in self.registry.funcs.values(): diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 7f2f242..a7239e7 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -20,6 +20,11 @@ #ifndef __WINE_VULKAN_PRIVATE_H #define __WINE_VULKAN_PRIVATE_H +/* Perform vulkan struct conversion on 32-bit x86 platforms. */ +#if defined(__i386__) +#define USE_STRUCT_CONVERSION +#endif + #include "vulkan_thunks.h" /* Magic value defined by Vulkan ICD / Loader spec */ @@ -99,4 +104,10 @@ struct VkQueue_T VkQueue queue; /* native queue */ }; +void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; +void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; + +BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; +BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; + #endif /* __WINE_VULKAN_PRIVATE_H */ diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 30a53ac..67df71d 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -3,18 +3,6 @@ #ifndef __WINE_VULKAN_THUNKS_H #define __WINE_VULKAN_THUNKS_H -/* Perform vulkan struct conversion on 32-bit x86 platforms. */ -#if defined(__i386__) -#define USE_STRUCT_CONVERSION -#endif - -/* For use by vk_icdGetInstanceProcAddr / vkGetInstanceProcAddr */ -void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; -void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; - -BOOL wine_vk_device_extension_supported(const char *name) DECLSPEC_HIDDEN; -BOOL wine_vk_instance_extension_supported(const char *name) DECLSPEC_HIDDEN; - /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers); void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers);

1 0

Józef Kucia : winevulkan: Use %#x to trace enums.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 063f6baaaf36bb547ea363ba535a7311de18f291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=063f6baaaf36bb547ea363ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 29 14:53:52 2018 +0200 winevulkan: Use %#x to trace enums. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 4 +--- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_thunks.c | 46 ++++++++++++++++++++--------------------- 3 files changed, 25 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=063f6baaaf36bb547ea3…

1 0

← Newer
1
2
3
4
5
6
7
8
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018