[ros-diffs] [reactos] 01/01: [INSENG] Sync with Wine Staging 4.18. CORE-16441

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf833d29a7a1de84e13ef…

commit bf833d29a7a1de84e13ef395e3f5912ec7f7af75
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Nov 2 18:36:31 2019 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Nov 2 18:36:31 2019 +0100

    [INSENG] Sync with Wine Staging 4.18. CORE-16441
---
 dll/win32/inseng/icif.c           | 2 +-
 dll/win32/inseng/inseng_main.c    | 1 -
 dll/win32/inseng/inseng_private.h | 9 ++++++---
 dll/win32/inseng/precomp.h        | 2 --
 media/doc/README.WINE             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dll/win32/inseng/icif.c b/dll/win32/inseng/icif.c
index f7bf0a07077..6fd35625006 100644
--- a/dll/win32/inseng/icif.c
+++ b/dll/win32/inseng/icif.c
@@ -18,7 +18,7 @@
 
 #define COBJMACROS
 
-#include "config.h"
+
 
 #include <stdarg.h>
 #include <string.h>
diff --git a/dll/win32/inseng/inseng_main.c b/dll/win32/inseng/inseng_main.c
index 8e2c4814931..213b27ee7b8 100644
--- a/dll/win32/inseng/inseng_main.c
+++ b/dll/win32/inseng/inseng_main.c
@@ -21,7 +21,6 @@
 
 #define COBJMACROS
 
-#include "config.h"
 
 #include <stdarg.h>
 
diff --git a/dll/win32/inseng/inseng_private.h b/dll/win32/inseng/inseng_private.h
index 60b6db953cd..ea99c233131 100644
--- a/dll/win32/inseng/inseng_private.h
+++ b/dll/win32/inseng/inseng_private.h
@@ -21,11 +21,14 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
+#ifdef __REACTOS__
+#include "winnls.h"
+#endif
 #include "ole2.h"
 #include "rpcproxy.h"
 #include "inseng.h"
 #include "wine/heap.h"
-#include "wine/unicode.h"
+
 
 static inline char *strdupA(const char *src)
 {
@@ -38,8 +41,8 @@ static inline WCHAR *strdupW(const WCHAR *src)
 {
     WCHAR *dest;
     if (!src) return NULL;
-    dest = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1) * sizeof(WCHAR));
-    if (dest) strcpyW(dest, src);
+    dest = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR));
+    if (dest) lstrcpyW(dest, src);
     return dest;
 }
 
diff --git a/dll/win32/inseng/precomp.h b/dll/win32/inseng/precomp.h
index 18e231259c5..0a8943f27de 100644
--- a/dll/win32/inseng/precomp.h
+++ b/dll/win32/inseng/precomp.h
@@ -2,8 +2,6 @@
 #ifndef _INSENG_PRECOMP_H
 #define _INSENG_PRECOMP_H
 
-#include <wine/config.h>
-
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index cbeb18fd511..f0c31646024 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -82,7 +82,7 @@ dll/win32/imm32               # Synced to WineStaging-4.18
 dll/win32/inetcomm            # Synced to WineStaging-4.18
 dll/win32/inetmib1            # Synced to WineStaging-4.18
 dll/win32/initpki             # Synced to WineStaging-4.18
-dll/win32/inseng              # Synced to WineStaging-3.3
+dll/win32/inseng              # Synced to WineStaging-4.18
 dll/win32/iphlpapi            # Out of sync
 dll/win32/itircl              # Synced to WineStaging-3.3
 dll/win32/itss                # Synced to WineStaging-3.17