March 2020 - Wine-Devel - list.winehq.org

[PATCH 3/8] adsldp: Add IDirectorySearch stubs.
by Dmitry Timoshkov March 24, 2020

March 24, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 123 +++++++++++++++++++++++++++++++++++++++++++ include/iads.idl | 4 +- 2 files changed, 124 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c49f9ef70b..caf404c3c6 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -381,6 +381,7 @@ typedef struct { IADs IADs_iface; IADsOpenDSObject IADsOpenDSObject_iface; + IDirectorySearch IDirectorySearch_iface; LONG ref; LDAP *ld; BSTR host; @@ -419,6 +420,13 @@ static HRESULT WINAPI ldapns_QueryInterface(IADs *iface, REFIID riid, void **obj return S_OK; } + if (IsEqualGUID(riid, &IID_IDirectorySearch)) + { + IADs_AddRef(iface); + *obj = &ldap->IDirectorySearch_iface; + return S_OK; + } + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1046,6 +1054,120 @@ static const IADsOpenDSObjectVtbl IADsOpenDSObject_vtbl = openobj_OpenDSObject }; +static inline LDAP_namespace *impl_from_IDirectorySearch(IDirectorySearch *iface) +{ + return CONTAINING_RECORD(iface, LDAP_namespace, IDirectorySearch_iface); +} + +static HRESULT WINAPI search_QueryInterface(IDirectorySearch *iface, REFIID riid, void **obj) +{ + TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), obj); + + if (!riid || !obj) return E_INVALIDARG; + + if (IsEqualGUID(riid, &IID_IDirectorySearch) || + IsEqualGUID(riid, &IID_IUnknown)) + { + IDirectorySearch_AddRef(iface); + *obj = iface; + return S_OK; + } + + FIXME("interface %s is not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI search_AddRef(IDirectorySearch *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + return IADs_AddRef(&ldap->IADs_iface); +} + +static ULONG WINAPI search_Release(IDirectorySearch *iface) +{ + LDAP_namespace *ldap = impl_from_IDirectorySearch(iface); + return IADs_Release(&ldap->IADs_iface); +} + +static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_SEARCHPREF_INFO prefs, DWORD count) +{ + FIXME("%p,%p,%u: stub\n", iface, prefs, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filter, LPWSTR *names, + DWORD count, PADS_SEARCH_HANDLE res) +{ + FIXME("%p,%s,%p,%u,%p: stub\n", iface, debugstr_w(filter), names, count, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_AbandonSearch(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetFirstRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetNextRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetPreviousRow(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetNextColumnName(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, LPWSTR *names) +{ + FIXME("%p,%p,%p: stub\n", iface, res, names); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_GetColumn(IDirectorySearch *iface, ADS_SEARCH_HANDLE res, + LPWSTR name, PADS_SEARCH_COLUMN col) +{ + FIXME("%p,%p,%s,%p: stub\n", iface, res, debugstr_w(name), col); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_FreeColumn(IDirectorySearch *iface, PADS_SEARCH_COLUMN col) +{ + FIXME("%p,%p: stub\n", iface, col); + return E_NOTIMPL; +} + +static HRESULT WINAPI search_CloseSearchHandle(IDirectorySearch *iface, ADS_SEARCH_HANDLE res) +{ + FIXME("%p,%p: stub\n", iface, res); + return E_NOTIMPL; +} + +static const IDirectorySearchVtbl IDirectorySearch_vtbl = +{ + search_QueryInterface, + search_AddRef, + search_Release, + search_SetSearchPreference, + search_ExecuteSearch, + search_AbandonSearch, + search_GetFirstRow, + search_GetNextRow, + search_GetPreviousRow, + search_GetNextColumnName, + search_GetColumn, + search_FreeColumn, + search_CloseSearchHandle +}; + static HRESULT LDAPNamespace_create(REFIID riid, void **obj) { LDAP_namespace *ldap; @@ -1056,6 +1178,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->IADs_iface.lpVtbl = &IADs_vtbl; ldap->IADsOpenDSObject_iface.lpVtbl = &IADsOpenDSObject_vtbl; + ldap->IDirectorySearch_iface.lpVtbl = &IDirectorySearch_vtbl; ldap->ref = 1; ldap->ld = NULL; ldap->host = NULL; diff --git a/include/iads.idl b/include/iads.idl index 8553a03d8c..fdee17859d 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -99,8 +99,6 @@ typedef enum ADS_SEARCHPREF_EXTENDED_DN } ADS_SEARCHPREF_ENUM; -typedef ADS_SEARCHPREF_ENUM *PADS_SEARCHPREF_INFO; - typedef enum { ADS_STATUS_S_OK, @@ -328,7 +326,7 @@ typedef struct ads_searchpref_info ADS_SEARCHPREF dwSearchPref; ADSVALUE vValue; ADS_STATUS dwStatus; -} ADS_SEARCHPREF_INFO; +} ADS_SEARCHPREF_INFO, *PADS_SEARCHPREF_INFO; typedef struct ads_search_column { -- 2.25.1

1 0

[PATCH 2/8] adsldp: Forward IADsOpenDSObject::AddRef/Release to base object.
by Dmitry Timoshkov March 24, 2020

March 24, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 7ff1aa09b4..c49f9ef70b 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -806,21 +806,13 @@ static HRESULT WINAPI openobj_QueryInterface(IADsOpenDSObject *iface, REFIID rii static ULONG WINAPI openobj_AddRef(IADsOpenDSObject *iface) { LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); - return InterlockedIncrement(&ldap->ref); + return IADs_AddRef(&ldap->IADs_iface); } static ULONG WINAPI openobj_Release(IADsOpenDSObject *iface) { LDAP_namespace *ldap = impl_from_IADsOpenDSObject(iface); - LONG ref = InterlockedDecrement(&ldap->ref); - - if (!ref) - { - TRACE("destroying %p\n", iface); - HeapFree(GetProcessHeap(), 0, ldap); - } - - return ref; + return IADs_Release(&ldap->IADs_iface); } static HRESULT WINAPI openobj_GetTypeInfoCount(IADsOpenDSObject *iface, UINT *count) -- 2.25.1

1 0

[PATCH 1/8] adsldp: Turn FIXME into a TRACE for IADsOpenDSObject::OpenDSObject().
by Dmitry Timoshkov March 24, 2020

March 24, 2020

It's in a good enough state already. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 03f7571afd..7ff1aa09b4 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -924,7 +924,7 @@ static HRESULT WINAPI openobj_OpenDSObject(IADsOpenDSObject *iface, BSTR path, B HRESULT hr; ULONG err; - FIXME("%p,%s,%s,%p,%08x,%p: semi-stub\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); + TRACE("%p,%s,%s,%p,%08x,%p\n", iface, debugstr_w(path), debugstr_w(user), password, flags, obj); hr = parse_path(path, &host, &port, &object); if (hr != S_OK) return hr; -- 2.25.1

1 0

[PATCH 3/5] d3d8/tests: Test detaching adapters.
by Zhiyi Zhang March 24, 2020

March 24, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 76 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a2c02b2c6a..d87832b716 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9831,9 +9831,11 @@ static void test_multi_adapter(void) { unsigned int i, adapter_count, expected_adapter_count = 0; DISPLAY_DEVICEA display_device; - MONITORINFO monitor_info; + MONITORINFOEXA monitor_info; + DEVMODEA old_mode, mode; HMONITOR monitor; IDirect3D8 *d3d; + LONG ret; d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -9853,17 +9855,79 @@ static void test_multi_adapter(void) for (i = 0; i < adapter_count; ++i) { monitor = IDirect3D8_GetAdapterMonitor(d3d, i); - ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, &monitor_info), - "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), + "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, - "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + "Adapter %u: Got unexpected monitor flags %#x.\n", i, monitor_info.dwFlags); else - ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + ok(!monitor_info.dwFlags, "Adapter %u: Got unexpected monitor flags %#x.\n", i, + monitor_info.dwFlags); + + /* Test D3D adapters after they got detached */ + if (monitor_info.dwFlags == MONITORINFOF_PRIMARY) + continue; + + /* Save current display settings */ + memset(&old_mode, 0, sizeof(old_mode)); + old_mode.dmSize = sizeof(old_mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &old_mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret), "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + + /* Detach */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + mode.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + mode.dmPosition = old_mode.dmPosition; + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + + /* Check if it is really detached */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret) , "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + if (mode.dmPelsWidth && mode.dmPelsHeight) + { + skip("Adapter %u: Failed to detach device %s.\n", i, monitor_info.szDevice); + continue; + } + + /* Detaching adapter shouldn't reduce the adapter count */ + expected_adapter_count = adapter_count; + adapter_count = IDirect3D8_GetAdapterCount(d3d); + ok(adapter_count == expected_adapter_count, + "Adapter %u: Got unexpected adapter count %u, expected %u.\n", i, adapter_count, + expected_adapter_count); + + monitor = IDirect3D8_GetAdapterMonitor(d3d, i); + ok(!monitor, "Adapter %u: Expect monitor to be NULL.\n", i); + + /* Restore settings */ + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &old_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); } IDirect3D8_Release(d3d); -- 2.20.1

3 3

[tools] winemono.php: Add architecture to filename in 5.0.
by Esme March 24, 2020

March 24, 2020

From: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- winemono.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/winemono.php b/winemono.php index 9938574..0c9d84d 100644 --- a/winemono.php +++ b/winemono.php @@ -17,7 +17,15 @@ if(isset($_GET['v'])) { $sVersion = $_GET['v']; } -if(!$sFileSuffix) +// Check which arch to use +if(((int)(explode(".", $sVersion, 2)[0])) >= 5) { + if(!isset($_GET['arch']) || $_GET['arch'] == 'x86_64') + $sArch = 'x86'; + else + $sArch = $_GET['arch']; + $sFileSuffix = $sVersion.'-'.$sArch; +} +else // version < 5, no arch in filename $sFileSuffix = $sVersion; $sExt = 'msi'; -- 2.17.1

1 0

[PATCH] mscoree: Handle the shared wine-mono installation like the msi case.
by Francois Gouget March 24, 2020

March 24, 2020

Expect to find the wine-mono-<ver> directory in the same location as the msi file, that is inside the mono directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I propose this patch to bring the shared Mono install case in line with the MSI case and Gecko, as per the last point in the following email: https://www.winehq.org/pipermail/wine-devel/2020-January/158129.html I don't think it's worth keeping backward compatibility, i.e. look in ../wine-mono-<ver> then ../mono/wine-mono-<ver> (or vice versa), but if that's deemed important, let me know. dlls/mscoree/metahost.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3786f3afc5c..df0417e0f6d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -784,16 +784,15 @@ static BOOL get_mono_path_datadir(LPWSTR path) static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; static const WCHAR unix_prefix[] = {'\\','?','?','\\','u','n','i','x','\\'}; - static const WCHAR monoW[] = {'\\','m','o','n','o',0}; - static const WCHAR dotdotW[] = {'\\','.','.',0}; + static const WCHAR monoW[] = {'\\','.','.','\\','m','o','n','o',0}; const WCHAR *data_dir, *suffix; WCHAR *package_dir; BOOL ret; if ((data_dir = _wgetenv( winedatadirW ))) - suffix = monoW; + suffix = monoW + 3; else if ((data_dir = _wgetenv( winebuilddirW ))) - suffix = dotdotW; + suffix = monoW; else return FALSE; -- 2.20.1

2 5

[PATCH] dinput: Fix crash in dump_DIEFFECT() when rglDirection is unexpectedly NULL.
by Brendan Shanks March 24, 2020

March 24, 2020

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/dinput/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 01611b0e44..19dd9ad736 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -207,7 +207,7 @@ void dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); TRACE(" - rglDirection: %p\n", eff->rglDirection); - if (dwFlags & DIEP_DIRECTION) { + if (dwFlags & DIEP_DIRECTION && eff->rglDirection) { TRACE(" "); for (i = 0; i < eff->cAxes; ++i) TRACE("%d ", eff->rglDirection[i]); -- 2.24.1

1 0

[PATCH] kernelbase: Set req->mask in SetConsoleScreenBufferInfoEx.
by Gijs Vermeulen March 24, 2020

March 24, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/kernelbase/console.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index b9843850c8..347f1d2a63 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1159,6 +1159,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, SERVER_START_REQ( set_console_output_info ) { req->handle = console_handle_unmap( handle ); + req->mask = SET_CONSOLE_OUTPUT_INFO_CURSOR_POS | SET_CONSOLE_OUTPUT_INFO_SIZE | + SET_CONSOLE_OUTPUT_INFO_ATTR | SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR | + SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW | SET_CONSOLE_OUTPUT_INFO_MAX_SIZE; req->width = info->dwSize.X; req->height = info->dwSize.Y; req->cursor_x = info->dwCursorPosition.X; -- 2.25.1

1 0

[PATCH v2] winevulkan: Generate typedefs for aliased structs
by Liam Middlebrook March 24, 2020

March 24, 2020

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: James Jones <jajones(a)nvidia.com> --- v2: Fix conversion struct handling --- dlls/winevulkan/make_vulkan | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a4ebb2c7e9..29d2f14d43 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1571,6 +1571,7 @@ class VkStruct(Sequence): self.union = union self.type_info = None # To be set later. self.struct_extensions = [] + self.aliased_by = [] def __getitem__(self, i): return self.members[i] @@ -1581,7 +1582,10 @@ class VkStruct(Sequence): @staticmethod def from_alias(struct, alias): name = struct.attrib.get("name") - return VkStruct(name, alias.members, alias.returnedonly, alias.structextends, alias=alias) + aliasee = VkStruct(name, alias.members, alias.returnedonly, alias.structextends, alias=alias) + + alias.add_aliased_by(aliasee) + return aliasee @staticmethod def from_xml(struct): @@ -1666,6 +1670,10 @@ class VkStruct(Sequence): postfix (str, optional): text to append to end of struct name, useful for struct renaming. """ + # Only define alias structs when doing conversions + if self.is_alias() and not conv: + return "" + if self.union: text = "typedef union {0}".format(self.name) else: @@ -1687,12 +1695,21 @@ class VkStruct(Sequence): if postfix is not None: text += "}} {0}{1};\n\n".format(self.name, postfix) else: - text += "}} {0};\n\n".format(self.name) + text += "}} {0};\n".format(self.name) + + for aliasee in self.aliased_by: + text += "typedef {0} {1};\n".format(self.name, aliasee.name) + + text += "\n" + return text def is_alias(self): return bool(self.alias) + def add_aliased_by(self, aliasee): + self.aliased_by.append(aliasee) + def needs_alignment(self): """ Check if structure needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due -- 2.17.1

1 0

[PATCH] winevulkan: Generate typedefs for aliased structs
by Liam Middlebrook March 24, 2020

March 24, 2020

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: James Jones <jajones(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index a4ebb2c7e9..c88626951f 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1571,6 +1571,7 @@ class VkStruct(Sequence): self.union = union self.type_info = None # To be set later. self.struct_extensions = [] + self.aliased_by = [] def __getitem__(self, i): return self.members[i] @@ -1581,7 +1582,10 @@ class VkStruct(Sequence): @staticmethod def from_alias(struct, alias): name = struct.attrib.get("name") - return VkStruct(name, alias.members, alias.returnedonly, alias.structextends, alias=alias) + aliasee = VkStruct(name, alias.members, alias.returnedonly, alias.structextends, alias=alias) + + alias.add_aliased_by(aliasee) + return aliasee @staticmethod def from_xml(struct): @@ -1665,6 +1669,8 @@ class VkStruct(Sequence): conv (bool, optional): enable struct conversion if the struct needs it. postfix (str, optional): text to append to end of struct name, useful for struct renaming. """ + if self.is_alias(): + return "" if self.union: text = "typedef union {0}".format(self.name) @@ -1687,12 +1693,21 @@ class VkStruct(Sequence): if postfix is not None: text += "}} {0}{1};\n\n".format(self.name, postfix) else: - text += "}} {0};\n\n".format(self.name) + text += "}} {0};\n".format(self.name) + + for aliasee in self.aliased_by: + text += "typedef {0} {1};\n".format(self.name, aliasee.name) + + text += "\n" + return text def is_alias(self): return bool(self.alias) + def add_aliased_by(self, aliasee): + self.aliased_by.append(aliasee) + def needs_alignment(self): """ Check if structure needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due -- 2.17.1

2 1