https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66b46b04f41e45f57728e1632ccb64fde9ea62a3
commit 66b46b04f41e45f57728e1632ccb64fde9ea62a3 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Nov 23 18:21:33 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Nov 30 14:55:34 2019 +0100 [STI] Sync with Wine Staging 4.18. CORE-16441 --- dll/win32/sti/sti.c | 10 ++++++---- media/doc/README.WINE | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) 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, ®isteredAppsKey); 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
