June 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Fix StretchDIBits return value when destination is clipped.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 1c2f9255f45d8ebea2416329eeeb513befa53c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c2f9255f45d8ebea2416329e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 22 13:37:19 2012 +0200 gdi32: Fix StretchDIBits return value when destination is clipped. --- dlls/gdi32/dib.c | 5 ++- dlls/gdi32/tests/bitmap.c | 63 ++++++++++++++++++++++++++++++-------------- 2 files changed, 46 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 286c404..c35de33 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -544,6 +544,9 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he src.visrect.bottom = height; if (!intersect_rect( &src.visrect, &src.visrect, &rect )) goto done; + if (rop == SRCCOPY) ret = height; + else ret = src_info->bmiHeader.biHeight; + get_bounding_rect( &rect, dst.x, dst.y, dst.width, dst.height ); if (!clip_visrect( dc, &dst.visrect, &rect )) goto done; @@ -584,8 +587,6 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (!err) err = dev->funcs->pPutImage( dev, NULL, dst_info, &src_bits, &src, &dst, rop ); } if (err) ret = 0; - else if (rop == SRCCOPY) ret = height; - else ret = src_info->bmiHeader.biHeight; done: if (src_bits.free) src_bits.free( &src_bits ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index b27b85c..a620361 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -3353,12 +3353,13 @@ static void check_StretchDIBits_pixel(HDC hdcDst, UINT32 *dstBuffer, UINT32 *src dwRop, expected, *dstBuffer, line); } -static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, +static INT check_StretchDIBits_stretch( HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, UINT32 expected[4], int line) { BITMAPINFO bitmapInfo; + INT ret; memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3369,9 +3370,9 @@ static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *s bitmapInfo.bmiHeader.biCompression = BI_RGB; memset(dstBuffer, 0, 16); - StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, - nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, - srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); + ret = StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); ok(memcmp(dstBuffer, expected, 16) == 0, "StretchDIBits expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X } " "stretching { %d, %d, %d, %d } to { %d, %d, %d, %d } from line %d\n", @@ -3379,6 +3380,7 @@ static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *s dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3], nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, line); + return ret; } static void test_StretchDIBits(void) @@ -3390,6 +3392,7 @@ static void test_StretchDIBits(void) HBRUSH hBrush, hOldBrush; BITMAPINFO biDst; UINT32 expected[4]; + INT ret; memset(&biDst, 0, sizeof(BITMAPINFO)); biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -3435,43 +3438,63 @@ static void test_StretchDIBits(void) expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; expected[2] = 0xFEDCBA98, expected[3] = 0x76543210; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0xCAFED00D, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 1, expected, __LINE__); + todo_wine ok( ret == 1, "got ret %d\n", ret ); expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98; expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 1, 1, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0x42441000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0x00000000; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 1, -2, -2, expected, __LINE__); + ok( ret == 0, "got ret %d\n", ret ); expected[0] = 0x00000000, expected[1] = 0x00000000; expected[2] = 0x00000000, expected[3] = 0xCAFED00D; - check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, - 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, 2, 2, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 2, 2, 4, 4, 0, 0, 2, 2, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + ret = check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + -4, -4, 4, 4, 0, 0, 4, 4, expected, __LINE__); + ok( ret == 2, "got ret %d\n", ret ); SelectObject(hdcDst, oldDst); DeleteObject(bmpDst);

1 0

Hans Leidekker : wbemprox: Handle more property types in get_propval.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: a827a51cc0de2bb1ea0cba54d090ae3e7fd61041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a827a51cc0de2bb1ea0cba54d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 22 09:23:20 2012 +0200 wbemprox: Handle more property types in get_propval. --- dlls/wbemprox/query.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7a2b545..181549f 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -653,6 +653,22 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = SysAllocString( (const WCHAR *)val ); break; + case CIM_SINT16: + V_VT( ret ) = VT_I2; + V_I2( ret ) = val; + break; + case CIM_UINT16: + V_VT( ret ) = VT_UI2; + V_UI2( ret ) = val; + break; + case CIM_SINT32: + V_VT( ret ) = VT_I4; + V_I4( ret ) = val; + break; + case CIM_UINT32: + V_VT( ret ) = VT_UI4; + V_UI4( ret ) = val; + break; default: ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED;

1 0

