December 2012 - Wine-commits

Frédéric Delanoy : d3drm: Fix a leak (coverity).
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 8ec82dfaaea38115043da79e0fd4fc8969aaad69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec82dfaaea38115043da79e0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 22 23:29:39 2012 +0100 d3drm: Fix a leak (coverity). --- dlls/d3drm/meshbuilder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index bf9a162..4fc8462 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2143,6 +2143,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil face_data = HeapAlloc(GetProcessHeap(), 0, This->face_data_size * sizeof(*face_data)); if (!face_data) { + HeapFree(GetProcessHeap(), 0, used_vertices); IDirect3DRMMesh_Release(*mesh); return E_OUTOFMEMORY; }

1 0

Jacek Caban : jscript: Don't pass 'this' argument to DISPID_VALUE of pure IDispatch interfaces.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 7726e018442b9e4e1501239277529560982e5391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7726e018442b9e4e150123927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 24 11:38:28 2012 +0100 jscript: Don't pass 'this' argument to DISPID_VALUE of pure IDispatch interfaces. --- dlls/jscript/dispex.c | 17 ++++- dlls/jscript/tests/run.c | 156 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 155 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7726e018442b9e4e15012…

1 0

Piotr Caban : msvcrt: Added _stricmp_l implementation.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: dbec250635d6bef389dbbf3296e949f4653b1276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbec250635d6bef389dbbf329… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 24 12:10:21 2012 +0100 msvcrt: Added _stricmp_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/string.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/tests/string.c | 31 +++++++++++++++++++++++++++++++ 7 files changed, 77 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a09b142..64b4105 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1331,7 +1331,7 @@ @ stub _strerror_s @ stub _strftime_l @ cdecl _stricmp(str str) msvcrt._stricmp -@ stub _stricmp_l +@ cdecl _stricmp_l(str str ptr) msvcrt._stricmp_l @ cdecl _stricoll(str str) msvcrt._stricoll @ cdecl _stricoll_l(str str ptr) msvcrt._stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4457c2c..91147cf 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -993,7 +993,7 @@ @ stub _strerror_s @ stub _strftime_l @ cdecl _stricmp(str str) msvcrt._stricmp -@ stub _stricmp_l +@ cdecl _stricmp_l(str str ptr) msvcrt._stricmp_l @ cdecl _stricoll(str str) msvcrt._stricoll @ cdecl _stricoll_l(str str ptr) msvcrt._stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c20c5fd..abde141 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -986,7 +986,7 @@ @ stub _strerror_s @ stub _strftime_l @ cdecl _stricmp(str str) msvcrt._stricmp -@ stub _stricmp_l +@ cdecl _stricmp_l(str str ptr) msvcrt._stricmp_l @ cdecl _stricoll(str str) msvcrt._stricoll @ cdecl _stricoll_l(str str ptr) msvcrt._stricoll_l @ cdecl _strlwr(str) msvcrt._strlwr diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0d0886f..096f77a 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -863,6 +863,8 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int); /* _get_output_format return code */ #define MSVCRT__TWO_DIGIT_EXPONENT 0x1 +#define MSVCRT__NLSCMPERROR ((unsigned int)0x7fffffff) + void __cdecl MSVCRT_free(void*); void* __cdecl MSVCRT_malloc(MSVCRT_size_t); void* __cdecl MSVCRT_calloc(MSVCRT_size_t,MSVCRT_size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6802104..3d15a21 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -918,7 +918,7 @@ @ cdecl _stat64(str ptr) MSVCRT_stat64 @ cdecl _stati64(str ptr) MSVCRT_stati64 @ cdecl _statusfp() -@ cdecl _strcmpi(str str) ntdll._strcmpi +@ cdecl _strcmpi(str str) MSVCRT__stricmp @ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) @@ -926,8 +926,8 @@ # stub _strdup_dbg(str long str long) @ cdecl _strerror(long) MSVCRT__strerror # stub _strerror_s(ptr long long) -@ cdecl _stricmp(str str) ntdll._stricmp -# stub _stricmp_l(str str ptr) +@ cdecl _stricmp(str str) MSVCRT__stricmp +@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll @ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l @ cdecl _strlwr(str) MSVCRT__strlwr diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a254158..b457510 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1551,9 +1551,46 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 #undef I10_OUTPUT_MAX_PREC /********************************************************************* - * memcpy (NTDLL.@) + * memcpy (MSVCRT.@) */ void * __cdecl MSVCRT_memcpy( void *dst, const void *src, size_t n ) { return memmove( dst, src, n ); } + +/********************************************************************* + * _stricmp_l (MSVCRT.@) + */ +int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadlocinfo locinfo; + char c1, c2; + + if(!MSVCRT_CHECK_PMT(s1!=NULL && s2!=NULL)) + return MSVCRT__NLSCMPERROR; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) + return strcasecmp(s1, s2); + + do { + c1 = MSVCRT__tolower_l(*s1++, locale); + c2 = MSVCRT__tolower_l(*s2++, locale); + if(c1 != c2) + break; + }while(c1 && c1==c2); + + return c1-c2; +} + +/********************************************************************* + * _stricmp (MSVCRT.@) + */ +int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) +{ + return MSVCRT__stricmp_l(s1, s2, NULL); +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index bbaeda0..f2fd8f9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2438,6 +2438,36 @@ static void test__atodbl(void) ok(ret == _OVERFLOW, "_atodbl(&d, \"1e309\") returned %d, expected _OVERFLOW\n", ret); } +static void test__stricmp(void) +{ + int ret; + + ret = _stricmp("test", "test"); + ok(ret == 0, "_stricmp returned %d\n", ret); + ret = _stricmp("a", "z"); + ok(ret < 0, "_stricmp returned %d\n", ret); + ret = _stricmp("z", "a"); + ok(ret > 0, "_stricmp returned %d\n", ret); + ret = _stricmp("\xa5", "\xb9"); + ok(ret < 0, "_stricmp returned %d\n", ret); + + if(!setlocale(LC_ALL, "polish")) { + win_skip("stricmp tests"); + return; + } + + ret = _stricmp("test", "test"); + ok(ret == 0, "_stricmp returned %d\n", ret); + ret = _stricmp("a", "z"); + ok(ret < 0, "_stricmp returned %d\n", ret); + ret = _stricmp("z", "a"); + ok(ret > 0, "_stricmp returned %d\n", ret); + ret = _stricmp("\xa5", "\xb9"); + ok(ret == 0, "_stricmp returned %d\n", ret); + + setlocale(LC_ALL, "C"); +} + START_TEST(string) { char mem[100]; @@ -2533,4 +2563,5 @@ START_TEST(string) test_wctomb(); test_tolower(); test__atodbl(); + test__stricmp(); }

