wine-devel October 2019

wine-devel@winehq.org

80 participants
669 discussions

[PATCH] dplayx: Copy the correct Short name variable.
by Alistair Leslie-Hughes 20 Oct '19

20 Oct '19

This appears to be a copy/paste bug. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dplayx/dplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index e7d6edc6a0..089d034dfd 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2709,7 +2709,7 @@ static HRESULT DP_IF_GetGroupName( IDirectPlayImpl *This, DPID idGroup, void *lp if( lpGData->name.u1.lpszShortNameA ) { … [View More]

2 1

[PATCH] ntdll: Fix the SYSTEM_MODULE struct field names
by Vijay Kiran Kamuju 20 Oct '19

20 Oct '19

based on https://www.geoffchappell.com/studies/windows/km/ntoskrnl/api/rtl/ldrreloc/… Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ntdll/loader.c | 10 +++++----- dlls/ntdll/tests/info.c | 2 +- include/winternl.h | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5eacc5a23c7b..e67a4a6b2fd3 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3259,14 +3259,14 @@ … [View More]NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, size += sizeof(*sm); if (size <= buf_size) { - sm->Reserved1 = 0; /* FIXME */ - sm->Reserved2 = 0; /* FIXME */ + sm->Section = 0; /* FIXME */ + sm->MappedBaseAddress = 0; /* FIXME */ sm->ImageBaseAddress = mod->BaseAddress; sm->ImageSize = mod->SizeOfImage; sm->Flags = mod->Flags; - sm->Id = id++; - sm->Rank = 0; /* FIXME */ - sm->Unknown = 0; /* FIXME */ + sm->LoadOrderIndex = id++; + sm->InitOrderIndex = 0; /* FIXME */ + sm->LoadCount = mod->LoadCount; str.Length = 0; str.MaximumLength = MAXIMUM_FILENAME_LENGTH; str.Buffer = (char*)sm->Name; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 93920714f215..64c39f09402a 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -488,7 +488,7 @@ static void test_query_module(void) /* Loop through all the modules/drivers, Wine doesn't get here (yet) */ for (i = 0; i < ModuleCount ; i++) { - ok( i == sm->Id, "Id (%d) should have matched %u\n", sm->Id, i); + ok( i == sm->LoadOrderIndex, "LoadOrderIndex (%d) should have matched %u\n", sm->LoadOrderIndex, i); sm++; } diff --git a/include/winternl.h b/include/winternl.h index 16df96377067..9b8bef0fe7c5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2271,14 +2271,14 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT typedef struct _SYSTEM_MODULE { - PVOID Reserved1; /* 00/00 */ - PVOID Reserved2; /* 04/08 */ + PVOID Section; /* 00/00 */ + PVOID MappedBaseAddress; /* 04/08 */ PVOID ImageBaseAddress; /* 08/10 */ ULONG ImageSize; /* 0c/18 */ ULONG Flags; /* 10/1c */ - WORD Id; /* 14/20 */ - WORD Rank; /* 16/22 */ - WORD Unknown; /* 18/24 */ + WORD LoadOrderIndex; /* 14/20 */ + WORD InitOrderIndex; /* 16/22 */ + WORD LoadCount; /* 18/24 */ WORD NameOffset; /* 1a/26 */ BYTE Name[MAXIMUM_FILENAME_LENGTH]; /* 1c/28 */ } SYSTEM_MODULE, *PSYSTEM_MODULE; -- 2.21.0 [View Less]

1 0

[PATCH] advapi32/tests: Use unique names for each created service.
by Zebediah Figura 19 Oct '19

19 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/advapi32/tests/service.c | 38 ++++++----------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index f91ea185ae..6c78900bd4 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -199,7 +199,7 @@ static void test_create_delete_svc(void) CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD … [View More]user_size = UNLEN + 1; CHAR account[UNLEN + 3]; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_create_delete"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = ""; static const CHAR password [] = "secret"; @@ -428,12 +428,6 @@ static void test_create_delete_svc(void) CloseServiceHandle(svc_handle1); CloseServiceHandle(scm_handle); - /* Wait a while. One of the following tests also does a CreateService for the - * same servicename and this would result in an ERROR_SERVICE_MARKED_FOR_DELETE - * error if we do this too quickly. Vista seems more picky than the others. - */ - Sleep(1000); - /* And a final NULL check */ SetLastError(0xdeadbeef); ret = DeleteService(NULL); @@ -453,7 +447,7 @@ static void test_get_displayname(void) static const WCHAR spoolerW[] = {'S','p','o','o','l','e','r',0}; static const WCHAR deadbeefW[] = {'D','e','a','d','b','e','e','f',0}; static const WCHAR abcW[] = {'A','B','C',0}; - static const CHAR servicename[] = "Winetest"; + static const CHAR servicename[] = "winetest_displayname"; static const CHAR pathname[] = "we_dont_care.exe"; /* Having NULL for the size of the buffer will crash on W2K3 */ @@ -725,9 +719,6 @@ static void test_get_displayname(void) CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); - - /* Wait a while. Just in case one of the following tests does a CreateService again */ - Sleep(1000); } static void test_get_servicekeyname(void) @@ -1861,7 +1852,7 @@ static void test_sequence(void) BOOL ret, is_nt4; QUERY_SERVICE_CONFIGA *config; DWORD given, needed; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_sequence"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR displayname2[] = "Winetest dummy service (2)"; static const CHAR pathname [] = "we_dont_care.exe"; @@ -2029,10 +2020,6 @@ static void test_sequence(void) ret = DeleteService(svc_handle); ok(ret, "Expected success, got error %u\n", GetLastError()); CloseServiceHandle(svc_handle); - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); HeapFree(GetProcessHeap(), 0, config); } @@ -2046,7 +2033,7 @@ static void test_queryconfig2(void) LPSERVICE_DESCRIPTIONA pConfig = (LPSERVICE_DESCRIPTIONA)buffer; LPSERVICE_DESCRIPTIONW pConfigW = (LPSERVICE_DESCRIPTIONW)buffer; SERVICE_PRESHUTDOWN_INFO preshutdown_info; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_query_config2"; static const CHAR displayname [] = "Winetest dummy service"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR dependencies[] = "Master1\0Master2\0+MasterGroup1\0"; @@ -2304,12 +2291,7 @@ static void test_queryconfig2(void) cleanup: DeleteService(svc_handle); - CloseServiceHandle(svc_handle); - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); } @@ -2512,7 +2494,7 @@ static void test_start_stop(void) BOOL ret; SC_HANDLE scm_handle, svc_handle; DWORD le, is_nt4; - static const char servicename[] = "Winetest"; + static const char servicename[] = "winetest_start_stop"; char cmd[MAX_PATH+20]; const char* displayname; @@ -2592,17 +2574,13 @@ cleanup: DeleteService(svc_handle); CloseServiceHandle(svc_handle); } - - /* Wait a while. The following test does a CreateService again */ - Sleep(1000); - CloseServiceHandle(scm_handle); } static void test_refcount(void) { SC_HANDLE scm_handle, svc_handle1, svc_handle2, svc_handle3, svc_handle4, svc_handle5; - static const CHAR servicename [] = "Winetest"; + static const CHAR servicename [] = "winetest_refcount"; static const CHAR pathname [] = "we_dont_care.exe"; BOOL ret; @@ -2681,10 +2659,6 @@ static void test_refcount(void) /* Delete the service */ ret = DeleteService(svc_handle5); ok(ret, "Expected success (err=%d)\n", GetLastError()); - - /* Wait a while. Just in case one of the following tests does a CreateService again */ - Sleep(1000); - CloseServiceHandle(svc_handle5); CloseServiceHandle(scm_handle); } -- 2.20.1 [View Less]

