February 2015 - Wine-commits

Nikolay Sivov : dwrite: Implement GetCaretMetrics().
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 8f9bca910362460716ceecccf6eaa1637135417a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9bca910362460716ceecccf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 3 13:27:24 2015 +0300 dwrite: Implement GetCaretMetrics(). --- dlls/dwrite/dwrite_private.h | 5 +- dlls/dwrite/font.c | 46 ++++++------------ dlls/dwrite/opentype.c | 31 ++++++++++-- dlls/dwrite/tests/font.c | 113 ++++++++++++++++++++++++++++++++++++------- 4 files changed, 139 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f9bca910362460716cee…

1 0

Ken Thomases : opengl32: Fix get_current_context_type() to not shift the type bits down.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 4a6743e91353ffa8cfdf5183c6518bd95327a835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6743e91353ffa8cfdf5183c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 2 15:51:42 2015 -0600 opengl32: Fix get_current_context_type() to not shift the type bits down. The result is compared directly with handle type values like HANDLE_CONTEXT whose meaningful values are in the high nibble. --- dlls/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index cb91699..6ff54f0 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -165,7 +165,7 @@ static void free_handle_ptr( struct wgl_handle *ptr ) static inline enum wgl_handle_type get_current_context_type(void) { if (!NtCurrentTeb()->glCurrentRC) return HANDLE_CONTEXT; - return (LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK) >> 12; + return LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK; } /***********************************************************************

1 0

Jacek Caban : mshtml: Use our submit implementation for all windows, but only for POST method.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: f0fc2ba27d933c49313e19eabce3ce973597f37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fc2ba27d933c49313e19eab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 2 13:43:49 2015 +0100 mshtml: Use our submit implementation for all windows, but only for POST method. --- dlls/mshtml/binding.h | 3 ++- dlls/mshtml/htmlform.c | 23 ++++++++++++++----- dlls/mshtml/navigate.c | 16 +++++++++++++- dlls/mshtml/nsiface.idl | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/nsio.c | 19 ++++++++++++++-- dlls/mshtml/persist.c | 2 +- 6 files changed, 111 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0fc2ba27d933c49313e1…

1 0

Orion Poplawski : msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default buffer lengthSet MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 8bf17329625320b45d6742feed43771dd3306291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf17329625320b45d6742fee… Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Mon Feb 2 16:14:59 2015 -0700 msvcrt: Bump MSVCRT_MB_LEN_MAX to 5 and use it in MSVCRT__wctomb_l for default buffer lengthSet MB_LEN_MAX to 5 to match MSVCRT_MB_LEN_MAX. --- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/wcs.c | 2 +- include/msvcrt/limits.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 41f31b9..806c4bf 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -47,7 +47,7 @@ #define MSVCRT_I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff) #define MSVCRT_I64_MIN (-MSVCRT_I64_MAX-1) #define MSVCRT_UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff) -#define MSVCRT_MB_LEN_MAX 2 +#define MSVCRT_MB_LEN_MAX 5 #ifdef _WIN64 #define MSVCRT_SIZE_MAX MSVCRT_UI64_MAX #else diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5bc544c..98bc686 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1474,7 +1474,7 @@ int CDECL MSVCRT__wctomb_l(char *dst, MSVCRT_wchar_t ch, MSVCRT__locale_t locale { int len; - MSVCRT__wctomb_s_l(&len, dst, dst ? 6 : 0, ch, locale); + MSVCRT__wctomb_s_l(&len, dst, dst ? MSVCRT_MB_LEN_MAX : 0, ch, locale); return len; } diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index d0f058b..ece8c68 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -4,7 +4,7 @@ #include <crtdefs.h> #define CHAR_BIT 8 -#define MB_LEN_MAX 2 +#define MB_LEN_MAX 5 #define SCHAR_MIN (-0x80) #define SCHAR_MAX 0x7f

1 0

Sebastian Lackner : dbghelp: Don' t fill KdHelp structure for usermode applications.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: c6fcb427a2485184e209b91b7b95e37fc891ff88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6fcb427a2485184e209b91b7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 15 22:55:49 2014 +0200 dbghelp: Don't fill KdHelp structure for usermode applications. --- dlls/dbghelp/stack.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 3e1ff72..21412f6 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -240,15 +240,6 @@ BOOL WINAPI StackWalk64(DWORD MachineType, HANDLE hProcess, HANDLE hThread, if (!cpu->stack_walk(&csw, frame, ctx)) return FALSE; /* we don't handle KdHelp */ - frame->KdHelp.Thread = 0xC000FADE; - frame->KdHelp.ThCallbackStack = 0x10; - frame->KdHelp.ThCallbackBStore = 0; - frame->KdHelp.NextCallback = 0; - frame->KdHelp.FramePointer = 0; - frame->KdHelp.KiCallUserMode = 0xD000DAFE; - frame->KdHelp.KeUserCallbackDispatcher = 0xE000F000; - frame->KdHelp.SystemRangeStart = 0xC0000000; - frame->KdHelp.Reserved[0] /* KiUserExceptionDispatcher */ = 0xE0005000; return TRUE; }

