diff --git a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch index 37a76496..7c1c081e 100644 --- a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 49eb261c42d89a4c755914a40af797eb0b04d816 Mon Sep 17 00:00:00 2001 +From 44c826229e00ebefac0bca596746c1037c5c370b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 17:02:41 +0100 Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll. @@ -13,27 +13,27 @@ Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index e8b9c2a..736c744 100644 +index cc1d5ba443c..78c163e5f35 100644 --- a/configure.ac +++ b/configure.ac -@@ -2801,6 +2801,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) +@@ -2939,6 +2939,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) WINE_CONFIG_DLL(api-ms-win-service-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-shcore-scaling-l1-1-1) WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) - WINE_CONFIG_DLL(apphelp) diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in new file mode 100644 -index 0000000..6588d13 +index 00000000000..6588d13937e --- /dev/null +++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-obsolete-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec new file mode 100644 -index 0000000..edb8143 +index 00000000000..edb8143799d --- /dev/null +++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec @@ -0,0 +1,3 @@ @@ -41,20 +41,20 @@ index 0000000..edb8143 +@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA +@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW diff --git a/tools/make_specfiles b/tools/make_specfiles -index 6fb6376..c19993d 100755 +index ec4b68c2cf1..00f70283d49 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -270,6 +270,10 @@ my @dll_groups = +@@ -330,6 +330,10 @@ my @dll_groups = + "shlwapi", "shcore", ], - [ ++ [ + "shcore", + "api-ms-win-shcore-obsolete-l1-1-0", + ], -+ [ + [ "user32", "api-ms-win-core-stringansi-l1-1-0", - "api-ms-win-core-string-l2-1-0", -- -2.9.0 +2.14.2 diff --git a/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch index c6cb37fe..7247054e 100644 --- a/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From c0c54145e9b77cabfe520050f1a383659abd679f Mon Sep 17 00:00:00 2001 +From 19a4e40be4d9ef69c06b79185631f462f613c906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 19 Jan 2016 16:19:11 +0100 Subject: api-ms-win-shcore-thread-l1-1-0: Add dll @@ -13,27 +13,27 @@ Subject: api-ms-win-shcore-thread-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 3847ab8..876b232 100644 +index 4f88873c57c..9efeb2fb02f 100644 --- a/configure.ac +++ b/configure.ac -@@ -2797,6 +2797,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) - WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) +@@ -2941,6 +2941,7 @@ WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-shcore-scaling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_DLL(apphelp) diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in new file mode 100644 -index 0000000..0a20ccf +index 00000000000..0a20ccf206f --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-thread-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec new file mode 100644 -index 0000000..1533005 +index 00000000000..15330050ded --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec @@ -0,0 +1,8 @@ @@ -46,10 +46,10 @@ index 0000000..1533005 +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stub SetProcessReference diff --git a/tools/make_specfiles b/tools/make_specfiles -index e16a378..3fd4f36 100755 +index 00f70283d49..7abb3be32e6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -268,6 +268,7 @@ my @dll_groups = +@@ -333,6 +333,7 @@ my @dll_groups = [ "shcore", "api-ms-win-shcore-obsolete-l1-1-0", @@ -58,5 +58,5 @@ index e16a378..3fd4f36 100755 [ "user32", -- -2.9.0 +2.14.2 diff --git a/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch index 92cf292a..e35aa67b 100644 --- a/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From dece0c4c7519885d8e6da604de5735f1ebed7769 Mon Sep 17 00:00:00 2001 +From 56a35eb70c12ef297d1030e7a13f9a5f5746d057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 20:56:53 +0100 Subject: api-ms-win-shcore-stream-l1-1-0: Add dll @@ -13,27 +13,27 @@ Subject: api-ms-win-shcore-stream-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index d88aa46..f5d8f62 100644 +index 9efeb2fb02f..115becf5aaf 100644 --- a/configure.ac +++ b/configure.ac -@@ -2798,6 +2798,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) - WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) +@@ -2941,6 +2941,7 @@ WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-shcore-scaling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-shcore-stream-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in new file mode 100644 -index 0000000..df2caad +index 00000000000..df2caadd38b --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-stream-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec b/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec new file mode 100644 -index 0000000..1ee9dd3 +index 00000000000..1ee9dd335b6 --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec @@ -0,0 +1,15 @@ @@ -53,10 +53,10 @@ index 0000000..1ee9dd3 +@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW diff --git a/tools/make_specfiles b/tools/make_specfiles -index 6a08495..dc429d7 100755 +index 7abb3be32e6..86509aa7fb7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -270,6 +270,7 @@ my @dll_groups = +@@ -334,6 +334,7 @@ my @dll_groups = "shcore", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-thread-l1-1-0", @@ -65,5 +65,5 @@ index 6a08495..dc429d7 100755 [ "user32", -- -2.9.0 +2.14.2 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 058b0c04..772676cd 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "981dec4986e7ac1982049dbede1ca2aa72f5e70c" + echo "c14a16b08911d1695e42b75c60436ace9f42ea01" } # Show version information