September 2011 - Wine-commits

Francois Gouget : gdiplus/tests: Don' t check for hardcoded family font names.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: bcd793bf3b9c0f334b012b6afe8bef3160d64f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd793bf3b9c0f334b012b6af… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 13 01:45:20 2011 +0200 gdiplus/tests: Don't check for hardcoded family font names. Only check that each font family is different and that we can create fonts from them. --- dlls/gdiplus/tests/font.c | 89 +++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 43 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 323461a..98c4114 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -34,6 +34,7 @@ static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; +static const WCHAR LiberationSerif[] = {'L','i','b','e','r','a','t','i','o','n',' ','S','e','r','i','f',0}; static void test_createfont(void) { @@ -284,60 +285,62 @@ static void test_fontfamily_properties (void) } } -static void test_getgenerics (void) +static void check_family(const char* context, GpFontFamily *family, WCHAR *name) { GpStatus stat; - GpFontFamily* family; - WCHAR familyName[LF_FACESIZE]; - ZeroMemory(familyName, sizeof(familyName)/sizeof(WCHAR)); + GpFont* font; - stat = GdipGetGenericFontFamilySansSerif (&family); - if (stat == FontFamilyNotFound) + *name = 0; + stat = GdipGetFamilyName(family, name, LANG_NEUTRAL); + ok(stat == Ok, "could not get the %s family name: %.8x\n", context, stat); + + stat = GdipCreateFont(family, 12, FontStyleRegular, UnitPixel, &font); + ok(stat == Ok, "could not create a font for the %s family: %.8x\n", context, stat); + if (stat == Ok) { - skip("Microsoft Sans Serif not installed\n"); - goto serif; + stat = GdipDeleteFont(font); + ok(stat == Ok, "could not delete the %s family font: %.8x\n", context, stat); } + + stat = GdipDeleteFontFamily(family); + ok(stat == Ok, "could not delete the %s family: %.8x\n", context, stat); +} + +static void test_getgenerics (void) +{ + GpStatus stat; + GpFontFamily *family; + WCHAR sansname[LF_FACESIZE], serifname[LF_FACESIZE], mononame[LF_FACESIZE]; + int missingfonts = 0; + + stat = GdipGetGenericFontFamilySansSerif(&family); expect (Ok, stat); - stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); - expect (Ok, stat); - if (!lstrcmpiW(familyName, Tahoma)) - todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), - "Expected Microsoft Sans Serif, got Tahoma\n"); + if (stat == FontFamilyNotFound) + missingfonts = 1; else - ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0), - "Expected Microsoft Sans Serif, got %s\n", wine_dbgstr_w(familyName)); - stat = GdipDeleteFontFamily (family); - expect (Ok, stat); + check_family("Sans Serif", family, sansname); -serif: - stat = GdipGetGenericFontFamilySerif (&family); - if (stat == FontFamilyNotFound) - { - skip("Times New Roman not installed\n"); - goto monospace; - } - expect (Ok, stat); - stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); + stat = GdipGetGenericFontFamilySerif(&family); expect (Ok, stat); - ok (lstrcmpiW(familyName, TimesNewRoman) == 0, - "Expected Times New Roman, got %s\n", wine_dbgstr_w(familyName)); - stat = GdipDeleteFontFamily (family); - expect (Ok, stat); - -monospace: - stat = GdipGetGenericFontFamilyMonospace (&family); if (stat == FontFamilyNotFound) - { - skip("Courier New not installed\n"); - return; - } - expect (Ok, stat); - stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL); - expect (Ok, stat); - ok (lstrcmpiW(familyName, CourierNew) == 0, - "Expected Courier New, got %s\n", wine_dbgstr_w(familyName)); - stat = GdipDeleteFontFamily (family); + missingfonts = 1; + else + check_family("Serif", family, serifname); + + stat = GdipGetGenericFontFamilyMonospace(&family); expect (Ok, stat); + if (stat == FontFamilyNotFound) + missingfonts = 1; + else + check_family("Monospace", family, mononame); + + if (missingfonts && strcmp(winetest_platform, "wine") == 0) + trace("You may need to install either the Microsoft Web Fonts or the Liberation Fonts\n"); + + /* Check that the family names are all different */ + ok(lstrcmpiW(sansname, serifname) != 0, "Sans Serif and Serif families should be different: %s\n", wine_dbgstr_w(sansname)); + ok(lstrcmpiW(sansname, mononame) != 0, "Sans Serif and Monospace families should be different: %s\n", wine_dbgstr_w(sansname)); + ok(lstrcmpiW(serifname, mononame) != 0, "Serif and Monospace families should be different: %s\n", wine_dbgstr_w(serifname)); } static void test_installedfonts (void)

