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

This commit is contained in:
Amine Khaldi 2019-11-23 18:21:33 +01:00
parent 21c2e3982d
commit 66b46b04f4
2 changed files with 7 additions and 5 deletions

View file

@ -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)

View file

@ -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