May 2010 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Sync msvcr* dlls.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 4733bd8162822d6680a1790e4c12b427ce2654e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4733bd8162822d6680a1790e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:28:21 2010 +0200 msvcrt: Sync msvcr* dlls. --- dlls/msvcr100/msvcr100.spec | 36 ++++++++++++++++++------------------ dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2d30cfe..2117c05 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -332,13 +332,13 @@ @ cdecl ___lc_collate_cp_func() msvcrt.___lc_collate_cp_func @ cdecl ___lc_handle_func() msvcrt.___lc_handle_func @ cdecl ___mb_cur_max_func() msvcrt.___mb_cur_max_func -@ stub ___mb_cur_max_l_func +@ cdecl ___mb_cur_max_l_func(ptr) msvcrt.___mb_cur_max_l_func @ cdecl ___setlc_active_func() msvcrt.___setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() msvcrt.___unguarded_readlc_active_add_func @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv @ extern __badioinfo msvcrt.__badioinfo -@ stub __clean_type_info_names_internal +@ cdecl __clean_type_info_names_internal(ptr) msvcr90.__clean_type_info_names_internal @ stub __control87_2 @ stub __create_locale @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @@ -422,8 +422,8 @@ @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr @ stub __strncnt @ stub __swprintf_l -@ stub __sys_errlist -@ stub __sys_nerr +@ cdecl __sys_errlist() msvcr90.__sys_errlist +@ cdecl __sys_nerr() msvcr90.__sys_nerr @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid @ stub __timezone @@ -475,7 +475,7 @@ @ cdecl _c_exit() msvcrt._c_exit @ cdecl _cabs(long) msvcrt._cabs @ cdecl _callnewh(long) msvcrt._callnewh -@ stub _calloc_crt +@ cdecl _calloc_crt(long long) msvcrt.calloc @ cdecl _cexit() msvcrt._cexit @ cdecl _cgets(str) msvcrt._cgets @ stub _cgets_s @@ -537,7 +537,7 @@ @ stub _dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s -@ stub _encoded_null +@ cdecl _encoded_null() msvcr90._encoded_null @ cdecl _endthread() msvcrt._endthread @ cdecl _endthreadex(long) msvcrt._endthreadex @ extern _environ msvcrt._environ @@ -682,19 +682,19 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ stub _hypotf +@ cdecl _hypotf(double double) msvcrt._hypotf @ cdecl _i64toa(long long ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(long long ptr long) msvcrt._i64tow @ stub _i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ stub _initterm_e +@ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e @ stub _inp @ stub _inpd @ stub _inpw @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter -@ stub _invalid_parameter_noinfo +@ cdecl _invalid_parameter_noinfo() msvcr90._invalid_parameter_noinfo @ stub _invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ extern _iob msvcrt._iob @@ -820,7 +820,7 @@ @ stub _ltow_s @ cdecl _makepath(ptr str str str str) msvcrt._makepath @ stub _makepath_s -@ stub _malloc_crt +@ cdecl _malloc_crt(long) msvcrt.malloc @ cdecl _mbbtombc(long) msvcrt._mbbtombc @ stub _mbbtombc_l @ cdecl _mbbtype(long long) msvcrt._mbbtype @@ -946,10 +946,10 @@ @ stub _mbstok_l @ stub _mbstok_s @ stub _mbstok_s_l -@ stub _mbstowcs_l -@ stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen -@ stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) msvcrt._mbstrlen_l @ stub _mbstrnlen @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @@ -996,7 +996,7 @@ @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read @ stub _realloc_crt -@ stub _recalloc +@ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt @ stub _resetstkoflw @ cdecl _rmdir(str) msvcrt._rmdir @@ -1148,7 +1148,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ui64toa(long long ptr long) msvcrt._ui64toa -@ stub _ui64toa_s +@ cdecl _ui64toa_s(long ptr long long) msvcrt._ui64toa_s @ cdecl _ui64tow(long long ptr long) msvcrt._ui64tow @ stub _ui64tow_s @ cdecl _ultoa(long ptr long) msvcrt._ultoa @@ -1219,7 +1219,7 @@ @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l @ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l -@ stub _vswprintf_p +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l @@ -1263,7 +1263,7 @@ @ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l -@ stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @@ -1483,7 +1483,7 @@ @ stub mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs -@ stub mbstowcs_s +@ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @ cdecl mbtowc(wstr str long) msvcrt.mbtowc @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 866d49a..edf3da4 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -446,7 +446,7 @@ @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle -@ stub _osplatform +@ extern _osplatform msvcrt._osplatform @ extern _osver msvcrt._osver @ stub _outp @ stub _outpd diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 20240e0..f0d6255 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -441,7 +441,7 @@ @ cdecl _onexit(ptr) msvcrt._onexit @ varargs _open(str long) msvcrt._open @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle -@ stub _osplatform +@ extern _osplatform msvcrt._osplatform @ extern _osver msvcrt._osver @ cdecl -i386 _outp(long long) msvcrt._outp @ cdecl -i386 _outpd(long long) msvcrt._outpd diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8b82783..0249277 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -522,7 +522,7 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ stub _hypotf +@ cdecl _hypotf(double double) msvcrt._hypotf @ cdecl _i64toa(long long ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(long long ptr long) msvcrt._i64tow @@ -788,7 +788,7 @@ @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen -@ stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) msvcrt._mbstrlen_l @ stub _mbstrnlen @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @@ -1109,7 +1109,7 @@ @ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l -@ stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9594535..be4a675 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -510,7 +510,7 @@ @ stub _heapused @ cdecl _heapwalk(ptr) msvcrt._heapwalk @ cdecl _hypot(double double) msvcrt._hypot -@ stub _hypotf +@ cdecl _hypotf(double double) msvcrt.hypotf @ cdecl _i64toa(long long ptr long) msvcrt._i64toa @ stub _i64toa_s @ cdecl _i64tow(long long ptr long) msvcrt._i64tow @@ -776,7 +776,7 @@ @ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l @ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen -@ stub _mbstrlen_l +@ cdecl _mbstrlen_l(str ptr) msvcrt._mbstrlen_l @ stub _mbstrnlen @ stub _mbstrnlen_l @ cdecl _mbsupr(str) msvcrt._mbsupr @@ -1096,7 +1096,7 @@ @ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l -@ stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l