2 1

[PATCH] ntdll/tests: Fix some test failures with Windows 10.
by Zebediah Figura 19 Oct '19

19 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/reg.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 9bb8d25020..649ae484f2 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -387,7 +387,9 @@ todo_wine /* Open is case sensitive unless OBJ_CASE_INSENSITIVE is specified. */ pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine" … [View More]); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND, "NtOpenKey Failed: 0x%08x\n", status); + todo_wine ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtOpenKey Failed: 0x%08x\n", status); + if (!status) pNtClose( key ); attr.Attributes = OBJ_CASE_INSENSITIVE; status = pNtOpenKey(&key, KEY_READ, &attr); @@ -616,7 +618,9 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); todo_wine - ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "NtCreateKey failed: 0x%08x\n", status ); + ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_SUCCESS /* Win10 1607+ */, + "NtCreateKey failed: 0x%08x\n", status ); + if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); @@ -926,14 +930,14 @@ static void test_NtQueryLicenseKey(void) len = 0xbeef; status = pNtQueryLicenseValue(&name, NULL, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue returned %08x, expected STATUS_OBJECT_NAME_NOT_FOUND\n", status); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); type = 0xdead; len = 0xbeef; status = pNtQueryLicenseValue(&name, &type, buffer, sizeof(buffer), &len); ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtQueryLicenseValue unexpected succeeded\n"); ok(type == 0xdead, "expected unmodified value for type, got %u\n", type); - ok(len == 0xbeef, "expected unmodified value for len, got %u\n", len); + ok(len == 0xbeef || broken(!len) /* Win10 1607 */, "expected unmodified value for len, got %u\n", len); pRtlFreeUnicodeString(&name); @@ -1291,7 +1295,7 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); attr.ObjectName = &link_str; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_SUCCESS || status == STATUS_OBJECT_NAME_NOT_FOUND, + ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID /* Win10 1607+ */, "NtOpenKey wrong status 0x%08x\n", status ); key = (HKEY)0xdeadbeef; @@ -1320,8 +1324,10 @@ static void test_symlinks(void) ok( status == STATUS_SUCCESS, "NtSetValueKey failed: 0x%08x\n", status ); status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); - ok( status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_NAME_TOO_LONG, - "NtOpenKey failed: 0x%08x\n", status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND /* XP */ + || status == STATUS_NAME_TOO_LONG + || status == STATUS_INVALID_PARAMETER /* Win10 1607+ */, + "NtOpenKey failed: 0x%08x\n", status ); attr.Attributes = OBJ_OPENLINK; status = pNtOpenKey( &key, KEY_ALL_ACCESS, &attr ); -- 2.20.1 [View Less]

