September 2022 - Wine-commits

Francois Gouget : testbot/TestWTBS: Fix $LogType for Windows reports.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: tools Branch: master Commit: f588b7648e5a47ab8263ddcad649dbe8a7daa165 URL: https://gitlab.winehq.org/winehq/tools/-/commit/f588b7648e5a47ab8263ddcad64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 20 10:23:35 2022 +0200 testbot/TestWTBS: Fix $LogType for Windows reports. This ensures TestWTBS uses the correct list of expected errors. --- testbot/tests/TestWTBS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 5663f956..15e7931e 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -964,7 +964,8 @@ sub CheckTask($$$$) my $LogType = "log"; if ($LogName =~ /\.report$/) { - $LogType = $LogName =~ /^wow32/ ? "wow32" : + $LogType = $MissionType =~ /^exe/ ? "report" : + $LogName =~ /^wow32/ ? "wow32" : $LogName =~ /^wow64/ ? "wow64" : "win32"; $ReportCount++;

1 0

Francois Gouget : testbot/TestWTBS: Tweak messages to correctly describe errors as old/new.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: tools Branch: master Commit: b874ada411669ccfc2aa6686bff44bd21030c307 URL: https://gitlab.winehq.org/winehq/tools/-/commit/b874ada411669ccfc2aa6686bff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 15 17:39:13 2022 +0200 testbot/TestWTBS: Tweak messages to correctly describe errors as old/new. --- testbot/tests/TestWTBS | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index 15e7931e..ef04d5ce 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -752,14 +752,16 @@ sub CheckLogErrors($$$$) next; } - fail("$LogKey has an unexpected new error in $GroupName: $LogGroup->{Errors}->[$LogIndex]"); + my $NewOld = $LogGroup->{IsNew}->[$LogIndex] ? "new" : "old"; + fail("$LogKey has an unexpected $NewOld error in $GroupName: $LogGroup->{Errors}->[$LogIndex]"); $LogIndex++; } # And for missing expected errors my $MissingCount = $Diff->Items(2); foreach (1..$MissingCount) { - fail("$LogKey is missing an error in $GroupName: $RefGroup->{Errors}->[$RefIndex]"); + my $NewOld = $RefGroup->{IsNew}->[$RefIndex] ? "a new" : "an old"; + fail("$LogKey is missing $NewOld error in $GroupName: $RefGroup->{Errors}->[$RefIndex]"); $RefIndex++; } }

1 0

Francois Gouget : testbot/TestWTBS: Check the old/new status of failures.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: tools Branch: master Commit: 3c3af6d9a26e9858bcaf6d8ca803576d02afe935 URL: https://gitlab.winehq.org/winehq/tools/-/commit/3c3af6d9a26e9858bcaf6d8ca80… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 15 17:45:44 2022 +0200 testbot/TestWTBS: Check the old/new status of failures. Originally this was not worth testing because the tests could not generate old failures. But with flaky they can. --- testbot/tests/TestWTBS | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/testbot/tests/TestWTBS b/testbot/tests/TestWTBS index ef04d5ce..fd59da66 100755 --- a/testbot/tests/TestWTBS +++ b/testbot/tests/TestWTBS @@ -736,8 +736,17 @@ sub CheckLogErrors($$$$) my $SameCount = $Diff->Same(); if ($SameCount) { - $LogIndex += $SameCount; - $RefIndex += $SameCount; + foreach (1..$SameCount) + { + my $LogNewOld = $LogGroup->{IsNew}->[$LogIndex] ? "new" : "old"; + my $RefNewOld = $RefGroup->{IsNew}->[$RefIndex] ? "new" : "old"; + if ($LogNewOld ne $RefNewOld) + { + fail("expected this error to be $RefNewOld not $LogNewOld: $LogGroup->{Errors}->[$LogIndex]"); + } + $LogIndex++; + $RefIndex++; + } } else {

1 0