1 0

Piotr Caban : msvcrt: Fixed wcstombs(_s_l) implementation.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 335c9772ece4964c061526d8178348c6d1f61ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=335c9772ece4964c061526d81… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:27:57 2010 +0200 msvcrt: Fixed wcstombs(_s_l) implementation. --- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/wcs.c | 109 +++++++++++++++++++++++++++------------------- 2 files changed, 66 insertions(+), 47 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 8655f6f..c7d6654 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1040,7 +1040,7 @@ @ cdecl _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l -# stub _wcstombs_l +@ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @@ -1417,7 +1417,7 @@ @ cdecl wcstok(wstr wstr) MSVCRT_wcstok # stub wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol -@ cdecl wcstombs(ptr ptr long) ntdll.wcstombs +@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) ntdll.wcstoul @ stub wcsxfrm #(ptr wstr long) MSVCRT_wcsxfrm diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5334115..96a25e5 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -227,76 +227,95 @@ double CDECL MSVCRT__wcstod_l(const MSVCRT_wchar_t* str, MSVCRT_wchar_t** end, } /********************************************************************* - * _wcstombs_s_l (MSVCRT.@) + * _wcstombs_l (MSVCRT.@) */ -int CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, - MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, +MSVCRT_size_t CDECL MSVCRT__wcstombs_l(char *mbstr, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { - char default_char = '\0', *p; - int hlp, len; - - if(!size) - return 0; - - if(!mbstr || !wcstr) { - MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - if(mbstr) - *mbstr = '\0'; - *MSVCRT__errno() = MSVCRT_EINVAL; - return MSVCRT_EINVAL; - } + char default_char = '\0'; + MSVCRT_size_t tmp; + BOOL used_default; if(!locale) locale = get_locale(); - if(size<=count) - len = size; - else if(count==_TRUNCATE) - len = size-1; - else - len = count; + /* FIXME: Use wcslen here */ + tmp = strlenW(wcstr); + if(tmp>count && mbstr) + tmp = count; - p = mbstr; - *ret = 0; - while(1) { - if(!len) - break; + tmp = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, tmp, mbstr, count, &default_char, &used_default); - if(*wcstr == '\0') { - *p = '\0'; - break; - } + if(used_default) + return -1; - hlp = WideCharToMultiByte(locale->locinfo->lc_codepage, - WC_NO_BEST_FIT_CHARS, wcstr, 1, p, len, &default_char, NULL); - if(!hlp || *p=='\0') - break; + if(tmp<count && mbstr) + mbstr[tmp] = '\0'; - p += hlp; - len -= hlp; + return tmp; +} - wcstr++; - *ret += 1; +/********************************************************************* + * wcstombs (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcstombs(char *mbstr, const MSVCRT_wchar_t *wcstr, + MSVCRT_size_t count) +{ + return MSVCRT__wcstombs_l(mbstr, wcstr, count, NULL); +} + +/********************************************************************* + * _wcstombs_s_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__wcstombs_s_l(MSVCRT_size_t *ret, char *mbstr, + MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_size_t conv; + + if(!mbstr && !size) { + conv = MSVCRT__wcstombs_l(NULL, wcstr, 0, locale); + if(ret) + *ret = conv; + return 0; + } + + if(!wcstr || !mbstr) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(mbstr && size) + mbstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; } - if(!len && size<=count) { + if(count==_TRUNCATE || size<count) + conv = size; + else + conv = count; + + conv = MSVCRT__wcstombs_l(mbstr, wcstr, conv, locale); + if(conv<size) + mbstr[conv++] = '\0'; + else if(conv==size && (count==_TRUNCATE || mbstr[conv-1]=='\0')) + mbstr[conv-1] = '\0'; + else { MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); - *mbstr = '\0'; + if(size) + mbstr[0] = '\0'; *MSVCRT__errno() = MSVCRT_ERANGE; return MSVCRT_ERANGE; } - if(*wcstr == '\0') - *ret += 1; - *p = '\0'; + if(ret) + *ret = conv; return 0; } /********************************************************************* * wcstombs_s (MSVCRT.@) */ -int CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, +MSVCRT_size_t CDECL MSVCRT_wcstombs_s(MSVCRT_size_t *ret, char *mbstr, MSVCRT_size_t size, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count) { return MSVCRT__wcstombs_s_l(ret, mbstr, size, wcstr, count, NULL);

