ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Use C locale in VARIANT_BstrFromReal. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50672
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 22a1485c08)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Jacek Caban 2021-02-16 19:03:37 +01:00 committed by Michael Stefaniuc
parent 1f09409052
commit 3591388c75
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/oleaut32/vartype.c
View File

@ -29,6 +29,8 @@
#include "variant.h"
#include "resource.h"
#include "locale.h"
WINE_DEFAULT_DEBUG_CHANNEL(variant);
extern HMODULE hProxyDll DECLSPEC_HIDDEN;
@ -6501,12 +6503,15 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl
static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags,
BSTR* pbstrOut, LPCWSTR lpszFormat)
{
_locale_t locale;
WCHAR buff[256];
if (!pbstrOut)
return E_INVALIDARG;
swprintf( buff, ARRAY_SIZE(buff), lpszFormat, dblIn );
if (!(locale = _create_locale(LC_ALL, "C"))) return E_OUTOFMEMORY;
_swprintf_l(buff, ARRAY_SIZE(buff), lpszFormat, locale, dblIn);
_free_locale(locale);
/* Negative zeroes are disallowed (some applications depend on this).
If buff starts with a minus, and then nothing follows but zeroes

11
include/msvcrt/corecrt_wstdio.h
View File

@ -181,6 +181,17 @@ static inline int WINAPIV swprintf_s(wchar_t *buffer, size_t size, const wchar_t
return ret;
}
static inline int WINAPIV _swprintf_l(wchar_t *buffer, size_t size, const wchar_t* format, _locale_t locale, ...)
{
int ret;
__ms_va_list args;
__ms_va_start(args, locale);
ret = __stdio_common_vswprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args);
__ms_va_end(args);
return ret;
}
static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args)
{
int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR,