wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Piotr Caban : msvcrt: Added wcrtomb implementation.
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: c0ce611ebd3684dcc59fb4803dbd0fa2af87bf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ce611ebd3684dcc59fb4803… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:49:42 2012 +0000 msvcrt: Added wcrtomb implementation. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6a88832..ecf44fd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1445,7 +1445,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) MSVCRT_vswprintf_s @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s -# stub wcrtomb(ptr long ptr) +@ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb # stub wcrtomb_s(ptr ptr long long ptr) @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 08628d4..555e63a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1083,7 +1083,25 @@ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) */ INT CDECL MSVCRT_wctomb( char *dst, MSVCRT_wchar_t ch ) { - return WideCharToMultiByte( get_locinfo()->lc_codepage, 0, &ch, 1, dst, 6, NULL, NULL ); + BOOL error; + INT size; + + size = WideCharToMultiByte(get_locinfo()->lc_codepage, 0, &ch, 1, dst, dst ? 6 : 0, NULL, &error); + if(!size || error) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EOF; + } + return size; +} + +/********************************************************************* + * wcrtomb (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate_t *s) +{ + if(s) + *s = 0; + return MSVCRT_wctomb(dst, ch); } /*********************************************************************

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSGetConstantBuffers().
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: 027ef4ccdb9e2067a0576c26c4bbcd1601d19545 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027ef4ccdb9e2067a0576c26c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:46 2012 +0100 d3d10core: Implement d3d10_device_VSGetConstantBuffers(). --- dlls/d3d10core/device.c | 21 ++++++++++++++++++++- dlls/wined3d/device.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 6c25e7b..25439b0 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -500,8 +500,27 @@ static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_VSGetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer **buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + if (!(wined3d_buffer = wined3d_device_get_vs_cb(device->wined3d_device, start_slot + i))) + { + buffers[i] = NULL; + continue; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + buffers[i] = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(buffers[i]); + } } static void STDMETHODCALLTYPE d3d10_device_PSGetShaderResources(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1aecff8..57e1de9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2571,6 +2571,19 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str } } +struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return NULL; + } + + return device->stateBlock->state.vs_cb[idx]; +} + HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 66dc056..b7b04df 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -94,6 +94,7 @@ @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) +@ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9506f81..7b1e043 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2170,6 +2170,7 @@ void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); +struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSSetConstantBuffers().
by Alexandre Julliard 30 Nov '12

30 Nov '12

