March 2021 - Wine-devel - list.winehq.org

[PATCH] ntdll: Fix environment memcpy read overflow (valgrind).
by Rémi Bernon 08 Mar '21

08 Mar '21

Invalid read of size 1 at 0x7BC5C5E3: memcpy (string.c:109) by 0x7BC267F7: RtlCreateProcessParametersEx (env.c:785) by 0x7B04EB57: create_process_params (process.c:183) by 0x7B04EB57: CreateProcessInternalW (process.c:544) by 0x7B0508E3: CreateProcessW (process.c:668) by 0x403B1E: runCmd (wineboot.c:1055) by 0x403B1E: process_run_key (wineboot.c:1126) by 0x404228: ProcessRunKeys (wineboot.c:1159) by 0x406DB1: main (wineboot.c:1707) Address 0x7ffffe00331a is 0 bytes after a recently re-allocated block of size 12,074 alloc'd at 0x7BC2D209: notify_alloc (heap.c:260) by 0x7BC2D209: RtlAllocateHeap (heap.c:1713) by 0x7BC25BAC: RtlSetEnvironmentVariable (env.c:515) by 0x7BC25EE0: set_env_var (env.c:61) by 0x7BC26C37: set_wow64_environment (env.c:228) by 0x7BC26C37: init_user_process_params (env.c:891) by 0x7BC3B01B: process_init (loader.c:3991) by 0x7BC3CD24: __wine_set_unix_funcs (loader.c:4095) by 0x469604E: start_main_thread (loader.c:1752) by 0x469604E: __wine_main (loader.c:2083) by 0x7D001231: main (main.c:157) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/env.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index a18d1446db4..75ea2ebbb45 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -762,14 +762,13 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu + ROUND_SIZE( ShellInfo->MaximumLength ) + ROUND_SIZE( RuntimeInfo->MaximumLength )); - env_size = ROUND_SIZE( env_size ); - if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + env_size ))) + if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size ) ))) { RTL_USER_PROCESS_PARAMETERS *params = ptr; params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->EnvironmentSize = env_size; + params->EnvironmentSize = ROUND_SIZE( env_size ); if (cur_params) params->ConsoleFlags = cur_params->ConsoleFlags; /* all other fields are zero */ -- 2.30.0

1 0

[PATCH] ntdll: Initialize dbg_offset and dbg_size (valgrind).
by Rémi Bernon 08 Mar '21

08 Mar '21

Syscall param writev(vector[...]) points to uninitialised byte(s) at 0x4189DA3: writev (writev.c:26) by 0x46A5A0B: send_request (server.c:213) by 0x46A5A0B: server_call_unlocked (server.c:273) by 0x46A5B4F: wine_server_call (server.c:289) by 0x46C996A: virtual_create_builtin_view (virtual.c:2524) by 0x4692CB4: dlopen_dll (loader.c:1133) by 0x46931CA: open_builtin_file (loader.c:1373) by 0x46931CA: open_builtin_file (loader.c:1354) by 0x4694559: load_builtin_dll (loader.c:1457) by 0x7BC375F2: load_builtin_dll (loader.c:2348) by 0x7BC38369: load_dll (loader.c:2705) by 0x7BC39E46: import_dll (loader.c:782) by 0x7BC36CEC: fixup_imports (loader.c:1138) by 0x7BC3BE4B: LdrInitializeThunk (loader.c:3454) Address 0x32e390 is on thread 1's stack in frame #5, created by open_builtin_file (loader.c:1357) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/unix/loader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6adf4bb5b00..1c26d1322f8 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1068,6 +1068,8 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) info->header_size = nt->OptionalHeader.SizeOfHeaders; info->file_size = nt->OptionalHeader.SizeOfImage; info->checksum = nt->OptionalHeader.CheckSum; + info->dbg_offset = 0; + info->dbg_size = 0; info->cpu = client_cpu; info->__pad = 0; } -- 2.30.0

1 0

[PATCH] ntdll: Allocate heap->pending_free using NtAllocateVirtualMemory.
by Rémi Bernon 08 Mar '21

08 Mar '21

