November 2012 - Wine-Commits

Nikolay Sivov : msxml3: Revert "msxml3: AddRef() typeinfo pointers only when we have to.".
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: f929611a68e2cd659aebdcca88b96b49e9c4f85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f929611a68e2cd659aebdcca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:32:38 2012 -0500 msxml3: Revert "msxml3: AddRef() typeinfo pointers only when we have to.". This reverts commit 6e566ce6c24186174ab9c5370a3ffbeccb8389a1. --- dlls/msxml3/dispex.c | 14 ++++++++------ dlls/msxml3/httprequest.c | 30 ++++++++++++++++++------------ dlls/msxml3/mxwriter.c | 17 +++++++++-------- dlls/msxml3/node.c | 14 ++++++++++---- dlls/msxml3/saxreader.c | 28 ++++++++++++++++++++-------- dlls/msxml3/xmldoc.c | 15 +++++++++------ dlls/msxml3/xmlelem.c | 14 ++++++++++---- 7 files changed, 84 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f929611a68e2cd659aebd…

1 0

Nikolay Sivov : msxml3: Fix a leak on error path.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 00484ed942b6d499eb524b7727a567d37c0015f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00484ed942b6d499eb524b772… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:35:19 2012 -0500 msxml3: Fix a leak on error path. --- dlls/msxml3/dispex.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 3aafc44..3c84e09 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -598,6 +598,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc hres = IUnknown_QueryInterface(This->outer, get_riid_from_tid(data->funcs[n].tid), (void**)&unk); if(FAILED(hres)) { ERR("Could not get iface: %08x\n", hres); + ITypeInfo_Release(ti); return E_FAIL; }

1 0

Piotr Caban : msvcrt: Added mbrlen implementation.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

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 Nov. 29, 2012

Nov. 29, 2012

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 Nov. 29, 2012

Nov. 29, 2012

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

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

Nov. 29, 2012

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

Henri Verbeet : d3dx9: Avoid LPD3DXBASEMESH.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: d608de9341ccd75c0a6ce36901bf2cc806487338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d608de9341ccd75c0a6ce3690… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:45 2012 +0100 d3dx9: Avoid LPD3DXBASEMESH. --- include/d3dx9mesh.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 76e7179..21261ab 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -782,7 +782,7 @@ HRESULT WINAPI D3DXComputeIMTFromSignal(ID3DXMesh *mesh, DWORD texture_idx, UINT LPD3DXUVATLASCB status_cb, void *status_ctx, ID3DXBuffer **buffer); HRESULT WINAPI D3DXComputeIMTFromTexture(struct ID3DXMesh *mesh, struct IDirect3DTexture9 *texture, DWORD texture_idx, DWORD options, LPD3DXUVATLASCB cb, void *ctx, struct ID3DXBuffer **out); -HRESULT WINAPI D3DXComputeNormals(LPD3DXBASEMESH, CONST DWORD *); +HRESULT WINAPI D3DXComputeNormals(ID3DXBaseMesh *mesh, const DWORD *adjacency); HRESULT WINAPI D3DXComputeTangentFrameEx(ID3DXMesh *mesh_in, DWORD texture_in_semantic, DWORD texture_in_idx, DWORD u_partial_out_semantic, DWORD u_partial_out_idx, DWORD v_partial_out_semantic, DWORD v_partial_out_idx, DWORD normal_out_semantic, DWORD normal_out_idx, DWORD flags, @@ -801,8 +801,11 @@ HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMEN HRESULT WINAPI D3DXGeneratePMesh(ID3DXMesh *mesh, const DWORD *adjacency, const D3DXATTRIBUTEWEIGHTS *attribute_weights, const float *vertex_weights, DWORD min_value, DWORD flags, ID3DXPMesh **pmesh); -HRESULT WINAPI D3DXIntersect(LPD3DXBASEMESH, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); -HRESULT WINAPI D3DXIntersectSubset(LPD3DXBASEMESH, DWORD, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, BOOL *, DWORD *, FLOAT *, FLOAT *, FLOAT *, LPD3DXBUFFER *, DWORD *); +HRESULT WINAPI D3DXIntersect(ID3DXBaseMesh *mesh, const D3DXVECTOR3 *ray_position, const D3DXVECTOR3 *ray_direction, + BOOL *hit, DWORD *face_idx, float *u, float *v, float *distance, ID3DXBuffer **hits, DWORD *hit_count); +HRESULT WINAPI D3DXIntersectSubset(ID3DXBaseMesh *mesh, DWORD attribute_id, const D3DXVECTOR3 *ray_position, + const D3DXVECTOR3 *ray_direction, BOOL *hit, DWORD *face_idx, float *u, float *v, float *distance, + ID3DXBuffer **hits, DWORD *hit_count); BOOL WINAPI D3DXIntersectTri(CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3 *, CONST D3DXVECTOR3*, FLOAT *, FLOAT *, FLOAT *); HRESULT WINAPI D3DXOptimizeFaces(LPCVOID, UINT, UINT, BOOL, DWORD *); HRESULT WINAPI D3DXOptimizeVertices(LPCVOID, UINT, UINT, BOOL, DWORD *);

1 0

Henri Verbeet : wined3d: Fix a typo in wined3d_device_set_stream_output().
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

Module: wine Branch: master Commit: 56b3953207a8afa2f54f59d339714cb9a6410e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b3953207a8afa2f54f59d33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:48 2012 +0100 wined3d: Fix a typo in wined3d_device_set_stream_output(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 713e959..c52882b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1581,7 +1581,7 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT if (buffer) wined3d_buffer_incref(buffer); if (prev_buffer) - wined3d_buffer_decref(buffer); + wined3d_buffer_decref(prev_buffer); return; }

1 0

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

Nov. 29, 2012

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 : gdi32: Add assembly helpers for filling solid rectangles.
by Alexandre Julliard Nov. 29, 2012

Nov. 29, 2012

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