1 0

Henri Verbeet : ddraw: Get rid of an unused prototype.
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: be32dd86d61c2bb9dace287e9cdf469619a7191e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be32dd86d61c2bb9dace287e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:15 2011 +0200 ddraw: Get rid of an unused prototype. --- dlls/ddraw/ddraw_private.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1daefbc..09e9aed 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -133,8 +133,6 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) DECLSPEC_ /* Utility functions */ void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN; void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN; -HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, - DDSURFACEDESC2 *desc, void *Context) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DECLSPEC_HIDDEN; /* The default surface type */

1 0

Henri Verbeet : ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D().
by Alexandre Julliard 13 Sep '11

13 Sep '11

Module: wine Branch: master Commit: f2115004d551e337799b03b9739546536fa2619a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2115004d551e337799b03b97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:16 2011 +0200 ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D(). Most of these would just be the result of the application giving us invalid pixel formats. --- dlls/ddraw/utils.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index d2a4194..b341a78 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -426,7 +426,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { return WINED3DFMT_B2G3R3A8_UNORM; } - ERR("16 bit RGB Pixel format does not match\n"); + WARN("16 bit RGB Pixel format does not match.\n"); return WINED3DFMT_UNKNOWN; case 24: @@ -445,10 +445,10 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat return WINED3DFMT_B8G8R8X8_UNORM; } - ERR("32 bit RGB pixel format does not match\n"); + WARN("32 bit RGB pixel format does not match.\n"); default: - ERR("Invalid dwRGBBitCount in Pixelformat structure\n"); + WARN("Invalid dwRGBBitCount in Pixelformat structure.\n"); return WINED3DFMT_UNKNOWN; } } @@ -460,12 +460,12 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat case 1: case 2: case 4: - ERR("Unsupported Alpha-Only bit depth 0x%x\n", DDPixelFormat->u1.dwAlphaBitDepth); + FIXME("Unsupported Alpha-Only bit depth 0x%x.\n", DDPixelFormat->u1.dwAlphaBitDepth); case 8: return WINED3DFMT_A8_UNORM; default: - ERR("Invalid AlphaBitDepth in Alpha-Only Pixelformat\n"); + WARN("Invalid AlphaBitDepth in Alpha-Only Pixelformat.\n"); return WINED3DFMT_UNKNOWN; } } @@ -480,17 +480,17 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat case 4: if(DDPixelFormat->u1.dwAlphaBitDepth == 4) return WINED3DFMT_L4A4_UNORM; - ERR("Unknown Alpha / Luminance bit depth combination\n"); + WARN("Unknown Alpha / Luminance bit depth combination.\n"); return WINED3DFMT_UNKNOWN; case 6: - ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n"); + FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n"); return WINED3DFMT_R5G5_SNORM_L6_UNORM; case 8: if(DDPixelFormat->u1.dwAlphaBitDepth == 8) return WINED3DFMT_L8A8_UNORM; - ERR("Unknown Alpha / Lumincase bit depth combination\n"); + WARN("Unknown Alpha / Lumincase bit depth combination.\n"); return WINED3DFMT_UNKNOWN; } } @@ -500,14 +500,14 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat switch(DDPixelFormat->u1.dwLuminanceBitCount) { case 6: - ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n"); + FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n"); return WINED3DFMT_R5G5_SNORM_L6_UNORM; case 8: return WINED3DFMT_L8_UNORM; default: - ERR("Unknown luminance-only bit depth 0x%x\n", DDPixelFormat->u1.dwLuminanceBitCount); + WARN("Unknown luminance-only bit depth 0x%x.\n", DDPixelFormat->u1.dwLuminanceBitCount); return WINED3DFMT_UNKNOWN; } } @@ -599,7 +599,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } } - ERR("Unknown Pixelformat!\n"); + WARN("Unknown Pixelformat.\n"); return WINED3DFMT_UNKNOWN; }

