diff --git a/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch b/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch index ebec823c..df8fae92 100644 --- a/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch +++ b/patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch @@ -1,4 +1,4 @@ -From 4a511591eb74436feb8aa12e33f6caac544ba54a Mon Sep 17 00:00:00 2001 +From 50bd67fb1fd718eaaf9f5600fba7ab86e4b71a76 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 5 Jul 2019 13:20:23 +0800 Subject: [PATCH] cryptext: Implement CryptExtOpenCER. @@ -8,19 +8,19 @@ Signed-off-by: Dmitry Timoshkov configure | 1 + configure.ac | 1 + dlls/cryptext/Makefile.in | 3 +- - dlls/cryptext/cryptext.spec | 4 +- - dlls/cryptext/cryptext_main.c | 80 +++++++++++++++++++++++++++++++++ - dlls/cryptext/tests/Makefile.in | 4 ++ - dlls/cryptext/tests/cryptext.c | 61 +++++++++++++++++++++++++ - 7 files changed, 151 insertions(+), 3 deletions(-) + dlls/cryptext/cryptext.spec | 4 +-- + dlls/cryptext/cryptext_main.c | 64 +++++++++++++++++++++++++++++++++ + dlls/cryptext/tests/Makefile.in | 4 +++ + dlls/cryptext/tests/cryptext.c | 61 +++++++++++++++++++++++++++++++ + 7 files changed, 135 insertions(+), 3 deletions(-) create mode 100644 dlls/cryptext/tests/Makefile.in create mode 100644 dlls/cryptext/tests/cryptext.c diff --git a/configure b/configure -index 08936ff0ec1..79c966d23b1 100755 +index 2b20133cd65..f3ef3aef3a9 100755 --- a/configure +++ b/configure -@@ -20347,6 +20347,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests +@@ -20350,6 +20350,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg wine_fn_config_makefile dlls/cryptdll enable_cryptdll wine_fn_config_makefile dlls/cryptext enable_cryptext @@ -29,10 +29,10 @@ index 08936ff0ec1..79c966d23b1 100755 wine_fn_config_makefile dlls/cryptnet/tests enable_tests wine_fn_config_makefile dlls/cryptsp enable_cryptsp diff --git a/configure.ac b/configure.ac -index fea6fe89c83..1a10f687682 100644 +index 24f5c8847d6..f71fb6f401d 100644 --- a/configure.ac +++ b/configure.ac -@@ -3095,6 +3095,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests) +@@ -3083,6 +3083,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests) WINE_CONFIG_MAKEFILE(dlls/cryptdlg) WINE_CONFIG_MAKEFILE(dlls/cryptdll) WINE_CONFIG_MAKEFILE(dlls/cryptext) @@ -67,10 +67,10 @@ index 0dba38e3934..911ab2f4ba4 100644 @ stub CryptExtOpenCRLW @ stub CryptExtOpenCTL diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c -index 537ba66cd3b..2a381782d68 100644 +index 537ba66cd3b..f9e34d1f8c5 100644 --- a/dlls/cryptext/cryptext_main.c +++ b/dlls/cryptext/cryptext_main.c -@@ -22,10 +22,45 @@ +@@ -22,10 +22,29 @@ #include "windef.h" #include "winbase.h" @@ -96,27 +96,11 @@ index 537ba66cd3b..2a381782d68 100644 + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} -+ -+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -+{ -+ TRACE("(%p, %u, %p)\n", instance, reason, reserved); -+ -+ switch (reason) -+ { -+ case DLL_WINE_PREATTACH: -+ return FALSE; /* prefer native version */ -+ case DLL_PROCESS_ATTACH: -+ DisableThreadLibraryCalls(instance); -+ break; -+ } -+ -+ return TRUE; -+} + /*********************************************************************** * CryptExtAddPFX (CRYPTEXT.@) */ -@@ -43,3 +78,48 @@ HRESULT WINAPI CryptExtAddPFXW(LPCWSTR filename) +@@ -43,3 +62,48 @@ HRESULT WINAPI CryptExtAddPFXW(LPCWSTR filename) FIXME("stub: %s\n", debugstr_w(filename)); return E_NOTIMPL; } @@ -243,5 +227,5 @@ index 00000000000..cc62a772b59 + test_CryptExtOpenCER(); +} -- -2.30.0 +2.20.1 diff --git a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch index dc83d8a1..bbb28174 100644 --- a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch +++ b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch @@ -1,4 +1,4 @@ -From 3d71df14a8a79f7827591f76eab7e3dbb3b9aa1a Mon Sep 17 00:00:00 2001 +From 10fbfd11d5fd45b0e84c1b987dab7831e8567ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 5 Sep 2016 15:31:29 +0200 Subject: [PATCH] inseng: Implement CIF reader and download functions. @@ -18,7 +18,7 @@ FIXME: Needs splitting. create mode 100644 dlls/inseng/inseng_private.h diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in -index 797a0d2b46f..d58b88377f3 100644 +index d3f29328f67..b12c2156339 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in @@ -1,8 +1,11 @@ @@ -26,7 +26,7 @@ index 797a0d2b46f..d58b88377f3 100644 -IMPORTS = uuid ole32 advapi32 +IMPORTS = uuid ole32 advapi32 urlmon shlwapi - EXTRADLLFLAGS = -mno-cygwin + EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native -C_SRCS = inseng_main.c +C_SRCS = \ @@ -37,7 +37,7 @@ index 797a0d2b46f..d58b88377f3 100644 IDL_SRCS = inseng_classes.idl diff --git a/dlls/inseng/icif.c b/dlls/inseng/icif.c new file mode 100644 -index 00000000000..f7bf0a07077 +index 00000000000..6fd35625006 --- /dev/null +++ b/dlls/inseng/icif.c @@ -0,0 +1,1745 @@ @@ -2249,7 +2249,7 @@ index 82c0b4d5fe1..7ae46fad3a7 100644 +@ stdcall GetICifRWFileFromFile(ptr str) @ stub PurgeDownloadDirectory diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c -index 631a9364e39..afa13873c08 100644 +index c9a5988478c..c465e2d3ed7 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -2,6 +2,7 @@ @@ -3454,7 +3454,7 @@ index 631a9364e39..afa13873c08 100644 IInstallEngine2_Release(&engine->IInstallEngine2_iface); diff --git a/dlls/inseng/inseng_private.h b/dlls/inseng/inseng_private.h new file mode 100644 -index 00000000000..1a649e251ec +index 00000000000..55d3899808a --- /dev/null +++ b/dlls/inseng/inseng_private.h @@ -0,0 +1,79 @@ @@ -3864,5 +3864,5 @@ index 8a3f4c4d270..82927418a99 100644 +cpp_quote("HRESULT WINAPI GetICifFileFromFile(ICifFile **, const char *);") +cpp_quote("HRESULT WINAPI GetICifRWFileFromFile(ICifRWFile **, const char *);") -- -2.17.1 +2.20.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 5c44e7a1..c21a62b6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "3c2db20f66806074b047b0b3c76aa86ad79e3175" + echo "7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e" } # Show version information diff --git a/patches/shell32-ACE_Viewer/0001-aclui-Add-basic-ACE-viewer.patch b/patches/shell32-ACE_Viewer/0001-aclui-Add-basic-ACE-viewer.patch index 81ca519d..16d6eee8 100644 --- a/patches/shell32-ACE_Viewer/0001-aclui-Add-basic-ACE-viewer.patch +++ b/patches/shell32-ACE_Viewer/0001-aclui-Add-basic-ACE-viewer.patch @@ -1,4 +1,4 @@ -From f28a857b189d801435e899ed039611cc6fb116f2 Mon Sep 17 00:00:00 2001 +From ae9ac5d6ccbfe580cfa53d6fa774d8ac4025a603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 8 May 2017 23:01:28 +0200 Subject: [PATCH] aclui: Add basic ACE viewer. @@ -6,10 +6,10 @@ Subject: [PATCH] aclui: Add basic ACE viewer. --- dlls/aclui/Makefile.in | 3 + dlls/aclui/aclui.rc | 58 +++++ - dlls/aclui/aclui_main.c | 531 +++++++++++++++++++++++++++++++++++++- + dlls/aclui/aclui_main.c | 526 +++++++++++++++++++++++++++++++++++++- dlls/aclui/resource.h | 38 +++ dlls/aclui/user_icons.bmp | Bin 0 -> 2730 bytes - 5 files changed, 626 insertions(+), 4 deletions(-) + 5 files changed, 621 insertions(+), 4 deletions(-) create mode 100644 dlls/aclui/aclui.rc create mode 100644 dlls/aclui/resource.h create mode 100644 dlls/aclui/user_icons.bmp @@ -93,10 +93,10 @@ index 00000000000..08f8b567314 +/* @makedep: user_icons.bmp */ +IDB_USER_ICONS BITMAP user_icons.bmp diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c -index 1a03f30df24..a3a789e2daa 100644 +index 1a03f30df24..6fd6a561ff9 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c -@@ -20,25 +20,548 @@ +@@ -20,25 +20,543 @@ #include @@ -117,9 +117,6 @@ index 1a03f30df24..a3a789e2daa 100644 WINE_DEFAULT_DEBUG_CHANNEL(aclui); -HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi) -+ -+HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi); -+ +/* the aclui.h files does not contain the necessary COBJMACROS */ +#define ISecurityInformation_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISecurityInformation_Release(This) (This)->lpVtbl->Release(This) @@ -128,7 +125,8 @@ index 1a03f30df24..a3a789e2daa 100644 +#define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def) + +struct user -+{ + { +- FIXME("(%p): stub\n", psi); + struct list entry; + WCHAR *name; + @@ -157,8 +155,6 @@ index 1a03f30df24..a3a789e2daa 100644 + + switch (fdwReason) + { -+ case DLL_WINE_PREATTACH: -+ return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + aclui_instance = hinstDLL; + DisableThreadLibraryCalls(hinstDLL); @@ -200,8 +196,7 @@ index 1a03f30df24..a3a789e2daa 100644 +} + +static void users_clear(struct security_page *page) - { -- FIXME("(%p): stub\n", psi); ++{ + struct user *user, *user2; + + LIST_FOR_EACH_ENTRY_SAFE(user, user2, &page->users, struct user, entry) @@ -729,5 +724,5 @@ literal 0 HcmV?d00001 -- -2.30.0 +2.20.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index 3a7ca73d..25cc1700 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -3c2db20f66806074b047b0b3c76aa86ad79e3175 +7fa74fa78e2f8fedeea6fa3c796f0f2eb202825e