As we may just be initializing the process heap itself, it's not completely ready. This should fix the "HEAP_GetPtr Invalid heap 0000000000000000!" error. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cae41cba0d9..0ecf765f733 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1508,8 +1508,9 @@ void heap_set_debug_flags( HANDLE handle ) if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free && ((flags & HEAP_FREE_CHECKING_ENABLED) || RUNNING_ON_VALGRIND)) { - heap->pending_free = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, - MAX_FREE_PENDING * sizeof(*heap->pending_free) ); + SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free); + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&heap->pending_free, 0, + &size, MEM_COMMIT, PAGE_READWRITE ); heap->pending_pos = 0; } } @@ -1623,7 +1624,12 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } subheap_notify_free_all(&heapPtr->subheap); - RtlFreeHeap( GetProcessHeap(), 0, heapPtr->pending_free ); + if (heapPtr->pending_free) + { + size = 0; + addr = heapPtr->pending_free; + NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); + } size = 0; addr = heapPtr->subheap.base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); -- 2.30.0

1 0

[PATCH v2] comctl32/listview: Fix the listview sorting error.
by Haoyang Chen 08 Mar '21

08 Mar '21

The original sequence may be stored in lparam. During the sorting process, this sequence is out-of-order, but lparam remains unchanged. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/comctl32/dpa.c | 13 ++++++- dlls/comctl32/tests/listview.c | 67 ++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 36b3a422e8c..69e9d0a33bb 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -818,8 +818,17 @@ BOOL WINAPI DPA_Sort (HDPA hdpa, PFNDPACOMPARE pfnCompare, LPARAM lParam) TRACE("(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam); if ((hdpa->nItemCount > 1) && (hdpa->ptrs)) - DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1, - pfnCompare, lParam); + { + LPVOID *ptrs = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY, + hdpa->nItemCount * sizeof(LPVOID)); + if (!ptrs) + return FALSE; + memcpy(ptrs, hdpa->ptrs, hdpa->nItemCount * sizeof(LPVOID)); + DPA_QuickSort (ptrs, 0, hdpa->nItemCount - 1, pfnCompare, lParam); + + memcpy(hdpa->ptrs, ptrs, hdpa->nItemCount * sizeof(LPVOID)); + HeapFree (hdpa->hHeap, 0, ptrs); + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..f67fbaff3e3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2921,6 +2921,28 @@ static INT WINAPI test_CallBackCompare(LPARAM first, LPARAM second, LPARAM lPara return (first > second ? 1 : -1); } +static INT WINAPI test_CallBackCompare1(LPARAM first, LPARAM second, LPARAM lParam) +{ + CHAR str1[5]; + CHAR str2[5]; + INT r; + HWND hwnd = (HWND)lParam; + LV_ITEMA item = {0}; + + if (first == second) return 0; + item.cchTextMax = 5; + item.iSubItem = 0; + item.pszText = str1; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, first, (LPARAM)&item); + expect(TRUE, r); + + item.pszText = str2; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, second, (LPARAM)&item); + expect(TRUE, r); + + return atoi(str1) > atoi(str2) ? 1 : -1; +} + static void test_sorting(void) { HWND hwnd; @@ -2929,6 +2951,10 @@ static void test_sorting(void) LONG_PTR style; static CHAR names[][5] = {"A", "B", "C", "D", "0"}; CHAR buff[10]; + static CHAR before_sort_array[][5] = {"6","3","1","4","2"}; + static CHAR after_sort_arary[][5] = {"1","2","3","4","6"}; + INT i; + LVCOLUMNA lvc; hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -2979,6 +3005,47 @@ static void test_sorting(void) DestroyWindow(hwnd); + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + + lvc.mask = LVCF_TEXT | LVCF_WIDTH; + lvc.pszText = names[0]; + lvc.cx = 50; + + SendMessageA(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&lvc); + SendMessageA(hwnd, LVM_INSERTCOLUMNA, 1, (LPARAM)&lvc); + + item.mask = LVIF_PARAM | LVIF_TEXT; + item.iSubItem = 0; + item.cchTextMax = 5; + + for (i = 0; i < sizeof(before_sort_array)/5; i++) + { + item.iItem = i; + item.lParam = i; + item.pszText = &before_sort_array[i][0]; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(i, r); + } + + r = SendMessageA(hwnd, LVM_SORTITEMS, (WPARAM)(LPARAM)hwnd, (LPARAM)test_CallBackCompare1); + expect(TRUE, r); + + for (i = 0; i < sizeof(after_sort_arary)/5; i++) + { + CHAR str[5]; + item.iItem = i; + item.cchTextMax = 5; + item.iSubItem = 0; + item.pszText = str; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, i, (LPARAM)&item); + expect(TRUE, r); + + expect(atoi(after_sort_arary[i]), atoi(str)); + } + + DestroyWindow(hwnd); + /* switch to LVS_SORTASCENDING when some items added */ hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); -- 2.20.1

1 0

[PATH] programs/wmic: Fix wmic cmd line.
by Chao Long 08 Mar '21

08 Mar '21

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- programs/wmic/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 1372c0986e9..f0b6ea0f05d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -44,7 +44,10 @@ alias_map[] = { L"LogicalDisk", L"Win32_LogicalDisk" }, { L"nic", L"Win32_NetworkAdapter" }, { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" } + { L"process", L"Win32_Process" }, + { L"baseboard", L"Win32_BaseBoard" }, + { L"diskdrive", L"Win32_DiskDrive" }, + { L"memorychip", L"Win32_PhysicalMemory" } }; static const WCHAR *find_class( const WCHAR *alias ) -- 2.20.1

1 0

[tools] testbot/web: Use <thead> for the CollectionBlock table headers.
by Francois Gouget 08 Mar '21

08 Mar '21

It usually does not make any difference but is good practice. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index b523d142c..058bb4784 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -107,10 +107,12 @@ EOF print "<table border='0' cellpadding='5' cellspacing='0' summary='" . "Overview of " . $Collection->GetCollectionName() . "'>\n"; - print "<tbody>\n"; + print "<thead>\n"; my $Actions = $self->CallGetItemActions(); $self->CallGenerateHeaderRow($PropertyDescriptors, $Actions); + print "</thead>\n"; + print "<tbody>\n"; my $DetailsPage = $self->CallGetDetailsPage(); my $Row = 0; my $Keys = $self->CallSortKeys($self->{Collection}->GetKeys()); -- 2.20.1

1 0

[tools] testbot/web: Remove a duplicate </tbody> on the Stats page.
by Francois Gouget 08 Mar '21

08 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 4a70cb0e0..bf7f9baf3 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -429,7 +429,7 @@ sub GenerateFooter($) print "<p>The errors section shows how many <b>Timeouts</b> occurred, that is how many tasks failed to complete within the allotted time; how many failed due to a <b>TestBot error</b>; and how many had to be rerun due to a <b>Transient error</b> such as a network connection issue.</p>\n"; print "</td></tr></tbody>\n"; - print "</tbody></table></div>\n"; + print "</table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; print "</div>\n"; } -- 2.20.1

1 0

[tools] testbot/web: Make the CollectionBlock <th> cells sticky.
by Francois Gouget 08 Mar '21

08 Mar '21

This keeps the table header visible, making long tables easier to read. The header disappears when scrolling past the table so this does not impact the remainder of the page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/WineTestBot.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 3fccbd265..6d170b145 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -232,6 +232,8 @@ h2 padding: 4px; margin: 0; border: 1px solid white; + position: sticky; + top: 0; } .CollectionBlock td -- 2.20.1

1 0

[PATCH] ntdll: Export RtlQueryRegistryValuesEx().
by Zebediah Figura 07 Mar '21

07 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46969 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/reg.c | 17 +++-------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4d33a15ce5b..9ba8f1de0d3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -903,6 +903,7 @@ @ stub RtlQueryPropertyNames @ stub RtlQueryPropertySet @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) +@ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stub RtlQuerySecurityObject @ stub RtlQueryTagHeap @ stdcall RtlQueryTimeZoneInformation(ptr) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 54f01049abf..294b724a5e5 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -460,20 +460,9 @@ static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) return status; } -/************************************************************************* - * RtlQueryRegistryValues [NTDLL.@] - * - * Query multiple registry values with a single call. - * - * PARAMS - * RelativeTo [I] Registry path that Path refers to - * Path [I] Path to key - * QueryTable [I] Table of key values to query - * Context [I] Parameter to pass to the application defined QueryRoutine function - * Environment [I] Optional parameter to use when performing expansion - * - * RETURNS - * STATUS_SUCCESS or an appropriate NTSTATUS error code. +/****************************************************************************** + * RtlQueryRegistryValues (NTDLL.@) + * RtlQueryRegistryValuesEx (NTDLL.@) */ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, IN PRTL_QUERY_REGISTRY_TABLE QueryTable, IN PVOID Context, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c9038a58ef8..bfc21888816 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1216,6 +1216,7 @@ @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryPackageIdentity(long ptr ptr ptr ptr ptr) @ stdcall RtlQueryRegistryValues(long ptr ptr ptr ptr) +@ stdcall RtlQueryRegistryValuesEx(long ptr ptr ptr ptr) RtlQueryRegistryValues @ stdcall RtlQueryTimeZoneInformation(ptr) @ stdcall -norelay RtlRaiseException(ptr) @ stdcall RtlRaiseStatus(long) -- 2.20.1