1 0

Bernhard Loos : msi: Speed up WHERE statement evaluation by evaluating the condition as early as possible .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 9b729bb1b348ac5485fe993fcedef870b59d88b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b729bb1b348ac5485fe993fc… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Sep 9 11:25:58 2011 +0200 msi: Speed up WHERE statement evaluation by evaluating the condition as early as possible. --- dlls/msi/where.c | 208 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 145 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b729bb1b348ac5485fe9…

1 0

Piotr Caban : msvcp90: Added basic_string<wchar>::operator=(const wchar*) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: ac29261f1972fe725a95b491170c345a1367df75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac29261f1972fe725a95b4911… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:49 2011 +0200 msvcp90: Added basic_string<wchar>::operator=(const wchar*) implementation. --- dlls/msvcp90/msvcp90.spec | 4 ++-- dlls/msvcp90/string.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 5518c06..fc6cf20 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1394,8 +1394,8 @@ @ stub -arch=win64 ??4?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAAEAV01(a)PEBG@Z @ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign @ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign -@ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z -@ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z +@ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr +@ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr @ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z @ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z @ stub -arch=win32 ??4?$char_traits(a)D@std@@QAEAAU01(a)ABU01@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index c25c7f1..1d15331 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1552,6 +1552,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr_len( /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z */ /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_cstr, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr( basic_string_wchar *this, const wchar_t *str)

1 0

Piotr Caban : msvcp90: Added basic_string::substr(size_t, size_t) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 145f6c14f2f7469f903594d3258b3287edd2b3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145f6c14f2f7469f903594d32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:58 2011 +0200 msvcp90: Added basic_string::substr(size_t, size_t) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index fc6cf20..66ec6a0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5496,12 +5496,12 @@ @ stub -arch=win64 ?str@?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ @ stub -arch=win32 ?str(a)strstreambuf@std@@QAEPADXZ @ stub -arch=win64 ?str(a)strstreambuf@std@@QEAAPEADXZ -@ stub -arch=win32 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV12(a)II@Z -@ stub -arch=win64 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV12(a)_K0@Z +@ thiscall -arch=win32 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV12(a)II@Z(ptr ptr long long) MSVCP_basic_string_char_substr +@ cdecl -arch=win64 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV12(a)_K0@Z(ptr ptr long long) MSVCP_basic_string_char_substr @ stub -arch=win32 ?substr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBE?AV12(a)II@Z @ stub -arch=win64 ?substr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA?AV12(a)_K0@Z -@ stub -arch=win32 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV12(a)II@Z -@ stub -arch=win64 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV12(a)_K0@Z +@ thiscall -arch=win32 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV12(a)II@Z(ptr ptr long long) MSVCP_basic_string_wchar_substr +@ cdecl -arch=win64 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV12(a)_K0@Z(ptr ptr long long) MSVCP_basic_string_wchar_substr @ thiscall -arch=win32 ?sungetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sungetc @ cdecl -arch=win64 ?sungetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sungetc @ stub -arch=win32 ?sungetc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAEGXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 1d15331..2ad568c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -847,6 +847,19 @@ void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_stri } } +/* ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV12(a)II@Z */ +/* ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV12(a)_K0@Z */ +DEFINE_THISCALL_WRAPPER_RETPTR(MSVCP_basic_string_char_substr, 12) +basic_string_char __thiscall MSVCP_basic_string_char_substr( + basic_string_char *this, MSVCP_size_t off, MSVCP_size_t len) +{ + basic_string_char ret = { 0 }; + TRACE("%p %lu %lu\n", this, off, len); + + MSVCP_basic_string_char_ctor_substr(&ret, this, off, len); + return ret; +} + /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_substr, 16) @@ -1700,6 +1713,19 @@ void __thiscall MSVCP_basic_string_wchar_swap(basic_string_wchar *this, basic_st } } +/* ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV12(a)II@Z */ +/* ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV12(a)_K0@Z */ +DEFINE_THISCALL_WRAPPER_RETPTR(MSVCP_basic_string_wchar_substr, 12) +basic_string_wchar __thiscall MSVCP_basic_string_wchar_substr( + basic_string_wchar *this, MSVCP_size_t off, MSVCP_size_t len) +{ + basic_string_wchar ret = { 0 }; + TRACE("%p %lu %lu\n", this, off, len); + + MSVCP_basic_string_wchar_ctor_substr(&ret, this, off, len); + return ret; +} + /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@II(a)Z */ /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_substr, 16)

