- Wine-Commits - list.winehq.org

Davide Beatrici : winepulse: Move process_attach and process_detach handling into mmdevapi.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 3cc61002a830f57dcd9dc762099c3e87d4b37248 URL: https://gitlab.winehq.org/wine/wine/-/commit/3cc61002a830f57dcd9dc762099c3e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 3 02:31:44 2023 +0100 winepulse: Move process_attach and process_detach handling into mmdevapi. --- dlls/mmdevapi/main.c | 18 +++++++++++++++--- dlls/winepulse.drv/mmdevdrv.c | 4 +--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index b019d2e427c..d71b7948428 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -19,7 +19,9 @@ #include <stdarg.h> +#include "ntstatus.h" #define COBJMACROS +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -87,6 +89,11 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) goto fail; } + if ((status = __wine_unix_call(driver->module_unixlib, process_attach, NULL))) { + ERR("Unable to initialize library: %lx\n", status); + goto fail; + } + #define LDFC(n) do { driver->p##n = (void*)GetProcAddress(driver->module, #n);\ if(!driver->p##n) { goto fail; } } while(0) LDFC(GetPriority); @@ -177,9 +184,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DisableThreadLibraryCalls(hinstDLL); break; case DLL_PROCESS_DETACH: - if(lpvReserved) - break; - MMDevEnum_Free(); + if (drvs.module_unixlib) { + const NTSTATUS status = __wine_unix_call(drvs.module_unixlib, process_detach, NULL); + if (status) + WARN("Unable to deinitialize library: %lx\n", status); + } + + if (!lpvReserved) + MMDevEnum_Free(); break; } diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 5de9a941099..99dbe24c82f 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -87,14 +87,12 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) DisableThreadLibraryCalls(dll); if (__wine_init_unix_call()) return FALSE; - if (WINE_UNIX_CALL(process_attach, NULL)) - return FALSE; } else if (reason == DLL_PROCESS_DETACH) { struct device_cache *device, *device_next; LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry) free(device); - WINE_UNIX_CALL(process_detach, NULL); + if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); CloseHandle(pulse_thread);

1 0

Davide Beatrici : winepulse: Return STATUS_SUCCESS for unused unixlib functions.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: c24df1bb6c918cef355585cea16ef5f631efd01a URL: https://gitlab.winehq.org/wine/wine/-/commit/c24df1bb6c918cef355585cea16ef5… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 3 01:56:39 2023 +0100 winepulse: Return STATUS_SUCCESS for unused unixlib functions. --- dlls/winepulse.drv/pulse.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 9446feb452c..900b77415a8 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -119,6 +119,11 @@ static const REFERENCE_TIME DefaultPeriod = 100000; static pthread_mutex_t pulse_mutex; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; +static NTSTATUS pulse_not_implemented(void *args) +{ + return STATUS_SUCCESS; +} + static void pulse_lock(void) { pthread_mutex_lock(&pulse_mutex); @@ -2373,7 +2378,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_release_render_buffer, pulse_get_capture_buffer, pulse_release_capture_buffer, - NULL, + pulse_not_implemented, pulse_get_mix_format, pulse_get_device_period, pulse_get_buffer_size, @@ -2387,12 +2392,12 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_test_connect, pulse_is_started, pulse_get_prop_value, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, }; #ifdef _WIN64 @@ -2820,7 +2825,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_release_render_buffer, pulse_wow64_get_capture_buffer, pulse_release_capture_buffer, - NULL, + pulse_not_implemented, pulse_wow64_get_mix_format, pulse_wow64_get_device_period, pulse_wow64_get_buffer_size, @@ -2834,12 +2839,12 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_wow64_test_connect, pulse_is_started, pulse_wow64_get_prop_value, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, + pulse_not_implemented, }; #endif /* _WIN64 */

1 0