Hans Leidekker : wbemprox: Add a partial Win32_VideoController class implementation.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 47261d63cae77fc87b040dd2802f30377f9633e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47261d63cae77fc87b040dd28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 22 09:23:36 2012 +0200 wbemprox: Add a partial Win32_VideoController class implementation. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 56 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index f973c2f..56e3d8f 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = oleaut32 ole32 advapi32 +IMPORTS = dxgi oleaut32 ole32 advapi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 0c88ad5..af913d4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "wbemcli.h" #include "tlhelp32.h" +#include "initguid.h" +#include "d3d10.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -43,13 +45,19 @@ static const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; +static const WCHAR class_videocontrollerW[] = + {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; +static const WCHAR prop_adapterramW[] = + {'A','d','a','p','t','e','r','R','A','M',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; +static const WCHAR prop_deviceidW[] = + {'D','e','v','i','c','e','I','d',0}; static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_manufacturerW[] = @@ -101,6 +109,11 @@ static const struct column col_processor[] = { { prop_manufacturerW, CIM_STRING } }; +static const struct column col_videocontroller[] = +{ + { prop_adapterramW, CIM_UINT32 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_KEY } +}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; @@ -124,6 +137,8 @@ static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; static const WCHAR processor_manufacturerW[] = {'G','e','n','u','i','n','e','I','n','t','e','l',0}; +static const WCHAR videocontroller_deviceidW[] = + {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; #include "pshpack1.h" struct record_bios @@ -158,6 +173,11 @@ struct record_processor { const WCHAR *manufacturer; }; +struct record_videocontroller +{ + UINT32 adapter_ram; + const WCHAR *device_id; +}; #include "poppack.h" static const struct record_bios data_bios[] = @@ -244,13 +264,47 @@ static void fill_os( struct table *table ) table->num_rows = 1; } +static void fill_videocontroller( struct table *table ) +{ + + struct record_videocontroller *rec; + HRESULT hr; + IDXGIFactory *factory = NULL; + IDXGIAdapter *adapter = NULL; + DXGI_ADAPTER_DESC desc; + UINT vidmem = 512 * 1024 * 1024; + + if (!(table->data = heap_alloc( sizeof(*rec) ))) return; + + hr = CreateDXGIFactory( &IID_IDXGIFactory, (void **)&factory ); + if (FAILED(hr)) goto done; + + hr = IDXGIFactory_EnumAdapters( factory, 0, &adapter ); + if (FAILED(hr)) goto done; + + hr = IDXGIAdapter_GetDesc( adapter, &desc ); + if (SUCCEEDED(hr)) vidmem = desc.DedicatedVideoMemory; + +done: + rec = (struct record_videocontroller *)table->data; + rec->device_id = videocontroller_deviceidW; + rec->adapter_ram = vidmem; + + TRACE("created 1 row\n"); + table->num_rows = 1; + + if (adapter) IDXGIAdapter_Release( adapter ); + if (factory) IDXGIFactory_Release( factory ); +} + static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, { class_compsysW, SIZEOF(col_compsys), col_compsys, SIZEOF(data_compsys), (BYTE *)data_compsys, NULL }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, - { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL } + { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL }, + { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, NULL, fill_videocontroller } }; struct table *get_table( const WCHAR *name )

1 0

