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

Rebased against c3beca6c8fc8c07ecd992e64f8f8d0dda3a10ac8

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-21 11:20:15 +11:00
parent 8b6ef3476f
commit a14e2990e5
42 changed files with 346 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b8ccfc99a86a2431888e02019fbc42ebaa2f65c2 Mon Sep 17 00:00:00 2001
From 33fb892671a02207304145a987bb02885fb6b6b2 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.
@@ -19,12 +19,12 @@ Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx.
create mode 100644 include/pathcch.h
diff --git a/configure.ac b/configure.ac
index d06476e..a12e04d 100644
index 1b41c90..6621815 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3297,7 +3297,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
@@ -3329,7 +3329,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
WINE_CONFIG_DLL(kerberos)
WINE_CONFIG_DLL(kernel32,,[clean,implib])
WINE_CONFIG_DLL(kernel32,,[implib])
WINE_CONFIG_TEST(dlls/kernel32/tests)
-WINE_CONFIG_DLL(kernelbase)
+WINE_CONFIG_DLL(kernelbase,,[implib])
@@ -58,7 +58,7 @@ index 74df98c..247c6bf 100644
C_SRCS = \
main.c
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index eb6edbe..065af41 100644
index 6c61c51..55737f9 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -1037,7 +1037,7 @@
@@ -71,10 +71,10 @@ index eb6edbe..065af41 100644
# @ stub PathCchIsRoot
# @ stub PathCchRemoveBackslash
diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
index 9c89ff4..7e5ffde 100644
index 920fd12..eadb130 100644
--- a/dlls/kernelbase/main.c
+++ b/dlls/kernelbase/main.c
@@ -19,7 +19,11 @@
@@ -20,7 +20,11 @@
#include "windows.h"
#include "appmodel.h"
@@ -86,7 +86,7 @@ index 9c89ff4..7e5ffde 100644
WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
@@ -87,3 +91,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
@@ -97,3 +101,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
return FALSE;
}
@@ -246,10 +246,10 @@ index 0000000..c848640
+ test_PathCchCombineEx();
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index f1bcba3..72304d6 100644
index 563d10c..ac0ff21 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -494,6 +494,7 @@ SOURCES = \
@@ -495,6 +495,7 @@ SOURCES = \
opnrst.idl \
optary.idl \
patchapi.h \