Module: wine Branch: master Commit: ae5e15319e10d04f8f5bb076bbfbb60cc070a27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5e15319e10d04f8f5bb076b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:45 2012 +0100 d3d10core: Implement d3d10_device_VSSetConstantBuffers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 1 + 6 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index dff8fd3..6c25e7b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -117,8 +117,19 @@ static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) static void STDMETHODCALLTYPE d3d10_device_VSSetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + + wined3d_device_set_vs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c52882b..1aecff8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2532,6 +2532,45 @@ struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wine return device->stateBlock->state.vertex_shader; } +void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + struct wined3d_buffer *prev; + + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.vs_cb[idx]; + device->updateStateBlock->state.vs_cb[idx] = buffer; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev) + wined3d_buffer_decref(prev); + return; + } + + if (prev != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev) + { + InterlockedDecrement(&prev->resource.bind_count); + wined3d_buffer_decref(prev); + } + } +} + HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9b71486..11d8fa8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -521,6 +521,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) + { + if ((buffer = state->vs_cb[i])) + { + state->vs_cb[i] = NULL; + wined3d_buffer_decref(buffer); + } + } + if ((shader = state->geometry_shader)) { state->geometry_shader = NULL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d664c76..66dc056 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -140,6 +140,7 @@ @ cdecl wined3d_device_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_set_vertex_shader(ptr ptr) @ cdecl wined3d_device_set_viewport(ptr ptr) +@ cdecl wined3d_device_set_vs_cb(ptr long ptr) @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb1a6be..3610fc3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -162,6 +162,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; #define MAX_COMBINED_SAMPLERS (MAX_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS) #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES +#define MAX_CONSTANT_BUFFERS 15 struct min_lookup { @@ -2299,6 +2300,7 @@ struct wined3d_state GLenum gl_primitive_type; struct wined3d_shader *vertex_shader; + struct wined3d_buffer *vs_cb[MAX_CONSTANT_BUFFERS]; BOOL vs_consts_b[MAX_CONST_B]; INT vs_consts_i[MAX_CONST_I * 4]; float *vs_consts_f; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b540991..9506f81 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2244,6 +2244,7 @@ void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); +void __cdecl wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device,

1 0

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

30 Nov '12

Module: wine Branch: master Commit: 521c439d3011714a6a2a1e3c55a7e807e885982c URL: http://source.winehq.org/git/wine.git/?a=commit;h=521c439d3011714a6a2a1e3c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:44 2012 +0100 d3dx9: Avoid LPD3DXSPRITE. --- include/d3dx9core.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 2fb26da..252d5db 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -146,8 +146,10 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown) STDMETHOD(PreloadTextA)(THIS_ LPCSTR string, INT count) PURE; STDMETHOD(PreloadTextW)(THIS_ LPCWSTR string, INT count) PURE; - STDMETHOD_(INT, DrawTextA)(THIS_ LPD3DXSPRITE sprite, LPCSTR string, INT count, LPRECT rect, DWORD format, D3DCOLOR color) PURE; - STDMETHOD_(INT, DrawTextW)(THIS_ LPD3DXSPRITE sprite, LPCWSTR string, INT count, LPRECT rect, DWORD format, D3DCOLOR color) PURE; + STDMETHOD_(INT, DrawTextA)(THIS_ struct ID3DXSprite *sprite, const char *string, + INT count, RECT *rect, DWORD format, D3DCOLOR color) PURE; + STDMETHOD_(INT, DrawTextW)(THIS_ struct ID3DXSprite *sprite, const WCHAR *string, + INT count, RECT *rect, DWORD format, D3DCOLOR color) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; STDMETHOD(OnResetDevice)(THIS) PURE;

1 0

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

30 Nov '12

Module: wine Branch: master Commit: c109249445f2e45b918bf8c9fa565bf54cf8c023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c109249445f2e45b918bf8c9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:43 2012 +0100 d3dx9: Avoid LPD3DXEFFECTSTATEMANAGER. --- dlls/d3dx9_36/effect.c | 4 ++-- dlls/d3dx9_36/tests/effect.c | 4 ++-- include/d3dx9effect.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bb1e594..ec14f98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3609,7 +3609,7 @@ static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER manager) +static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); @@ -3623,7 +3623,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER *manager) +static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0f1cfea..8e12b74 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -140,7 +140,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ID3DXBaseEffect *base; ULONG count; IDirect3DDevice9 *device2; - LPD3DXEFFECTSTATEMANAGER manager = (LPD3DXEFFECTSTATEMANAGER)0xdeadbeef; + ID3DXEffectStateManager *manager = (ID3DXEffectStateManager *)0xdeadbeef; ID3DXEffectPool *pool = (ID3DXEffectPool *)0xdeadbeef, *pool2; hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); @@ -169,7 +169,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(!manager, "GetStateManager failed, got %p\n", manager); /* this works, but it is not recommended! */ - hr = effect->lpVtbl->SetStateManager(effect, (LPD3DXEFFECTSTATEMANAGER) device); + hr = effect->lpVtbl->SetStateManager(effect, (ID3DXEffectStateManager *)device); ok(hr == D3D_OK, "SetStateManager failed, got %x, expected 0 (D3D_OK)\n", hr); hr = effect->lpVtbl->GetStateManager(effect, &manager); diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 7ff789d..5a04092 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -272,8 +272,8 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; STDMETHOD(OnResetDevice)(THIS) PURE; - STDMETHOD(SetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER manager) PURE; - STDMETHOD(GetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER* manager) PURE; + STDMETHOD(SetStateManager)(THIS_ ID3DXEffectStateManager *manager) PURE; + STDMETHOD(GetStateManager)(THIS_ ID3DXEffectStateManager **manager) PURE; STDMETHOD(BeginParameterBlock)(THIS) PURE; STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE; STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;

