November 2012 - Wine-commits

Piotr Caban : msvcrt: Added mbrlen implementation.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: b8ee0dd7ab70b046d15176ed2bfccff8e5d44a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ee0dd7ab70b046d15176ed2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:22:27 2012 +0000 msvcrt: Added mbrlen implementation. --- dlls/msvcrt/mbcs.c | 34 +++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 3c575e9..b083ea1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1902,12 +1902,44 @@ int CDECL MSVCRT_mblen(const char* str, MSVCRT_size_t size) if(get_locinfo()->mb_cur_max == 1) return 1; /* ASCII CP */ - return !MSVCRT_isleadbyte(*str) ? 1 : (size>1 ? 2 : -1); + return !MSVCRT_isleadbyte((unsigned char)*str) ? 1 : (size>1 ? 2 : -1); } return 0; } /********************************************************************* + * mbrlen(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbrlen(const char *str, MSVCRT_size_t len, MSVCRT_mbstate_t *state) +{ + MSVCRT_mbstate_t s = (state ? *state : 0); + MSVCRT_size_t ret; + + if(!len || !str || !*str) + return 0; + + if(get_locinfo()->mb_cur_max == 1) { + return 1; + }else if(!s && MSVCRT_isleadbyte((unsigned char)*str)) { + if(len == 1) { + s = (unsigned char)*str; + ret = -2; + }else { + ret = 2; + } + }else if(!s) { + ret = 1; + }else { + s = 0; + ret = 2; + } + + if(state) + *state = s; + return ret; +} + +/********************************************************************* * _mbstrlen_l(MSVCRT.@) */ MSVCRT_size_t CDECL _mbstrlen_l(const char* str, MSVCRT__locale_t locale) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f5cad22..7957e92 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1328,7 +1328,7 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen -# stub mbrlen(ptr long ptr) +@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen # stub mbrtowc(ptr str long ptr) # stub mbsdup_dbg(wstr long ptr long) # stub mbsrtowcs(ptr ptr long ptr)

1 0

Piotr Caban : msvcrt: Added mbrlen tests.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 00658a4a6383cf0e219440f8230a138eeb98cf6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00658a4a6383cf0e219440f82… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:22:46 2012 +0000 msvcrt: Added mbrlen tests. --- dlls/msvcrt/tests/string.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 909077f..73e7414 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -23,6 +23,7 @@ #include "winnls.h" #include <string.h> #include <mbstring.h> +#include <wchar.h> #include <stdlib.h> #include <stdio.h> #include <mbctype.h> @@ -84,6 +85,7 @@ 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 int (__cdecl *p_tolower)(int); +static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -304,6 +306,21 @@ static void test_mbcp(void) expect_eq(_mbslen(mbsonlylead), 0, int, "%d"); /* lead + NUL not counted as character */ expect_eq(_mbslen(mbstring), 4, int, "%d"); /* lead + invalid trail counted */ + /* mbrlen */ + if(!setlocale(LC_ALL, ".936") || !p_mbrlen) { + win_skip("mbrlen tests\n"); + }else { + mbstate_t state = 0; + expect_eq(p_mbrlen((const char*)mbstring, 2, NULL), 2, int, "%d"); + expect_eq(p_mbrlen((const char*)&mbstring[2], 2, NULL), 2, int, "%d"); + expect_eq(p_mbrlen((const char*)&mbstring[3], 2, NULL), 1, int, "%d"); + expect_eq(p_mbrlen((const char*)mbstring, 1, NULL), -2, int, "%d"); + expect_eq(p_mbrlen((const char*)mbstring, 1, &state), -2, int, "%d"); + ok(state == mbstring[0], "incorrect state value (%x)\n", state); + expect_eq(p_mbrlen((const char*)&mbstring[1], 1, &state), 2, int, "%d"); + } + setlocale(LC_ALL, "C"); + /* _mbccpy/_mbsncpy */ memset(buf, 0xff, sizeof(buf)); _mbccpy(buf, mbstring); @@ -2302,6 +2319,7 @@ START_TEST(string) p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); + p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Piotr Caban : msvcrt: Added mbrtowc implementation.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 4b67531bf72ee1a8c92029a7be3836c96594150e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b67531bf72ee1a8c92029a7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:02 2012 +0000 msvcrt: Added mbrtowc implementation. --- dlls/msvcrt/mbcs.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b083ea1..71b5343 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1995,7 +1995,7 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, /* return the number of bytes from src that have been used */ if(!*str) return 0; - if(n >= 2 && MSVCRT__isleadbyte_l(*str, locale) && str[1]) + if(n >= 2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale) && str[1]) return 2; return 1; } @@ -2009,6 +2009,53 @@ int CDECL MSVCRT_mbtowc(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n) } /********************************************************************* + * mbrtowc(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbrtowc(MSVCRT_wchar_t *dst, const char *str, + MSVCRT_size_t n, MSVCRT_mbstate_t *state) +{ + MSVCRT_pthreadlocinfo locinfo = get_locinfo(); + MSVCRT_mbstate_t s = (state ? *state : 0); + char tmpstr[2]; + int len = 0; + + if(dst) + *dst = 0; + + if(!n || !str || !*str) + return 0; + + if(locinfo->mb_cur_max == 1) { + tmpstr[len++] = *str; + }else if(!s && MSVCRT_isleadbyte((unsigned char)*str)) { + if(n == 1) { + s = (unsigned char)*str; + len = -2; + }else { + tmpstr[0] = str[0]; + tmpstr[1] = str[1]; + len = 2; + } + }else if(!s) { + tmpstr[len++] = *str; + }else { + tmpstr[0] = s; + tmpstr[1] = *str; + len = 2; + s = 0; + } + + if(len > 0) { + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, tmpstr, len, dst, dst ? 1 : 0)) + len = -1; + } + + if(state) + *state = s; + return len; +} + +/********************************************************************* * _mbstowcs_l(MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7957e92..4f2fa9a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1329,7 +1329,7 @@ @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -# stub mbrtowc(ptr str long ptr) +@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc # stub mbsdup_dbg(wstr long ptr long) # stub mbsrtowcs(ptr ptr long ptr) # stub mbsrtowcs_s(ptr ptr long ptr long ptr)