Davide Beatrici : mmdevapi: Query MemoryWineUnixFuncs virtual memory and store the resulting handle.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 0888d2242df7a5fb310cd9473465fbfe3374a615 URL: https://gitlab.winehq.org/wine/wine/-/commit/0888d2242df7a5fb310cd9473465fb… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Mar 4 02:31:53 2023 +0100 mmdevapi: Query MemoryWineUnixFuncs virtual memory and store the resulting handle. In preparation for calling the audio driver's UNIX functions directly. --- dlls/mmdevapi/main.c | 12 +++++++++++- dlls/mmdevapi/mmdevapi.h | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index c792661af33..b019d2e427c 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -65,6 +65,7 @@ static const char *get_priority_string(int prio) static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) { + NTSTATUS status; WCHAR driver_module[264]; lstrcpyW(driver_module, L"wine"); @@ -80,8 +81,14 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) return FALSE; } + if ((status = NtQueryVirtualMemory(GetCurrentProcess(), driver->module, MemoryWineUnixFuncs, + &driver->module_unixlib, sizeof(driver->module_unixlib), NULL))) { + ERR("Unable to load UNIX functions: %lx\n", status); + goto fail; + } + #define LDFC(n) do { driver->p##n = (void*)GetProcAddress(driver->module, #n);\ - if(!driver->p##n) { FreeLibrary(driver->module); return FALSE; } } while(0) + if(!driver->p##n) { goto fail; } } while(0) LDFC(GetPriority); LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); @@ -98,6 +105,9 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) wine_dbgstr_w(driver_module), get_priority_string(driver->priority)); return TRUE; +fail: + FreeLibrary(driver->module); + return FALSE; } static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index d694a3930aa..16eb3606fea 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -18,13 +18,17 @@ #include "unixlib.h" +#include <winternl.h> + #include <wine/list.h> +#include <wine/unixlib.h> extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; typedef struct _DriverFuncs { HMODULE module; + unixlib_handle_t module_unixlib; WCHAR module_name[64]; int priority;

1 0

Davide Beatrici : wineoss: Return STATUS_SUCCESS for unused unixlib functions.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 09fd62b3d4f65b05cf1e14dafcadcdff91bb0557 URL: https://gitlab.winehq.org/wine/wine/-/commit/09fd62b3d4f65b05cf1e14dafcadcd… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 3 01:56:39 2023 +0100 wineoss: Return STATUS_SUCCESS for unused unixlib functions. --- dlls/wineoss.drv/oss.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 4bc8bc20666..65ca42c3182 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -69,6 +69,11 @@ struct oss_stream WINE_DEFAULT_DEBUG_CHANNEL(oss); +static NTSTATUS oss_not_implemented(void *args) +{ + return STATUS_SUCCESS; +} + /* copied from kernelbase */ static int muldiv( int a, int b, int c ) { @@ -1612,9 +1617,9 @@ static NTSTATUS oss_aux_message(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - NULL, - NULL, - NULL, + oss_not_implemented, + oss_not_implemented, + oss_not_implemented, oss_get_endpoint_ids, oss_create_stream, oss_release_stream, @@ -1628,7 +1633,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_release_capture_buffer, oss_is_format_supported, oss_get_mix_format, - NULL, + oss_not_implemented, oss_get_buffer_size, oss_get_latency, oss_get_current_padding, @@ -1639,8 +1644,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_set_event_handle, oss_test_connect, oss_is_started, - NULL, - NULL, + oss_not_implemented, + oss_not_implemented, oss_midi_release, oss_midi_out_message, oss_midi_in_message, @@ -2016,9 +2021,9 @@ static NTSTATUS oss_wow64_aux_message(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - NULL, - NULL, - NULL, + oss_not_implemented, + oss_not_implemented, + oss_not_implemented, oss_wow64_get_endpoint_ids, oss_wow64_create_stream, oss_wow64_release_stream, @@ -2032,7 +2037,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_release_capture_buffer, oss_wow64_is_format_supported, oss_wow64_get_mix_format, - NULL, + oss_not_implemented, oss_wow64_get_buffer_size, oss_wow64_get_latency, oss_wow64_get_current_padding, @@ -2043,8 +2048,8 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_set_event_handle, oss_wow64_test_connect, oss_is_started, - NULL, - NULL, + oss_not_implemented, + oss_not_implemented, oss_midi_release, oss_wow64_midi_out_message, oss_wow64_midi_in_message,

1 0