Francois Gouget : testbot/LibvirtTool: Disable the Windows time service.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: tools Branch: master Commit: 05e5686eb1ccf95f92de00d93804ae5fdbccb346 URL: https://gitlab.winehq.org/winehq/tools/-/commit/05e5686eb1ccf95f92de00d9380… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 19 17:26:33 2022 +0200 testbot/LibvirtTool: Disable the Windows time service. The TestBot already sets the VM's current time before starting a task. But the Windows Time service could still be making small time adjustmenents (including backwards) by small (<1s) amounts while the tests are running, which could cause failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53516 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53273 --- testbot/bin/LibvirtTool.pl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index d087b358..0c070da6 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -716,6 +716,21 @@ sub CreateSnapshot($$$$) Error("Could not change the Windows boot delay on $VMKey\n"); } + # Stop and disable the Windows time service to be sure it won't change + # the time while a test is running. + if (RunAndWait($PTA, ["net.exe", "stop", "w32time"])) + { + Error("Could not stop the $VMKey Windows time service\n"); + } + if (RunAndWait($PTA, ["sc.exe", "config", "w32time", "start=", "disabled"])) + { + Error("Could not disable the $VMKey Windows time service\n"); + } + if (RunAndWait($TA, ["reg.exe", "add", "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Services\\W32Time\\Parameters", "/v", "Type", "/t", "REG_SZ", "/d", "NoSync", "/f"])) + { + FatalError("Could not set the $VMKey Windows Time service to NoSync\n"); + } + if ($Config->{tsign}) { # Takes effect after the next reboot

1 0

Francois Gouget : testbot/RestoreVM: When renaming a VM, warn if a disk was not renamed.
by Alexandre Julliard 23 Sep '22

23 Sep '22

Module: tools Branch: master Commit: ddf7c8a5987f858d9a25a6b8a803d73ac806f109 URL: https://gitlab.winehq.org/winehq/tools/-/commit/ddf7c8a5987f858d9a25a6b8a80… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 25 11:15:58 2022 +0200 testbot/RestoreVM: When renaming a VM, warn if a disk was not renamed. It means the name of that disk is not specific to the VM and may thus end up being shared with the original VM. --- testbot/scripts/RestoreVM | 3 +++ 1 file changed, 3 insertions(+) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index 29f5f43d..b020211a 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -502,6 +502,9 @@ else dst_target=`echo "$src_target" | sed -e "s/$vm/$opt_vm/g"` rm "$src_disk" ln -s "$dst_target" "$dst_disk" || failed=1 + elif [ "$src_disk" = "$dst_disk" ] + then + warning "not renaming '$src_disk'" else mv "$src_disk" "$dst_disk" || failed=1 fi

1 0

Owen Rudge : secur32/tests: Add tests for LsaGetLogonSessionData.
by Alexandre Julliard 22 Sep '22

22 Sep '22

Module: wine Branch: master Commit: 402b8473c9a2c9de667b53762682f301606eb127 URL: https://gitlab.winehq.org/wine/wine/-/commit/402b8473c9a2c9de667b53762682f3… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 21 12:54:15 2022 +0100 secur32/tests: Add tests for LsaGetLogonSessionData. --- dlls/secur32/tests/main.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index 36ed02ab467..9b148a5368f 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -26,6 +26,7 @@ #include <windef.h> #include <winbase.h> #include <sspi.h> +#include <ntsecapi.h> #include "wine/test.h" @@ -244,6 +245,42 @@ static void testQuerySecurityPackageInfo(void) ok(pkg_info == (void *)0xdeadbeef, "wrong pkg_info address %p\n", pkg_info); } +static void test_get_logon_session_data(void) +{ + SECURITY_LOGON_SESSION_DATA *data = NULL; + TOKEN_STATISTICS ts; + HANDLE thread_hdl; + NTSTATUS status; + DWORD ret_len; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &thread_hdl); + ok(ret, "got %ld\n", GetLastError()); + + if (!ret) return; + + ret_len = sizeof(TOKEN_STATISTICS); + ret = GetTokenInformation(thread_hdl, TokenStatistics, &ts, sizeof(TOKEN_STATISTICS), &ret_len); + ok(ret, "got %ld\n", GetLastError()); + + if (!ret) goto cleanup; + + status = LsaGetLogonSessionData(&ts.AuthenticationId, &data); + todo_wine ok(!status, "got %08lx\n", status); + + if (status) goto cleanup; + + ok(data->Size >= sizeof(SECURITY_LOGON_SESSION_DATA), "Size == %ld\n", data->Size); + ok(!memcmp(&data->LogonId, &ts.AuthenticationId, sizeof(LUID)), "LogonId mismatch\n"); + + /* We can't easily verify the content of the various logon parameters, so just ensure data is present */ + ok(data->AuthenticationPackage.Length > 0, "AuthenticationPackage missing\n"); + +cleanup: + CloseHandle(thread_hdl); + if (data != NULL) LsaFreeReturnBuffer(data); +} + START_TEST(main) { InitFunctionPtrs(); @@ -260,4 +297,6 @@ START_TEST(main) } if(secdll) FreeLibrary(secdll); + + test_get_logon_session_data(); }

