November 2012 - Wine-commits

Henri Verbeet : d3dx9: Avoid LPD3DXMATRIXSTACK.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 8c94757c2b6d84110b7fdc82125053e8f44fa236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c94757c2b6d84110b7fdc821… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:46 2012 +0100 d3dx9: Avoid LPD3DXMATRIXSTACK. --- dlls/d3dx9_36/math.c | 2 +- include/d3dx9math.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 12073e3..e09dbec 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -877,7 +877,7 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm) static const unsigned int INITIAL_STACK_SIZE = 32; -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK *ppstack) +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **ppstack) { struct ID3DXMatrixStackImpl *object; diff --git a/include/d3dx9math.h b/include/d3dx9math.h index 0f5dc7c..769e086 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -451,7 +451,7 @@ DECLARE_INTERFACE_(ID3DXMatrixStack, IUnknown) extern "C" { #endif -HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack); +HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, ID3DXMatrixStack **stack); #ifdef __cplusplus }

1 0

Henri Verbeet : wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources ().
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 5d9d20ee0ef1ea7d4269fc12a79f80621dc5dffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9d20ee0ef1ea7d4269fc12a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 28 22:11:47 2012 +0100 wined3d: Also unbind stream outputs and the geometry shader in stateblock_unbind_resources(). --- dlls/wined3d/stateblock.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c399bad..9b71486 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -491,6 +491,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) } } + for (i = 0; i < MAX_STREAM_OUT; ++i) + { + if ((buffer = state->stream_output[i].buffer)) + { + state->stream_output[i].buffer = NULL; + wined3d_buffer_decref(buffer); + } + } + for (i = 0; i < MAX_STREAMS; ++i) { if ((buffer = state->streams[i].buffer)) @@ -512,6 +521,12 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + if ((shader = state->geometry_shader)) + { + state->geometry_shader = NULL; + wined3d_shader_decref(shader); + } + if ((shader = state->pixel_shader)) { state->pixel_shader = NULL;

1 0

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

29 Nov '12

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

Nikolay Sivov : wshom: Fix refcount for typeinfo pointers.
by Alexandre Julliard 29 Nov '12

29 Nov '12

Module: wine Branch: master Commit: 13d99144bdb256a7ff7fc377955c8d1253d667fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d99144bdb256a7ff7fc3779… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 29 07:26:41 2012 -0500 wshom: Fix refcount for typeinfo pointers. --- dlls/wshom.ocx/wshom_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 1c6bb44..c253b61 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -77,6 +77,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) } *typeinfo = typeinfos[tid]; + ITypeInfo_AddRef(*typeinfo); return S_OK; }

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

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

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(a)tr1@std@@YAXXZ */ +void __cdecl _Xmem(void) +{ + TRACE("()\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); +} + +/* ?_Xinvalid_argument(a)std@@YAXPBD(a)Z */ +/* ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z */ +void __cdecl _Xinvalid_argument(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_INVALID_ARGUMENT, str); +} + +/* ?_Xlength_error(a)std@@YAXPBD(a)Z */ +/* ?_Xlength_error(a)std@@YAXPEBD(a)Z */ +void __cdecl _Xlength_error(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_LENGTH_ERROR, str); +} + +/* ?_Xout_of_range(a)std@@YAXPBD(a)Z */ +/* ?_Xout_of_range(a)std@@YAXPEBD(a)Z */ +void __cdecl _Xout_of_range(const char *str) +{ + TRACE("(%s)\n", debugstr_a(str)); + throw_exception(EXCEPTION_OUT_OF_RANGE, str); +} + +/* ?_Xruntime_error(a)std@@YAXPBD(a)Z */ +/* ?_Xruntime_error(a)std@@YAXPEBD(a)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(a)tr1@std@@YAOO(a)Z @ stub ?_Xbad(a)tr1@std@@YAXW4error_type(a)regex_constants@12@@Z @ stub ?_Xfunc(a)tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xlength_error(a)std@@YAXPEBD(a)Z -@ stub ?_Xmem(a)tr1@std@@YAXXZ -@ stub -arch=win32 ?_Xout_of_range(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xout_of_range(a)std@@YAXPEBD(a)Z +@ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument +@ cdecl -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z(str) _Xinvalid_argument +@ cdecl -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z(str) _Xlength_error +@ cdecl -arch=win64 ?_Xlength_error(a)std@@YAXPEBD(a)Z(str) _Xlength_error +@ cdecl ?_Xmem(a)tr1@std@@YAXXZ() _Xmem +@ cdecl -arch=win32 ?_Xout_of_range(a)std@@YAXPBD(a)Z(str) _Xout_of_range +@ cdecl -arch=win64 ?_Xout_of_range(a)std@@YAXPEBD(a)Z(str) _Xout_of_range @ stub -arch=win32 ?_Xoverflow_error(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Xoverflow_error(a)std@@YAXPEBD(a)Z -@ stub -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z -@ stub -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z +@ cdecl -arch=win32 ?_Xruntime_error(a)std@@YAXPBD(a)Z(str) _Xruntime_error +@ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error @ thiscall -arch=win32 ?always_noconv(a)codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv(a)codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=win32 ?bad(a)ios_base@std@@QBE_NXZ(ptr) ios_base_bad

1 0