Davide Beatrici : winecoreaudio: Return STATUS_SUCCESS for unused unixlib functions.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: ae3c2d7c5fb61ad2dcf6c2e12e43f9a57b129b25 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae3c2d7c5fb61ad2dcf6c2e12e43f9… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 3 01:56:39 2023 +0100 winecoreaudio: Return STATUS_SUCCESS for unused unixlib functions. --- dlls/winecoreaudio.drv/coreaudio.c | 41 +++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index b48a0c751fd..073dacf4bad 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -96,6 +96,11 @@ struct coreaudio_stream BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; }; +static NTSTATUS unix_not_implemented(void *args) +{ + return STATUS_SUCCESS; +} + static HRESULT osstatus_to_hresult(OSStatus sc) { switch(sc){ @@ -1647,23 +1652,23 @@ static NTSTATUS unix_set_volumes(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - NULL, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, + unix_not_implemented, unix_get_endpoint_ids, unix_create_stream, unix_release_stream, unix_start, unix_stop, unix_reset, - NULL, + unix_not_implemented, unix_get_render_buffer, unix_release_render_buffer, unix_get_capture_buffer, unix_release_capture_buffer, unix_is_format_supported, unix_get_mix_format, - NULL, + unix_not_implemented, unix_get_buffer_size, unix_get_latency, unix_get_current_padding, @@ -1671,16 +1676,16 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_get_frequency, unix_get_position, unix_set_volumes, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, unix_is_started, - NULL, + unix_not_implemented, unix_midi_init, unix_midi_release, unix_midi_out_message, unix_midi_in_message, unix_midi_notify_wait, - NULL, + unix_not_implemented, }; #ifdef _WIN64 @@ -1991,23 +1996,23 @@ static NTSTATUS unix_wow64_set_volumes(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - NULL, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, + unix_not_implemented, unix_wow64_get_endpoint_ids, unix_wow64_create_stream, unix_wow64_release_stream, unix_start, unix_stop, unix_reset, - NULL, + unix_not_implemented, unix_wow64_get_render_buffer, unix_release_render_buffer, unix_wow64_get_capture_buffer, unix_release_capture_buffer, unix_wow64_is_format_supported, unix_wow64_get_mix_format, - NULL, + unix_not_implemented, unix_wow64_get_buffer_size, unix_wow64_get_latency, unix_wow64_get_current_padding, @@ -2015,16 +2020,16 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_wow64_get_frequency, unix_wow64_get_position, unix_wow64_set_volumes, - NULL, - NULL, + unix_not_implemented, + unix_not_implemented, unix_is_started, - NULL, + unix_not_implemented, unix_wow64_midi_init, unix_midi_release, unix_wow64_midi_out_message, unix_wow64_midi_in_message, unix_wow64_midi_notify_wait, - NULL, + unix_not_implemented, }; #endif /* _WIN64 */

1 0

Davide Beatrici : winealsa: Return STATUS_SUCCESS for unused unixlib functions.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 0870956c7788a8bed4fc3db01f231a7eb908f842 URL: https://gitlab.winehq.org/wine/wine/-/commit/0870956c7788a8bed4fc3db01f231a… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri Mar 3 01:56:39 2023 +0100 winealsa: Return STATUS_SUCCESS for unused unixlib functions. --- dlls/winealsa.drv/alsa.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index ffa39f5e484..2b5f61eb213 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -88,6 +88,11 @@ static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', 'w','i','n','e','a','l','s','a','.','d','r','v'}; +static NTSTATUS alsa_not_implemented(void *args) +{ + return STATUS_SUCCESS; +} + static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) { while (len--) *dst++ = (unsigned char)*src++; @@ -2431,9 +2436,9 @@ static NTSTATUS alsa_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - NULL, - NULL, - NULL, + alsa_not_implemented, + alsa_not_implemented, + alsa_not_implemented, alsa_get_endpoint_ids, alsa_create_stream, alsa_release_stream, @@ -2447,7 +2452,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_release_capture_buffer, alsa_is_format_supported, alsa_get_mix_format, - NULL, + alsa_not_implemented, alsa_get_buffer_size, alsa_get_latency, alsa_get_current_padding, @@ -2456,15 +2461,15 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_get_position, alsa_set_volumes, alsa_set_event_handle, - NULL, + alsa_not_implemented, alsa_is_started, alsa_get_prop_value, - NULL, + alsa_not_implemented, alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, - NULL, + alsa_not_implemented, }; #ifdef _WIN64 @@ -2852,9 +2857,9 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - NULL, - NULL, - NULL, + alsa_not_implemented, + alsa_not_implemented, + alsa_not_implemented, alsa_wow64_get_endpoint_ids, alsa_wow64_create_stream, alsa_wow64_release_stream, @@ -2868,7 +2873,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_release_capture_buffer, alsa_wow64_is_format_supported, alsa_wow64_get_mix_format, - NULL, + alsa_not_implemented, alsa_wow64_get_buffer_size, alsa_wow64_get_latency, alsa_wow64_get_current_padding, @@ -2877,15 +2882,15 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_wow64_get_position, alsa_wow64_set_volumes, alsa_wow64_set_event_handle, - NULL, + alsa_not_implemented, alsa_is_started, alsa_wow64_get_prop_value, - NULL, + alsa_not_implemented, alsa_midi_release, alsa_wow64_midi_out_message, alsa_wow64_midi_in_message, alsa_wow64_midi_notify_wait, - NULL, + alsa_not_implemented, }; #endif /* _WIN64 */

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.242.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 1eed39fffe86ec60dee0678ba2303fee7ad78aec URL: https://gitlab.winehq.org/wine/wine/-/commit/1eed39fffe86ec60dee0678ba2303f… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 21:34:37 2023 +0100 winevulkan: Update to VK spec version 1.3.242. --- dlls/vulkan-1/vulkan-1.spec | 4 +- dlls/winevulkan/loader_thunks.c | 31 ++++- dlls/winevulkan/loader_thunks.h | 25 +++- dlls/winevulkan/make_vulkan | 4 +- dlls/winevulkan/vulkan_thunks.c | 271 +++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 8 +- dlls/winevulkan/winevulkan.json | 2 +- dlls/winevulkan/winevulkan.spec | 4 +- include/wine/vulkan.h | 105 ++++++++++++++-- include/wine/vulkan_driver.h | 2 +- 10 files changed, 435 insertions(+), 21 deletions(-)

1 0

Georg Lehmann : winevulkan: Only parse extensions for Vulkan.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: e500ca7648438067778d7a33955cfc1da10f7a3d URL: https://gitlab.winehq.org/wine/wine/-/commit/e500ca7648438067778d7a33955cfc… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 20:53:07 2023 +0100 winevulkan: Only parse extensions for Vulkan. 242 adds VulkanSC only extensions --- dlls/winevulkan/make_vulkan | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e1ba431175e..d80b7ccc9c6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3490,8 +3490,9 @@ class VkRegistry(object): if cmd_name in self.funcs: self.funcs[cmd_name].extensions.add(ext_name) - # Some extensions are not ready or have numbers reserved as a place holder. - if ext.attrib["supported"] == "disabled": + # Some extensions are not ready or have numbers reserved as a place holder + # or are only supported for VulkanSC. + if not "vulkan" in ext.attrib["supported"].split(","): LOGGER.debug("Skipping disabled extension: {0}".format(ext_name)) skipped_exts.append(ext_name) return

1 0

Georg Lehmann : winevulkan: Deal with per api xml entries.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 53c7ccec44e2cac1f3d117b6fc81193e8c8388d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/53c7ccec44e2cac1f3d117b6fc8119… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 20:47:43 2023 +0100 winevulkan: Deal with per api xml entries. Otherwise we will have duplicate members/params with the new 242 xml. --- dlls/winevulkan/make_vulkan | 80 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 706f4df5853..e1ba431175e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -300,6 +300,8 @@ class Direction(Enum): INPUT = 1 OUTPUT = 2 +def api_is_vulkan(obj): + return "vulkan" in obj.get("api", "vulkan").split(",") class VkBaseType(object): def __init__(self, name, _type, alias=None, requires=None): @@ -350,6 +352,9 @@ class VkDefine(object): @staticmethod def from_xml(define): + if not api_is_vulkan(define): + return None + name_elem = define.find("name") if name_elem is None: @@ -426,6 +431,9 @@ class VkEnum(object): @staticmethod def from_xml(enum): + if not api_is_vulkan(enum): + return None + name = enum.attrib.get("name") bitwidth = int(enum.attrib.get("bitwidth", "32")) result = VkEnum(name, bitwidth) @@ -589,6 +597,9 @@ class VkFunction(object): Returns: VkFunction """ + if not api_is_vulkan(command): + return None + func_name = command.attrib.get("name") func_type = alias.type params = alias.params @@ -597,6 +608,9 @@ class VkFunction(object): @staticmethod def from_xml(command, types): + if not api_is_vulkan(command): + return None + proto = command.find("proto") func_name = proto.find("name").text func_type = proto.find("type").text @@ -604,7 +618,8 @@ class VkFunction(object): params = [] for param in command.findall("param"): vk_param = VkParam.from_xml(param, types, params) - params.append(vk_param) + if vk_param: + params.append(vk_param) return VkFunction(_type=func_type, name=func_name, params=params) @@ -950,6 +965,9 @@ class VkFunctionPointer(object): @staticmethod def from_xml(funcpointer): + if not api_is_vulkan(funcpointer): + return None + members = [] begin = None @@ -1030,6 +1048,9 @@ class VkHandle(object): @staticmethod def from_xml(handle): + if not api_is_vulkan(handle): + return None + name = handle.find("name").text _type = handle.find("type").text parent = handle.attrib.get("parent") # Most objects have a parent e.g. VkQueue has VkDevice. @@ -1370,6 +1391,9 @@ class VkMember(VkVariable): def from_xml(member, returnedonly, parent): """ Helper function for parsing a member tag within a struct or union. """ + if not api_is_vulkan(member): + return None + name_elem = member.find("name") type_elem = member.find("type") @@ -1608,6 +1632,9 @@ class VkParam(VkVariable): def from_xml(param, types, parent): """ Helper function to create VkParam from xml. """ + if not api_is_vulkan(param): + return None + # Parameter parsing is slightly tricky. All the data is contained within # a param tag, but some data is within subtags while others are text # before or after the type tag. @@ -1916,6 +1943,9 @@ class VkStruct(Sequence): @staticmethod def from_xml(struct): + if not api_is_vulkan(struct): + return None + # Unions and structs are the same parsing wise, but we need to # know which one we are dealing with later on for code generation. union = True if struct.attrib["category"] == "union" else False @@ -1944,7 +1974,8 @@ class VkStruct(Sequence): s = VkStruct(name, [], returnedonly, structextends, union=union) for member in struct.findall("member"): vk_member = VkMember.from_xml(member, returnedonly, s) - s.members.append(vk_member) + if vk_member: + s.members.append(vk_member) return s @@ -3303,13 +3334,15 @@ class VkRegistry(object): continue func = VkFunction.from_xml(command, self.types) - funcs[func.name] = func + if func: + funcs[func.name] = func for command in alias_commands: alias_name = command.attrib.get("alias") alias = funcs[alias_name] func = VkFunction.from_alias(command, alias) - funcs[func.name] = func + if func: + funcs[func.name] = func # To make life easy for the code generation, separate all function # calls out in the 4 types of Vulkan functions: @@ -3347,7 +3380,9 @@ class VkRegistry(object): _type = enum.attrib.get("type") if _type in ("enum", "bitmask"): - enums[name] = VkEnum.from_xml(enum) + enum_obj = VkEnum.from_xml(enum) + if enum_obj: + enums[name] = enum_obj else: # If no type is set, we are dealing with API constants. for value in enum.findall("enum"): @@ -3607,8 +3642,11 @@ class VkRegistry(object): if tail is not None: _type += tail.strip() basetype = VkBaseType(name, _type) - base_types.append(basetype) - type_info["data"] = basetype + if basetype: + base_types.append(basetype) + type_info["data"] = basetype + else: + continue # Basic C types don't need us to define them, but we do need data for them if type_info["requires"] == "vk_platform": @@ -3629,8 +3667,11 @@ class VkRegistry(object): if type_info["category"] == "define": define = VkDefine.from_xml(t) - defines.append(define) - type_info["data"] = define + if define: + defines.append(define) + type_info["data"] = define + else: + continue if type_info["category"] == "enum": name = t.attrib.get("name") @@ -3646,13 +3687,19 @@ class VkRegistry(object): if type_info["category"] == "funcpointer": funcpointer = VkFunctionPointer.from_xml(t) - funcpointers.append(funcpointer) - type_info["data"] = funcpointer + if funcpointer: + funcpointers.append(funcpointer) + type_info["data"] = funcpointer + else: + continue if type_info["category"] == "handle": handle = VkHandle.from_xml(t) - handles.append(handle) - type_info["data"] = handle + if handle: + handles.append(handle) + type_info["data"] = handle + else: + continue if type_info["category"] in ["struct", "union"]: # We store unions among structs as some structs depend @@ -3660,8 +3707,11 @@ class VkRegistry(object): # generation anyway. The official Vulkan scripts use # a similar kind of hack. struct = VkStruct.from_xml(t) - structs.append(struct) - type_info["data"] = struct + if struct: + structs.append(struct) + type_info["data"] = struct + else: + continue # Name is in general within a name tag else it is an optional # attribute on the type tag.

1 0

Georg Lehmann : winevulkan: Add basic support for extension dependencies.
by Alexandre Julliard March 6, 2023

March 6, 2023

Module: wine Branch: master Commit: 421140b6246a5efd3352a21345f1b7b69b3cc980 URL: https://gitlab.winehq.org/wine/wine/-/commit/421140b6246a5efd3352a21345f1b7… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Mar 3 21:26:31 2023 +0100 winevulkan: Add basic support for extension dependencies. --- dlls/winevulkan/make_vulkan | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 173de720443..95e65a087b6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3533,6 +3533,11 @@ class VkRegistry(object): if len(set(requires).intersection(skipped_exts)) > 0: skipped_exts.append(ext_name) return + elif "depends" in ext.attrib: + # The syntax for this is more complex, but this is good enough for now. + if any([sext in ext.attrib["depends"] for sext in skipped_exts]): + skipped_exts.append(ext_name) + return LOGGER.debug("Loading extension: {0}".format(ext_name))

1 0