1 0

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

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 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 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 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 : msvcp100: Added exception throwing helpers.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: d55eabbb31f54a50be48aeebea4c7f85114fa4ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55eabbb31f54a50be48aeebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 09:22:10 2012 +0000 msvcp100: Added exception throwing helpers. --- dlls/msvcp100/exception.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcp100/msvcp100.spec | 18 +++++++++--------- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp100/exception.c b/dlls/msvcp100/exception.c index 1f4ffd2..2e9f1aa 100644 --- a/dlls/msvcp100/exception.c +++ b/dlls/msvcp100/exception.c @@ -454,6 +454,45 @@ void __cdecl _Nomemory(void) throw_exception(EXCEPTION_BAD_ALLOC, NULL); } +/* ?_Xmem@tr1@std@@YAXXZ */ +void __cdecl _Xmem(void) +{ + TRACE("()\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); +} + +/* ?_Xinvalid_argument@std@@YAXPBD@Z */ +/* ?_Xinvalid_argument@std@@YAXPEBD@Z */ +void __cdecl _Xinvalid_argument(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_INVALID_ARGUMENT, str); +} + +/* ?_Xlength_error@std@@YAXPBD@Z */ +/* ?_Xlength_error@std@@YAXPEBD@Z */ +void __cdecl _Xlength_error(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_LENGTH_ERROR, str); +} + +/* ?_Xout_of_range@std@@YAXPBD@Z */ +/* ?_Xout_of_range@std@@YAXPEBD@Z */ +void __cdecl _Xout_of_range(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_OUT_OF_RANGE, str); +} + +/* ?_Xruntime_error@std@@YAXPBD@Z */ +/* ?_Xruntime_error@std@@YAXPEBD@Z */ +void __cdecl _Xruntime_error(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_RUNTIME_ERROR, str); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index e4ac191..6a67b3b 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1232,17 +1232,17 @@ @ stub ?_XLgamma@tr1@std@@YAOO@Z @ stub ?_Xbad@tr1@std@@YAXW4error_type@regex_constants@12@@Z @ stub ?_Xfunc@tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xinvalid_argument@std@@YAXPEBD@Z -@ stub -arch=win32 ?_Xlength_error@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xlength_error@std@@YAXPEBD@Z -@ stub ?_Xmem@tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xout_of_range@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xout_of_range@std@@YAXPEBD@Z +@ cdecl -arch=win32 ?_Xinvalid_argument@std@@YAXPBD@Z(str) _Xinvalid_argument +@ cdecl -arch=win64 ?_Xinvalid_argument@std@@YAXPEBD@Z(str) _Xinvalid_argument +@ cdecl -arch=win32 ?_Xlength_error@std@@YAXPBD@Z(str) _Xlength_error +@ cdecl -arch=win64 ?_Xlength_error@std@@YAXPEBD@Z(str) _Xlength_error +@ cdecl ?_Xmem@tr1@std@@YAXXZ() _Xmem +@ cdecl -arch=win32 ?_Xout_of_range@std@@YAXPBD@Z(str) _Xout_of_range +@ cdecl -arch=win64 ?_Xout_of_range@std@@YAXPEBD@Z(str) _Xout_of_range @ stub -arch=win32 ?_Xoverflow_error@std@@YAXPBD@Z @ stub -arch=win64 ?_Xoverflow_error@std@@YAXPEBD@Z -@ stub -arch=win32 ?_Xruntime_error@std@@YAXPBD@Z -@ stub -arch=win64 ?_Xruntime_error@std@@YAXPEBD@Z +@ cdecl -arch=win32 ?_Xruntime_error@std@@YAXPBD@Z(str) _Xruntime_error +@ cdecl -arch=win64 ?_Xruntime_error@std@@YAXPEBD@Z(str) _Xruntime_error @ thiscall -arch=win32 ?always_noconv@codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=win32 ?bad@ios_base@std@@QBE_NXZ(ptr) ios_base_bad

1 0

Nikolay Sivov : msxml3: Initialize body pointer and size for unknown types (Coverity).
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 2684eee0b243c3e7977c9c3a8582ac49d8215604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2684eee0b243c3e7977c9c3a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:52:53 2012 -0500 msxml3: Initialize body pointer and size for unknown types (Coverity). --- dlls/msxml3/httprequest.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3f02337..7fbb836 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -699,14 +699,14 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * size++; break; } + default: + FIXME("unsupported body data type %d\n", V_VT(body)); + /* fall through */ case VT_EMPTY: case VT_ERROR: ptr = NULL; size = 0; break; - default: - FIXME("unsupported body data type %d\n", V_VT(body)); - break; } bsc->body = GlobalAlloc(GMEM_FIXED, size);

1 0

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

29 Nov '12

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

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

29 Nov '12

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 : oledb32: Properly free property sets and propinfo sets ( Coverity).
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 75cc571fabd101bace788a67c3e3a2cfdadd199b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75cc571fabd101bace788a67c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 08:22:55 2012 -0500 oledb32: Properly free property sets and propinfo sets (Coverity). --- dlls/oledb32/datainit.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index b53e08a..a191c88 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -355,8 +355,8 @@ static void free_dbpropset(ULONG count, DBPROPSET *propset) VariantClear(&propset[i].rgProperties[p].vValue); CoTaskMemFree(&propset[i].rgProperties[p]); } - CoTaskMemFree(&propset[i]); } + CoTaskMemFree(propset); } static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) @@ -372,8 +372,8 @@ static void free_dbpropinfoset(ULONG count, DBPROPINFOSET *propinfoset) VariantClear(&propinfoset[i].rgPropertyInfos[p].vValues); CoTaskMemFree(&propinfoset[i].rgPropertyInfos[p]); } - CoTaskMemFree(&propinfoset[i]); } + CoTaskMemFree(propinfoset); } static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, IUnknown *datasource,

1 0

Nikolay Sivov : dwrite: Handle allocation error (Coverity).
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 0e179e08b67f3d7b69e1a258fd0e8318f8f6f3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e179e08b67f3d7b69e1a258f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:38:21 2012 -0500 dwrite: Handle allocation error (Coverity). --- dlls/dwrite/font.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7d332b7..0ec581b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -930,6 +930,13 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) ret = GetOutlineTextMetricsW(hdc, 0, NULL); otm = heap_alloc(ret); + if (!otm) + { + heap_free(This); + DeleteDC(hdc); + DeleteObject(hfont); + return E_OUTOFMEMORY; + } otm->otmSize = ret; ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm);

1 0

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