1 0

Alexandre Julliard : winex11: Create a window of the appropriate visual to initialize GL info.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: df6cd82ccf5dd03b0362a7ea571e14d66bbc5d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df6cd82ccf5dd03b0362a7ea5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 14:57:44 2010 +0200 winex11: Create a window of the appropriate visual to initialize GL info. --- dlls/winex11.drv/opengl.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d8f8d0a..584abb6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -297,16 +297,21 @@ static BOOL infoInitialized = FALSE; static BOOL X11DRV_WineGL_InitOpenglInfo(void) { int screen = DefaultScreen(gdi_display); - Window win = RootWindow(gdi_display, screen); + Window win = 0, root = 0; const char* str; XVisualInfo *vis; GLXContext ctx = NULL; + XSetWindowAttributes attr; + BOOL ret = FALSE; int attribList[] = {GLX_RGBA, GLX_DOUBLEBUFFER, None}; if (infoInitialized) return TRUE; infoInitialized = TRUE; + attr.override_redirect = True; + attr.colormap = None; + wine_tsx11_lock(); vis = pglXChooseVisual(gdi_display, screen, attribList); @@ -318,23 +323,26 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if (wine_get_fs() != old_fs) { wine_set_fs( old_fs ); - wine_tsx11_unlock(); ERR( "%%fs register corrupted, probably broken ATI driver, disabling OpenGL.\n" ); ERR( "You need to set the \"UseFastTls\" option to \"2\" in your X config file.\n" ); - return FALSE; + goto done; } #else ctx = pglXCreateContext(gdi_display, vis, None, GL_TRUE); #endif } + if (!ctx) goto done; - if (ctx) { - pglXMakeCurrent(gdi_display, win, ctx); - } else { - ERR(" couldn't initialize OpenGL, expect problems\n"); - wine_tsx11_unlock(); - return FALSE; - } + root = RootWindow( gdi_display, vis->screen ); + if (vis->visual != DefaultVisual( gdi_display, vis->screen )) + attr.colormap = XCreateColormap( gdi_display, root, vis->visual, AllocNone ); + if ((win = XCreateWindow( gdi_display, root, -1, -1, 1, 1, 0, vis->depth, InputOutput, + vis->visual, CWOverrideRedirect | CWColormap, &attr ))) + XMapWindow( gdi_display, win ); + else + win = root; + + pglXMakeCurrent(gdi_display, win, ctx); WineGLInfo.glVersion = (const char *) pglGetString(GL_VERSION); str = (const char *) pglGetString(GL_EXTENSIONS); @@ -391,14 +399,19 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) if(!strcmp(gl_renderer, "Software Rasterizer") || !strcmp(gl_renderer, "Mesa X11")) ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL drivers haven't been installed correctly\n"); } + ret = TRUE; +done: if(vis) XFree(vis); if(ctx) { pglXMakeCurrent(gdi_display, None, NULL); pglXDestroyContext(gdi_display, ctx); } + if (win != root) XDestroyWindow( gdi_display, win ); + if (attr.colormap) XFreeColormap( gdi_display, attr.colormap ); wine_tsx11_unlock(); - return TRUE; + if (!ret) ERR(" couldn't initialize OpenGL, expect problems\n"); + return ret; } void X11DRV_OpenGL_Cleanup(void) @@ -891,7 +904,7 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) render_type = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT; break; default: - ERR("Unknown render_type: %x\n", render_type); + ERR("Unknown render_type: %x\n", render_type_bit); } return render_type; }

1 0

Matteo Bruni : d3dx9: Support all the remaining register types in the shader assembler.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 5f934aca62e37170b6904515e14b06c96ac25bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f934aca62e37170b6904515e… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 5 16:56:09 2010 +0200 d3dx9: Support all the remaining register types in the shader assembler. --- dlls/d3dx9_36/asmshader.l | 70 +++++++++++++ dlls/d3dx9_36/asmshader.y | 198 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/asmutils.c | 59 +++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 27 +++++- 4 files changed, 352 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f934aca62e37170b6904…

1 0

Piotr Caban : msvcrt: Added mbstowcs and wcstombs tests.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 2eb4b694a7256c4a5c418363501ef1b8122b84a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb4b694a7256c4a5c4183635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:28:08 2010 +0200 msvcrt: Added mbstowcs and wcstombs tests. --- dlls/msvcrt/tests/string.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5d61687..f6c0e2c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -56,6 +56,8 @@ static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); static size_t (__cdecl *p_strnlen)(const char *, size_t); 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 int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -1161,6 +1163,79 @@ static void test__strtod(void) ok(errno == ERANGE, "errno = %x\n", errno); } +static void test_mbstowcs(void) +{ + static const wchar_t wSimple[] = { 't','e','x','t',0 }; + static const wchar_t wHiragana[] = { 0x3042,0x3043,0 }; + static const char mSimple[] = "text"; + static const char mHiragana[] = { 0x82,0xa0,0x82,0xa1,0 }; + + wchar_t wOut[6]; + char mOut[6]; + size_t ret; + int err; + + wOut[4] = '!'; wOut[5] = '\0'; + mOut[4] = '!'; mOut[5] = '\0'; + + ret = mbstowcs(NULL, mSimple, 0); + ok(ret == 4, "ret = %d\n", ret); + + ret = mbstowcs(wOut, mSimple, 4); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(wOut, wSimple, 4*sizeof(wchar_t)), "wOut = %s\n", wine_dbgstr_w(wOut)); + ok(wOut[4] == '!', "wOut[4] != \'!\'\n"); + + ret = wcstombs(NULL, wSimple, 0); + ok(ret == 4, "ret = %d\n", ret); + + ret = wcstombs(mOut, wSimple, 6); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + + ret = wcstombs(mOut, wSimple, 2); + ok(ret == 2, "ret = %d\n", ret); + ok(!memcmp(mOut, mSimple, 5*sizeof(char)), "mOut = %s\n", mOut); + + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("Japanese_Japan.932 locale not available\n"); + return; + } + + ret = mbstowcs(wOut, mHiragana, 6); + ok(ret == 2, "ret = %d\n", ret); + ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + + ret = wcstombs(mOut, wHiragana, 6); + ok(ret == 4, "ret = %d\n", ret); + ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); + + if(!pmbstowcs_s || !pwcstombs_s) { + win_skip("mbstowcs_s or wcstombs_s not available\n"); + return; + } + + err = pmbstowcs_s(&ret, wOut, 6, mSimple, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); + ok(!memcmp(wOut, wSimple, sizeof(wSimple)), "wOut = %s\n", wine_dbgstr_w(wOut)); + + err = pmbstowcs_s(&ret, wOut, 6, mHiragana, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 3, "ret = %d\n", (int)ret); + ok(!memcmp(wOut, wHiragana, sizeof(wHiragana)), "wOut = %s\n", wine_dbgstr_w(wOut)); + + err = pwcstombs_s(&ret, mOut, 6, wSimple, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); + ok(!memcmp(mOut, mSimple, sizeof(mSimple)), "mOut = %s\n", mOut); + + err = pwcstombs_s(&ret, mOut, 6, wHiragana, -1/*_TRUNCATE*/); + ok(err == 0, "err = %d\n", err); + ok(ret == 5, "ret = %d\n", (int)ret); + ok(!memcmp(mOut, mHiragana, sizeof(mHiragana)), "mOut = %s\n", mOut); +} + START_TEST(string) { char mem[100]; @@ -1183,6 +1258,8 @@ START_TEST(string) p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); p_strtoi64 = (void *) GetProcAddress(hMsvcrt, "_strtoi64"); p_strtoui64 = (void *) GetProcAddress(hMsvcrt, "_strtoui64"); + pmbstowcs_s = (void *) GetProcAddress(hMsvcrt, "mbstowcs_s"); + pwcstombs_s = (void *) GetProcAddress(hMsvcrt, "wcstombs_s"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -1215,4 +1292,5 @@ START_TEST(string) test_strnlen(); test__strtoi64(); test__strtod(); + test_mbstowcs(); }

