diff --git a/patches/setupapi-DiskSpaceList/0001-setupapi-Rewrite-DiskSpaceList-logic-using-lists.patch b/patches/setupapi-DiskSpaceList/0001-setupapi-Rewrite-DiskSpaceList-logic-using-lists.patch index af0c9494..a9b79414 100644 --- a/patches/setupapi-DiskSpaceList/0001-setupapi-Rewrite-DiskSpaceList-logic-using-lists.patch +++ b/patches/setupapi-DiskSpaceList/0001-setupapi-Rewrite-DiskSpaceList-logic-using-lists.patch @@ -1,4 +1,4 @@ -From 41373705396aeb4703a6267148ccf663bf9a42bc Mon Sep 17 00:00:00 2001 +From 6fd6c8a87ca47b28314b815f1c71a224c9598528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 3 Mar 2016 04:52:35 +0100 Subject: [PATCH] setupapi: Rewrite DiskSpaceList logic using lists. @@ -288,5 +288,5 @@ index 5b89fd5ca99..04bc2696236 100644 return TRUE; } -- -2.40.1 +2.42.0 diff --git a/patches/setupapi-DiskSpaceList/0002-setupapi-Implement-SetupAddToDiskSpaceList.patch b/patches/setupapi-DiskSpaceList/0002-setupapi-Implement-SetupAddToDiskSpaceList.patch index 9abea3a3..9dcd5c81 100644 --- a/patches/setupapi-DiskSpaceList/0002-setupapi-Implement-SetupAddToDiskSpaceList.patch +++ b/patches/setupapi-DiskSpaceList/0002-setupapi-Implement-SetupAddToDiskSpaceList.patch @@ -1,4 +1,4 @@ -From 133fbf15df8b8fd81052d545da7d7d85d4bbe16e Mon Sep 17 00:00:00 2001 +From 38d743d160a9bc0def832b7dc2b87e5b50fd1998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 3 Mar 2016 05:02:21 +0100 Subject: [PATCH] setupapi: Implement SetupAddToDiskSpaceList. @@ -9,7 +9,7 @@ Subject: [PATCH] setupapi: Implement SetupAddToDiskSpaceList. 2 files changed, 285 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c -index dcfa39b5a92..cc309f9393c 100644 +index 04bc2696236..e261f6ea4b7 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -48,7 +48,21 @@ struct space_list @@ -389,5 +389,5 @@ index 577b1f84a2a..3cd83c8471f 100644 + test_SetupAddToDiskSpaceListA(); } -- -2.35.1 +2.42.0 diff --git a/patches/setupapi-DiskSpaceList/0003-setupapi-Implement-SetupQueryDrivesInDiskSpaceList.patch b/patches/setupapi-DiskSpaceList/0003-setupapi-Implement-SetupQueryDrivesInDiskSpaceList.patch index 7317accf..62f4d40d 100644 --- a/patches/setupapi-DiskSpaceList/0003-setupapi-Implement-SetupQueryDrivesInDiskSpaceList.patch +++ b/patches/setupapi-DiskSpaceList/0003-setupapi-Implement-SetupQueryDrivesInDiskSpaceList.patch @@ -1,4 +1,4 @@ -From 49440e98e566e15c9785415e966b4ceb80077f06 Mon Sep 17 00:00:00 2001 +From 0a4c0d6d28e4f64d693d06d3c8110b5c91089415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 3 Mar 2016 05:03:11 +0100 Subject: [PATCH] setupapi: Implement SetupQueryDrivesInDiskSpaceList. @@ -10,7 +10,7 @@ Subject: [PATCH] setupapi: Implement SetupQueryDrivesInDiskSpaceList. 3 files changed, 155 insertions(+), 18 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c -index cc309f9393c..e59b2736300 100644 +index e261f6ea4b7..1b49b9600c8 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -419,3 +419,88 @@ BOOL WINAPI SetupAddToDiskSpaceListA(HDSKSPC diskspace, PCSTR targetfile, @@ -103,7 +103,7 @@ index cc309f9393c..e59b2736300 100644 + return ret; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c -index af058b8eac8..55483941033 100644 +index 75185de047c..7f7aed6c3fe 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -230,24 +230,6 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) @@ -218,5 +218,5 @@ index 3cd83c8471f..930b957e913 100644 + test_SetupQueryDrivesInDiskSpaceListA(); } -- -2.35.1 +2.42.0 diff --git a/patches/setupapi-DiskSpaceList/0004-setupapi-Ignore-deletion-of-added-files-in-SetupAddT.patch b/patches/setupapi-DiskSpaceList/0004-setupapi-Ignore-deletion-of-added-files-in-SetupAddT.patch index d620fc14..ffa7e4e1 100644 --- a/patches/setupapi-DiskSpaceList/0004-setupapi-Ignore-deletion-of-added-files-in-SetupAddT.patch +++ b/patches/setupapi-DiskSpaceList/0004-setupapi-Ignore-deletion-of-added-files-in-SetupAddT.patch @@ -1,18 +1,19 @@ -From a9ca8eed486e1a1deb479643ce00a149a93b0f38 Mon Sep 17 00:00:00 2001 +From 48e72ae0c9b216449b7551582802d25386ea4dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 4 Mar 2016 04:21:18 +0100 -Subject: setupapi: Ignore deletion of added files in SetupAddToDiskSpaceList. +Subject: [PATCH] setupapi: Ignore deletion of added files in + SetupAddToDiskSpaceList. --- - dlls/setupapi/diskspace.c | 6 +++++ - dlls/setupapi/tests/diskspace.c | 60 ++++++++++++++++++++++++++++++++++++++++- + dlls/setupapi/diskspace.c | 6 ++++ + dlls/setupapi/tests/diskspace.c | 60 ++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c -index 378aa59d..0cadf72 100644 +index 1b49b9600c8..ee9fdb801bb 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c -@@ -373,6 +373,12 @@ BOOL WINAPI SetupAddToDiskSpaceListW(HDSKSPC diskspace, PCWSTR targetfile, +@@ -372,6 +372,12 @@ BOOL WINAPI SetupAddToDiskSpaceListW(HDSKSPC diskspace, PCWSTR targetfile, list_add_tail(&list->files, &file->entry); } @@ -26,10 +27,10 @@ index 378aa59d..0cadf72 100644 file->operation = operation; if (operation == FILEOP_COPY) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c -index 60087d1..793d3a1 100644 +index 930b957e913..0cacf9a75aa 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c -@@ -440,7 +440,15 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) +@@ -428,7 +428,15 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) ret = SetupQuerySpaceRequiredOnDriveA(handle, "F:", &space, NULL, 0); ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); @@ -46,7 +47,7 @@ index 60087d1..793d3a1 100644 ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); -@@ -478,6 +486,45 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) +@@ -466,6 +474,45 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); @@ -92,7 +93,7 @@ index 60087d1..793d3a1 100644 handle = SetupCreateDiskSpaceListA(NULL, 0, 0); ok(handle != NULL, "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); -@@ -492,6 +539,7 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) +@@ -480,6 +527,7 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) ok(SetupDestroyDiskSpaceList(handle), "Expected SetupDestroyDiskSpaceList to succeed\n"); @@ -100,7 +101,7 @@ index 60087d1..793d3a1 100644 handle = SetupCreateDiskSpaceListA(NULL, 0, SPDSL_IGNORE_DISK); ok(handle != NULL, "Expected SetupCreateDiskSpaceListA to return a valid handle, got NULL\n"); -@@ -503,6 +551,16 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) +@@ -491,6 +539,16 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) ok(ret, "Expected SetupQuerySpaceRequiredOnDriveA to succeed\n"); ok(space == 0, "Expected size = 0, got %s\n", debugstr_longlong(space)); @@ -118,5 +119,5 @@ index 60087d1..793d3a1 100644 "Expected SetupDestroyDiskSpaceList to succeed\n"); } -- -2.7.1 +2.42.0 diff --git a/patches/setupapi-DiskSpaceList/0005-setupapi-ImplementSetupAddSectionToDiskSpaceList.patch b/patches/setupapi-DiskSpaceList/0005-setupapi-ImplementSetupAddSectionToDiskSpaceList.patch index 397527d7..7e8fea5e 100644 --- a/patches/setupapi-DiskSpaceList/0005-setupapi-ImplementSetupAddSectionToDiskSpaceList.patch +++ b/patches/setupapi-DiskSpaceList/0005-setupapi-ImplementSetupAddSectionToDiskSpaceList.patch @@ -1,4 +1,4 @@ -From e332b9169147c9956e498133be4164ae8597681b Mon Sep 17 00:00:00 2001 +From f38d21bbc42cc448931a4c1f4c7781db0b525c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 4 Mar 2016 04:53:00 +0100 Subject: [PATCH] setupapi: ImplementSetupAddSectionToDiskSpaceList. @@ -432,5 +432,5 @@ index 0cacf9a75aa..8e2eb88bf93 100644 + test_SetupAddSectionToDiskSpaceListA(); } -- -2.40.1 +2.42.0 diff --git a/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch b/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch index 037cfaab..c7d9a61a 100644 --- a/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch +++ b/patches/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch @@ -1,4 +1,4 @@ -From 1d7906d21e3a04ed01e0b6ba49879c18c7061fb8 Mon Sep 17 00:00:00 2001 +From c3ba1fbd5560fa0aaa791d8099ed25be93176b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 4 Mar 2016 04:54:37 +0100 Subject: [PATCH] setupapi: Implement SetupAddInstallSectionToDiskSpaceList. @@ -11,7 +11,7 @@ Subject: [PATCH] setupapi: Implement SetupAddInstallSectionToDiskSpaceList. 4 files changed, 266 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c -index 436af0ec1f0..3ef91e79632 100644 +index 3d1e96f43c3..39663aac07a 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -295,14 +295,93 @@ BOOL WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC diskspace, HINF hinf, HINF h @@ -335,5 +335,5 @@ index 21992ead500..41a0f720c7c 100644 BOOL WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, UINT, PVOID, UINT); #define SetupAddSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddSectionToDiskSpaceList) -- -2.38.1 +2.42.0 diff --git a/patches/vcomp_for_dynamic_init_i8/0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch b/patches/vcomp_for_dynamic_init_i8/0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch index 783561e1..9a448eb1 100644 --- a/patches/vcomp_for_dynamic_init_i8/0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch +++ b/patches/vcomp_for_dynamic_init_i8/0001-vcomp-Implement-_vcomp_for_dynamic_init_i8.patch @@ -29,11 +29,11 @@ index 374adf3991a..faa863d3ea4 100644 + FILETIME kernelTime; + FILETIME userTime; + ULARGE_INTEGER li; -+ ++ + GetProcessTimes(GetCurrentProcess(), &createTime, &exitTime, &kernelTime, &userTime); + li.LowPart = userTime.dwLowDateTime; + li.HighPart = userTime.dwHighDateTime; -+ ++ + return (double)li.QuadPart / 10000000.0; +} +