1 0

Owen Rudge : secur32: Implement basic functionality for LsaGetLogonSessionData.
by Alexandre Julliard 22 Sep '22

22 Sep '22

Module: wine Branch: master Commit: 283cefe242d854bd92311ae8b71af2614a9249e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/283cefe242d854bd92311ae8b71af2… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Sep 21 12:53:41 2022 +0100 secur32: Implement basic functionality for LsaGetLogonSessionData. --- dlls/secur32/lsa.c | 29 ++++++++++++++++++++++++++--- dlls/secur32/tests/main.c | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 9368d3728e4..3cbd49e6b0e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define LSA_MAGIC_CREDENTIALS ('L' << 24 | 'S' << 16 | 'A' << 8 | '1') #define LSA_MAGIC_CONTEXT ('L' << 24 | 'S' << 16 | 'A' << 8 | '2') +static const WCHAR *default_authentication_package = L"Negotiate"; + struct lsa_package { ULONG package_id; @@ -157,9 +159,30 @@ NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID buffer) NTSTATUS WINAPI LsaGetLogonSessionData(PLUID LogonId, PSECURITY_LOGON_SESSION_DATA* ppLogonSessionData) { - FIXME("%p %p stub\n", LogonId, ppLogonSessionData); - *ppLogonSessionData = NULL; - return STATUS_NOT_IMPLEMENTED; + SECURITY_LOGON_SESSION_DATA *data; + int authpkg_len; + WCHAR *end; + + FIXME("%p %p semi-stub\n", LogonId, ppLogonSessionData); + + authpkg_len = wcslen(default_authentication_package) * sizeof(WCHAR); + + data = calloc(1, sizeof(*data) + authpkg_len + sizeof(WCHAR)); + if (!data) return STATUS_NO_MEMORY; + + data->Size = sizeof(*data); + data->LogonId = *LogonId; + + end = (WCHAR *)(data + 1); + wcscpy(end, default_authentication_package); + + data->AuthenticationPackage.Length = authpkg_len; + data->AuthenticationPackage.MaximumLength = authpkg_len + sizeof(WCHAR); + data->AuthenticationPackage.Buffer = end; + + *ppLogonSessionData = data; + + return STATUS_SUCCESS; } NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName, diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index 9b148a5368f..46a62c8ea02 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -266,7 +266,7 @@ static void test_get_logon_session_data(void) if (!ret) goto cleanup; status = LsaGetLogonSessionData(&ts.AuthenticationId, &data); - todo_wine ok(!status, "got %08lx\n", status); + ok(!status, "got %08lx\n", status); if (status) goto cleanup;

1 0

Santino Mazza : include: Define REG_APP_HIVE and REG_PROCESS_PRIVATE.
by Alexandre Julliard 22 Sep '22

22 Sep '22

Module: wine Branch: master Commit: 823074201612e36526148a55c873eaf92a5df00a URL: https://gitlab.winehq.org/wine/wine/-/commit/823074201612e36526148a55c873ea… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Thu Sep 15 19:09:44 2022 -0300 include: Define REG_APP_HIVE and REG_PROCESS_PRIVATE. --- include/winnt.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c0599a5f757..836bd7123e5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5517,6 +5517,8 @@ typedef struct _TAPE_GET_MEDIA_PARAMETERS { #define REG_REFRESH_HIVE 0x00000002 #define REG_NO_LAZY_FLUSH 0x00000004 #define REG_FORCE_RESTORE 0x00000008 +#define REG_APP_HIVE 0x00000010 +#define REG_PROCESS_PRIVATE 0x00000020 #define KEY_READ ((STANDARD_RIGHTS_READ| \ KEY_QUERY_VALUE| \

1 0

Santino Mazza : ntdll/tests: Test for NtRegLoadKey roothandle parameter.
by Alexandre Julliard 22 Sep '22

22 Sep '22

