November 2015 - Wine-commits

Alexandre Julliard : winegcc: Force stack alignment on all x86 platforms.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: bf73faefc7eb67a4940d3b9179568942e48b47c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf73faefc7eb67a4940d3b917… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 22:52:41 2015 +0900 winegcc: Force stack alignment on all x86 platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ad139f5..ee5ac6b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -548,47 +548,34 @@ static void compile(struct options* opts, const char* lang) if (gcc_defs) { - int fastcall_done = 0; - if (opts->target_cpu == CPU_x86_64) + switch (opts->target_cpu) { + case CPU_x86_64: strarray_add(comp_args, "-D__stdcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_stdcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_cdecl=__attribute__((ms_abi))"); strarray_add(comp_args, "-D__fastcall=__attribute__((ms_abi))"); strarray_add(comp_args, "-D_fastcall=__attribute__((ms_abi))"); - fastcall_done = 1; - } - else if (opts->target_platform == PLATFORM_APPLE) - { - /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ + break; + case CPU_x86: strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))"); strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))"); - } - else if (opts->target_cpu == CPU_ARM || opts->target_cpu == CPU_ARM64) - { + strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); + strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + break; + case CPU_ARM: + case CPU_ARM64: + case CPU_POWERPC: strarray_add(comp_args, "-D__stdcall="); strarray_add(comp_args, "-D__cdecl="); strarray_add(comp_args, "-D_stdcall="); strarray_add(comp_args, "-D_cdecl="); strarray_add(comp_args, "-D__fastcall="); strarray_add(comp_args, "-D_fastcall="); - fastcall_done = 1; - } - else - { - strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__))"); - strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__))"); - strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__))"); - strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__))"); - } - - if (!fastcall_done) - { - strarray_add(comp_args, "-D__fastcall=__attribute__((__fastcall__))"); - strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); + break; } strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))");

1 0

Alexandre Julliard : winegcc: Disable setting image base address on Android.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 097006b1466854fbd80af8d85a729d85ec52b163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097006b1466854fbd80af8d85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 23:30:10 2015 +0900 winegcc: Disable setting image base address on Android. The Android linker doesn't handle this correctly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/utils.h | 7 ++++++- tools/winegcc/winegcc.c | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index 789b4ea..536fb2d 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -42,7 +42,12 @@ enum target_cpu enum target_platform { - PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SOLARIS, PLATFORM_WINDOWS, PLATFORM_CYGWIN + PLATFORM_UNSPECIFIED, + PLATFORM_APPLE, + PLATFORM_ANDROID, + PLATFORM_SOLARIS, + PLATFORM_WINDOWS, + PLATFORM_CYGWIN }; void error(const char* s, ...) DECLSPEC_NORETURN; diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ee5ac6b..c07243b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -171,6 +171,7 @@ static const struct { { "macos", PLATFORM_APPLE }, { "darwin", PLATFORM_APPLE }, + { "android", PLATFORM_ANDROID }, { "solaris", PLATFORM_SOLARIS }, { "cygwin", PLATFORM_CYGWIN }, { "mingw32", PLATFORM_WINDOWS }, @@ -229,6 +230,8 @@ static const enum target_cpu build_cpu = CPU_ARM64; #ifdef __APPLE__ static enum target_platform build_platform = PLATFORM_APPLE; +#elif defined(__ANDROID__) +static enum target_platform build_platform = PLATFORM_ANDROID; #elif defined(__sun) static enum target_platform build_platform = PLATFORM_SOLARIS; #elif defined(__CYGWIN__) @@ -384,6 +387,7 @@ static const strarray* get_lddllflags( const struct options *opts, const strarra } break; + case PLATFORM_ANDROID: case PLATFORM_SOLARIS: case PLATFORM_UNSPECIFIED: strarray_add( flags, "-shared" ); @@ -1121,6 +1125,9 @@ static void build(struct options* opts) strarray_add(tmp_files, mapfile); } break; + case PLATFORM_ANDROID: + /* not supported on Android */ + break; default: if (opts->image_base) {

1 0

