wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : d3dx9: Avoid LPD3DXEFFECTPOOL.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 8678e890e69830e72c59cf2e879a4deab54c7f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8678e890e69830e72c59cf2e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:42 2012 +0100 d3dx9: Avoid LPD3DXEFFECTPOOL. --- dlls/d3dx9_36/effect.c | 4 ++-- include/d3dx9effect.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 48bd266..bb1e594 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3406,7 +3406,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPOOL *pool) +static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); @@ -5969,7 +5969,7 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = ID3DXEffectPoolImpl_Release }; -HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool) +HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) { struct ID3DXEffectPoolImpl *object; diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 74b80e1..7ff789d 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -258,7 +258,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffect methods ***/ - STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE; + STDMETHOD(GetPool)(THIS_ ID3DXEffectPool **pool) PURE; STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE technique) PURE; STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE; STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE technique) PURE; @@ -363,7 +363,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) extern "C" { #endif -HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool); +HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool); HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);

1 0

Frédéric Delanoy : wined3d: Add some ' fall through' comments (coverity).
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: a6db6688950deb5605d49b7e37d6ea56bec13da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6db6688950deb5605d49b7e3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 29 17:04:32 2012 +0100 wined3d: Add some 'fall through' comments (coverity). --- dlls/wined3d/glsl_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9490552..3cac7d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5126,8 +5126,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf { case WINED3D_TOP_BUMPENVMAP_LUMINANCE: lum_map |= 1 << stage; + /* fall through */ case WINED3D_TOP_BUMPENVMAP: bump_map |= 1 << stage; + /* fall through */ case WINED3D_TOP_BLEND_TEXTURE_ALPHA: case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: tex_map |= 1 << stage;

1 0

Francois Gouget : testbot/testagentd: Only rebuild the iso file if the Windows binary has changed.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: tools Branch: master Commit: 405dfa8493c192b846956976af79b8af3bfaa9f5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=405dfa8493c192b846956976… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:15:47 2012 +0100 testbot/testagentd: Only rebuild the iso file if the Windows binary has changed. But always recreate the winetest directory from scratch in case it was left from a previous failed build. --- testbot/src/testagentd/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 6090d02..f6035be 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -27,7 +27,10 @@ TestAgentd.exe: testagentd.obj platform_windows.obj C_SRCS = testagentd.c platform_unix.c platform_windows.c $(C_SRCS:.c=.o) $(C_SRCS:.c=.obj): platform.h -iso: windows +iso: winetestbot.iso + +winetestbot.iso: TestAgentd.exe + rm -rf winetest mkdir winetest cp TestAgentd.exe winetest mkisofs="mkisofs"; \

1 0

Francois Gouget : testbot/testagentd: Fix the buffer reallocation in vset_status().
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: tools Branch: master Commit: 6587169d46cd96d75919b6578ca5e71cb07087a0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6587169d46cd96d75919b657… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 30 12:15:04 2012 +0100 testbot/testagentd: Fix the buffer reallocation in vset_status(). --- testbot/src/testagentd/testagentd.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 4d5a13e..4973fd5 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -190,12 +190,15 @@ static void vset_status(const char* format, va_list valist) { int len; va_list args; - len = 1; + len = 0; do { if (len >= status_size) { - status_size = (len +0xf) & ~0xf; + /* len does not count the trailing '\0'. So add 1 and round up + * to the next 16 bytes multiple. + */ + status_size = (len + 1 + 0xf) & ~0xf; status = realloc(status, status_size); } va_copy(args, valist);

1 0

Alexandre Julliard : gdi32: Avoid creating a copy of the pattern bits for the R2_COPYPEN case.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: a796ad5ed8d06c6ac2edb67242e00b646bf1e6ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a796ad5ed8d06c6ac2edb6724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 29 17:59:59 2012 +0100 gdi32: Avoid creating a copy of the pattern bits for the R2_COPYPEN case. --- dlls/gdi32/dibdrv/objects.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index b658af6..8dee8e8 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1782,7 +1782,7 @@ static BOOL alloc_brush_mask_bits( dib_brush *brush ) static void free_brush_mask_bits( dib_brush *brush ) { - HeapFree(GetProcessHeap(), 0, brush->masks.and); + if (brush->masks.xor != brush->dib.bits.ptr) HeapFree(GetProcessHeap(), 0, brush->masks.xor); brush->masks.and = brush->masks.xor = NULL; } @@ -1798,6 +1798,12 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; + if (brush->rop == R2_COPYPEN) + { + brush->masks.xor = brush_bits; /* use the pattern bits directly */ + return TRUE; + } + if (!alloc_brush_mask_bits( brush )) return FALSE; and_bits = brush->masks.and;

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 : 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 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

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

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

← Newer
1
2
3
4
5
6
7
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012