1 0

Piotr Caban : msvcp90: Added basic_string::find(basic_string, size_t) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 05b2cc19603bf557e565a80aa9a0670210f898c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b2cc19603bf557e565a80aa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:07 2011 +0200 msvcp90: Added basic_string::find(basic_string, size_t) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 66ec6a0..32c3766 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3817,8 +3817,8 @@ @ stub -arch=win64 ?fill@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEAA_W_W(a)Z @ stub -arch=win32 ?fill@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QBE_WXZ @ stub -arch=win64 ?fill@?$basic_ios(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_WXZ -@ stub -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z -@ stub -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z +@ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z(ptr ptr long) MSVCP_basic_string_char_find_off +@ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z(ptr ptr long) MSVCP_basic_string_char_find_off @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z(ptr long long) MSVCP_basic_string_char_find_ch @ cdecl -arch=win64 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z(ptr long long) MSVCP_basic_string_char_find_ch @ thiscall -arch=win32 ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIPBDI(a)Z(ptr str long) MSVCP_basic_string_char_find_cstr_off @@ -3833,8 +3833,8 @@ @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEBG_K1(a)Z @ stub -arch=win32 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEIPBGII(a)Z @ stub -arch=win64 ?find@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA_KPEBG_K(a)Z -@ stub -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z -@ stub -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z +@ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z(ptr ptr long) MSVCP_basic_string_wchar_find_off +@ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z(ptr ptr long) MSVCP_basic_string_wchar_find_off @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WI(a)Z(ptr wstr long) MSVCP_basic_string_wchar_find_cstr_off @ cdecl -arch=win64 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KPEB_W_K1(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr @ thiscall -arch=win32 ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIPB_WII(a)Z(ptr wstr long long) MSVCP_basic_string_wchar_find_cstr_substr diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 2ad568c..6260ee8 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1195,6 +1195,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_char_find_cstr_off( MSVCP_char_traits_char_length(find)); } +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIABV12(a)I@Z */ +/* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KAEBV12(a)_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_char_find_off( + const basic_string_char *this, const basic_string_char *find, MSVCP_size_t off) +{ + return MSVCP_basic_string_char_find_cstr_substr(this, + basic_string_char_const_ptr(find), off, find->size); +} + /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEIDI(a)Z */ /* ?find@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA_KD_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_find_ch, 12) @@ -2061,6 +2071,16 @@ MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_cstr_off( MSVCP_char_traits_wchar_length(find)); } +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEIABV12(a)I@Z */ +/* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_KAEBV12(a)_K@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_off, 12) +MSVCP_size_t __thiscall MSVCP_basic_string_wchar_find_off( + const basic_string_wchar *this, const basic_string_wchar *find, MSVCP_size_t off) +{ + return MSVCP_basic_string_wchar_find_cstr_substr(this, + basic_string_wchar_const_ptr(find), off, find->size); +} + /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBEI_WI(a)Z */ /* ?find@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA_K_W_K(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_find_ch, 12)

1 0

Piotr Caban : msvcp90: Added basic_string::operator=(char) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: c0f991e9b1ef258b926f57e6345f80036657ecf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f991e9b1ef258b926f57e63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:16 2011 +0200 msvcp90: Added basic_string::operator=(char) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 32c3766..d5d1ca3 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1382,8 +1382,8 @@ @ cdecl -arch=win64 ??4?$allocator(a)_W@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign @ thiscall -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_char_assign @ cdecl -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_assign -@ stub -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z -@ stub -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z +@ thiscall -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z(ptr long) MSVCP_basic_string_char_assign_ch +@ cdecl -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z(ptr long) MSVCP_basic_string_char_assign_ch @ thiscall -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr @ cdecl -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr @ stub -arch=win32 ??4?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)ABV01@@Z @@ -1396,8 +1396,8 @@ @ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign @ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr @ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr -@ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z -@ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z +@ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_assign_ch +@ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_assign_ch @ stub -arch=win32 ??4?$char_traits(a)D@std@@QAEAAU01(a)ABU01@@Z @ stub -arch=win64 ??4?$char_traits(a)D@std@@QEAAAEAU01(a)AEBU01@@Z @ stub -arch=win32 ??4?$char_traits(a)G@std@@QAEAAU01(a)ABU01@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6260ee8..c161335 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -697,6 +697,15 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr_len( return this; } +/* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z */ +/* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_ch, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_assign_ch( + basic_string_char *this, char ch) +{ + return MSVCP_basic_string_char_assign_cstr_len(this, &ch, 1); +} + /* ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD@Z */ /* ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD@Z */ /* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z */ @@ -1573,6 +1582,15 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr_len( return this; } +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_ch, 8) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_ch( + basic_string_wchar *this, wchar_t ch) +{ + return MSVCP_basic_string_wchar_assign_cstr_len(this, &ch, 1); +} + /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z */ /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z */ /* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z */