1 0

Sebastian Lackner : slc/tests: Add tests for SLGetWindowsInformationDWORD.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 15e609ba5b5f1d4d02c9c5a90374df45644ef227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15e609ba5b5f1d4d02c9c5a90… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 22 07:26:37 2014 +0100 slc/tests: Add tests for SLGetWindowsInformationDWORD. --- configure | 1 + configure.ac | 1 + dlls/slc/tests/Makefile.in | 5 +++ dlls/slc/tests/slc.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ include/slerror.h | 1 + 5 files changed, 88 insertions(+) diff --git a/configure b/configure index 0431209..ae5e327 100755 --- a/configure +++ b/configure @@ -17530,6 +17530,7 @@ wine_fn_config_dll shlwapi enable_shlwapi implib,po wine_fn_config_test dlls/shlwapi/tests shlwapi_test wine_fn_config_dll slbcsp enable_slbcsp wine_fn_config_dll slc enable_slc implib +wine_fn_config_test dlls/slc/tests slc_test wine_fn_config_dll snmpapi enable_snmpapi implib wine_fn_config_test dlls/snmpapi/tests snmpapi_test wine_fn_config_dll softpub enable_softpub diff --git a/configure.ac b/configure.ac index a931730..e8c2ae3 100644 --- a/configure.ac +++ b/configure.ac @@ -3244,6 +3244,7 @@ WINE_CONFIG_DLL(shlwapi,,[implib,po]) WINE_CONFIG_TEST(dlls/shlwapi/tests) WINE_CONFIG_DLL(slbcsp) WINE_CONFIG_DLL(slc,,[implib]) +WINE_CONFIG_TEST(dlls/slc/tests) WINE_CONFIG_DLL(snmpapi,,[implib]) WINE_CONFIG_TEST(dlls/snmpapi/tests) WINE_CONFIG_DLL(softpub) diff --git a/dlls/slc/tests/Makefile.in b/dlls/slc/tests/Makefile.in new file mode 100644 index 0000000..51b648c --- /dev/null +++ b/dlls/slc/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = slc.dll +IMPORTS = slc + +C_SRCS = \ + slc.c diff --git a/dlls/slc/tests/slc.c b/dlls/slc/tests/slc.c new file mode 100644 index 0000000..723cd4c --- /dev/null +++ b/dlls/slc/tests/slc.c @@ -0,0 +1,80 @@ +/* + * Copyright 2014 Sebastian Lackner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" + +#include "slpublic.h" +#include "slerror.h" + +#include <wine/test.h> + +static void test_SLGetWindowsInformationDWORD(void) +{ + static const WCHAR NonexistentLicenseValueW[] = {'N','o','n','e','x','i','s','t','e','n','t','-', + 'L','i','c','e','n','s','e','-','V','a','l','u','e',0}; + static const WCHAR KernelMUILanguageAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', + 'L','a','n','g','u','a','g','e','-','A','l','l','o','w','e','d',0}; + static const WCHAR KernelMUINumberAllowedW[] = {'K','e','r','n','e','l','-','M','U','I','-', + 'N','u','m','b','e','r','-','A','l','l','o','w','e','d',0}; + static const WCHAR emptyW[] = {0}; + DWORD value; + HRESULT res; + + res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, NULL); + todo_wine + ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); + + res = SLGetWindowsInformationDWORD(NULL, &value); + todo_wine + ok(res == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", res); + + value = 0xdeadbeef; + res = SLGetWindowsInformationDWORD(NonexistentLicenseValueW, &value); + todo_wine + ok(res == SL_E_VALUE_NOT_FOUND, "expected SL_E_VALUE_NOT_FOUND, got %08x\n", res); + ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); + + value = 0xdeadbeef; + res = SLGetWindowsInformationDWORD(emptyW, &value); + ok(res == SL_E_RIGHT_NOT_GRANTED || broken(res == 0xd000000d) /* Win 8 */, + "expected SL_E_RIGHT_NOT_GRANTED, got %08x\n", res); + ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); + + value = 0xdeadbeef; + res = SLGetWindowsInformationDWORD(KernelMUILanguageAllowedW, &value); + todo_wine + ok(res == SL_E_DATATYPE_MISMATCHED, "expected SL_E_DATATYPE_MISMATCHED, got %08x\n", res); + ok(value == 0xdeadbeef, "expected value = 0xdeadbeef, got %u\n", value); + + value = 0xdeadbeef; + res = SLGetWindowsInformationDWORD(KernelMUINumberAllowedW, &value); + todo_wine + ok(res == S_OK, "expected S_OK, got %u\n", res); + todo_wine + ok(value != 0xdeadbeef, "expected value != 0xdeadbeef\n"); +} + + +START_TEST(slc) +{ + test_SLGetWindowsInformationDWORD(); +} diff --git a/include/slerror.h b/include/slerror.h index 9c800f6..8b45d99 100644 --- a/include/slerror.h +++ b/include/slerror.h @@ -19,6 +19,7 @@ #ifndef __WINE_SLERROR_H #define __WINE_SLERROR_H +#define SL_E_VALUE_NOT_FOUND 0xC004F012 #define SL_E_RIGHT_NOT_GRANTED 0xC004F013 #define SL_E_DATATYPE_MISMATCHED 0xC004F01E

