From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 23 Nov 2019 17:21:33 +0000 (+0100)
Subject: [STI] Sync with Wine Staging 4.18. CORE-16441
X-Git-Tag: 0.4.14-RC~1051
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=66b46b04f41e45f57728e1632ccb64fde9ea62a3

[STI] Sync with Wine Staging 4.18. CORE-16441
---

diff --git a/dll/win32/sti/sti.c b/dll/win32/sti/sti.c
index 41c94f57538..19feadcfeea 100644
--- a/dll/win32/sti/sti.c
+++ b/dll/win32/sti/sti.c
@@ -18,6 +18,9 @@
  */
 
 #include <stdarg.h>
+#ifdef __REACTOS__
+#include <wchar.h>
+#endif
 
 #define COBJMACROS
 
@@ -29,7 +32,6 @@
 #include "sti.h"
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(sti);
 
@@ -149,11 +151,11 @@ static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface,
     ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, registeredAppsLaunchPath, &registeredAppsKey);
     if (ret == ERROR_SUCCESS)
     {
-        WCHAR *value = HeapAlloc(GetProcessHeap(), 0,
-            (lstrlenW(pwszCommandLine) + 1 + lstrlenW(commandLineSuffix) + 1) * sizeof(WCHAR));
+        size_t len = lstrlenW(pwszCommandLine) + 1 + lstrlenW(commandLineSuffix) + 1;
+        WCHAR *value = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
         if (value)
         {
-            sprintfW(value, format, pwszCommandLine, commandLineSuffix);
+            swprintf(value, format, pwszCommandLine, commandLineSuffix);
             ret = RegSetValueExW(registeredAppsKey, pwszAppName, 0,
                 REG_SZ, (BYTE*)value, (lstrlenW(value)+1)*sizeof(WCHAR));
             if (ret != ERROR_SUCCESS)
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index af91d5cc817..623e539443d 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -181,7 +181,7 @@ dll/win32/snmpapi             # Synced to WineStaging-4.18
 dll/win32/softpub             # Synced to WineStaging-2.9
 dll/win32/stdole2.tlb         # Synced to WineStaging-3.3
 dll/win32/stdole32.tlb        # Synced to WineStaging-3.3
-dll/win32/sti                 # Synced to WineStaging-3.3
+dll/win32/sti                 # Synced to WineStaging-4.18
 dll/win32/sxs                 # Synced to WineStaging-4.0
 dll/win32/t2embed             # Synced to WineStaging-4.0
 dll/win32/tapi32              # Synced to WineStaging-3.3