diff --git a/patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch b/patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch index 7ed1ecfb..c13b1f63 100644 --- a/patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch +++ b/patches/advapi32-LsaLookupSids/0007-advapi32-Fix-name-and-use-of-DOMAIN_GROUP_RID_USERS.patch @@ -1,18 +1,18 @@ -From 83517396c266c2de290670128d678770f5d79cc9 Mon Sep 17 00:00:00 2001 +From b22b71cd61378082af89bb872002955b1cbbae4d Mon Sep 17 00:00:00 2001 From: Qian Hong Date: Tue, 28 Apr 2015 23:00:08 +0800 -Subject: advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS. +Subject: [PATCH] advapi32: Fix name and use of DOMAIN_GROUP_RID_USERS. --- dlls/advapi32/security.c | 7 +++++-- - dlls/advapi32/tests/security.c | 4 ++-- - 2 files changed, 7 insertions(+), 4 deletions(-) + dlls/advapi32/tests/security.c | 2 +- + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c -index d27b2e7..2362dd5 100644 +index a7707f15d39..73c1f054d5c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c -@@ -191,7 +191,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m',' +@@ -187,7 +187,7 @@ static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m',' static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; @@ -21,7 +21,7 @@ index d27b2e7..2362dd5 100644 static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; -@@ -2206,7 +2206,10 @@ LookupAccountSidW( +@@ -1185,7 +1185,10 @@ LookupAccountSidW( ac = Domain_Admins; break; case DOMAIN_GROUP_RID_USERS: @@ -34,20 +34,18 @@ index d27b2e7..2362dd5 100644 case DOMAIN_GROUP_RID_GUESTS: ac = Domain_Guests; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c -index 573119f..490ce26 100644 +index 5f65ed385dd..400ab439948 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c -@@ -2578,8 +2578,8 @@ static void test_process_security(void) +@@ -3003,7 +3003,7 @@ static void test_process_security(void) dom_size = sizeof(domain); ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); ok(ret, "LookupAccountSid failed with %d\n", ret); - todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); -- todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); -+ ok(!strcmp(account, "None"), "expect None, got %s\n", account); - - res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); - ok(!res, "Expected failure, got %d\n", res); + if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) + skip("Non-English locale (test with hardcoded 'None')\n"); + else -- -2.3.5 +2.17.1 diff --git a/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch b/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch index 9b43d7c1..b779b3cf 100644 --- a/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch +++ b/patches/fsutil-Stub_Program/0001-fsutil-Add-fsutil-program-with-support-for-creating-.patch @@ -1,4 +1,4 @@ -From 8289235edb964f494c221044e36f2ea4294721ae Mon Sep 17 00:00:00 2001 +From b0eec9e5d8736bfa86096fd2d69cfb73dba7a5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 1 Apr 2016 01:29:51 +0200 Subject: [PATCH] fsutil: Add fsutil program with support for creating hard @@ -14,7 +14,7 @@ Subject: [PATCH] fsutil: Add fsutil program with support for creating hard create mode 100644 programs/fsutil/resources.h diff --git a/programs/fsutil/Makefile.in b/programs/fsutil/Makefile.in -index 64307e83ac..e10bd433ba 100644 +index 64307e83aca..e10bd433baa 100644 --- a/programs/fsutil/Makefile.in +++ b/programs/fsutil/Makefile.in @@ -1,6 +1,9 @@ @@ -29,7 +29,7 @@ index 64307e83ac..e10bd433ba 100644 +RC_SRCS = fsutil.rc diff --git a/programs/fsutil/fsutil.rc b/programs/fsutil/fsutil.rc new file mode 100644 -index 0000000000..593f8175a2 +index 00000000000..593f8175a23 --- /dev/null +++ b/programs/fsutil/fsutil.rc @@ -0,0 +1,34 @@ @@ -68,7 +68,7 @@ index 0000000000..593f8175a2 + STRING_HARDLINK_CREATE_USAGE, "Syntax: fsutil hardlink create old new\n\n" +} diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c -index 2bce87edc8..6f7974ad1d 100644 +index eb4e3412976..ffef8aecbb1 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -1,5 +1,6 @@ @@ -191,7 +191,7 @@ index 2bce87edc8..6f7974ad1d 100644 + return ret; +} + - int wmain(int argc, WCHAR *argv[]) + int __cdecl wmain(int argc, WCHAR *argv[]) { - int i; + static const WCHAR hardlinkW[]={'h','a','r','d','l','i','n','k',0}; @@ -222,7 +222,7 @@ index 2bce87edc8..6f7974ad1d 100644 } diff --git a/programs/fsutil/resources.h b/programs/fsutil/resources.h new file mode 100644 -index 0000000000..b85826ac42 +index 00000000000..b85826ac421 --- /dev/null +++ b/programs/fsutil/resources.h @@ -0,0 +1,25 @@ @@ -252,5 +252,5 @@ index 0000000000..b85826ac42 +#define STRING_HARDLINK_USAGE 104 +#define STRING_HARDLINK_CREATE_USAGE 105 -- -2.23.0.rc1 +2.17.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index dcee59e5..8c50108e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "71e96bd3b757a2b058b6a769c341d81f82329d79" + echo "0fe003435e90dc32dd405a62af8fbcc20afc925d" } # Show version information diff --git a/patches/wusa-MSU_Package_Installer/0001-wusa-Implement-basic-installation-logic.patch b/patches/wusa-MSU_Package_Installer/0001-wusa-Implement-basic-installation-logic.patch index 24cba15b..b5e84a80 100644 --- a/patches/wusa-MSU_Package_Installer/0001-wusa-Implement-basic-installation-logic.patch +++ b/patches/wusa-MSU_Package_Installer/0001-wusa-Implement-basic-installation-logic.patch @@ -1,7 +1,7 @@ -From 1fdf0ca43f4530d1303362b3f8b20b0af06588d4 Mon Sep 17 00:00:00 2001 +From 0ed6209063d3c679af561e16cc6b716412842640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 14 Dec 2015 00:39:54 +0100 -Subject: [PATCH 1/7] wusa: Implement basic installation logic. +Subject: [PATCH] wusa: Implement basic installation logic. --- programs/wusa/Makefile.in | 4 +- @@ -13,7 +13,7 @@ Subject: [PATCH 1/7] wusa: Implement basic installation logic. create mode 100644 programs/wusa/wusa.h diff --git a/programs/wusa/Makefile.in b/programs/wusa/Makefile.in -index 3042e86bf8..bf90273411 100644 +index 3042e86bf85..bf902734114 100644 --- a/programs/wusa/Makefile.in +++ b/programs/wusa/Makefile.in @@ -1,6 +1,8 @@ @@ -27,7 +27,7 @@ index 3042e86bf8..bf90273411 100644 + main.c \ + manifest.c diff --git a/programs/wusa/main.c b/programs/wusa/main.c -index aa7a38fe17..0d6e5c345c 100644 +index c3e3dfd38ce..894184b5dfb 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -1,5 +1,7 @@ @@ -1044,7 +1044,7 @@ index aa7a38fe17..0d6e5c345c 100644 + return ret; +} + - int wmain(int argc, WCHAR *argv[]) + int __cdecl wmain(int argc, WCHAR *argv[]) { + static const WCHAR norestartW[] = {'/','n','o','r','e','s','t','a','r','t',0}; + static const WCHAR quietW[] = {'/','q','u','i','e','t',0}; @@ -1095,7 +1095,7 @@ index aa7a38fe17..0d6e5c345c 100644 } diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c new file mode 100644 -index 0000000000..d88b5f98a9 +index 00000000000..d88b5f98a94 --- /dev/null +++ b/programs/wusa/manifest.c @@ -0,0 +1,704 @@ @@ -1805,7 +1805,7 @@ index 0000000000..d88b5f98a9 +} diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h new file mode 100644 -index 0000000000..0b2b616a7c +index 00000000000..0b2b616a7c6 --- /dev/null +++ b/programs/wusa/wusa.h @@ -0,0 +1,159 @@ @@ -1969,5 +1969,5 @@ index 0000000000..0b2b616a7c + return ret; +} -- -2.23.0.rc1 +2.17.1 diff --git a/patches/wusa-MSU_Package_Installer/0004-wusa-Implement-WOW64-support.patch b/patches/wusa-MSU_Package_Installer/0004-wusa-Implement-WOW64-support.patch index 739b44b8..be093117 100644 --- a/patches/wusa-MSU_Package_Installer/0004-wusa-Implement-WOW64-support.patch +++ b/patches/wusa-MSU_Package_Installer/0004-wusa-Implement-WOW64-support.patch @@ -1,14 +1,14 @@ -From 3469408e1493cc2836c2ec38cf820bc52449c02a Mon Sep 17 00:00:00 2001 +From b9426dcd2d1a01b5f7ca857a5332c102e59dbc40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 21 Dec 2015 01:47:59 +0100 -Subject: [PATCH 4/7] wusa: Implement WOW64 support. +Subject: [PATCH] wusa: Implement WOW64 support. --- programs/wusa/main.c | 62 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/programs/wusa/main.c b/programs/wusa/main.c -index 837729554f..3598c39660 100644 +index db29a3e5078..78b4e18483a 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -65,6 +65,12 @@ struct installer_state @@ -112,10 +112,10 @@ index 837729554f..3598c39660 100644 + ExitProcess(exit_code); +} + - int wmain(int argc, WCHAR *argv[]) + int __cdecl wmain(int argc, WCHAR *argv[]) { static const WCHAR norestartW[] = {'/','n','o','r','e','s','t','a','r','t',0}; -@@ -1034,6 +1092,8 @@ int wmain(int argc, WCHAR *argv[]) +@@ -1034,6 +1092,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) WCHAR *filename = NULL; int i; @@ -125,5 +125,5 @@ index 837729554f..3598c39660 100644 state.quiet = FALSE; -- -2.23.0.rc1 +2.17.1