1 0

Andrew Talbot : winex11.drv: Indentation fix.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: 9acc966688aa1d9952dabf6f7a600b95e0d78420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acc966688aa1d9952dabf6f7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 19:18:58 2012 +0000 winex11.drv: Indentation fix. --- dlls/winex11.drv/opengl.c | 6 +++--- dlls/winex11.drv/palette.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8dc6281..3a6a2c7 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -682,7 +682,7 @@ static BOOL has_opengl(void) * enable this function when the Xserver understand GLX 1.3 or newer */ pglXQueryDrawable = NULL; - } else if(strcmp("ATI", WineGLInfo.glxClientVendor) == 0) { + } else if(strcmp("ATI", WineGLInfo.glxClientVendor) == 0) { TRACE("Overriding ATI GLX capabilities!\n"); pglXChooseFBConfig = pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfig"); pglXGetFBConfigAttrib = pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib"); @@ -2570,9 +2570,9 @@ static BOOL X11DRV_wglGetPixelFormatAttribivARB( HDC hdc, int iPixelFormat, int if (!fmt) goto pix_error; hTest = pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, curGLXAttr, &tmp); if (hTest) goto get_error; - piValues[i] = GL_FALSE; + piValues[i] = GL_FALSE; if (GLX_NONE != tmp) piValues[i] = GL_TRUE; - continue; + continue; case WGL_PIXEL_TYPE_ARB: curGLXAttr = GLX_RENDER_TYPE; diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index bd687ca..d19d112 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -736,7 +736,7 @@ COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) if (shifts->logicalBlue.scale<8) color.blue= color.blue << (8-shifts->logicalBlue.scale) | color.blue >> (2*shifts->logicalBlue.scale-8); - return RGB(color.red,color.green,color.blue); + return RGB(color.red,color.green,color.blue); } /* check if we can bypass X */

1 0

