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

Fix configure changes

Browse Source
This commit is contained in:
Zebediah Figura
2018-02-23 14:52:23 -06:00
parent e180b2e4dd
commit 7b0a3f25ac
11 changed files with 91 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,10 @@
From 2d1834fcb5993b569fa1fb6edc0c6e782b4cd385 Mon Sep 17 00:00:00 2001
From 800f9e5129a1f5eabe4dbdc971ead453ee93e26e 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: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx.
---
configure.ac | 3 +-
configure.ac | 1 +
.../api-ms-win-core-path-l1-1-0.spec | 2 +-
dlls/kernelbase/Makefile.in | 4 +-
dlls/kernelbase/kernelbase.spec | 2 +-
@@ -13,21 +13,19 @@ Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx.
dlls/kernelbase/tests/path.c | 113 +++++++++++++++++++++
include/Makefile.in | 1 +
include/pathcch.h | 26 +++++
9 files changed, 181 insertions(+), 4 deletions(-)
9 files changed, 180 insertions(+), 3 deletions(-)
create mode 100644 dlls/kernelbase/tests/Makefile.in
create mode 100644 dlls/kernelbase/tests/path.c
create mode 100644 include/pathcch.h
diff --git a/configure.ac b/configure.ac
index 1559d4d..cd79406 100644
index 7b796ef..f9e5e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3340,7 +3340,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
WINE_CONFIG_DLL(kerberos)
@@ -3308,6 +3308,7 @@ WINE_CONFIG_DLL(kerberos)
WINE_CONFIG_DLL(kernel32)
WINE_CONFIG_TEST(dlls/kernel32/tests)
-WINE_CONFIG_DLL(kernelbase)
+WINE_CONFIG_DLL(kernelbase,,[implib])
WINE_CONFIG_DLL(kernelbase)
+WINE_CONFIG_TEST(dlls/kernelbase/tests)
WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
WINE_CONFIG_DLL(krnl386.exe16,enable_win16)
@@ -58,7 +56,7 @@ index 74df98c..247c6bf 100644
C_SRCS = \
main.c
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 6c61c51..55737f9 100644
index eb6edbe..065af41 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1037,7 +1037,7 @@
@@ -71,10 +69,10 @@ index 6c61c51..55737f9 100644
# @ stub PathCchIsRoot
# @ stub PathCchRemoveBackslash
diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
index 920fd12..eadb130 100644
index 9c89ff4..7e5ffde 100644
--- a/dlls/kernelbase/main.c
+++ b/dlls/kernelbase/main.c
@@ -20,7 +20,11 @@
@@ -19,7 +19,11 @@
#include "windows.h"
#include "appmodel.h"
@@ -86,7 +84,7 @@ index 920fd12..eadb130 100644
WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
@@ -97,3 +101,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
@@ -87,3 +91,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
return FALSE;
}
@@ -246,10 +244,10 @@ index 0000000..c848640
+ test_PathCchCombineEx();
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index 563d10c..ac0ff21 100644
index f1bcba3..72304d6 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -495,6 +495,7 @@ SOURCES = \
@@ -494,6 +494,7 @@ SOURCES = \
opnrst.idl \
optary.idl \
patchapi.h \
@@ -290,5 +288,5 @@ index 0000000..8831c52
+
+HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);
--
1.9.1
2.7.4