2 1

[PATCH] qwave: Don't test the last error in the successful case.
by Zebediah Figura 19 Oct '19

19 Oct '19

On Windows 8 and above we may get ERROR_SERVICE_ALREADY_RUNNING. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qwave/tests/qos.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/qwave/tests/qos.c b/dlls/qwave/tests/qos.c index 5cb3e53996..10a32f7495 100644 --- a/dlls/qwave/tests/qos.c +++ b/dlls/qwave/tests/qos.c @@ -44,12 +44,10 @@ static void test_QOSCreateHandle(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == … [View More]

2 1

[PATCH 1/2] psapi/tests: Increase the GetPerformanceInfo() margins again.
by Zebediah Figura 19 Oct '19

19 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index d565053722..78aac2c044 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -259,7 +259,7 @@ static void test_GetPerformanceInfo(void) ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); ok(info.cb == … [View More]

2 3

[PATCH] webservices: Fix some leaks on error paths (Coverity).
by Sven Baars 19 Oct '19

19 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/webservices/msg.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index a006841be6..5e9c70924d 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1577,12 +1577,17 @@ static HRESULT get_header_value_wsz( struct header *header, WS_READ_OPTION optio case WS_READ_OPTIONAL_POINTER: case WS_READ_NILLABLE_POINTER: - if (size != … [View More]

1 0

[PATCH v2 1/5] quartz/tests: Add more tests for stream start time.
by Zebediah Figura 19 Oct '19

19 Oct '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e5be0af908..6811fb241d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3136,6 +3136,16 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Paused); + hr = … [View More]IMediaFilter_Run(filter, 0xdeadf00d); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); @@ -3152,6 +3162,35 @@ todo_wine ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + Sleep(600); + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + Sleep(600); + + start_time += 600 * 10000; + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); -- 2.20.1 [View Less]

2 5

[PATCH 1/5] quartz/tests: Add more tests for stream start time.
by Zebediah Figura 19 Oct '19

19 Oct '19

--- dlls/quartz/tests/filtergraph.c | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e5be0af908..6811fb241d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3136,6 +3136,16 @@ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Paused); + hr = IMediaFilter_Run(filter, 0xdeadf00d); + todo_wine ok(hr == … [View More]S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == 0xdeadf00d, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); @@ -3152,6 +3162,35 @@ todo_wine ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + Sleep(600); + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + + hr = IMediaFilter_Pause(filter); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Paused); + Sleep(600); + + start_time += 600 * 10000; + hr = IMediaFilter_Run(filter, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + check_filter_state(graph, State_Running); + ok(source.start_time >= start_time && source.start_time < start_time + 500 * 10000, + "Expected time near %s, got %s.\n", + wine_dbgstr_longlong(start_time), wine_dbgstr_longlong(source.start_time)); + ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n", + wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time)); + hr = IMediaFilter_Stop(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped); -- 2.20.1 [View Less]

2 7

[PATCH 1/6] setupapi: Rewrite DiskSpaceList logic using lists.
by Vijay Kiran Kamuju 19 Oct '19

19 Oct '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/diskspace.c | 183 +++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 82 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index f5e79d5327c9..4f047dd2b544 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -1,6 +1,7 @@ /* * … [View More]SetupAPI DiskSpace functions * + * Copyright 2016 Michael Müller * Copyright 2004 CodeWeavers (Aric Stewart) * * This library is free software; you can redistribute it and/or @@ -27,69 +28,50 @@ #include "winnls.h" #include "winreg.h" #include "setupapi.h" +#include "wine/list.h" #include "wine/debug.h" +#include "setupapi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); -typedef struct { - WCHAR lpzName[20]; - LONGLONG dwFreeSpace; - LONGLONG dwWantedSpace; -} DRIVE_ENTRY, *LPDRIVE_ENTRY; +struct file_entry +{ + struct list entry; + WCHAR *path; + UINT operation; + LONGLONG size; +}; + +struct space_list +{ + struct list files; + UINT flags; +}; -typedef struct { - DWORD dwDriveCount; - DRIVE_ENTRY Drives[26]; -} DISKSPACELIST, *LPDISKSPACELIST; /*********************************************************************** * SetupCreateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID reserved1, DWORD reserved2, UINT flags) { - WCHAR drives[255]; - DWORD rc; - WCHAR *ptr; - LPDISKSPACELIST list=NULL; + struct space_list *list; - TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags); + TRACE("(%p, %u, 0x%08x)\n", reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK) + if (reserved1 || reserved2 || flags & ~SPDSL_IGNORE_DISK) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - rc = GetLogicalDriveStringsW(255,drives); - - if (rc == 0) - return NULL; - - list = HeapAlloc(GetProcessHeap(),0,sizeof(DISKSPACELIST)); - - list->dwDriveCount = 0; - - ptr = drives; - - while (*ptr) + list = HeapAlloc(GetProcessHeap(), 0, sizeof(*list)); + if (list) { - DWORD type = GetDriveTypeW(ptr); - if (type == DRIVE_FIXED) - { - DWORD clusters; - DWORD sectors; - DWORD bytes; - DWORD total; - lstrcpyW(list->Drives[list->dwDriveCount].lpzName,ptr); - GetDiskFreeSpaceW(ptr,&sectors,&bytes,&clusters,&total); - list->Drives[list->dwDriveCount].dwFreeSpace = clusters * sectors * - bytes; - list->Drives[list->dwDriveCount].dwWantedSpace = 0; - list->dwDriveCount++; - } - ptr += lstrlenW(ptr) + 1; + list->flags = flags; + list_init(&list->files); } + return list; } @@ -105,32 +87,58 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListA(PVOID Reserved1, DWORD Reserved2, UINT /*********************************************************************** * SetupDuplicateDiskSpaceListW (SETUPAPI.@) */ -HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags) +HDSKSPC WINAPI SetupDuplicateDiskSpaceListW(HDSKSPC diskspace, PVOID reserved1, DWORD reserved2, UINT flags) { - DISKSPACELIST *list_copy, *list_original = DiskSpace; + struct space_list *list_copy, *list = diskspace; + struct file_entry *file, *file_copy; + + TRACE("(%p, %p, %u, %u)\n", diskspace, reserved1, reserved2, flags); - if (Reserved1 || Reserved2 || Flags) + if (reserved1 || reserved2 || flags) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - if (!DiskSpace) + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return NULL; } - list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(DISKSPACELIST)); + list_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*list_copy)); if (!list_copy) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - *list_copy = *list_original; + list_copy->flags = list->flags; + list_init(&list_copy->files); + + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + file_copy = HeapAlloc(GetProcessHeap(), 0, sizeof(*file_copy)); + if (!file_copy) goto error; + + file_copy->path = strdupW(file->path); + if (!file_copy->path) + { + HeapFree(GetProcessHeap(), 0, file_copy); + goto error; + } + + file_copy->operation = file->operation; + file_copy->size = file->size; + list_add_head(&list_copy->files, &file->entry); + } return list_copy; + +error: + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetupDestroyDiskSpaceList(list_copy); + return NULL; } /*********************************************************************** @@ -155,55 +163,51 @@ BOOL WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC DiskSpace, /*********************************************************************** * SetupQuerySpaceRequiredOnDriveW (SETUPAPI.@) */ -BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC DiskSpace, - LPCWSTR DriveSpec, LONGLONG *SpaceRequired, - PVOID Reserved1, UINT Reserved2) +BOOL WINAPI SetupQuerySpaceRequiredOnDriveW(HDSKSPC diskspace, + LPCWSTR drivespec, LONGLONG *required, + PVOID reserved1, UINT reserved2) { - WCHAR *driveW; - unsigned int i; - LPDISKSPACELIST list = DiskSpace; - BOOL rc = FALSE; - static const WCHAR bkslsh[]= {'\\',0}; + struct space_list *list = diskspace; + struct file_entry *file; + LONGLONG sum = 0; - if (!DiskSpace) + TRACE("(%p, %s, %p, %p, %u)\n", diskspace, debugstr_w(drivespec), required, reserved1, reserved2); + + if (!diskspace) { SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - if (!DriveSpec) + if (!drivespec || !drivespec[0]) { - SetLastError(ERROR_INVALID_PARAMETER); + SetLastError(drivespec ? ERROR_INVALID_DRIVE : ERROR_INVALID_DRIVE); return FALSE; } - driveW = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(DriveSpec) + 2) * sizeof(WCHAR)); - if (!driveW) + if (!required) { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - lstrcpyW(driveW,DriveSpec); - lstrcatW(driveW,bkslsh); - - TRACE("Looking for drive %s\n",debugstr_w(driveW)); - - for (i = 0; i < list->dwDriveCount; i++) + if (towlower(drivespec[0]) < 'a' || towlower(drivespec[0]) > 'z' || + drivespec[1] != ':' || drivespec[2] != 0) { - TRACE("checking drive %s\n",debugstr_w(list->Drives[i].lpzName)); - if (wcscmp(driveW,list->Drives[i].lpzName)==0) - { - rc = TRUE; - *SpaceRequired = list->Drives[i].dwWantedSpace; - break; - } + FIXME("UNC paths not yet supported (%s)\n", debugstr_w(drivespec)); + SetLastError((GetVersion() & 0x80000000) ? ERROR_INVALID_DRIVE : ERROR_INVALID_PARAMETER); + return FALSE; } - HeapFree(GetProcessHeap(), 0, driveW); + LIST_FOR_EACH_ENTRY(file, &list->files, struct file_entry, entry) + { + if (towlower(file->path[0]) == towlower(drivespec[0]) && + file->path[1] == ':' && file->path[2] == '\\') + sum += file->size; + } - if (!rc) SetLastError(ERROR_INVALID_DRIVE); - return rc; + *required = sum; + return TRUE; } /*********************************************************************** @@ -253,10 +257,25 @@ BOOL WINAPI SetupQuerySpaceRequiredOnDriveA(HDSKSPC DiskSpace, /*********************************************************************** * SetupDestroyDiskSpaceList (SETUPAPI.@) */ -BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC DiskSpace) +BOOL WINAPI SetupDestroyDiskSpaceList(HDSKSPC diskspace) { - LPDISKSPACELIST list = DiskSpace; - HeapFree(GetProcessHeap(),0,list); + struct space_list *list = diskspace; + struct file_entry *file, *file2; + + if (!diskspace) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE(file, file2, &list->files, struct file_entry, entry) + { + HeapFree(GetProcessHeap(), 0, file->path); + list_remove(&file->entry); + HeapFree(GetProcessHeap(), 0, file); + } + + HeapFree(GetProcessHeap(), 0, list); return TRUE; } -- 2.21.0 [View Less]

2 7

← Newer
1
...
36
37
38
39
40
41
42
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel October 2019