Andrew Talbot : wined3d: Indentation fix.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: c61b14cbcc87f061e3888e9a0e1a0402a94edbe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61b14cbcc87f061e3888e9a0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 19:18:54 2012 +0000 wined3d: Indentation fix. --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d6da35d..1c5b3de 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2034,7 +2034,7 @@ static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins) shader_arb_get_src_param(ins, &ins->src[0], 0, reg_src); shader_arb_get_dst_param(ins, &ins->dst[0], dst_str); shader_addline(buffer, "MOV %s, %s;\n", dst_str, reg_src); - } + } } static void pshader_hw_texreg2ar(const struct wined3d_shader_instruction *ins) @@ -6210,7 +6210,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con if(tfactor_used) { shader_addline(&buffer, "PARAM tfactor = program.env[%u];\n", ARB_FFP_CONST_TFACTOR); } - shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); + shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); if(settings->sRGB_write) { shader_addline(&buffer, "PARAM srgb_consts1 = {%f, %f, %f, %f};\n",

1 0

Andrew Talbot : usp10: Indentation fix.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: c5ce8c8e089859bdfc0c859dc1c53a147b252eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ce8c8e089859bdfc0c859dc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 19:18:52 2012 +0000 usp10: Indentation fix. --- dlls/usp10/breaking.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 3efc3da..ff6e740 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -132,7 +132,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT case b_NL: case b_BK: if (i < count-1) else_break(&break_before[i+1],b_r); - else_break(&break_before[i],b_x); + else_break(&break_before[i],b_x); break; /* LB7 */ case b_SP:

1 0

Andrew Talbot : user32: Indentation fix.
by Alexandre Julliard 24 Dec '12

24 Dec '12

Module: wine Branch: master Commit: c78f8d7405a06de20b0da63c650065abf47a242e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78f8d7405a06de20b0da63c6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Dec 21 19:18:48 2012 +0000 user32: Indentation fix. --- dlls/user32/edit.c | 10 +++++----- dlls/user32/icontitle.c | 2 +- dlls/user32/lstr.c | 2 +- dlls/user32/text.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c143aa6..ada313f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -581,9 +581,9 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta cp = current_position; while (*cp) { if (*cp == '\n') break; - if ((*cp == '\r') && (*(cp + 1) == '\n')) - break; - cp++; + if ((*cp == '\r') && (*(cp + 1) == '\n')) + break; + cp++; } /* Mark type of line termination */ @@ -789,7 +789,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if ((es->style & ES_CENTER) || (es->style & ES_RIGHT)) rc.left = es->format_rect.left; else - rc.left = LOWORD(EDIT_EM_PosFromChar(es, nstart_index, FALSE)); + rc.left = LOWORD(EDIT_EM_PosFromChar(es, nstart_index, FALSE)); rc.right = es->format_rect.right; SetRectRgn(hrgn, rc.left, rc.top, rc.right, rc.bottom); @@ -4901,7 +4901,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B if (SendMessageW(GetParent(hwnd), CB_GETDROPPEDSTATE, 0, 0)) result |= DLGC_WANTMESSAGE; } - } + } } break; diff --git a/dlls/user32/icontitle.c b/dlls/user32/icontitle.c index 04f0c69..93c2822 100644 --- a/dlls/user32/icontitle.c +++ b/dlls/user32/icontitle.c @@ -222,7 +222,7 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, case WM_CLOSE: return 0; case WM_SHOWWINDOW: - if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); + if (wParam) ICONTITLE_SetTitlePos( hWnd, owner ); return 0; case WM_ERASEBKGND: if( GetWindowLongW( owner, GWL_STYLE ) & WS_CHILD ) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index 25a935a..a7e885a 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -164,7 +164,7 @@ BOOL WINAPI CharToOemBuffA( LPCSTR s, LPSTR d, DWORD len ) */ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) { - if ( !s || !d ) return TRUE; + if ( !s || !d ) return TRUE; WideCharToMultiByte( CP_OEMCP, 0, s, len, d, len, NULL, NULL ); return TRUE; } diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 20f7798..338cba2 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -872,7 +872,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, TRACE("%s, %d, [%s] %08x\n", debugstr_wn (str, count), count, wine_dbgstr_rect(rect), flags); - if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", + if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin); if (!str) return 0;

1 0

Alexandre Julliard : Wine release 1.5.20
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: website Branch: master Commit: a3b2b9447bdcdb0dae38eacd42ba4c9d0d053707 URL: http://source.winehq.org/git/website.git/?a=commit;h=a3b2b9447bdcdb0dae38ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 20:26:39 2012 +0100 Wine release 1.5.20 --- news/en/2012122101.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2012122101.xml b/news/en/2012122101.xml new file mode 100644 index 0000000..3b4d84f --- /dev/null +++ b/news/en/2012122101.xml @@ -0,0 +1,17 @@ +<news> +<date>December 21, 2012</date> +<title>Wine 1.5.20 Released</title> +<body> + The Wine development release 1.5.20 is now available. + <a href="{$root}/announce/1.5.20">What's new</a> in this release: +<ul> + <li>A bunch of dlls with ugly names for API sets support.</li> + <li>More ATL functions implemented.</li> + <li>Still more C++ runtime functions.</li> + <li>Several text rendering fixes.</li> + <li>PostScript driver improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.20.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.20.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: fd457cd9c2596ba245d34cea27eae28cf5f21ec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd457cd9c2596ba245d34cea2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 20:14:41 2012 +0100 Release 1.5.20. --- ANNOUNCE | 855 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 450 insertions(+), 425 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd457cd9c2596ba245d34…

1 0

Tag wine-1.5.20 : Alexandre Julliard : Release 1.5.20
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: refs/tags/wine-1.5.20 Tag: efeca6263f01261a6d24c710c2fed1725cd6742e URL: http://source.winehq.org/git/wine.git/?a=tag;h=efeca6263f01261a6d24c710c2fe… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 20:14:48 2012 +0100 Release 1.5.20

1 0