Sebastian Lackner : ntdll/tests: Print the correct status code in ok() messages.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: b1c8e0591cacf2b09184b629b2d666720fce818e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c8e0591cacf2b09184b629b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Nov 13 22:03:34 2015 +0100 ntdll/tests: Print the correct status code in ok() messages. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 6 +++--- dlls/ntdll/tests/reg.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 83fdd53..21b2e6c 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -288,7 +288,7 @@ static void test_query_process(void) /* test ReturnLength */ ReturnLength = 0; status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength); - ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH got %08x\n", status); ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */, "Expected a ReturnLength to show the needed length\n"); @@ -1050,7 +1050,7 @@ static void test_query_process_debug_port(int argc, char **argv) status = pNtQueryInformationProcess(NULL, ProcessDebugPort, &debug_port, sizeof(debug_port), NULL); - ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugPort, &debug_port, sizeof(debug_port) - 1, NULL); @@ -1302,7 +1302,7 @@ static void test_query_process_debug_flags(int argc, char **argv) status = pNtQueryInformationProcess(NULL, ProcessDebugFlags, &debug_flags, sizeof(debug_flags), NULL); - ok(status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected STATUS_ACCESS_VIOLATION, got %#x.\n", status); + ok(status == STATUS_INVALID_HANDLE || broken(status == STATUS_INVALID_INFO_CLASS) /* NT4 */, "Expected STATUS_INVALID_HANDLE, got %#x.\n", status); status = pNtQueryInformationProcess(GetCurrentProcess(), ProcessDebugFlags, &debug_flags, sizeof(debug_flags) - 1, NULL); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 96f190b..0e00f99 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -639,7 +639,7 @@ static void test_NtQueryValueKey(void) ok(status == STATUS_SUCCESS, "NtSetValueKey Failed: 0x%08x\n", status); status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, &pi, sizeof(pi), &len); - ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_BUFFER_TOO_SMALL instead of 0x%08x\n", status); + ok(status == STATUS_SUCCESS, "NtQueryValueKey should have returned STATUS_SUCCESS instead of 0x%08x\n", status); ok(pi.Type == 0xff00ff00, "Type=%x\n", pi.Type); ok(pi.DataLength == 0, "DataLength=%u\n", pi.DataLength); pRtlFreeUnicodeString(&ValName);

1 0

Nikolay Sivov : gdi32/tests: Some empty string tests for GetTextExtentPoint.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: 0e92f07f41c280bb62ef8dc658bd23134536697b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e92f07f41c280bb62ef8dc65… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 14 00:38:39 2015 +0300 gdi32/tests: Some empty string tests for GetTextExtentPoint. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6eefc3b..53945da 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1410,6 +1410,7 @@ static void test_GetCharABCWidths(void) static void test_text_extents(void) { static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; + static const WCHAR emptyW[] = {0}; LPINT extents; INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; @@ -1428,9 +1429,20 @@ static void test_text_extents(void) hdc = GetDC(0); hfont = SelectObject(hdc, hfont); GetTextMetricsA(hdc, &tm); - GetTextExtentPointA(hdc, "o", 1, &sz); + ret = GetTextExtentPointA(hdc, "o", 1, &sz); + ok(ret, "got %d\n", ret); ok(sz.cy == tm.tmHeight, "cy %d tmHeight %d\n", sz.cy, tm.tmHeight); + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointA(hdc, "o", 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); + + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointA(hdc, "", 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); + SetLastError(0xdeadbeef); GetTextExtentExPointW(hdc, wt, 1, 1, &fit1, &fit2, &sz1); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -1442,6 +1454,16 @@ static void test_text_extents(void) return; } + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointW(hdc, wt, 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); + + memset(&sz, 0xcc, sizeof(sz)); + ret = GetTextExtentPointW(hdc, emptyW, 0, &sz); + ok(ret, "got %d\n", ret); + ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); + len = lstrlenW(wt); extents = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof extents[0]); extents[0] = 1; /* So that the increasing sequence test will fail

1 0

Piotr Caban : oleaut32: Take lcid into account while parsing input variant in VARIANT_FormatNumber.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: a6259d3182e4bd4441ca64a40c595a4a19740f9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6259d3182e4bd4441ca64a40… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 14 13:17:23 2015 +0100 oleaut32: Take lcid into account while parsing input variant in VARIANT_FormatNumber. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 35 +++++++++++++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 4 ++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 216acc6..b81500c 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -558,6 +558,40 @@ static void test_VarWeekdayName(void) } } +static void test_VarFormatFromTokens(void) +{ + static WCHAR number_fmt[] = {'#','#','#',',','#','#','0','.','0','0',0}; + static const WCHAR number[] = {'6',',','9','0',0}; + static const WCHAR number_us[] = {'6','9','0','.','0','0',0}; + + BYTE buff[256]; + LCID lcid; + VARIANT var; + BSTR bstr; + HRESULT hres; + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(number); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + hres = VarTokenizeFormatString(number_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, number_us), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); + hres = VarTokenizeFormatString(number_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, number_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, number), "incorrectly formatted number: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantClear(&var); +} + START_TEST(varformat) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -567,4 +601,5 @@ START_TEST(varformat) test_VarFormatNumber(); test_VarFormat(); test_VarWeekdayName(); + test_VarFormatFromTokens(); } diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 5d220fa..1f7d7d5 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1212,13 +1212,13 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, else { /* Get a number string from pVarIn, and parse it */ - hRes = VariantChangeTypeEx(&vString, pVarIn, LCID_US, VARIANT_NOUSEROVERRIDE, VT_BSTR); + hRes = VariantChangeTypeEx(&vString, pVarIn, lcid, VARIANT_NOUSEROVERRIDE, VT_BSTR); if (FAILED(hRes)) return hRes; np.cDig = sizeof(rgbDig); np.dwInFlags = NUMPRS_STD; - hRes = VarParseNumFromStr(V_BSTR(&vString), LCID_US, 0, &np, rgbDig); + hRes = VarParseNumFromStr(V_BSTR(&vString), lcid, 0, &np, rgbDig); if (FAILED(hRes)) return hRes;