1 0

Ken Thomases : winemac: Prevent interpolation of the window surface image when it' s blitted to the actual window.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 530a039dac488bbd57a8c2833c0e5a781e79f920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=530a039dac488bbd57a8c2833… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 2 23:11:37 2015 -0600 winemac: Prevent interpolation of the window surface image when it's blitted to the actual window. On high-resolution Retina displays, the OS X window backing store has twice the pixels as Wine's window backing store. So, our images get scaled up. Core Graphics had been interpolating/smoothing the image, which resulted in fuzziness. This tells it not to do that. I had assumed this wouldn't be necessary since we pass FALSE for the shouldInterpolate parameter of CGImageCreate() when we create the images. Apparently, that's not sufficient. --- dlls/winemac.drv/cocoa_window.m | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 57ae2b8..4688687 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -265,6 +265,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; CGContextSetBlendMode(context, kCGBlendModeCopy); + CGContextSetInterpolationQuality(context, kCGInterpolationNone); for (i = 0; i < count; i++) {

1 0

Mark Harmstone : dsound: Fix 3D positioning bug with head-relative buffers.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 1c73ce1ee78e417e55550d05e4fd0fad8d3099f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c73ce1ee78e417e55550d05e… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Feb 2 23:55:39 2015 +0000 dsound: Fix 3D positioning bug with head-relative buffers. --- dlls/dsound/sound3d.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index f720478..c53783e 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -181,13 +181,14 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) case DS3DMODE_NORMAL: TRACE("Normal 3D processing mode\n"); /* we need to calculate distance between buffer and listener*/ - vDistance = VectorBetweenTwoPoints(&dsb->ds3db_ds3db.vPosition, &dsb->device->ds3dl.vPosition); + vDistance = VectorBetweenTwoPoints(&dsb->device->ds3dl.vPosition, &dsb->ds3db_ds3db.vPosition); flDistance = VectorMagnitude (&vDistance); break; case DS3DMODE_HEADRELATIVE: TRACE("Head-relative 3D processing mode\n"); /* distance between buffer and listener is same as buffer's position */ - flDistance = VectorMagnitude (&dsb->ds3db_ds3db.vPosition); + vDistance = dsb->ds3db_ds3db.vPosition; + flDistance = VectorMagnitude (&vDistance); break; } @@ -220,8 +221,14 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) } else { + D3DVECTOR vDistanceInv; + + vDistanceInv.x = -vDistance.x; + vDistanceInv.y = -vDistance.y; + vDistanceInv.z = -vDistance.z; + /* calculate angle */ - flAngle = AngleBetweenVectorsDeg(&dsb->ds3db_ds3db.vConeOrientation, &vDistance); + flAngle = AngleBetweenVectorsDeg(&dsb->ds3db_ds3db.vConeOrientation, &vDistanceInv); /* if by any chance it happens that OutsideConeAngle = InsideConeAngle (that means that conning has no effect) */ if (dsb->ds3db_ds3db.dwInsideConeAngle != dsb->ds3db_ds3db.dwOutsideConeAngle) { @@ -254,14 +261,10 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) } /* panning */ - if (dsb->device->ds3dl.vPosition.x == dsb->ds3db_ds3db.vPosition.x && - dsb->device->ds3dl.vPosition.y == dsb->ds3db_ds3db.vPosition.y && - dsb->device->ds3dl.vPosition.z == dsb->ds3db_ds3db.vPosition.z) { + if (vDistance.x == 0.0f && vDistance.y == 0.0f && vDistance.z == 0.0f) flAngle = 0.0; - } else { - vDistance = VectorBetweenTwoPoints(&dsb->device->ds3dl.vPosition, &dsb->ds3db_ds3db.vPosition); vLeft = VectorProduct(&dsb->device->ds3dl.vOrientFront, &dsb->device->ds3dl.vOrientTop); flAngle = AngleBetweenVectorsRad(&dsb->device->ds3dl.vOrientFront, &vDistance); flAngle2 = AngleBetweenVectorsRad(&vLeft, &vDistance);

1 0

Austin English : prntvpt: Add a stub for PTQuerySchemaVersionSupport.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 64ec12df8efac0334f5ac5f48cc49cc72f95e656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ec12df8efac0334f5ac5f48… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 28 20:07:57 2015 -0600 prntvpt: Add a stub for PTQuerySchemaVersionSupport. --- dlls/prntvpt/main.c | 7 +++++++ dlls/prntvpt/prntvpt.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index f5abde9..aa01252 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -41,3 +41,10 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } return TRUE; } + + +HRESULT WINAPI PTQuerySchemaVersionSupport(PCWSTR printer, DWORD *version) +{ + FIXME("stub:%s %p\n", debugstr_w(printer), version); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index 3f5e329..2f20d3c 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,4 +1,4 @@ -1 stub PTQuerySchemaVersionSupport +1 stdcall PTQuerySchemaVersionSupport(wstr ptr) 2 stub PTOpenProvider 3 stub PTOpenProviderEx 4 stub PTCloseProvider

1 0

YongHao Hu : msvcp90/tests: Add more tests to ostream_print_complex_float.
by Alexandre Julliard 03 Feb '15

03 Feb '15

Module: wine Branch: master Commit: 0d3e7397100df16457530141bfe07cdf8a29da64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d3e7397100df16457530141b… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Wed Jan 28 23:13:45 2015 +0800 msvcp90/tests: Add more tests to ostream_print_complex_float. --- dlls/msvcp90/tests/ios.c | 81 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 71 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index ab6c3ab..91833f4 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -2122,22 +2122,83 @@ static void test_istream_read_double(void) static void test_ostream_print_complex_float(void) { - static const char complex_float_str[] = "(3.14,1.57)"; - basic_stringstream_char ss; basic_string_char pstr; const char *str; - complex_float val = {3.14, 1.57}; + locale lcl, retlcl; + int i; + struct _test_print_complex_float { + complex_float val; + const char *lcl; + streamsize prec; /* set to -1 for default */ + IOSB_fmtflags fmtfl; /* FMTFLAG_scientific, FMTFLAG_fixed */ + const char *str; + } tests[] = { + /* simple cases */ + { {0.123,-4.5}, NULL, -1, 0, "(0.123,-4.5)" }, + { {0.123,-4.5}, NULL, 6, 0, "(0.123,-4.5)" }, + { {0.123,-4.5}, NULL, 0, 0, "(0.123,-4.5)" }, + + /*{ fixed format */ + { {0.123,-4.6}, NULL, 0, FMTFLAG_fixed, "(0,-5)" }, + { {0.123,-4.6}, NULL, -1, FMTFLAG_fixed, "(0.123000,-4.600000)" }, + { {0.123,-4.6}, NULL, 6, FMTFLAG_fixed, "(0.123000,-4.600000)" }, + + /*{ scientific format */ + { {123456.789,-4.5678}, NULL, -1, FMTFLAG_scientific, "(1.234568e+005,-4.567800e+000)" }, + { {123456.789,-4.5678}, NULL, 0, FMTFLAG_scientific, "(1.234568e+005,-4.567800e+000)" }, + { {123456.789,-4.5678}, NULL, 9, FMTFLAG_scientific, "(1.234567891e+005,-4.567800045e+000)" }, + { {123456.789,-4.5678}, "German", 9, FMTFLAG_scientific, "(1,234567891e+005,-4,567800045e+000)" }, + + /*{ different locales */ + { {0.123,-4.5}, "C", -1, 0, "(0.123,-4.5)" }, + { {0.123,-4.5}, "English", -1, 0, "(0.123,-4.5)" }, + { {0.123,-4.5}, "German", -1, 0, "(0,123,-4,5)" }, + + { {123456.789,-4.5678}, "C", -1, 0, "(123457,-4.5678)" }, + { {123456.789,-4.5678}, "English", -1, 0, "(123,457,-4.5678)" }, + { {123456.789,-4.5678}, "German", -1, 0, "(123.457,-4,5678)" }, + + /*{ signs and exponents */ + { { 1.0e-9,-4.1e-3}, NULL, -1, 0, "(1e-009,-0.0041)" }, + { { 1.0e-9,-4.1e-3}, NULL, 9, 0, "(9.99999972e-010,-0.00410000002)" }, + { {-1.0e9,-4.1e-3}, NULL, -1, 0, "(-1e+009,-0.0041)" }, + { {-1.0e9,-4.1e-3}, NULL, 9, 0, "(-1e+009,-0.00410000002)" }, + + { { 1.0e-9,0}, NULL, 0, FMTFLAG_fixed, "(0,0)" }, + { { 1.0e-9,0}, NULL, 6, FMTFLAG_fixed, "(0.000000,0.000000)" }, + { { 1.0e-9,0}, NULL, 9, FMTFLAG_fixed, "(0.000000001,0.000000000)" }, + { {-1.0e9, 0}, NULL, 0, FMTFLAG_fixed, "(-1000000000,0)" }, + { {-1.0e9, 0}, NULL, 6, FMTFLAG_fixed, "(-1000000000.000000,0.000000)" }, + + { {-1.23456789e9,2.3456789e9}, NULL, 0, 0, "(-1.23457e+009,2.34568e+009)" }, + { {-1.23456789e9,2.3456789e9}, NULL, 0, FMTFLAG_fixed, "(-1234567936,2345678848)" }, + { {-1.23456789e9,2.3456789e9}, NULL, 6, FMTFLAG_fixed, "(-1234567936.000000,2345678848.000000)" }, + { {-1.23456789e-9,2.3456789e9}, NULL, 6, FMTFLAG_fixed, "(-0.000000,2345678848.000000)" }, + { {-1.23456789e-9,2.3456789e9}, NULL, 9, FMTFLAG_fixed, "(-0.000000001,2345678848.000000000)" } + }; - call_func1(p_basic_stringstream_char_ctor, &ss); - p_basic_ostream_char_print_complex_float(&ss.base.base2, &val); + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + call_func1(p_basic_stringstream_char_ctor, &ss); - call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); - str = call_func1(p_basic_string_char_cstr, &pstr); - ok(!strcmp(complex_float_str, str), "str = %s\n", str); + if(tests[i].lcl) { + call_func3(p_locale_ctor_cstr, &lcl, tests[i].lcl, 0x3f /* FIXME: support categories */); + call_func3(p_basic_ios_char_imbue, &ss.basic_ios, &retlcl, &lcl); + } - call_func1(p_basic_string_char_dtor, &pstr); - call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + /* set format and precision only if specified, so we can try defaults */ + if(tests[i].fmtfl) + call_func3(p_ios_base_setf_mask, &ss.basic_ios.base, tests[i].fmtfl, FMTFLAG_floatfield); + if(tests[i].prec != -1) + call_func2(p_ios_base_precision_set, &ss.basic_ios.base, tests[i].prec); + p_basic_ostream_char_print_complex_float(&ss.base.base2, &tests[i].val); + + call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); + str = call_func1(p_basic_string_char_cstr, &pstr); + ok(!strcmp(str, tests[i].str), "test %d fail, str = %s\n", i+1, str); + call_func1(p_basic_string_char_dtor, &pstr); + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + } } static void test_ostream_print_complex_double(void)

1 0