November 2012 - Wine-commits

Alexandre Julliard : gdi32: Make blend_subpixel inline.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: d10d95608cd49c5eb3dea152c7f737be8efcc13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10d95608cd49c5eb3dea152c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:23:37 2012 +0100 gdi32: Make blend_subpixel inline. --- dlls/gdi32/dibdrv/primitives.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index bcd2900..77ac620 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5153,7 +5153,7 @@ static void draw_glyph_null( const dib_info *dib, const RECT *rect, const dib_in return; } -static DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) +static inline DWORD blend_subpixel( BYTE r, BYTE g, BYTE b, DWORD text, DWORD alpha ) { return blend_color( r, text >> 16, (BYTE)(alpha >> 16) ) << 16 | blend_color( g, text >> 8, (BYTE)(alpha >> 8) ) << 8 |

1 0

Alexandre Julliard : gdi32: Use the faster memset for vertical gradients.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: abdce5c2c818506a56c9dc4a0d9a9e5184ae63d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdce5c2c818506a56c9dc4a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:59:04 2012 +0100 gdi32: Use the faster memset for vertical gradients. --- dlls/gdi32/dibdrv/primitives.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 77ac620..a8270ae 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -4520,7 +4520,7 @@ static BOOL gradient_rect_8888( const dib_info *dib, const RECT *rc, const TRIVE for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 4) { DWORD val = gradient_rgb_8888( v, y - v[0].y, v[1].y - v[0].y ); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; + memset_32( ptr, val, rc->right - rc->left ); } break; @@ -4570,7 +4570,7 @@ static BOOL gradient_rect_32( const dib_info *dib, const RECT *rc, const TRIVERT break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride / 4) { DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); if (dib->red_len == 8 && dib->green_len == 8 && dib->blue_len == 8) @@ -4582,8 +4582,7 @@ static BOOL gradient_rect_32( const dib_info *dib, const RECT *rc, const TRIVERT put_field( val >> 8, dib->green_shift, dib->green_len ) | put_field( val, dib->blue_shift, dib->blue_len )); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; - ptr += dib->stride / 4; + memset_32( ptr, val, rc->right - rc->left ); } break;

1 0

Alexandre Julliard : gdi32: Avoid computing grayscale glyph intensities when not needed.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 2d3385eec93674613a78b037ed751384b505deaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3385eec93674613a78b037e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 17:24:05 2012 +0100 gdi32: Avoid computing grayscale glyph intensities when not needed. --- dlls/gdi32/dibdrv/dibdrv.h | 4 +- dlls/gdi32/dibdrv/graphics.c | 61 +++++++++++++++-------------------------- dlls/gdi32/dibdrv/objects.c | 32 +++++++++++----------- 3 files changed, 40 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d3385eec93674613a78b…

1 0

Carlos Rafael Ramirez : po: Update Spanish translation.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 010449622c2dd2e7e914aadfe4a757732023aa1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=010449622c2dd2e7e914aadfe… Author: Carlos Rafael Ramirez <crramirez(a)gmail.com> Date: Fri Nov 30 11:28:38 2012 -0600 po: Update Spanish translation. --- po/es.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/es.po b/po/es.po index cc7c935..fee1edc 100644 --- a/po/es.po +++ b/po/es.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-02-23 09:23+0100\n" +"PO-Revision-Date: 2012-11-30 11:26-0600\n" "Last-Translator: Eduardo García <eduardo.garcia(a)gmx.com>\n" "Language-Team: none\n" "Language: Spanish\n" @@ -3511,10 +3511,8 @@ msgid "" msgstr "" #: joy.rc:28 -#, fuzzy -#| msgid "Create Control" msgid "Game Controllers" -msgstr "Crear control" +msgstr "Mandos de juego" #: jscript.rc:25 msgid "Error converting object to primitive type"

1 0