Piotr Caban : msvcp90: Fixed fraction digits ignoring in num_get_char__Getffld.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: ca90f4723a03e5812942addf3ec4cd168afa3dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca90f4723a03e5812942addf3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:26:06 2012 +0200 msvcp90: Fixed fraction digits ignoring in num_get_char__Getffld. --- dlls/msvcp90/locale.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 728ce3b..8a2fb93 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4686,8 +4686,6 @@ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_it break; else if(dest<num_end) *dest++ = first->val; - else - exp--; } if(first->strbuf && (first->val=='e' || first->val=='E')) {

1 0

Piotr Caban : msvcp90: Added num_put<char> class stub.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 83ef253b8ddf4fc82dc6880f3dbfd9ab9e566528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ef253b8ddf4fc82dc6880f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:26:32 2012 +0200 msvcp90: Added num_put<char> class stub. --- dlls/msvcp90/locale.c | 311 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 11 ++ dlls/msvcp90/msvcp90.spec | 126 +++++++++--------- 3 files changed, 385 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83ef253b8ddf4fc82dc68…

1 0

Piotr Caban : msvcp90: Added partial num_put<char> implementation.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: a359df5fa286047fc79335c2c6ebdbdaf093511b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a359df5fa286047fc79335c2c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:26:48 2012 +0200 msvcp90: Added partial num_put<char> implementation. --- dlls/msvcp90/locale.c | 137 ++++++++++++++++++++++++++++++++++++----------- dlls/msvcp90/msvcp90.h | 1 + 2 files changed, 106 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a359df5fa286047fc7933…

1 0

Piotr Caban : msvcp90: Added num_put<char>::put(integral number).
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: feccc21044837e6d913f6384c893c1961334f775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feccc21044837e6d913f6384c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:27:02 2012 +0200 msvcp90: Added num_put<char>::put(integral number). --- dlls/msvcp90/locale.c | 120 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 106 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index fc85426..eabdef8 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5477,8 +5477,30 @@ ostreambuf_iterator_char* __cdecl num_put_char__Fput(const num_put *this, ostrea /* ?_Ifmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADPEBDH(a)Z */ char* __cdecl num_put_char__Ifmt(const num_put *this, char *fmt, const char *spec, int fmtfl) { - FIXME("(%p %p %p %d) stub\n", this, fmt, spec, fmtfl); - return NULL; + int base = fmtfl & FMTFLAG_basefield; + char *p = fmt; + + TRACE("(%p %p %p %d)\n", this, fmt, spec, fmtfl); + + *p++ = '%'; + if(fmtfl & FMTFLAG_showpos) + *p++ = '+'; + if(fmtfl & FMTFLAG_showbase) + *p++ = '#'; + + *p++ = *spec++; + if(*spec == 'l') + *p++ = *spec++; + + if(base == FMTFLAG_oct) + *p++ = 'o'; + else if(base == FMTFLAG_hex) + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'X' : 'x'; + else + *p++ = *spec; + + *p++ = '\0'; + return fmt; } /* ?_Iput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPADI(a)Z */ @@ -5486,8 +5508,55 @@ char* __cdecl num_put_char__Ifmt(const num_put *this, char *fmt, const char *spe ostreambuf_iterator_char* __cdecl num_put_char__Iput(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, char *buf, MSVCP_size_t count) { - FIXME("(%p %p %p %d %p %ld) stub\n", this, ret, base, fill, buf, count); - return NULL; + numpunct_char *numpunct = numpunct_char_use_facet(base->loc); + basic_string_char grouping_bstr; + const char *grouping; + char *p, sep; + int cur_group = 0, group_size = 0; + int adjustfield = base->fmtfl & FMTFLAG_adjustfield; + MSVCP_size_t pad; + + TRACE("(%p %p %p %d %s %ld)\n", this, ret, base, fill, buf, count); + + /* Add separators to number */ + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { + group_size++; + if(group_size == grouping[cur_group]) { + group_size = 0; + if(grouping[cur_group+1]) + cur_group++; + + memmove(p+1, p, buf+count-p); + *p = sep; + count++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + + /* Display number with padding */ + if(count >= base->wide) + pad = 0; + else + pad = base->wide-count; + base->wide = 0; + + if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { + num_put_char__Putc(this, &dest, dest, buf, 1); + buf++; + }else if((adjustfield & FMTFLAG_internal) && (buf[1]=='x' || buf[1]=='X')) { + num_put_char__Putc(this, &dest, dest, buf, 2); + buf += 2; + } + if(adjustfield != FMTFLAG_left) { + num_put_char__Rep(this, ret, dest, fill, pad); + pad = 0; + } + num_put_char__Putc(this, &dest, dest, buf, count); + return num_put_char__Rep(this, ret, dest, fill, pad); } /* ?do_put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DJ(a)Z */ @@ -5499,8 +5568,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_long, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_long(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, LONG v) { - FIXME("(%p %p %p %d %d) stub\n", this, ret, base, fill, v); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "ld", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DJ(a)Z */ @@ -5522,8 +5596,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_ulong, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_ulong(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, ULONG v) { - FIXME("(%p %p %p %d %d) stub\n", this, ret, base, fill, v); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "lu", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DK(a)Z */ @@ -5583,8 +5662,11 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_ptr, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_ptr(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, const void *v) { - FIXME("(%p %p %p %d %p) stub\n", this, ret, base, fill, v); - return NULL; + char tmp[17]; /* 8(16^8==2^64)*2(separators beetwen every digit) + 1 */ + + TRACE("(%p %p %p %d %p)\n", this, ret, base, fill, v); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, sprintf(tmp, "%p", v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBX(a)Z */ @@ -5606,8 +5688,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_int64, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_int64(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, __int64 v) { - FIXME("(%p %p %p %d) stub\n", this, ret, base, fill); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d)\n", this, ret, base, fill); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "lld", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@D_J(a)Z */ @@ -5629,8 +5716,13 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_uint64, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_uint64(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, unsigned __int64 v) { - FIXME("(%p %p %p %d) stub\n", this, ret, base, fill); - return NULL; + char tmp[48]; /* 22(8^22>2^64)*2(separators beetwen every digit) + 3(strlen("+0x"))+1 */ + char fmt[7]; /* strlen("%+#lld")+1 */ + + TRACE("(%p %p %p %d)\n", this, ret, base, fill); + + return num_put_char__Iput(this, ret, dest, base, fill, tmp, + sprintf(tmp, num_put_char__Ifmt(this, fmt, "llu", base->fmtfl), v)); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@D_K(a)Z */

1 0

Piotr Caban : msvcp90: Added num_put<char>::put(bool) implementation.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 8003b0ab3da1422ba3367428404eb8b16e52a90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8003b0ab3da1422ba33674284… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:27:16 2012 +0200 msvcp90: Added num_put<char>::put(bool) implementation. --- dlls/msvcp90/locale.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index eabdef8..2e48c79 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5744,8 +5744,32 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_bool, 28) ostreambuf_iterator_char* __thiscall num_put_char_do_put_bool(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, MSVCP_bool v) { - FIXME("(%p %p %p %d %d) stub\n", this, ret, base, fill, v); - return NULL; + TRACE("(%p %p %p %d %d)\n", this, ret, base, fill, v); + + if(base->fmtfl & FMTFLAG_boolalpha) { + numpunct_char *numpunct = numpunct_char_use_facet(base->loc); + basic_string_char str; + MSVCP_size_t pad, len; + + if(v) + numpunct_char_truename(numpunct, &str); + else + numpunct_char_falsename(numpunct, &str); + + len = MSVCP_basic_string_char_length(&str); + pad = (len>base->wide ? 0 : base->wide-len); + base->wide = 0; + + if((base->fmtfl & FMTFLAG_adjustfield) != FMTFLAG_left) { + num_put_char__Rep(this, &dest, dest, fill, pad); + pad = 0; + } + num_put_char__Putc(this, &dest, dest, MSVCP_basic_string_char_c_str(&str), len); + MSVCP_basic_string_char_dtor(&str); + return num_put_char__Rep(this, ret, dest, fill, pad); + } + + return num_put_char_put_long(this, ret, dest, base, fill, v); } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@D_N(a)Z */

1 0

Piotr Caban : msvcp90: Added num_put<char>::put(double) implementation.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 27f9052440ac2468f77ee935f2da33b296018693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f9052440ac2468f77ee935f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:27:50 2012 +0200 msvcp90: Added num_put<char>::put(double) implementation. --- dlls/msvcp90/locale.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.h | 2 +- include/msvcrt/stdio.h | 1 + 3 files changed, 107 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2e48c79..88f02e3 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -5458,8 +5458,32 @@ ostreambuf_iterator_char* __cdecl num_put_char__Rep(const num_put *this, ostream /* ?_Ffmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADDH(a)Z */ char* __cdecl num_put_char__Ffmt(const num_put *this, char *fmt, char spec, int fmtfl) { - FIXME("(%p %p %d %d) stub\n", this, fmt, spec, fmtfl); - return NULL; + int type = fmtfl & FMTFLAG_floatfield; + char *p = fmt; + + TRACE("(%p %p %d %d)\n", this, fmt, spec, fmtfl); + + *p++ = '%'; + if(fmtfl & FMTFLAG_showpos) + *p++ = '+'; + if(fmtfl & FMTFLAG_showbase) + *p++ = '#'; + *p++ = '.'; + *p++ = '*'; + if(spec) + *p++ = spec; + + if(type == FMTFLAG_fixed) + *p++ = 'f'; + else if(type == FMTFLAG_scientific) + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'E' : 'e'; + else if(type == (FMTFLAG_fixed|FMTFLAG_scientific)) + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'A' : 'a'; + else + *p++ = (fmtfl & FMTFLAG_uppercase) ? 'G' : 'g'; + + *p++ = '\0'; + return fmt; } /* ?_Fput@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBDIIII(a)Z */ @@ -5473,6 +5497,67 @@ ostreambuf_iterator_char* __cdecl num_put_char__Fput(const num_put *this, ostrea return NULL; } +/* TODO: This function should be removed when num_put_char__Fput is implemented */ +static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreambuf_iterator_char *ret, + ostreambuf_iterator_char dest, ios_base *base, char fill, char *buf, MSVCP_size_t count) +{ + numpunct_char *numpunct = numpunct_char_use_facet(base->loc); + basic_string_char grouping_bstr; + const char *grouping; + char *p, sep = *localeconv()->decimal_point; + int cur_group = 0, group_size = 0; + int adjustfield = base->fmtfl & FMTFLAG_adjustfield; + MSVCP_size_t pad; + + TRACE("(%p %p %p %d %s %ld)\n", this, ret, base, fill, buf, count); + + /* Change decimal point */ + for(p=buf; p<buf+count; p++) { + if(*p == sep) { + *p = numpunct_char_decimal_point(numpunct); + break; + } + } + p--; + + /* Add separators to number */ + numpunct_char_grouping(numpunct, &grouping_bstr); + grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; + + for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { + group_size++; + if(group_size == grouping[cur_group]) { + group_size = 0; + if(grouping[cur_group+1]) + cur_group++; + + memmove(p+1, p, buf+count-p); + *p = sep; + count++; + } + } + MSVCP_basic_string_char_dtor(&grouping_bstr); + + /* Display number with padding */ + if(count >= base->wide) + pad = 0; + else + pad = base->wide-count; + base->wide = 0; + + if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { + num_put_char__Putc(this, &dest, dest, buf, 1); + buf++; + } + if(adjustfield != FMTFLAG_left) { + num_put_char__Rep(this, ret, dest, fill, pad); + pad = 0; + } + num_put_char__Putc(this, &dest, dest, buf, count); + return num_put_char__Rep(this, ret, dest, fill, pad); +} + /* ?_Ifmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@ABAPADPADPBDH(a)Z */ /* ?_Ifmt@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@AEBAPEADPEADPEBDH(a)Z */ char* __cdecl num_put_char__Ifmt(const num_put *this, char *fmt, const char *spec, int fmtfl) @@ -5629,8 +5714,24 @@ DEFINE_THISCALL_WRAPPER(num_put_char_do_put_double, 32) ostreambuf_iterator_char* __thiscall num_put_char_do_put_double(const num_put *this, ostreambuf_iterator_char *ret, ostreambuf_iterator_char dest, ios_base *base, char fill, double v) { - FIXME("(%p %p %p %d %lf) stub\n", this, ret, base, fill, v); - return NULL; + char *tmp; + char fmt[8]; /* strlen("%+#.*lg")+1 */ + int size; + + TRACE("(%p %p %p %d %lf)\n", this, ret, base, fill, v); + + num_put_char__Ffmt(this, fmt, '\0', base->fmtfl); + size = _scprintf(fmt, base->prec, v); + + /* TODO: don't use dynamic allocation */ + tmp = MSVCRT_operator_new(size*2); + if(!tmp) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + num_put_char_fput(this, ret, dest, base, fill, tmp, sprintf(tmp, fmt, base->prec, v)); + MSVCRT_operator_delete(tmp); + return ret; } /* ?put@?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DN(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index edb3efa..cc7a2aa 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -417,7 +417,7 @@ typedef enum { FMTFLAG_stdio = 0x8000, FMTFLAG_adjustfield = FMTFLAG_left|FMTFLAG_right|FMTFLAG_internal, FMTFLAG_basefield = FMTFLAG_dec|FMTFLAG_oct|FMTFLAG_hex, - FMTFLAG_floadfield = FMTFLAG_scientific|FMTFLAG_fixed, + FMTFLAG_floatfield = FMTFLAG_scientific|FMTFLAG_fixed, FMTFLAG_mask = 0xffff } IOSB_fmtflags; diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index e2c1669..80439ee 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -167,6 +167,7 @@ void __cdecl setbuf(FILE*,char*); int __cdecl setvbuf(FILE*,char*,int,size_t); int __cdecl sprintf(char*,const char*,...); int __cdecl sprintf_s(char*,size_t,const char*,...); +int __cdecl _scprintf(const char *, ...); int __cdecl sscanf(const char*,const char*,...); int __cdecl sscanf_s(const char*,const char*,...); FILE* __cdecl tmpfile(void);

1 0

Piotr Caban : msvcp90: Added basic_ostream::operator<<(base type) implementation.
by Alexandre Julliard 22 Jun '12

22 Jun '12

Module: wine Branch: master Commit: 8e2efc19390423299a22ad730410f51f7c5539db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2efc19390423299a22ad730… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 22 10:28:05 2012 +0200 msvcp90: Added basic_ostream::operator<<(base type) implementation. --- dlls/msvcp90/ios.c | 223 +++++++++++++++++++++++++++++++++++++------- dlls/msvcp90/locale.c | 26 +++++ dlls/msvcp90/msvcp90.h | 18 ++++ dlls/msvcp90/msvcp90.spec | 12 +- 4 files changed, 237 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e2efc19390423299a22a…

1 0