1 0

Matteo Bruni : d3dx9: Support some more vs_3_0 instructions in the shader assembler.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: fb3ee6e0a66d48c5f5104db91670b2440f38873b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3ee6e0a66d48c5f5104db91… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Wed May 5 20:21:10 2010 +0200 d3dx9: Support some more vs_3_0 instructions in the shader assembler. --- dlls/d3dx9_36/asmshader.l | 37 +++++++ dlls/d3dx9_36/asmshader.y | 208 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/asmutils.c | 68 ++++++++++++ dlls/d3dx9_36/bytecodewriter.c | 36 +++++++ dlls/d3dx9_36/d3dx9_36_private.h | 43 +++++++- dlls/d3dx9_36/tests/asm.c | 23 +++-- 6 files changed, 403 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb3ee6e0a66d48c5f5104…

1 0

Piotr Caban : msvcrt: Added mbstowcs(_s_l) implementation.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 7352ee844e98d03561fe31c9cc7b6d9e625b56c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7352ee844e98d03561fe31c9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 6 14:27:45 2010 +0200 msvcrt: Added mbstowcs(_s_l) implementation. --- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.spec | 6 ++-- dlls/msvcrt/mbcs.c | 89 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 8 ++-- 4 files changed, 99 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b2a19c4..8b82783 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -785,8 +785,8 @@ @ stub _mbstok_l @ stub _mbstok_s @ stub _mbstok_s_l -@ stub _mbstowcs_l -@ stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ stub _mbstrlen_l @ stub _mbstrnlen @@ -1330,7 +1330,7 @@ @ stub mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs -@ stub mbstowcs_s +@ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @ cdecl mbtowc(wstr str long) msvcrt.mbtowc @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f41362d..9594535 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -773,8 +773,8 @@ @ stub _mbstok_l @ stub _mbstok_s @ stub _mbstok_s_l -@ stub _mbstowcs_l -@ stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) msvcrt._mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) msvcrt._mbstowcs_s_l @ cdecl _mbstrlen(str) msvcrt._mbstrlen @ stub _mbstrlen_l @ stub _mbstrnlen @@ -1314,7 +1314,7 @@ @ stub mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs -@ stub mbstowcs_s +@ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @ cdecl mbtowc(wstr str long) msvcrt.mbtowc @ cdecl memchr(ptr long long) msvcrt.memchr @ cdecl memcmp(ptr ptr long) msvcrt.memcmp diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c562234..837ac02 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1718,3 +1718,92 @@ MSVCRT_size_t CDECL _mbstrlen(const char* str) { return _mbstrlen_l(str, NULL); } + +/********************************************************************* + * _mbstowcs_l(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_size_t tmp; + + if(!locale) + locale = get_locale(); + + tmp = _mbstrlen_l(mbstr, locale); + if(tmp>count && wcstr) + tmp = count; + + tmp = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, + mbstr, tmp, wcstr, count); + + if(tmp<count && wcstr) + wcstr[tmp] = '\0'; + + return tmp; +} + +/********************************************************************* + * mbstowcs(MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_mbstowcs(MSVCRT_wchar_t *wcstr, + const char *mbstr, MSVCRT_size_t count) +{ + return MSVCRT__mbstowcs_l(wcstr, mbstr, count, NULL); +} + +/********************************************************************* + * _mbstowcs_s_l(MSVCRT.@) + */ +int CDECL MSVCRT__mbstowcs_s_l(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, + MSVCRT_size_t size, const char *mbstr, + MSVCRT_size_t count, MSVCRT__locale_t locale) +{ + MSVCRT_size_t conv; + + if(!wcstr && !size) { + conv = MSVCRT__mbstowcs_l(NULL, mbstr, 0, locale); + if(ret) + *ret = conv; + return 0; + } + + if(!mbstr || !wcstr) { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(wcstr && size) + wcstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if(count==_TRUNCATE || size<count) + conv = size; + else + conv = count; + + conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale); + if(conv<size) + wcstr[conv++] = '\0'; + else if(conv==size && (count==_TRUNCATE || wcstr[conv-1]=='\0')) + wcstr[conv-1] = '\0'; + else { + MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0); + if(size) + wcstr[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + if(ret) + *ret = conv; + return 0; +} + +/********************************************************************* + * mbstowcs_s(MSVCRT.@) + */ +int CDECL MSVCRT__mbstowcs_s(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, + MSVCRT_size_t size, const char *mbstr, MSVCRT_size_t count) +{ + return MSVCRT__mbstowcs_s_l(ret, wcstr, size, mbstr, count, NULL); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3437442..8655f6f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -731,8 +731,8 @@ # stub _mbstok_l # stub _mbstok_s # stub _mbstok_s_l -# stub _mbstowcs_l -# stub _mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) # stub _mbstrnlen @@ -1277,8 +1277,8 @@ # stub mbsdup_dbg # stub mbsrtowcs # stub mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) ntdll.mbstowcs -# stub mbstowcs_s +@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs +@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(wstr str long) MSVCRT_mbtowc @ cdecl memchr(ptr long long) ntdll.memchr @ cdecl memcmp(ptr ptr long) ntdll.memcmp

1 0

Joel Holdsworth : shell32: Comitted a Tango icon for the control panel.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: 7dfa965d95763ee054570e2a4d270bcb18ce5996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfa965d95763ee054570e2a4… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed May 5 21:54:57 2010 +0100 shell32: Comitted a Tango icon for the control panel. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/control.ico | Bin 0 -> 25214 bytes dlls/shell32/control.svg | 237 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shres.rc | 3 + 4 files changed, 241 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7dfa965d95763ee054570…

1 0

Alexandre Julliard : wined3d: Don' t crash during initialization if the adapter doesn't have full GL info.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: e45926d582ea3887f8ade611365654174cdd754f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e45926d582ea3887f8ade6113… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 14:57:21 2010 +0200 wined3d: Don't crash during initialization if the adapter doesn't have full GL info. --- dlls/wined3d/device.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f001591..2b8f231 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7034,25 +7034,29 @@ HRESULT device_init(IWineD3DDeviceImpl *device, IWineD3DImpl *wined3d, select_shader_mode(&adapter->gl_info, &device->ps_selected_mode, &device->vs_selected_mode); device->shader_backend = adapter->shader_backend; - device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); - device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; - device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; - device->vs_clipping = shader_caps.VSClipping; - + if (device->shader_backend) + { + device->shader_backend->shader_get_caps(&adapter->gl_info, &shader_caps); + device->d3d_vshader_constantF = shader_caps.MaxVertexShaderConst; + device->d3d_pshader_constantF = shader_caps.MaxPixelShaderConst; + device->vs_clipping = shader_caps.VSClipping; + } fragment_pipeline = adapter->fragment_pipe; device->frag_pipe = fragment_pipeline; - fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); - device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; - - hr = compile_state_table(device->StateTable, device->multistate_funcs, &adapter->gl_info, - ffp_vertexstate_template, fragment_pipeline, misc_state_template); - if (FAILED(hr)) + if (fragment_pipeline) { - ERR("Failed to compile state table, hr %#x.\n", hr); - IWineD3D_Release(device->wined3d); - return hr; - } + fragment_pipeline->get_caps(&adapter->gl_info, &ffp_caps); + device->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; + hr = compile_state_table(device->StateTable, device->multistate_funcs, &adapter->gl_info, + ffp_vertexstate_template, fragment_pipeline, misc_state_template); + if (FAILED(hr)) + { + ERR("Failed to compile state table, hr %#x.\n", hr); + IWineD3D_Release(device->wined3d); + return hr; + } + } device->blitter = adapter->blitter; return WINED3D_OK;

