Rebase against f9e1dbb83d850a2f7cb17079e02de139e2f8b920

This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions

View File

@@ -1,4 +1,4 @@
From 33fb892671a02207304145a987bb02885fb6b6b2 Mon Sep 17 00:00:00 2001
From 2d1834fcb5993b569fa1fb6edc0c6e782b4cd385 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,18 +19,18 @@ Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx.
create mode 100644 include/pathcch.h
diff --git a/configure.ac b/configure.ac
index 1b41c90..6621815 100644
index 1559d4d..cd79406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3329,7 +3329,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
@@ -3340,7 +3340,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
WINE_CONFIG_DLL(kerberos)
WINE_CONFIG_DLL(kernel32,,[implib])
WINE_CONFIG_DLL(kernel32)
WINE_CONFIG_TEST(dlls/kernel32/tests)
-WINE_CONFIG_DLL(kernelbase)
+WINE_CONFIG_DLL(kernelbase,,[implib])
+WINE_CONFIG_TEST(dlls/kernelbase/tests)
WINE_CONFIG_DLL(keyboard.drv16,enable_win16)
WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel])
WINE_CONFIG_DLL(krnl386.exe16,enable_win16)
WINE_CONFIG_DLL(ksuser)
diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec
index cb10d89..4df147e 100644