1 0

Piotr Caban : msvcp90: Added basic_string::push_back(char) implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 69f93177ac0b221ac1eaa593e705269481511db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f93177ac0b221ac1eaa593e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:26 2011 +0200 msvcp90: Added basic_string::push_back(char) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index d5d1ca3..d5baaf4 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -4890,12 +4890,12 @@ @ stub -arch=win64 ?pubsync@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QEAAHXZ @ stub -arch=win32 ?pubsync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QAEHXZ @ stub -arch=win64 ?pubsync@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAHXZ -@ stub -arch=win32 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXD(a)Z -@ stub -arch=win64 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXD(a)Z +@ thiscall -arch=win32 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXD(a)Z(ptr long) MSVCP_basic_string_char_append_ch +@ cdecl -arch=win64 ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXD(a)Z(ptr long) MSVCP_basic_string_char_append_ch @ stub -arch=win32 ?push_back@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEXG(a)Z @ stub -arch=win64 ?push_back@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAAXG(a)Z -@ stub -arch=win32 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEX_W(a)Z -@ stub -arch=win64 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_W(a)Z +@ thiscall -arch=win32 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEX_W(a)Z(ptr long) MSVCP_basic_string_wchar_append_ch +@ cdecl -arch=win64 ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_W(a)Z(ptr long) MSVCP_basic_string_wchar_append_ch @ thiscall -arch=win32 ?put@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)D@Z(ptr long) basic_ostream_char_put @ cdecl -arch=win64 ?put@?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)D@Z(ptr long) basic_ostream_char_put @ stub -arch=win32 ?put@?$basic_ostream(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)G@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index c161335..6492202 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -964,6 +964,8 @@ basic_string_char* __thiscall MSVCP_basic_string_char_append_len_ch( /* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z */ /* ??Y?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z */ +/* ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXD(a)Z */ +/* ?push_back@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXD(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_ch, 8) basic_string_char* __thiscall MSVCP_basic_string_char_append_ch( basic_string_char *this, char ch) @@ -1849,6 +1851,8 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_len_ch( /* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z */ /* ??Y?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z */ +/* ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEX_W(a)Z */ +/* ?push_back@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAX_W(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_ch, 8) basic_string_wchar* __thiscall MSVCP_basic_string_wchar_append_ch( basic_string_wchar *this, wchar_t ch)

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: aa19d0cf5f366830d7e4b47ca6f556a16f4c08f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa19d0cf5f366830d7e4b47ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:36 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 24 +++++++++--------- dlls/msvcp70/msvcp70.spec | 56 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 52 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 52 +++++++++++++++++++++--------------------- 4 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa19d0cf5f366830d7e4b…

1 0