Module: wine Branch: master Commit: e8390a102a6e149e518446b08bc2943530b708a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8390a102a6e149e518446b08bc294… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Thu Sep 15 19:56:56 2022 -0300 ntdll/tests: Test for NtRegLoadKey roothandle parameter. --- dlls/ntdll/tests/reg.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index f3c4eb15da0..c7d9d7e4c7f 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -153,6 +153,7 @@ static NTSTATUS (WINAPI * pNtNotifyChangeKey)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOI static NTSTATUS (WINAPI * pNtNotifyChangeMultipleKeys)(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE, void*,IO_STATUS_BLOCK*,ULONG,BOOLEAN,void*,ULONG,BOOLEAN); static NTSTATUS (WINAPI * pNtWaitForSingleObject)(HANDLE,BOOLEAN,const LARGE_INTEGER*); +static NTSTATUS (WINAPI * pNtLoadKeyEx)(const OBJECT_ATTRIBUTES*,OBJECT_ATTRIBUTES*,ULONG,HANDLE,HANDLE,ACCESS_MASK,HANDLE*,IO_STATUS_BLOCK*); static HMODULE hntdll = 0; static int CurrentTest = 0; @@ -205,6 +206,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(RtlpNtQueryValueKey) NTDLL_GET_PROC(RtlOpenCurrentUser) NTDLL_GET_PROC(NtWaitForSingleObject) + NTDLL_GET_PROC(NtLoadKeyEx); /* optional functions */ pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); @@ -2268,6 +2270,108 @@ static void test_NtRenameKey(void) pNtClose(key); } +static BOOL set_privileges(LPCSTR privilege, BOOL set) +{ + TOKEN_PRIVILEGES tp; + HANDLE hToken; + LUID luid; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + return FALSE; + + if(!LookupPrivilegeValueA(NULL, privilege, &luid)) + { + CloseHandle(hToken); + return FALSE; + } + + tp.PrivilegeCount = 1; + tp.Privileges[0].Luid = luid; + + if (set) + tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + else + tp.Privileges[0].Attributes = 0; + + AdjustTokenPrivileges(hToken, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, NULL); + if (GetLastError() != ERROR_SUCCESS) + { + CloseHandle(hToken); + return FALSE; + } + + CloseHandle(hToken); + return TRUE; +} + +static void test_NtRegLoadKeyEx(void) +{ + NTSTATUS status; + OBJECT_ATTRIBUTES file_attr, key_attr; + WCHAR temp_path[MAX_PATH], hivefile_path[MAX_PATH]; + UNICODE_STRING hivefile_pathW, key_pathW; + HANDLE key = 0; + + GetTempPathW(sizeof(temp_path), temp_path); + GetTempFileNameW(temp_path, L"key", 0, hivefile_path); + DeleteFileW(hivefile_path); + RtlDosPathNameToNtPathName_U(hivefile_path, &hivefile_pathW, NULL, NULL); + + if (!set_privileges(SE_RESTORE_NAME, TRUE) || + !set_privileges(SE_BACKUP_NAME, TRUE)) + { + win_skip("Failed to set SE_RESTORE_NAME and SE_BACKUP_NAME privileges, skipping tests\n"); + RtlFreeUnicodeString(&hivefile_pathW); + return; + } + + /* Generate hive file */ + InitializeObjectAttributes(&key_attr, &winetestpath, 0, NULL, NULL); + status = pNtCreateKey(&key, KEY_ALL_ACCESS, &key_attr, 0, 0, 0, 0); + ok(status == ERROR_SUCCESS, "couldn't create key 0x%lx\n", status); + status = RegSaveKeyW(key, hivefile_path, NULL); + ok(status == ERROR_SUCCESS, "couldn't save key %ld\n", status); + status = pNtDeleteKey(key); + ok(status == ERROR_SUCCESS, "couldn't delete key 0x%lx\n", status); + key = 0; + + /* Test for roothandle parameter with no flags */ + pRtlFormatCurrentUserKeyPath(&key_pathW); + key_pathW.Buffer = pRtlReAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, key_pathW.Buffer, + key_pathW.MaximumLength + sizeof(key_pathW)*sizeof(WCHAR)); + key_pathW.MaximumLength = key_pathW.MaximumLength + sizeof(key_pathW)*sizeof(WCHAR); + pRtlAppendUnicodeToString(&key_pathW, L"TestKey"); + + InitializeObjectAttributes(&file_attr, &hivefile_pathW, 0, NULL, NULL); + key_attr.ObjectName = &key_pathW; + status = pNtLoadKeyEx(&key_attr, &file_attr, 0, NULL, NULL, KEY_READ, &key, NULL); + todo_wine ok(status == STATUS_INVALID_PARAMETER_7 || broken(status == STATUS_INVALID_PARAMETER_6) /* win7 */, "got 0x%lx\n", status); + if (status == STATUS_INVALID_PARAMETER_6) + { + win_skip("NtLoadKeyEx has a different order of parameters in this windows version\n"); + RtlFreeUnicodeString(&hivefile_pathW); + RtlFreeUnicodeString(&key_pathW); + DeleteFileW(hivefile_path); + return; + } + ok(!key, "key is expected to be null\n"); + if (key) pNtClose(key); + RtlFreeUnicodeString(&key_pathW); + + /* Test for roothandle parameter with REG_APP_HIVE */ + RtlCreateUnicodeString(&key_pathW, L"\\REGISTRY\\A\\TestKey"); + status = pNtLoadKeyEx(&key_attr, &file_attr, REG_APP_HIVE, NULL, NULL, KEY_READ, &key, NULL); + todo_wine ok(status == STATUS_SUCCESS, "got 0x%lx\n", status); + todo_wine ok(key != NULL, "key is null\n"); + if (key) pNtClose(key); + RtlFreeUnicodeString(&key_pathW); + + set_privileges(SE_RESTORE_NAME, FALSE); + set_privileges(SE_BACKUP_NAME, FALSE); + RtlFreeUnicodeString(&hivefile_pathW); + DeleteFileW(hivefile_path); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -2298,6 +2402,7 @@ START_TEST(reg) test_symlinks(); test_redirection(); test_NtRenameKey(); + test_NtRegLoadKeyEx(); pRtlFreeUnicodeString(&winetestpath);

