wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 825d5c86415d9e76c92a9d533c00790efe847ae7.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-10-05 23:09:54 +02:00
parent 2cc3a4b98f
commit 7c183df10b
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch
View File

@@ -1,4 +1,4 @@
From 8cd69f6811475c6ba3ecf28588193bfd9fb91e34 Mon Sep 17 00:00:00 2001
From 02f531e6fb014016869e1d7ba191b77551c349e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 16 Aug 2017 02:45:23 +0200
Subject: kernelbase: Add semi-stub for PathCchCombineEx.
@@ -19,10 +19,10 @@ Subject: kernelbase: Add semi-stub for PathCchCombineEx.
create mode 100644 include/pathcch.h
diff --git a/configure.ac b/configure.ac
index 5979934047d..fd05212057f 100644
index 44c7eed86f8..5c0bf350739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3323,7 +3323,8 @@ WINE_CONFIG_DLL(jsproxy,,[implib])
@@ -3215,7 +3215,8 @@ WINE_CONFIG_DLL(jsproxy,,[implib])
WINE_CONFIG_TEST(dlls/jsproxy/tests)
WINE_CONFIG_DLL(kernel32,,[clean,implib])
WINE_CONFIG_TEST(dlls/kernel32/tests)
@@ -58,7 +58,7 @@ index 74df98ce2d5..247c6bf392a 100644
C_SRCS = \
main.c
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 4523c6a0b6f..05cafa377bd 100644
index 85b23237bbc..1ec67e37b0b 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1037,7 +1037,7 @@
@@ -71,12 +71,12 @@ index 4523c6a0b6f..05cafa377bd 100644
# @ stub PathCchIsRoot
# @ stub PathCchRemoveBackslash
diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
index 6673f9b63e0..00dacfe28c1 100644
index ff1b2f67623..02d538e76b0 100644
--- a/dlls/kernelbase/main.c
+++ b/dlls/kernelbase/main.c
@@ -17,7 +17,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
@@ -19,7 +19,11 @@
#include "windows.h"
#include "appmodel.h"
+#include "shlwapi.h"
+#include "strsafe.h"
@@ -86,7 +86,7 @@ index 6673f9b63e0..00dacfe28c1 100644
WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
@@ -38,3 +42,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
@@ -57,3 +61,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
FIXME("(%p, %p) stub!\n", unk1, unk2);
return FALSE;
}
@@ -246,10 +246,10 @@ index 00000000000..c848640a030
+ test_PathCchCombineEx();
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index 982a087d531..15f42c4ff3c 100644
index 025fe774552..8192e03536a 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -559,6 +559,7 @@ HEADER_SRCS = \
@@ -564,6 +564,7 @@ HEADER_SRCS = \
oledberr.h \
oledlg.h \
patchapi.h \
@@ -290,5 +290,5 @@ index 00000000000..8831c5238d2
+
+HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);
--
2.13.1
2.14.1