GCC 11 has a new warning (-Warray-parameter) that complains if an array argument is defined differently than declared in the function prototype. We can avoid that warning by consistently using the same definitions as the Windows SDK.
-Alex
Alex Henrie (2): msdmo: Fix size of DMOGetName's array argument (GCC) include: Fix size of MsiEnumClientsEx[AW]'s array argument (GCC)
dlls/msdmo/dmoreg.c | 2 +- include/msi.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
Signed-off-by: Alex Henrie alexhenrie24@gmail.com --- dlls/msdmo/dmoreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 33caa6d0dc5..d5c76c8273f 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -279,7 +279,7 @@ lend: * * Get DMO Name from the registry */ -HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[]) +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR name[80]) { static const INT max_name_len = 80*sizeof(WCHAR); DWORD count = max_name_len;
Signed-off-by: Alex Henrie alexhenrie24@gmail.com --- include/msi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/msi.h b/include/msi.h index 604331a9e5f..c1ca99771a4 100644 --- a/include/msi.h +++ b/include/msi.h @@ -470,8 +470,8 @@ UINT WINAPI MsiEnumClientsA(LPCSTR, DWORD, LPSTR); UINT WINAPI MsiEnumClientsW(LPCWSTR, DWORD, LPWSTR); #define MsiEnumClients WINELIB_NAME_AW(MsiEnumClients)
-UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR*, MSIINSTALLCONTEXT*, LPSTR, LPDWORD); -UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR*, MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExA(LPCSTR, LPCSTR, DWORD, DWORD, CHAR[39], MSIINSTALLCONTEXT*, LPSTR, LPDWORD); +UINT WINAPI MsiEnumClientsExW(LPCWSTR, LPCWSTR, DWORD, DWORD, WCHAR[39], MSIINSTALLCONTEXT*, LPWSTR, LPDWORD); #define MsiEnumClientsEx WINELIB_NAME_AW(MsiEnumClientsEx)
UINT WINAPI MsiOpenPackageA(LPCSTR, MSIHANDLE*);
Signed-off-by: Hans Leidekker hans@codeweavers.com