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 981dec4986e7ac1982049dbede1ca2aa72f5e70c.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-10-27 19:40:52 +02:00
parent e3089157b4
commit a8a83ab795
11 changed files with 90 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 02f531e6fb014016869e1d7ba191b77551c349e7 Mon Sep 17 00:00:00 2001
From 76daaa88f6a1ec55668fdb5a1abcc4ac31149976 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,11 +19,11 @@ Subject: kernelbase: Add semi-stub for PathCchCombineEx.
create mode 100644 include/pathcch.h
diff --git a/configure.ac b/configure.ac
index 44c7eed86f8..5c0bf350739 100644
index 04091fc0ec9..4bd6bb35c8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3215,7 +3215,8 @@ WINE_CONFIG_DLL(jsproxy,,[implib])
WINE_CONFIG_TEST(dlls/jsproxy/tests)
@@ -3235,7 +3235,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
WINE_CONFIG_DLL(kerberos)
WINE_CONFIG_DLL(kernel32,,[clean,implib])
WINE_CONFIG_TEST(dlls/kernel32/tests)
-WINE_CONFIG_DLL(kernelbase)
@@ -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 85b23237bbc..1ec67e37b0b 100644
index 395b65839b8..f1745e00c89 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1037,7 +1037,7 @@
@@ -71,7 +71,7 @@ index 85b23237bbc..1ec67e37b0b 100644
# @ stub PathCchIsRoot
# @ stub PathCchRemoveBackslash
diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
index ff1b2f67623..02d538e76b0 100644
index b0a34786e2e..0410f38a122 100644
--- a/dlls/kernelbase/main.c
+++ b/dlls/kernelbase/main.c
@@ -19,7 +19,11 @@
@@ -86,7 +86,7 @@ index ff1b2f67623..02d538e76b0 100644
WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
@@ -57,3 +61,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
@@ -83,3 +87,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
FIXME("(%p, %p) stub!\n", unk1, unk2);
return FALSE;
}
@@ -290,5 +290,5 @@ index 00000000000..8831c5238d2
+
+HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);
--
2.14.1
2.14.2