1 0

Piotr Caban : oleaut32: Take lcid into account while parsing input variant in VARIANT_FormatDate.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: aa71e545afaad7d03b50637424a36cea32911ddc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa71e545afaad7d03b5063742… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 14 13:17:31 2015 +0100 oleaut32: Take lcid into account while parsing input variant in VARIANT_FormatDate. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 25 +++++++++++++++++++++++++ dlls/oleaut32/varformat.c | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index b81500c..9d7400b 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -564,6 +564,10 @@ static void test_VarFormatFromTokens(void) static const WCHAR number[] = {'6',',','9','0',0}; static const WCHAR number_us[] = {'6','9','0','.','0','0',0}; + static WCHAR date_fmt[] = {'d','d','-','m','m',0}; + static const WCHAR date[] = {'1','2','-','1','1',0}; + static const WCHAR date_us[] = {'1','1','-','1','2',0}; + BYTE buff[256]; LCID lcid; VARIANT var; @@ -590,6 +594,27 @@ static void test_VarFormatFromTokens(void) SysFreeString(bstr); VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(date); + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + hres = VarTokenizeFormatString(date_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, date_us), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); + hres = VarTokenizeFormatString(date_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, date_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, date), "incorrectly formatted date: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + VariantClear(&var); } START_TEST(varformat) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 1f7d7d5..25feec1 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1621,7 +1621,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, { USHORT usFlags = dwFlags & VARIANT_CALENDAR_HIJRI ? VAR_CALENDAR_HIJRI : 0; - hRes = VariantChangeTypeEx(&vDate, pVarIn, LCID_US, usFlags, VT_DATE); + hRes = VariantChangeTypeEx(&vDate, pVarIn, lcid, usFlags, VT_DATE); if (FAILED(hRes)) return hRes; dateHeader = (FMT_DATE_HEADER*)(rgbTok + FmtGetPositive(header));

1 0

Piotr Caban : oleaut32: Take lcid into account while parsing input variant in VARIANT_FormatString.
by Alexandre Julliard 16 Nov '15

16 Nov '15