1 0

Eric Pouech : avifil32: Fix GCC 12.2 warning (-Warray-bounds).
by Alexandre Julliard 22 Sep '22

22 Sep '22

Module: wine Branch: master Commit: 52a83ffe4ef1ef58520b09f8d2144dcf291b622b URL: https://gitlab.winehq.org/wine/wine/-/commit/52a83ffe4ef1ef58520b09f8d2144d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 21 08:51:02 2022 +0200 avifil32: Fix GCC 12.2 warning (-Warray-bounds). Since struct _IAVIStreamImpl has a pointer to a WAVEFORMATEX, GCC 12.2 emits warning when dereferencing that pointer when the block has been allocated with sizeof(PCMWAVEFORMAT). The warning is fixed by always allocating with sizeof(WAVEFORMATEX). This will overallocate in case of a PCM stream. The alternative would have been to store in struct _IAVIStreamImpl a pointer to PCMWAVEFORMAT instead, and add the casting to a WAVEFORMATEX when needed. That would clutter the code IMO since most of the ACM APIs expect a LPWAVEFORMATEX. /home/eric/work/wine/dlls/avifil32/acmstream.c: In function 'AVIFILE_OpenCompressor': /home/eric/work/wine/dlls/avifil32/acmstream.c:105:24: warning: array subscript 'struct tWAVEFORMATEX[0]' is partly outside array bounds of 'unsigned char[16]' [-Warray-bounds] 105 | This->lpOutFormat->wFormatTag = WAVE_FORMAT_PCM; | ^~ /home/eric/work/wine/dlls/avifil32/acmstream.c:101:27: note: object of size 16 allocated by 'HeapAlloc' 101 | This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/avifil32/acmstream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index fe5a8e3660b..be8c7b7dc33 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -97,7 +97,7 @@ static HRESULT AVIFILE_OpenCompressor(IAVIStreamImpl *This) if (This->lpOutFormat == NULL) { /* we must decode to default format */ - This->cbOutFormat = sizeof(PCMWAVEFORMAT); + This->cbOutFormat = sizeof(WAVEFORMATEX); This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); if (This->lpOutFormat == NULL) return AVIERR_MEMORY; @@ -249,7 +249,7 @@ static HRESULT WINAPI ACMStream_fnCreate(IAVIStream *iface, LPARAM lParam1, if (((LPWAVEFORMATEX)lParam2)->wFormatTag != WAVE_FORMAT_PCM) This->cbOutFormat = sizeof(WAVEFORMATEX) + ((LPWAVEFORMATEX)lParam2)->cbSize; else - This->cbOutFormat = sizeof(PCMWAVEFORMAT); + This->cbOutFormat = sizeof(WAVEFORMATEX); This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); if (This->lpOutFormat == NULL)

1 0