From 00872dd69ce2fb4ce4bfe1890e1fbeb63dd75302 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 3 Dec 2014 23:47:54 +0100 Subject: [PATCH] Removed more api-ms-win-core-* stub patches (fixed upstream). --- patches/Makefile | 26 ++-- ...pi-ms-win-core-fibers-l1-1-0-Add-dll.patch | 28 ++--- ...ms-win-core-datetime-l1-1-0-Add-dll.patch} | 22 ++-- ...pi-ms-win-core-fibers-l1-1-1-Add-dll.patch | 59 --------- ...-api-ms-win-core-file-l2-1-0-Add-dll.patch | 65 ---------- ...win-core-xstate-l2-1-0-Add-stub-dll.patch} | 12 +- ...win-core-localization-l1-2-1-Add-dll.patch | 114 ------------------ ...core-winrt-error-l1-1-1-Add-stub-dll.patch | 60 +++++++++ ...in-core-datetime-l1-1-1-Add-stub-dll.patch | 60 --------- 9 files changed, 98 insertions(+), 348 deletions(-) rename patches/api-ms-win-core-Stubs/{0005-api-ms-win-core-datetime-l1-1-0-Add-dll.patch => 0002-api-ms-win-core-datetime-l1-1-0-Add-dll.patch} (82%) delete mode 100644 patches/api-ms-win-core-Stubs/0002-api-ms-win-core-fibers-l1-1-1-Add-dll.patch delete mode 100644 patches/api-ms-win-core-Stubs/0003-api-ms-win-core-file-l2-1-0-Add-dll.patch rename patches/api-ms-win-core-Stubs/{0007-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch => 0003-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch} (89%) delete mode 100644 patches/api-ms-win-core-Stubs/0004-api-ms-win-core-localization-l1-2-1-Add-dll.patch create mode 100644 patches/api-ms-win-core-Stubs/0004-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch delete mode 100644 patches/api-ms-win-core-Stubs/0006-api-ms-win-core-datetime-l1-1-1-Add-stub-dll.patch diff --git a/patches/Makefile b/patches/Makefile index 202536ee..2aedc70d 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -259,32 +259,20 @@ Staging.ok: # | # | Modified files: # | * configure.ac, dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in, dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core- -# | datetime-l1-1-0.spec, dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in, dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win- -# | core-datetime-l1-1-1.spec, dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in, dlls/api-ms-win-core-fibers-l1-1-0/api-ms- -# | win-core-fibers-l1-1-0.spec, dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in, dlls/api-ms-win-core-fibers-l1-1-1/api-ms- -# | win-core-fibers-l1-1-1.spec, dlls/api-ms-win-core-file-l2-1-0/Makefile.in, dlls/api-ms-win-core-file-l2-1-0/api-ms-win- -# | core-file-l2-1-0.spec, dlls/api-ms-win-core-localization-l1-2-1/Makefile.in, dlls/api-ms-win-core-localization-l1-2-1 -# | /api-ms-win-core-localization-l1-2-1.spec, dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in, dlls/api-ms-win-core- -# | winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec, dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in, dlls/api-ms- -# | win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec, tools/make_specfiles +# | datetime-l1-1-0.spec, dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in, dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win- +# | core-fibers-l1-1-0.spec, dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in, dlls/api-ms-win-core-winrt-error-l1-1-1 +# | /api-ms-win-core-winrt-error-l1-1-1.spec, dlls/api-ms-win-core-xstate-l2-1-0/Makefile.in, dlls/api-ms-win-core- +# | xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec, tools/make_specfiles # | .INTERMEDIATE: api-ms-win-core-Stubs.ok api-ms-win-core-Stubs.ok: $(call APPLY_FILE,api-ms-win-core-Stubs/0001-api-ms-win-core-fibers-l1-1-0-Add-dll.patch) - $(call APPLY_FILE,api-ms-win-core-Stubs/0002-api-ms-win-core-fibers-l1-1-1-Add-dll.patch) - $(call APPLY_FILE,api-ms-win-core-Stubs/0003-api-ms-win-core-file-l2-1-0-Add-dll.patch) - $(call APPLY_FILE,api-ms-win-core-Stubs/0004-api-ms-win-core-localization-l1-2-1-Add-dll.patch) - $(call APPLY_FILE,api-ms-win-core-Stubs/0005-api-ms-win-core-datetime-l1-1-0-Add-dll.patch) - $(call APPLY_FILE,api-ms-win-core-Stubs/0006-api-ms-win-core-datetime-l1-1-1-Add-stub-dll.patch) - $(call APPLY_FILE,api-ms-win-core-Stubs/0007-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch) - $(call APPLY_FILE,api-ms-win-core-Stubs/0008-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch) + $(call APPLY_FILE,api-ms-win-core-Stubs/0002-api-ms-win-core-datetime-l1-1-0-Add-dll.patch) + $(call APPLY_FILE,api-ms-win-core-Stubs/0003-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch) + $(call APPLY_FILE,api-ms-win-core-Stubs/0004-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch) @( \ echo '+ { "Michael Müller", "api-ms-win-core-fibers-l1-1-0: Add dll.", 1 },'; \ - echo '+ { "Michael Müller", "api-ms-win-core-fibers-l1-1-1: Add dll.", 1 },'; \ - echo '+ { "Michael Müller", "api-ms-win-core-file-l2-1-0: Add dll.", 1 },'; \ - echo '+ { "Michael Müller", "api-ms-win-core-localization-l1-2-1: Add dll.", 1 },'; \ echo '+ { "Michael Müller", "api-ms-win-core-datetime-l1-1-0: Add dll.", 1 },'; \ - echo '+ { "Michael Müller", "api-ms-win-core-datetime-l1-1-1: Add stub dll.", 1 },'; \ echo '+ { "Michael Müller", "api-ms-win-core-xstate-l2-1-0: Add stub dll.", 1 },'; \ echo '+ { "Michael Müller", "api-ms-win-core-winrt-error-l1-1-1: Add stub dll.", 1 },'; \ ) > api-ms-win-core-Stubs.ok diff --git a/patches/api-ms-win-core-Stubs/0001-api-ms-win-core-fibers-l1-1-0-Add-dll.patch b/patches/api-ms-win-core-Stubs/0001-api-ms-win-core-fibers-l1-1-0-Add-dll.patch index 38ad30fe..a8733642 100644 --- a/patches/api-ms-win-core-Stubs/0001-api-ms-win-core-fibers-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-core-Stubs/0001-api-ms-win-core-fibers-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 64f473f115548812ccaaff7d891650d0059afb34 Mon Sep 17 00:00:00 2001 +From 3548deeba0307b5fd911116975409b2182e15a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 26 Nov 2014 21:31:43 +0100 Subject: api-ms-win-core-fibers-l1-1-0: Add dll. @@ -13,17 +13,17 @@ Subject: api-ms-win-core-fibers-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-core-fibers-l1-1-0/api-ms-win-core-fibers-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index c33869e..48a2d0b 100644 +index eea1baf..ded14e8 100644 --- a/configure.ac +++ b/configure.ac -@@ -2649,6 +2649,7 @@ WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) +@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) - WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) diff --git a/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in b/dlls/api-ms-win-core-fibers-l1-1-0/Makefile.in new file mode 100644 index 0000000..f4cc782 @@ -42,17 +42,17 @@ index 0000000..26afab1 +@ stdcall FlsGetValue(long) kernel32.FlsGetValue +@ stdcall FlsSetValue(long ptr) kernel32.FlsSetValue diff --git a/tools/make_specfiles b/tools/make_specfiles -index 411f65e..d0d245c 100755 +index 641f18e..8866ab2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -134,6 +134,7 @@ my @dll_groups = - "api-ms-win-core-processthreads-l1-1-1", - "api-ms-win-core-debug-l1-1-1", - "api-ms-win-core-errorhandling-l1-1-1", +@@ -159,6 +159,7 @@ my @dll_groups = + "api-ms-win-core-file-l2-1-1", + "api-ms-win-core-sysinfo-l1-2-1", + "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-fibers-l1-1-0", - "api-ms-win-core-interlocked-l1-2-0", - "api-ms-win-core-profile-l1-1-0", - "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-fibers-l1-1-1", + "api-ms-win-core-file-l2-1-0", + "api-ms-win-core-localization-l1-2-1", -- 2.1.3 diff --git a/patches/api-ms-win-core-Stubs/0005-api-ms-win-core-datetime-l1-1-0-Add-dll.patch b/patches/api-ms-win-core-Stubs/0002-api-ms-win-core-datetime-l1-1-0-Add-dll.patch similarity index 82% rename from patches/api-ms-win-core-Stubs/0005-api-ms-win-core-datetime-l1-1-0-Add-dll.patch rename to patches/api-ms-win-core-Stubs/0002-api-ms-win-core-datetime-l1-1-0-Add-dll.patch index c8f2ac41..4af1906c 100644 --- a/patches/api-ms-win-core-Stubs/0005-api-ms-win-core-datetime-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-core-Stubs/0002-api-ms-win-core-datetime-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From cdba1db947a3d786cf655ad30070072d0fa1cff6 Mon Sep 17 00:00:00 2001 +From eff671feeb578061da7a273d5e49e28c49f42b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 26 Nov 2014 21:50:28 +0100 Subject: api-ms-win-core-datetime-l1-1-0: Add dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-core-datetime-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-core-datetime-l1-1-0/api-ms-win-core-datetime-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 83ade37..39deabe 100644 +index ded14e8..30bc3ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,6 +2647,7 @@ WINE_CONFIG_DLL(amstream,,[clean]) @@ -21,9 +21,9 @@ index 83ade37..39deabe 100644 WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) diff --git a/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in b/dlls/api-ms-win-core-datetime-l1-1-0/Makefile.in new file mode 100644 index 0000000..f722f65 @@ -42,17 +42,17 @@ index 0000000..c49cf5e +@ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA +@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW diff --git a/tools/make_specfiles b/tools/make_specfiles -index ab6c6b9..34c52d0 100755 +index 8866ab2..a51ed00 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -132,6 +132,7 @@ my @dll_groups = - "api-ms-win-downlevel-normaliz-l1-1-0", - "api-ms-win-core-processthreads-l1-1-0", - "api-ms-win-core-processthreads-l1-1-1", +@@ -163,6 +163,7 @@ my @dll_groups = + "api-ms-win-core-fibers-l1-1-1", + "api-ms-win-core-file-l2-1-0", + "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-datetime-l1-1-0", - "api-ms-win-core-debug-l1-1-1", - "api-ms-win-core-errorhandling-l1-1-1", - "api-ms-win-core-fibers-l1-1-0", + "api-ms-win-core-datetime-l1-1-1", + ], + [ -- 2.1.3 diff --git a/patches/api-ms-win-core-Stubs/0002-api-ms-win-core-fibers-l1-1-1-Add-dll.patch b/patches/api-ms-win-core-Stubs/0002-api-ms-win-core-fibers-l1-1-1-Add-dll.patch deleted file mode 100644 index 3ac805d1..00000000 --- a/patches/api-ms-win-core-Stubs/0002-api-ms-win-core-fibers-l1-1-1-Add-dll.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0e08bdde2ad4c44435ae02c3453ff6f9b87b6499 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Nov 2014 18:09:04 +0100 -Subject: api-ms-win-core-fibers-l1-1-1: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in | 1 + - .../api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec | 5 +++++ - tools/make_specfiles | 1 + - 4 files changed, 8 insertions(+) - create mode 100644 dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in - create mode 100644 dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec - -diff --git a/configure.ac b/configure.ac -index 48a2d0b..b8faada 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) - WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) -diff --git a/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in b/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in -new file mode 100644 -index 0000000..98b7880 ---- /dev/null -+++ b/dlls/api-ms-win-core-fibers-l1-1-1/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-fibers-l1-1-1.dll -diff --git a/dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec b/dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec -new file mode 100644 -index 0000000..4947543 ---- /dev/null -+++ b/dlls/api-ms-win-core-fibers-l1-1-1/api-ms-win-core-fibers-l1-1-1.spec -@@ -0,0 +1,5 @@ -+@ stdcall FlsAlloc(ptr) kernel32.FlsAlloc -+@ stdcall FlsFree(long) kernel32.FlsFree -+@ stdcall FlsGetValue(long) kernel32.FlsGetValue -+@ stdcall FlsSetValue(long ptr) kernel32.FlsSetValue -+@ stdcall IsThreadAFiber() kernel32.IsThreadAFiber -diff --git a/tools/make_specfiles b/tools/make_specfiles -index d0d245c..8c0c6b4 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -135,6 +135,7 @@ my @dll_groups = - "api-ms-win-core-debug-l1-1-1", - "api-ms-win-core-errorhandling-l1-1-1", - "api-ms-win-core-fibers-l1-1-0", -+ "api-ms-win-core-fibers-l1-1-1", - "api-ms-win-core-interlocked-l1-2-0", - "api-ms-win-core-profile-l1-1-0", - "api-ms-win-core-string-l1-1-0", --- -2.1.3 - diff --git a/patches/api-ms-win-core-Stubs/0003-api-ms-win-core-file-l2-1-0-Add-dll.patch b/patches/api-ms-win-core-Stubs/0003-api-ms-win-core-file-l2-1-0-Add-dll.patch deleted file mode 100644 index 8385e9d4..00000000 --- a/patches/api-ms-win-core-Stubs/0003-api-ms-win-core-file-l2-1-0-Add-dll.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a043b3b87b22c92e3c0014bf41ec39c87f9e4719 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Nov 2014 18:33:41 +0100 -Subject: api-ms-win-core-file-l2-1-0: Add dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-file-l2-1-0/Makefile.in | 1 + - .../api-ms-win-core-file-l2-1-0.spec | 11 +++++++++++ - tools/make_specfiles | 1 + - 4 files changed, 14 insertions(+) - create mode 100644 dlls/api-ms-win-core-file-l2-1-0/Makefile.in - create mode 100644 dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec - -diff --git a/configure.ac b/configure.ac -index b8faada..5bceaad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2652,6 +2652,7 @@ WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-file-l1-2-0) -+WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-0) - WINE_CONFIG_DLL(api-ms-win-core-file-l2-1-1) - WINE_CONFIG_DLL(api-ms-win-core-handle-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-heap-l1-2-0) -diff --git a/dlls/api-ms-win-core-file-l2-1-0/Makefile.in b/dlls/api-ms-win-core-file-l2-1-0/Makefile.in -new file mode 100644 -index 0000000..8edf54e ---- /dev/null -+++ b/dlls/api-ms-win-core-file-l2-1-0/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-file-l2-1-0.dll -diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec -new file mode 100644 -index 0000000..914e0c0 ---- /dev/null -+++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec -@@ -0,0 +1,11 @@ -+@ stub CopyFile2 -+@ stdcall CopyFileExW(wstr wstr ptr ptr ptr long) kernel32.CopyFileExW -+@ stdcall CreateDirectoryExW(wstr wstr ptr) kernel32.CreateDirectoryExW -+@ stdcall CreateHardLinkW(wstr wstr ptr) kernel32.CreateHardLinkW -+@ stub CreateSymbolicLinkW -+@ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx -+@ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW -+@ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW -+@ stub ReOpenFile -+@ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW -+@ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 8c0c6b4..ef78bb2 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -144,6 +144,7 @@ my @dll_groups = - "api-ms-win-core-synch-l1-2-0", - "api-ms-win-core-console-l1-1-0", - "api-ms-win-core-file-l1-2-0", -+ "api-ms-win-core-file-l2-1-0", - "api-ms-win-core-handle-l1-1-0", - "api-ms-win-core-heap-l1-2-0", - "api-ms-win-core-heap-obsolete-l1-1-0", --- -2.1.3 - diff --git a/patches/api-ms-win-core-Stubs/0007-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch b/patches/api-ms-win-core-Stubs/0003-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch similarity index 89% rename from patches/api-ms-win-core-Stubs/0007-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch rename to patches/api-ms-win-core-Stubs/0003-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch index c34021b3..94a6b3c3 100644 --- a/patches/api-ms-win-core-Stubs/0007-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-core-Stubs/0003-api-ms-win-core-xstate-l2-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From d506f1bb199ea494227ec0d5b86a5cbfee4711c9 Mon Sep 17 00:00:00 2001 +From 9930401b757f8cddb493e656772c275b278ae74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Wed, 26 Nov 2014 19:07:20 +0100 Subject: api-ms-win-core-xstate-l2-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-core-xstate-l2-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-core-xstate-l2-1-0/api-ms-win-core-xstate-l2-1-0.spec diff --git a/configure.ac b/configure.ac -index e2b2da6..00103b4 100644 +index 30bc3ce..e007f17 100644 --- a/configure.ac +++ b/configure.ac @@ -2689,6 +2689,7 @@ WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) @@ -44,13 +44,13 @@ index 0000000..0f9438d +@ stub LocateXStateFeature +@ stub SetXStateFeaturesMask diff --git a/tools/make_specfiles b/tools/make_specfiles -index 8ab41d8..bda1692 100755 +index a51ed00..7ef15d6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -165,6 +165,7 @@ my @dll_groups = - "api-ms-win-core-file-l2-1-1", - "api-ms-win-core-sysinfo-l1-2-1", - "api-ms-win-core-processthreads-l1-1-2", + "api-ms-win-core-localization-l1-2-1", + "api-ms-win-core-datetime-l1-1-0", + "api-ms-win-core-datetime-l1-1-1", + "api-ms-win-core-xstate-l2-1-0", ], [ diff --git a/patches/api-ms-win-core-Stubs/0004-api-ms-win-core-localization-l1-2-1-Add-dll.patch b/patches/api-ms-win-core-Stubs/0004-api-ms-win-core-localization-l1-2-1-Add-dll.patch deleted file mode 100644 index 8b33903a..00000000 --- a/patches/api-ms-win-core-Stubs/0004-api-ms-win-core-localization-l1-2-1-Add-dll.patch +++ /dev/null @@ -1,114 +0,0 @@ -From e89be694a987e4d2fc1f6f3e554b08b07c8b2ac0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Nov 2014 18:46:49 +0100 -Subject: api-ms-win-core-localization-l1-2-1: Add dll. - ---- - configure.ac | 1 + - .../Makefile.in | 1 + - .../api-ms-win-core-localization-l1-2-1.spec | 60 ++++++++++++++++++++++ - tools/make_specfiles | 1 + - 4 files changed, 63 insertions(+) - create mode 100644 dlls/api-ms-win-core-localization-l1-2-1/Makefile.in - create mode 100644 dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec - -diff --git a/configure.ac b/configure.ac -index 5bceaad..83ade37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-0) -+WINE_CONFIG_DLL(api-ms-win-core-localization-l1-2-1) - WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) -diff --git a/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in b/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in -new file mode 100644 -index 0000000..e5208a8 ---- /dev/null -+++ b/dlls/api-ms-win-core-localization-l1-2-1/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-localization-l1-2-1.dll -diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec -new file mode 100644 -index 0000000..ccba739 ---- /dev/null -+++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec -@@ -0,0 +1,60 @@ -+@ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale -+@ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID -+@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA -+@ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx -+@ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW -+@ stub FindNLSString -+@ stub FindNLSStringEx -+@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA -+@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW -+@ stdcall GetACP() kernel32.GetACP -+@ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo -+@ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW -+@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx -+@ stdcall GetCalendarInfoW(long long long ptr long ptr) kernel32.GetCalendarInfoW -+@ stub GetFileMUIInfo -+@ stub GetFileMUIPath -+@ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW -+@ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA -+@ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx -+@ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW -+@ stub GetNLSVersion -+@ stub GetNLSVersionEx -+@ stdcall GetOEMCP() kernel32.GetOEMCP -+@ stub GetProcessPreferredUILanguages -+@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID -+@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID -+@ stub GetSystemPreferredUILanguages -+@ stdcall GetThreadLocale() kernel32.GetThreadLocale -+@ stdcall GetThreadPreferredUILanguages(long ptr ptr ptr) kernel32.GetThreadPreferredUILanguages -+@ stdcall GetThreadUILanguage() kernel32.GetThreadUILanguage -+@ stub GetUILanguageInfo -+@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID -+@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID -+@ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName -+@ stdcall GetUserGeoID(long) kernel32.GetUserGeoID -+@ stub GetUserPreferredUILanguages -+@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii -+@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode -+@ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte -+@ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx -+@ stub IsNLSDefinedString -+@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage -+@ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup -+@ stdcall IsValidLocale(long long) kernel32.IsValidLocale -+@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName -+@ stub IsValidNLSVersion -+@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA -+@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx -+@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW -+@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID -+@ stub ResolveLocaleName -+@ stdcall SetCalendarInfoW(long long long wstr) kernel32.SetCalendarInfoW -+@ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW -+@ stub SetProcessPreferredUILanguages -+@ stdcall SetThreadLocale(long) kernel32.SetThreadLocale -+@ stdcall SetThreadPreferredUILanguages(long ptr ptr) kernel32.SetThreadPreferredUILanguages -+@ stdcall SetThreadUILanguage(long) kernel32.SetThreadUILanguage -+@ stdcall SetUserGeoID(long) kernel32.SetUserGeoID -+@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA -+@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW -diff --git a/tools/make_specfiles b/tools/make_specfiles -index ef78bb2..ab6c6b9 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -152,6 +152,7 @@ my @dll_groups = - "api-ms-win-core-kernel32-legacy-l1-1-0", - "api-ms-win-core-libraryloader-l1-1-1", - "api-ms-win-core-localization-l1-2-0", -+ "api-ms-win-core-localization-l1-2-1", - "api-ms-win-core-localization-obsolete-l1-1-0", - "api-ms-win-core-memory-l1-1-1", - "api-ms-win-core-namedpipe-l1-2-0", --- -2.1.3 - diff --git a/patches/api-ms-win-core-Stubs/0004-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch b/patches/api-ms-win-core-Stubs/0004-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch new file mode 100644 index 00000000..2f996b4a --- /dev/null +++ b/patches/api-ms-win-core-Stubs/0004-api-ms-win-core-winrt-error-l1-1-1-Add-stub-dll.patch @@ -0,0 +1,60 @@ +From 2b93ecb2dd631effac24746ac21573920a44c07f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Wed, 26 Nov 2014 20:13:34 +0100 +Subject: api-ms-win-core-winrt-error-l1-1-1: Add stub dll. + +--- + configure.ac | 1 + + dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in | 1 + + .../api-ms-win-core-winrt-error-l1-1-1.spec | 19 +++++++++++++++++++ + 3 files changed, 21 insertions(+) + create mode 100644 dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in + create mode 100644 dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec + +diff --git a/configure.ac b/configure.ac +index e007f17..863f5e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2687,6 +2687,7 @@ WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) ++WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) + WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) + WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) +diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in +new file mode 100644 +index 0000000..fe36f7b +--- /dev/null ++++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/Makefile.in +@@ -0,0 +1 @@ ++MODULE = api-ms-win-core-winrt-error-l1-1-1.dll +diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +new file mode 100644 +index 0000000..b1ad813 +--- /dev/null ++++ b/dlls/api-ms-win-core-winrt-error-l1-1-1/api-ms-win-core-winrt-error-l1-1-1.spec +@@ -0,0 +1,19 @@ ++@ stub GetRestrictedErrorInfo ++@ stub IsErrorPropagationEnabled ++@ stub RoCaptureErrorContext ++@ stub RoClearError ++@ stub RoFailFastWithErrorContext ++@ stub RoGetErrorReportingFlags ++@ stub RoGetMatchingRestrictedErrorInfo ++@ stub RoInspectCapturedStackBackTrace ++@ stub RoInspectThreadErrorInfo ++@ stub RoOriginateError ++@ stub RoOriginateErrorW ++@ stub RoOriginateLanguageException ++@ stub RoReportFailedDelegate ++@ stub RoReportUnhandledError ++@ stub RoResolveRestrictedErrorInfoReference ++@ stub RoSetErrorReportingFlags ++@ stub RoTransformError ++@ stub RoTransformErrorW ++@ stub SetRestrictedErrorInfo +-- +2.1.3 + diff --git a/patches/api-ms-win-core-Stubs/0006-api-ms-win-core-datetime-l1-1-1-Add-stub-dll.patch b/patches/api-ms-win-core-Stubs/0006-api-ms-win-core-datetime-l1-1-1-Add-stub-dll.patch deleted file mode 100644 index 7e2e9d9e..00000000 --- a/patches/api-ms-win-core-Stubs/0006-api-ms-win-core-datetime-l1-1-1-Add-stub-dll.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 51ecbb1b098b251508fb91d6f1bf4a4cb5572438 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 26 Nov 2014 18:53:12 +0100 -Subject: api-ms-win-core-datetime-l1-1-1: Add stub dll. - ---- - configure.ac | 1 + - dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in | 1 + - .../api-ms-win-core-datetime-l1-1-1.spec | 6 ++++++ - tools/make_specfiles | 1 + - 4 files changed, 9 insertions(+) - create mode 100644 dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in - create mode 100644 dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec - -diff --git a/configure.ac b/configure.ac -index 39deabe..e2b2da6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2648,6 +2648,7 @@ WINE_CONFIG_TEST(dlls/amstream/tests) - WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-core-datetime-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-debug-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-errorhandling-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-core-fibers-l1-1-0) -diff --git a/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in -new file mode 100644 -index 0000000..2bf9501 ---- /dev/null -+++ b/dlls/api-ms-win-core-datetime-l1-1-1/Makefile.in -@@ -0,0 +1 @@ -+MODULE = api-ms-win-core-datetime-l1-1-1.dll -diff --git a/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec b/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec -new file mode 100644 -index 0000000..5630929 ---- /dev/null -+++ b/dlls/api-ms-win-core-datetime-l1-1-1/api-ms-win-core-datetime-l1-1-1.spec -@@ -0,0 +1,6 @@ -+@ stdcall GetDateFormatA(long long ptr str ptr long) kernel32.GetDateFormatA -+@ stub GetDateFormatEx -+@ stdcall GetDateFormatW(long long ptr wstr ptr long) kernel32.GetDateFormatW -+@ stdcall GetTimeFormatA(long long ptr str ptr long) kernel32.GetTimeFormatA -+@ stub GetTimeFormatEx -+@ stdcall GetTimeFormatW(long long ptr wstr ptr long) kernel32.GetTimeFormatW -diff --git a/tools/make_specfiles b/tools/make_specfiles -index 34c52d0..8ab41d8 100755 ---- a/tools/make_specfiles -+++ b/tools/make_specfiles -@@ -133,6 +133,7 @@ my @dll_groups = - "api-ms-win-core-processthreads-l1-1-0", - "api-ms-win-core-processthreads-l1-1-1", - "api-ms-win-core-datetime-l1-1-0", -+ "api-ms-win-core-datetime-l1-1-1", - "api-ms-win-core-debug-l1-1-1", - "api-ms-win-core-errorhandling-l1-1-1", - "api-ms-win-core-fibers-l1-1-0", --- -2.1.3 -