1 0

[PATCH 1/4] setupapi/tests: Expand tests for SetupIterateCabinet().
by Zebediah Figura 07 Mar '21

07 Mar '21

Partially based on a patch by Sebastian Lackner. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/setupcab.c | 231 ++++++++++++++++++++++++--------- 1 file changed, 169 insertions(+), 62 deletions(-) diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index bb9add035db..6ead90206f8 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -297,108 +297,206 @@ static void test_invalid_callbackW(void) DeleteFileW(source); } -static const char *expected_files[] = {"tristram", "wine", "shandy"}; +static const struct +{ + const char *nameA; + const WCHAR *nameW; + DWORD size; +} +expected_files[] = +{ + {"tristram", L"tristram", 10}, + {"wine", L"wine", 14}, + {"shandy", L"shandy", 8}, +}; -static UINT CALLBACK simple_callbackA(PVOID Context, UINT Notification, - UINT_PTR Param1, UINT_PTR Param2) +static UINT CALLBACK simple_callbackA(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) { static int index; - int *file_count = Context; + int *file_count = context; - switch (Notification) + switch (message) { case SPFILENOTIFY_CABINETINFO: - index = 0; - return NO_ERROR; + { + const CABINET_INFO_A *info = (const CABINET_INFO_A *)param1; + char temp[MAX_PATH]; + + GetTempPathA(ARRAY_SIZE(temp), temp); + ok(!strcmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_a(info->CabinetPath)); + todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_a(info->CabinetFile)); + ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_a(info->DiskName)); + ok(!info->SetId, "Got set ID %#x.\n", info->SetId); + ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber); + ok(!param2, "Got param2 %#Ix.\n", param2); + return ERROR_SUCCESS; + } + case SPFILENOTIFY_FILEINCABINET: { - FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)Param1; + FILE_IN_CABINET_INFO_A *info = (FILE_IN_CABINET_INFO_A *)param1; + char temp[MAX_PATH], path[MAX_PATH]; (*file_count)++; - if (index < ARRAY_SIZE(expected_files)) - { - ok(!strcmp(expected_files[index], info->NameInCabinet), - "[%d] Expected file \"%s\", got \"%s\"\n", - index, expected_files[index], info->NameInCabinet); - index++; - return FILEOP_SKIP; - } - else - { - ok(0, "Unexpectedly enumerated more than number of files in cabinet, index = %d\n", index); - return FILEOP_ABORT; - } + ok(index < ARRAY_SIZE(expected_files), "%u: Got unexpected file.\n", index); + ok(!strcmp(info->NameInCabinet, expected_files[index].nameA), + "%u: Got file name %s.\n", index, debugstr_a(info->NameInCabinet)); + ok(info->FileSize == expected_files[index].size, "%u: Got file size %u.\n", index, info->FileSize); + ok(!info->Win32Error, "%u: Got error %u.\n", index, info->Win32Error); + ok(info->DosDate == 14545, "%u: Got date %u.\n", index, info->DosDate); + ok(info->DosTime == 18672, "%u: Got time %u.\n", index, info->DosTime); + ok(info->DosAttribs == FILE_ATTRIBUTE_ARCHIVE, "%u: Got attributes %#x.\n", index, info->DosAttribs); + + GetTempPathA(ARRAY_SIZE(temp), temp); + snprintf(path, ARRAY_SIZE(path), "%s/./testcab.cab", temp); + todo_wine ok(!strcmp((const char *)param2, path), "%u: Got file name %s.\n", + index, debugstr_a((const char *)param2)); + + snprintf(info->FullTargetName, ARRAY_SIZE(info->FullTargetName), + "%s\\%s", temp, expected_files[index].nameA); + + return FILEOP_DOIT; + } + + case SPFILENOTIFY_FILEEXTRACTED: + { + const FILEPATHS_A *info = (const FILEPATHS_A *)param1; + char temp[MAX_PATH], path[MAX_PATH]; + + GetTempPathA(ARRAY_SIZE(temp), temp); + ok(index < ARRAY_SIZE(expected_files), "%u: Got unexpected file.\n", index); + snprintf(path, ARRAY_SIZE(path), "%s/./testcab.cab", temp); + todo_wine ok(!strcmp(info->Source, path), "%u: Got source %s.\n", index, debugstr_a(info->Source)); + snprintf(path, ARRAY_SIZE(path), "%s\\%s", temp, expected_files[index].nameA); + ok(!strcmp(info->Target, path), "%u: Got target %s.\n", index, debugstr_a(info->Target)); + ok(!info->Win32Error, "%u: Got error %u.\n", index, info->Win32Error); + /* info->Flags seems to contain garbage. */ + + ok(!param2, "Got param2 %#Ix.\n", param2); + ++index; + return ERROR_SUCCESS; } + default: - return NO_ERROR; + ok(0, "Unexpected message %#x.\n", message); + return ERROR_CALL_NOT_IMPLEMENTED; } } static void test_simple_enumerationA(void) { BOOL ret; - char source[MAX_PATH], temp[MAX_PATH]; - int enum_count = 0; + char temp[MAX_PATH], path[MAX_PATH]; + unsigned int enum_count = 0, i; - GetTempPathA(sizeof(temp), temp); - GetTempFileNameA(temp, "doc", 0, source); + ret = SetupIterateCabinetA(NULL, 0, NULL, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupIterateCabinetW is not available\n"); + return; + } - create_source_fileA(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + GetTempPathA(ARRAY_SIZE(temp), temp); + snprintf(path, ARRAY_SIZE(path), "%s/./testcab.cab", temp); + + create_source_fileA(path, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); - ret = SetupIterateCabinetA(source, 0, simple_callbackA, &enum_count); - ok(ret == 1, "Expected SetupIterateCabinetA to return 1, got %d\n", ret); + ret = SetupIterateCabinetA(path, 0, simple_callbackA, &enum_count); + ok(ret == 1, "Expected SetupIterateCabinetW to return 1, got %d\n", ret); ok(enum_count == ARRAY_SIZE(expected_files), "Unexpectedly enumerated %d files\n", enum_count); - DeleteFileA(source); -} + for (i = 0; i < ARRAY_SIZE(expected_files); ++i) + { + snprintf(path, ARRAY_SIZE(path), "%s\\%s", temp, expected_files[i].nameA); + ret = DeleteFileA(path); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_a(path), GetLastError()); + } -static const WCHAR tristramW[] = {'t','r','i','s','t','r','a','m',0}; -static const WCHAR wineW[] = {'w','i','n','e',0}; -static const WCHAR shandyW[] = {'s','h','a','n','d','y',0}; -static const WCHAR *expected_filesW[] = {tristramW, wineW, shandyW}; + snprintf(path, ARRAY_SIZE(path), "%s\\testcab.cab", temp); + ret = DeleteFileA(path); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_a(path), GetLastError()); +} -static UINT CALLBACK simple_callbackW(PVOID Context, UINT Notification, - UINT_PTR Param1, UINT_PTR Param2) +static UINT CALLBACK simple_callbackW(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) { static int index; - int *file_count = Context; + int *file_count = context; - switch (Notification) + switch (message) { case SPFILENOTIFY_CABINETINFO: - index = 0; - return NO_ERROR; + { + const CABINET_INFO_W *info = (const CABINET_INFO_W *)param1; + WCHAR temp[MAX_PATH]; + + GetTempPathW(ARRAY_SIZE(temp), temp); + ok(!wcscmp(info->CabinetPath, temp), "Got path %s.\n", debugstr_w(info->CabinetPath)); + todo_wine ok(!info->CabinetFile[0], "Got file %s.\n", debugstr_w(info->CabinetFile)); + ok(!info->DiskName[0], "Got disk name %s.\n", debugstr_w(info->DiskName)); + ok(!info->SetId, "Got set ID %#x.\n", info->SetId); + ok(!info->CabinetNumber, "Got cabinet number %u.\n", info->CabinetNumber); + ok(!param2, "Got param2 %#Ix.\n", param2); + return ERROR_SUCCESS; + } + case SPFILENOTIFY_FILEINCABINET: { - FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)Param1; + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + WCHAR temp[MAX_PATH], path[MAX_PATH]; (*file_count)++; - if (index < ARRAY_SIZE(expected_filesW)) - { - ok(!lstrcmpW(expected_filesW[index], info->NameInCabinet), - "[%d] Expected file %s, got %s\n", - index, wine_dbgstr_w(expected_filesW[index]), wine_dbgstr_w(info->NameInCabinet)); - index++; - return FILEOP_SKIP; - } - else - { - ok(0, "Unexpectedly enumerated more than number of files in cabinet, index = %d\n", index); - return FILEOP_ABORT; - } + ok(index < ARRAY_SIZE(expected_files), "%u: Got unexpected file.\n", index); + ok(!wcscmp(info->NameInCabinet, expected_files[index].nameW), + "%u: Got file name %s.\n", index, debugstr_w(info->NameInCabinet)); + ok(info->FileSize == expected_files[index].size, "%u: Got file size %u.\n", index, info->FileSize); + ok(!info->Win32Error, "%u: Got error %u.\n", index, info->Win32Error); + ok(info->DosDate == 14545, "%u: Got date %u.\n", index, info->DosDate); + ok(info->DosTime == 18672, "%u: Got time %u.\n", index, info->DosTime); + ok(info->DosAttribs == FILE_ATTRIBUTE_ARCHIVE, "%u: Got attributes %#x.\n", index, info->DosAttribs); + + GetTempPathW(ARRAY_SIZE(temp), temp); + swprintf(path, ARRAY_SIZE(path), L"%s/./testcab.cab", temp); + todo_wine ok(!wcscmp((const WCHAR *)param2, path), "%u: Got file name %s.\n", + index, debugstr_w((const WCHAR *)param2)); + + swprintf(info->FullTargetName, ARRAY_SIZE(info->FullTargetName), + L"%s\\%s", temp, expected_files[index].nameW); + + return FILEOP_DOIT; } + + case SPFILENOTIFY_FILEEXTRACTED: + { + const FILEPATHS_W *info = (const FILEPATHS_W *)param1; + WCHAR temp[MAX_PATH], path[MAX_PATH]; + + GetTempPathW(ARRAY_SIZE(temp), temp); + ok(index < ARRAY_SIZE(expected_files), "%u: Got unexpected file.\n", index); + swprintf(path, ARRAY_SIZE(path), L"%s/./testcab.cab", temp); + todo_wine ok(!wcscmp(info->Source, path), "%u: Got source %s.\n", index, debugstr_w(info->Source)); + swprintf(path, ARRAY_SIZE(path), L"%s\\%s", temp, expected_files[index].nameW); + ok(!wcscmp(info->Target, path), "%u: Got target %s.\n", index, debugstr_w(info->Target)); + ok(!info->Win32Error, "%u: Got error %u.\n", index, info->Win32Error); + /* info->Flags seems to contain garbage. */ + + ok(!param2, "Got param2 %#Ix.\n", param2); + ++index; + return ERROR_SUCCESS; + } + default: - return NO_ERROR; + ok(0, "Unexpected message %#x.\n", message); + return ERROR_CALL_NOT_IMPLEMENTED; } } static void test_simple_enumerationW(void) { BOOL ret; - WCHAR source[MAX_PATH], temp[MAX_PATH]; - int enum_count = 0; + WCHAR temp[MAX_PATH], path[MAX_PATH]; + unsigned int enum_count = 0, i; ret = SetupIterateCabinetW(NULL, 0, NULL, NULL); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -408,15 +506,24 @@ static void test_simple_enumerationW(void) } GetTempPathW(ARRAY_SIZE(temp), temp); - GetTempFileNameW(temp, docW, 0, source); + swprintf(path, ARRAY_SIZE(path), L"%s/./testcab.cab", temp); - create_source_fileW(source, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); + create_source_fileW(path, comp_cab_zip_multi, sizeof(comp_cab_zip_multi)); - ret = SetupIterateCabinetW(source, 0, simple_callbackW, &enum_count); + ret = SetupIterateCabinetW(path, 0, simple_callbackW, &enum_count); ok(ret == 1, "Expected SetupIterateCabinetW to return 1, got %d\n", ret); ok(enum_count == ARRAY_SIZE(expected_files), "Unexpectedly enumerated %d files\n", enum_count); - DeleteFileW(source); + for (i = 0; i < ARRAY_SIZE(expected_files); ++i) + { + swprintf(path, ARRAY_SIZE(path), L"%s\\%s", temp, expected_files[i].nameW); + ret = DeleteFileW(path); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(path), GetLastError()); + } + + swprintf(path, ARRAY_SIZE(path), L"%s\\testcab.cab", temp); + ret = DeleteFileW(path); + ok(ret, "Failed to delete %s, error %u.\n", debugstr_w(path), GetLastError()); } START_TEST(setupcab) -- 2.20.1

1 3