1 0

Piotr Caban : msvcrt: Added mbrtowc tests.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: f20a85a5da003ebe3e920847641c8097f255a373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20a85a5da003ebe3e9208476… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:20 2012 +0000 msvcrt: Added mbrtowc tests. --- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 73e7414..743b5b3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -86,6 +86,7 @@ static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements static int (__cdecl *p_wctob)(wint_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*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -319,6 +320,28 @@ static void test_mbcp(void) ok(state == mbstring[0], "incorrect state value (%x)\n", state); expect_eq(p_mbrlen((const char*)&mbstring[1], 1, &state), 2, int, "%d"); } + + /* mbrtowc */ + if(!setlocale(LC_ALL, ".936") || !p_mbrtowc) { + win_skip("mbrtowc tests\n"); + }else { + mbstate_t state = 0; + wchar_t dst; + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 2, NULL), 2, int, "%d"); + ok(dst == 0x6c28, "dst = %x, expected 0x6c28\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+2, 2, NULL), 2, int, "%d"); + ok(dst == 0x3f, "dst = %x, expected 0x3f\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+3, 2, NULL), 1, int, "%d"); + ok(dst == 0x20, "dst = %x, expected 0x20\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 1, NULL), -2, int, "%d"); + ok(dst == 0, "dst = %x, expected 0\n", dst); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring, 1, &state), -2, int, "%d"); + ok(dst == 0, "dst = %x, expected 0\n", dst); + ok(state == mbstring[0], "incorrect state value (%x)\n", state); + expect_eq(p_mbrtowc(&dst, (const char*)mbstring+1, 1, &state), 2, int, "%d"); + ok(dst == 0x6c28, "dst = %x, expected 0x6c28\n", dst); + ok(state == 0, "incorrect state value (%x)\n", state); + } setlocale(LC_ALL, "C"); /* _mbccpy/_mbsncpy */ @@ -2320,6 +2343,7 @@ START_TEST(string) p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); + p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Piotr Caban : msvcrt: Added mbsrtowcs implementation.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 5e50ec3df288b3bc9221c2deb802fa1ddc846df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e50ec3df288b3bc9221c2deb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:39 2012 +0000 msvcrt: Added mbsrtowcs implementation. --- dlls/msvcrt/mbcs.c | 34 +++++++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 71b5343..e06511d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2077,7 +2077,7 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, if(mbstr[size] == '\0') break; - size += (MSVCRT__isleadbyte_l(mbstr[size], locale) ? 2 : 1); + size += (MSVCRT__isleadbyte_l((unsigned char)mbstr[size], locale) ? 2 : 1); } size = MultiByteToWideChar(locinfo->lc_codepage, 0, @@ -2150,3 +2150,35 @@ int CDECL MSVCRT__mbstowcs_s(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, { return MSVCRT__mbstowcs_s_l(ret, wcstr, size, mbstr, count, NULL); } + +/********************************************************************* + * mbsrtowcs(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, + const char **pmbstr, MSVCRT_size_t count, MSVCRT_mbstate_t *state) +{ + MSVCRT_mbstate_t s = (state ? *state : 0); + MSVCRT_wchar_t tmpdst; + MSVCRT_size_t ret = 0; + + if(!MSVCRT_CHECK_PMT(pmbstr != NULL)) + return -1; + + while(!wcstr || count>ret) { + int ch_len = MSVCRT_mbrtowc(&tmpdst, *pmbstr, 2, &s); + if(wcstr) + wcstr[ret] = tmpdst; + + if(ch_len < 0) { + return -1; + }else if(ch_len == 0) { + *pmbstr = NULL; + return ret; + } + + *pmbstr += ch_len; + ret++; + } + + return ret; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4f2fa9a..6a88832 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1331,7 +1331,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc # stub mbsdup_dbg(wstr long ptr long) -# stub mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs # stub mbsrtowcs_s(ptr ptr long ptr long ptr) @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s

1 0

Piotr Caban : msvcrt: Added mbsrtowcs tests.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 1ced0f460c28507cef344b751aa163ab863ea925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ced0f460c28507cef344b751… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:23:57 2012 +0000 msvcrt: Added mbsrtowcs tests. --- dlls/msvcrt/tests/string.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 743b5b3..840c4de 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -72,6 +72,7 @@ static __int64 (__cdecl *p_strtoi64)(const char *, char **, int); static unsigned __int64 (__cdecl *p_strtoui64)(const char *, char **, int); static int (__cdecl *pwcstombs_s)(size_t*,char*,size_t,const wchar_t*,size_t); static int (__cdecl *pmbstowcs_s)(size_t*,wchar_t*,size_t,const char*,size_t); +static size_t (__cdecl *p_mbsrtowcs)(wchar_t*, const char**, size_t, mbstate_t*); static size_t (__cdecl *pwcsrtombs)(char*, const wchar_t**, size_t, int*); static errno_t (__cdecl *p_gcvt_s)(char*,size_t,double,int); static errno_t (__cdecl *p_itoa_s)(int,char*,size_t,int); @@ -1582,6 +1583,8 @@ static void test_mbstowcs(void) char mOut[6]; size_t ret; int err; + const char *pmbstr; + mbstate_t state; wOut[4] = '!'; wOut[5] = '\0'; mOut[4] = '!'; mOut[5] = '\0'; @@ -1672,6 +1675,38 @@ static void test_mbstowcs(void) ok(pwstr == NULL, "pwstr != NULL\n"); ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + if(!p_mbsrtowcs) { + setlocale(LC_ALL, "C"); + win_skip("mbsrtowcs not available\n"); + return; + } + + pmbstr = mHiragana; + ret = p_mbsrtowcs(wOut, &pmbstr, 6, NULL); + ok(ret == 2, "mbsrtowcs did not return 2\n"); + ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ok(!pmbstr, "pmbstr != NULL\n"); + + state = mHiragana[0]; + pmbstr = mHiragana+1; + ret = p_mbsrtowcs(wOut, &pmbstr, 6, &state); + ok(ret == 2, "mbsrtowcs did not return 2\n"); + ok(wOut[0] == 0x3042, "wOut[0] = %x\n", wOut[0]); + ok(wOut[1] == 0xff61, "wOut[1] = %x\n", wOut[1]); + ok(wOut[2] == 0, "wOut[2] = %x\n", wOut[2]); + ok(!pmbstr, "pmbstr != NULL\n"); + + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + errno = EBADF; + ret = p_mbsrtowcs(wOut, NULL, 6, &state); + ok(ret == -1, "mbsrtowcs did not return -1\n"); + ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); + if (p_set_invalid_parameter_handler) + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); + setlocale(LC_ALL, "C"); } @@ -2344,6 +2379,7 @@ START_TEST(string) p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); + p_mbsrtowcs = (void*)GetProcAddress(hMsvcrt, "mbsrtowcs"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */

1 0

Alexandre Julliard : gdi32: Add faster implementations of the solid_rects primitive for the common case of R2_COPYPEN .
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: cb7917f9c8a4a8d6820881aad52fa897a52d1583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7917f9c8a4a8d6820881aad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 12:17:55 2012 +0100 gdi32: Add faster implementations of the solid_rects primitive for the common case of R2_COPYPEN. --- dlls/gdi32/dibdrv/primitives.c | 177 +++++++++++++++++++++++++++++++--------- 1 files changed, 139 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb7917f9c8a4a8d682088…

1 0

Alexandre Julliard : gdi32: Add assembly helpers for filling solid rectangles.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 2aff4696b67daaf19249e969258f106fad6043f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aff4696b67daaf19249e9692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 12:31:13 2012 +0100 gdi32: Add assembly helpers for filling solid rectangles. --- dlls/gdi32/dibdrv/primitives.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index e3807ac..649912b 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -258,12 +258,26 @@ static inline void do_rop_codes_line_rev_1(BYTE *dst, int dst_x, const BYTE *src static inline void memset_32( DWORD *start, DWORD val, DWORD size ) { +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + DWORD dummy; + __asm__ __volatile__( "cld; rep; stosl" + : "=c" (dummy), "=D" (dummy) + : "a" (val), "0" (size), "1" (start) ); +#else while (size--) *start++ = val; +#endif } static inline void memset_16( WORD *start, WORD val, DWORD size ) { +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + DWORD dummy; + __asm__ __volatile__( "cld; rep; stosw" + : "=c" (dummy), "=D" (dummy) + : "a" (val), "0" (size), "1" (start) ); +#else while (size--) *start++ = val; +#endif } static void solid_rects_32(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor)

1 0

Alexandre Julliard : gdi32: Add faster implementation of the pattern_rects primitive when we don' t need an AND mask.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 7339308e16fa50665f1dc0312fd6e3432c63fe09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7339308e16fa50665f1dc0312… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 17:59:37 2012 +0100 gdi32: Add faster implementation of the pattern_rects primitive when we don't need an AND mask. --- dlls/gdi32/dibdrv/objects.c | 14 +- dlls/gdi32/dibdrv/primitives.c | 491 +++++++++++++++++++++++++++------------- 2 files changed, 346 insertions(+), 159 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7339308e16fa50665f1dc…

1 0

Alexandre Julliard : setupapi: Load IRegistrar from atl100.dll.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 960f0595b2648f5fdfe253a9df8c0671ab6efb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=960f0595b2648f5fdfe253a9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 28 21:25:00 2012 +0100 setupapi: Load IRegistrar from atl100.dll. --- dlls/setupapi/fakedll.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 7393e40..525f399 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -770,7 +770,7 @@ static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR nam static void register_fake_dll( const WCHAR *name, const void *data, size_t size ) { - static const WCHAR atlW[] = {'a','t','l','.','d','l','l',0}; + static const WCHAR atlW[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR manifestW[] = {'W','I','N','E','_','M','A','N','I','F','E','S','T',0}; @@ -791,20 +791,14 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size if (!registrar) { - /* create the object by hand since we can't guarantee that atl and ole32 are registered */ - IClassFactory *cf; - HRESULT (WINAPI *pDllGetClassObject)( REFCLSID clsid, REFIID iid, LPVOID *ppv ); + HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**); HMODULE atl = LoadLibraryW( atlW ); - if ((pDllGetClassObject = (void *)GetProcAddress( atl, "DllGetClassObject" ))) - { - hr = pDllGetClassObject( &CLSID_Registrar, &IID_IClassFactory, (void **)&cf ); - if (SUCCEEDED( hr )) - { - hr = IClassFactory_CreateInstance( cf, NULL, &IID_IRegistrar, (void **)&registrar ); - IClassFactory_Release( cf ); - } - } + if ((pAtlCreateRegistrar = (void *)GetProcAddress( atl, "AtlCreateRegistrar" ))) + hr = pAtlCreateRegistrar( &registrar ); + else + hr = E_NOINTERFACE; + if (!registrar) { ERR( "failed to create IRegistrar: %x\n", hr );

1 0