Piotr Caban : msvcrt: Added wcrtomb tests.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: d677bda97408d05a7b4781d782b6d1e5a8c2d640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d677bda97408d05a7b4781d78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:49:58 2012 +0000 msvcrt: Added wcrtomb tests. --- dlls/msvcrt/tests/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 840c4de..d606ebb 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -85,6 +85,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); @@ -2301,6 +2302,44 @@ static void test_wctob(void) ret = p_wctob(0xe0); ok(ret == (int)(char)0xe0, "ret = %x\n", ret); } +static void test_wctomb(void) +{ + mbstate_t state; + unsigned char dst[10]; + size_t ret; + + if(!p_wcrtomb || !setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("wcrtomb tests\n"); + return; + } + + ret = p_wcrtomb(NULL, 0x3042, NULL); + ok(ret == 2, "wcrtomb did not return 2\n"); + + state = 1; + dst[2] = 'a'; + ret = p_wcrtomb((char*)dst, 0x3042, &state); + ok(ret == 2, "wcrtomb did not return 2\n"); + ok(state == 0, "state != 0\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa0, "dst[1] = %x, expected 0xa0\n", dst[1]); + ok(dst[2] == 'a', "dst[2] != 'a'\n"); + + ret = p_wcrtomb((char*)dst, 0x3043, NULL); + ok(ret == 2, "wcrtomb did not return 2\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa1, "dst[1] = %x, expected 0xa1\n", dst[1]); + + ret = p_wcrtomb((char*)dst, 0x20, NULL); + ok(ret == 1, "wcrtomb did not return 1\n"); + ok(dst[0] == 0x20, "dst[0] = %x, expected 0x20\n", dst[0]); + + ret = p_wcrtomb((char*)dst, 0xffff, NULL); + ok(ret == -1, "wcrtomb did not return -1\n"); + ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x20\n", dst[0]); + + setlocale(LC_ALL, "C"); +} static void test_tolower(void) { @@ -2376,6 +2415,7 @@ START_TEST(string) p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); + p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); @@ -2427,5 +2467,6 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_wctomb(); test_tolower(); }

1 0

Piotr Caban : msvcp70: Forward bad_cast functions to msvcrt.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: a62158eb2923542b94bc4aeb13632d0f49a60503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a62158eb2923542b94bc4aeb1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:50:30 2012 +0000 msvcp70: Forward bad_cast functions to msvcrt. --- dlls/msvcp70/msvcp70.spec | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 401032e..ce079c2 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -447,10 +447,10 @@ @ stub -arch=win64 ??0__non_rtti_object(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0__non_rtti_object(a)std@@QAE(a)PBD@Z @ stub -arch=win64 ??0__non_rtti_object(a)std@@QEAA(a)PEBD@Z -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z -@ stub -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z -@ stub -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE(a)ABV0@@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA(a)AEBV0@@Z +@ thiscall -arch=win32 ??0bad_cast(a)std@@QAE(a)PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE(a)PBD@Z +@ cdecl -arch=win64 ??0bad_cast(a)std@@QEAA(a)PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA(a)PEBD@Z @ stub -arch=win32 ??0bad_typeid(a)std@@QAE(a)ABV01@@Z @ stub -arch=win64 ??0bad_typeid(a)std@@QEAA(a)AEBV01@@Z @ stub -arch=win32 ??0bad_typeid(a)std@@QAE(a)PBD@Z @@ -673,8 +673,8 @@ @ cdecl -arch=win64 ??1_Winit(a)std@@QEAA(a)XZ(ptr) msvcp90.??1_Winit(a)std@@QEAA(a)XZ @ stub -arch=win32 ??1__non_rtti_object(a)std@@UAE(a)XZ @ stub -arch=win64 ??1__non_rtti_object(a)std@@UEAA(a)XZ -@ stub -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ -@ stub -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ +@ thiscall -arch=win32 ??1bad_cast(a)std@@UAE(a)XZ(ptr) msvcrt.??1bad_cast@@UAE(a)XZ +@ cdecl -arch=win64 ??1bad_cast(a)std@@UEAA(a)XZ(ptr) msvcrt.??1bad_cast@@UEAA(a)XZ @ stub -arch=win32 ??1bad_typeid(a)std@@UAE(a)XZ @ stub -arch=win64 ??1bad_typeid(a)std@@UEAA(a)XZ @ thiscall -arch=win32 ??1codecvt_base(a)std@@UAE(a)XZ(ptr) msvcp90.??1codecvt_base(a)std@@UAE(a)XZ @@ -813,8 +813,8 @@ @ cdecl -arch=win64 ??4_Winit(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcp90.??4_Winit(a)std@@QEAAAEAV01(a)AEBV01@@Z @ stub -arch=win32 ??4__non_rtti_object(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z -@ stub -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z -@ stub -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z +@ thiscall -arch=win32 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z +@ cdecl -arch=win64 ??4bad_cast(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0(a)AEBV0@@Z @ stub -arch=win32 ??4bad_typeid(a)std@@QAEAAV01(a)ABV01@@Z @ stub -arch=win64 ??4bad_typeid(a)std@@QEAAAEAV01(a)AEBV01@@Z @ thiscall -arch=win32 ??4ios_base(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcp90.??4ios_base(a)std@@QAEAAV01(a)ABV01@@Z @@ -1727,8 +1727,8 @@ @ cdecl -arch=win64 ??_F_Locinfo(a)std@@QEAAXXZ(ptr) msvcp90.??_F_Locinfo(a)std@@QEAAXXZ @ thiscall -arch=win32 ??_F_Timevec(a)std@@QAEXXZ(ptr) msvcp90.??_F_Timevec(a)std@@QAEXXZ @ cdecl -arch=win64 ??_F_Timevec(a)std@@QEAAXXZ(ptr) msvcp90.??_F_Timevec(a)std@@QEAAXXZ -@ stub -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ -@ stub -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ +@ thiscall -arch=win32 ??_Fbad_cast(a)std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ +@ cdecl -arch=win64 ??_Fbad_cast(a)std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ @ stub -arch=win32 ??_Fbad_typeid(a)std@@QAEXXZ @ stub -arch=win64 ??_Fbad_typeid(a)std@@QEAAXXZ @ thiscall -arch=win32 ??_Fcodecvt_base(a)std@@QAEXXZ(ptr) msvcp90.??_Fcodecvt_base(a)std@@QAEXXZ

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 1a97bba65f2a0c6316b215988ea0847acd681e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a97bba65f2a0c6316b215988… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:50:56 2012 +0000 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp70/msvcp70.spec | 8 ++++---- dlls/msvcp71/msvcp71.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 307af74..26dbbe7 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4309,11 +4309,11 @@ # extern _Xbig @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen # msvcrt.mbrlen -@ stub mbrtowc # msvcrt.mbrtowc -@ stub mbsrtowcs # msvcrt.mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen # msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc # msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs # msvcrt.mbsrtowcs @ cdecl towctrans(long long) -@ stub wcrtomb # msvcrt.wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb # msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index ce079c2..c3856fb 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5098,11 +5098,11 @@ # extern _Zero @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ cdecl towctrans(long long) msvcp90.towctrans -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) msvcp90.wctrans diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 58636c2..70e659f 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5158,11 +5158,11 @@ # extern _Zero @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ cdecl towctrans(long long) -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8e2a9f4..b970fb9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1731,9 +1731,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1841,7 +1841,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3644345..c6341c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1381,9 +1381,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1483,7 +1483,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e0cb400..3545dd1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1384,9 +1384,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1494,7 +1494,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s

1 0

Detlef Riekenberg : d3dx9_36/tests: Fix broken line test.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 8b98b6a532056b506b3a3734c6cd54d5246d5490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b98b6a532056b506b3a3734c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 30 00:25:31 2012 +0100 d3dx9_36/tests: Fix broken line test. --- dlls/d3dx9_36/tests/line.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index dc0c747..891de5a 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -109,8 +109,7 @@ static void test_create_line(IDirect3DDevice9* device) ok(hr == D3D_OK, "Got result %x, expected %x (D3D_OK)\n", hr, D3D_OK); expect_mat(&world, &result); - ref = IDirect3DDevice9_Release(return_device); - ok(ref == 2, "Got %x references to device %p, expected 2\n", ref, return_device); + IDirect3DDevice9_Release(return_device); ref = ID3DXLine_Release(line); ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line);

1 0

Jason Edmeades : cmd: Wait for command to complete when spawned through cmd /c.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 64d7151669faccf09c845112c71a906587629ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d7151669faccf09c845112c… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Nov 29 23:23:25 2012 +0000 cmd: Wait for command to complete when spawned through cmd /c. --- programs/cmd/wcmdmain.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index cb9fab6..e373d19 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1201,8 +1201,10 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (!assumeInternal && !console) errorlevel = 0; else { - /* Always wait when called in a batch program context */ - if (assumeInternal || context || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE); + /* Always wait when non-interactive (cmd /c or in batch program), + or for console applications */ + if (assumeInternal || !interactive || !HIWORD(console)) + WaitForSingleObject (pe.hProcess, INFINITE); GetExitCodeProcess (pe.hProcess, &errorlevel); if (errorlevel == STILL_ACTIVE) errorlevel = 0; }

1 0

Alistair Leslie-Hughes : oleaut32: Fail if we cannot find the TYPELIB resource.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 04d3ba5b35c133852fb368caa3da998868a332e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d3ba5b35c133852fb368caa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 30 21:11:07 2012 +1100 oleaut32: Fail if we cannot find the TYPELIB resource. --- dlls/oleaut32/typelib.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 83ea7e1..fa9b050 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2509,6 +2509,7 @@ static const IUnknownVtbl TLB_PEFile_Vtable = static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *pdwTLBLength, IUnknown **ppFile) { TLB_PEFile *This; + HRESULT hr = TYPE_E_CANTLOADLIBRARY; This = heap_alloc(sizeof(TLB_PEFile)); if (!This) @@ -2543,11 +2544,13 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return S_OK; } } + + hr = E_FAIL; } } TLB_PEFile_Release((IUnknown *)&This->lpvtbl); - return TYPE_E_CANTLOADLIBRARY; + return hr; } typedef struct TLB_NEFile @@ -2946,6 +2949,8 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TYPE_E_CANTLOADLIBRARY; IUnknown_Release(pFile); } + else + ret = TYPE_E_CANTLOADLIBRARY; if(*ppTypeLib) { ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib;

1 0