Module: wine Branch: master Commit: f9041da281e9c34202f5a0a8667d4d6cf7adca4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9041da281e9c34202f5a0a86… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Nov 14 13:17:39 2015 +0100 oleaut32: Take lcid into account while parsing input variant in VARIANT_FormatString. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/varformat.c | 23 +++++++++++++++++++++++ dlls/oleaut32/varformat.c | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 9d7400b..9547c89 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -568,6 +568,10 @@ static void test_VarFormatFromTokens(void) static const WCHAR date[] = {'1','2','-','1','1',0}; static const WCHAR date_us[] = {'1','1','-','1','2',0}; + static WCHAR string_fmt[] = {'@',0}; + static const WCHAR string_de[] = {'1',',','5',0}; + static const WCHAR string_us[] = {'1','.','5',0}; + BYTE buff[256]; LCID lcid; VARIANT var; @@ -615,6 +619,25 @@ static void test_VarFormatFromTokens(void) SysFreeString(bstr); VariantClear(&var); + + V_VT(&var) = VT_R4; + V_R4(&var) = 1.5; + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + hres = VarTokenizeFormatString(string_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, string_us), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + lcid = MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT); + hres = VarTokenizeFormatString(string_fmt, buff, sizeof(buff), 1, 1, lcid, NULL); + ok(hres == S_OK, "VarTokenizeFormatString failed: %x\n", hres); + hres = VarFormatFromTokens(&var, string_fmt, buff, 0, &bstr, lcid); + ok(hres == S_OK, "VarFormatFromTokens failed: %x\n", hres); + ok(!strcmpW(bstr, string_de), "incorrectly formatted string: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); } START_TEST(varformat) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 25feec1..a4969c2 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1960,7 +1960,7 @@ static HRESULT VARIANT_FormatString(LPVARIANT pVarIn, LPOLESTR lpszFormat, } else { - hRes = VariantChangeTypeEx(&vStr, pVarIn, LCID_US, VARIANT_NOUSEROVERRIDE, VT_BSTR); + hRes = VariantChangeTypeEx(&vStr, pVarIn, lcid, VARIANT_NOUSEROVERRIDE, VT_BSTR); if (FAILED(hRes)) return hRes;

1 0

Frédéric Delanoy : French translation for release 1.7.55
by Jeremy Newman 13 Nov '15

13 Nov '15

Module: website Branch: master Commit: 4e6230833c9f1be5d39d33fbd598810463be3f15 URL: http://source.winehq.org/git/website.git/?a=commit;h=4e6230833c9f1be5d39d33… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 13 17:38:14 2015 +0100 French translation for release 1.7.55 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2015111301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2015111301.xml b/news/fr/2015111301.xml new file mode 100644 index 0000000..fe18dd0 --- /dev/null +++ b/news/fr/2015111301.xml @@ -0,0 +1,16 @@ +<news> +<date>13 novembre 2015</date> +<title>Sortie de Wine 1.7.55</title> +<body> +La version de développement 1.7.55 de Wine est disponible. +<a href="{$root}/announce/1.7.55">Nouveautés</a> de cette version : +<ul> + <li>Pilote son PulseAudio.</li> + <li>Divers correctifs pour la prise en charge de Microsoft Office 2013.</li> + <li>Poursuite de l'implémentation de la DLL Web Services.</li> + <li>Correctifs supplémentaires pour la dernière version du moteur d'exécution C.</li> + <li>Améliorations dans la génération des Makefile.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.55.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Julian Rüger : German translation for release 1.7.55
by Jeremy Newman 13 Nov '15

13 Nov '15

Module: website Branch: master Commit: 59f4c22fe9a7044d78d00e6ef4bb9a186c29a698 URL: http://source.winehq.org/git/website.git/?a=commit;h=59f4c22fe9a7044d78d00e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Nov 13 19:59:14 2015 +0100 German translation for release 1.7.55 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015111301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015111301.xml b/news/de/2015111301.xml new file mode 100644 index 0000000..f8b2dc9 --- /dev/null +++ b/news/de/2015111301.xml @@ -0,0 +1,17 @@ +<news> +<date>13. November 2015</date> +<title>Wine 1.7.55 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.55 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.55">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Pulseaudio-Treiber.</li> + <li>Diverse Korrekturen zur Unterstützung von Microsoft Office 2013.</li> + <li>Noch weitere Implementierung der Webservices-DLL.</li> + <li>Weitere Korrekturen an der neuesten Version der C-Laufzeit.</li> + <li>Verbesserungen an der Generierung von Makefiles.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.7/wine-1.7.55.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.55
by Alexandre Julliard 13 Nov '15

13 Nov '15

Module: website Branch: master Commit: 240f92bcffdfcf7af7d96997e4edd00cfa24f83b URL: http://source.winehq.org/git/website.git/?a=commit;h=240f92bcffdfcf7af7d969… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 13 23:34:57 2015 +0900 Wine release 1.7.55 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015111301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2015111301.xml b/news/en/2015111301.xml new file mode 100644 index 0000000..324f02a --- /dev/null +++ b/news/en/2015111301.xml @@ -0,0 +1,17 @@ +<news> +<date>November 13, 2015</date> +<title>Wine 1.7.55 Released</title> +<body> + The Wine development release 1.7.55 is now available. + <a href="{$root}/announce/1.7.55">What's new</a> in this release: +<ul> + <li>Pulse audio driver.</li> + <li>Various fixes for Microsoft Office 2013 support.</li> + <li>Some more implementation of the Web Services DLL.</li> + <li>More fixes for the latest C runtime version.</li> + <li>Improvements to the Makefile generation.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.7/wine-1.7.55.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0