1 0

Alexandre Julliard : shell32: Make use of the control panel icon.
by Alexandre Julliard May 6, 2010

May 6, 2010

Module: wine Branch: master Commit: fa29e0f2907bcd04ac75ed91677ac5853738e76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa29e0f2907bcd04ac75ed916… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 6 14:44:09 2010 +0200 shell32: Make use of the control panel icon. --- dlls/shell32/control.c | 8 ++++---- dlls/shell32/shresdef.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index 898e0ed..b0d4089 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -475,8 +475,8 @@ static LRESULT WINAPI Control_WndProc(HWND hWnd, UINT wMsg, case IDM_CPANEL_ABOUT: { WCHAR appName[MAX_STRING_LEN]; - HICON icon = LoadImageW((HINSTANCE)GetWindowLongPtrW(hWnd, GWLP_HINSTANCE), - MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 48, 48, LR_SHARED); + HICON icon = LoadImageW(shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), + IMAGE_ICON, 48, 48, LR_SHARED); LoadStringW(shell32_hInstance, IDS_CPANEL_TITLE, appName, sizeof(appName) / sizeof(appName[0])); @@ -627,12 +627,12 @@ static void Control_DoInterface(CPanel* panel, HWND hWnd, HINSTANCE hInst) wc.cbClsExtra = 0; wc.cbWndExtra = sizeof(CPlApplet*); wc.hInstance = panel->hInst = hInst; - wc.hIcon = LoadIconW( hInst, MAKEINTRESOURCEW(IDI_APPICON) ); + wc.hIcon = LoadIconW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL) ); wc.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW ); wc.hbrBackground = GetStockObject(WHITE_BRUSH); wc.lpszMenuName = NULL; wc.lpszClassName = className; - wc.hIconSm = LoadImageW( hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, + wc.hIconSm = LoadImageW( shell32_hInstance, MAKEINTRESOURCEW(IDI_SHELL_CONTROL_PANEL), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); if (!RegisterClassExW(&wc)) return; diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 93fb518..88c93c8 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -178,8 +178,6 @@ #define IDI_SHELL_CONFIRM_DELETE 161 #define IDI_SHELL_MY_DOCUMENTS 235 -#define IDI_APPICON 101 - /* AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 FIXME: Need to add them, but for now just let them use the same: searching.avi

1 0