June 2011 - Wine-commits - list.winehq.org

Piotr Caban : msvcp90: Added locale class stub.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 00f7683ea7bcb235c63bdd97ca7c8c4a14174c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00f7683ea7bcb235c63bdd97c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:39 2011 +0200 msvcp90: Added locale class stub. --- dlls/msvcp90/locale.c | 187 +++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.h | 13 +++- dlls/msvcp90/msvcp90.spec | 72 +++++++++--------- 3 files changed, 230 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00f7683ea7bcb235c63bd…

1 0

Piotr Caban : msvcp90: Added _Lockit class implementation.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: b8606c82ee82fbceb5b7d77f76178e69ec1642eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8606c82ee82fbceb5b7d77f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:03:54 2011 +0200 msvcp90: Added _Lockit class implementation. --- dlls/msvcp90/misc.c | 82 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 8 ++++ dlls/msvcp90/msvcp90.spec | 28 +++++++------- dlls/msvcp90/msvcp90_main.c | 2 + 4 files changed, 106 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 8f7a835..f0d1923 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -90,3 +90,85 @@ void CDECL mutex_mutex_dtor(mutex *m) { mutex_dtor(m); } + +#define _LOCK_LOCALE 0 +#define _LOCK_MALLOC 1 +#define _LOCK_STREAM 2 +#define _LOCK_DEBUG 3 +#define _MAX_LOCK 4 +static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; + +/* ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z */ +void __cdecl _Lockit_init(int locktype) { + InitializeCriticalSection(&lockit_cs[locktype]); + lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); +} + +/* ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z */ +void __cdecl _Lockit_free(int locktype) +{ + lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)0; + DeleteCriticalSection(&lockit_cs[locktype]); +} + +void init_lockit(void) { + int i; + + for(i=0; i<_MAX_LOCK; i++) + _Lockit_init(i); +} + +void free_lockit(void) { + int i; + + for(i=0; i<_MAX_LOCK; i++) + _Lockit_free(i); +} + +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z */ +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z */ +void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) +{ + lockit->locktype = locktype; + EnterCriticalSection(&lockit_cs[locktype]); +} + +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z */ +/* ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z */ +void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit) +{ + _Lockit__Lockit_ctor_locktype(lockit, 0); +} + +/* ??0_Lockit(a)std@@QAE(a)H@Z */ +/* ??0_Lockit(a)std@@QEAA(a)H@Z */ +DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8) +_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) +{ + _Lockit__Lockit_ctor_locktype(this, locktype); + return this; +} + +/* ??0_Lockit(a)std@@QAE(a)XZ */ +/* ??0_Lockit(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4) +_Lockit* __thiscall _Lockit_ctor(_Lockit *this) +{ + _Lockit__Lockit_ctor_locktype(this, 0); + return this; +} + +/* ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z */ +/* ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z */ +void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) +{ + LeaveCriticalSection(&lockit_cs[lockit->locktype]); +} + +/* ??1_Lockit(a)std@@QAE(a)XZ */ +/* ??1_Lockit(a)std@@QEAA(a)XZ */ +DEFINE_THISCALL_WRAPPER(_Lockit_dtor, 4) +void __thiscall _Lockit_dtor(_Lockit *this) +{ + _Lockit__Lockit_dtor(this); +} diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index d94bc6f..9c9e337 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -193,3 +193,11 @@ typedef struct { struct locale__Locimp *ptr; } locale; + +/* class _Lockit */ +typedef struct { + int locktype; +} _Lockit; + +void init_lockit(void); +void free_lockit(void); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3dfe4d2..0da53e9 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1078,10 +1078,10 @@ @ stub -arch=win64 ??0_Locinfo(a)std@@QEAA(a)HPEBD@Z @ stub -arch=win32 ??0_Locinfo(a)std@@QAE(a)PBD@Z @ stub -arch=win64 ??0_Locinfo(a)std@@QEAA(a)PEBD@Z -@ stub -arch=win32 ??0_Lockit(a)std@@QAE(a)H@Z -@ stub -arch=win64 ??0_Lockit(a)std@@QEAA(a)H@Z -@ stub -arch=win32 ??0_Lockit(a)std@@QAE(a)XZ -@ stub -arch=win64 ??0_Lockit(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??0_Lockit(a)std@@QAE(a)H@Z(ptr long) _Lockit_ctor_locktype +@ cdecl -arch=win64 ??0_Lockit(a)std@@QEAA(a)H@Z(ptr long) _Lockit_ctor_locktype +@ thiscall -arch=win32 ??0_Lockit(a)std@@QAE(a)XZ(ptr) _Lockit_ctor +@ cdecl -arch=win64 ??0_Lockit(a)std@@QEAA(a)XZ(ptr) _Lockit_ctor @ thiscall -arch=win32 ??0_Mutex(a)std@@QAE(a)XZ(ptr) mutex_ctor @ cdecl -arch=win64 ??0_Mutex(a)std@@QEAA(a)XZ(ptr) mutex_ctor @ stub -arch=win32 ??0_Timevec(a)std@@QAE(a)ABV01@@Z @@ -1316,8 +1316,8 @@ @ cdecl -arch=win64 ??1_Locimp(a)locale@std@@MEAA(a)XZ(ptr) locale__Locimp_dtor @ stub -arch=win32 ??1_Locinfo(a)std@@QAE(a)XZ @ stub -arch=win64 ??1_Locinfo(a)std@@QEAA(a)XZ -@ stub -arch=win32 ??1_Lockit(a)std@@QAE(a)XZ -@ stub -arch=win64 ??1_Lockit(a)std@@QEAA(a)XZ +@ thiscall -arch=win32 ??1_Lockit(a)std@@QAE(a)XZ(ptr) _Lockit_dtor +@ cdecl -arch=win64 ??1_Lockit(a)std@@QEAA(a)XZ(ptr) _Lockit_dtor @ thiscall -arch=win32 ??1_Mutex(a)std@@QAE(a)XZ(ptr) mutex_dtor @ cdecl -arch=win64 ??1_Mutex(a)std@@QEAA(a)XZ(ptr) mutex_dtor @ stub -arch=win32 ??1_Timevec(a)std@@QAE(a)XZ @@ -2599,14 +2599,14 @@ @ stub -arch=win64 ?_Lock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ @ thiscall -arch=win32 ?_Lock(a)_Mutex@std@@QAEXXZ(ptr) mutex_lock @ cdecl -arch=win64 ?_Lock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_lock -@ stub -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z -@ stub -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z -@ stub -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z -@ stub -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z -@ stub ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z -@ stub -arch=win32 ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z -@ stub -arch=win64 ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z -@ stub ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z +@ cdecl -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_ctor +@ cdecl -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_ctor +@ cdecl -arch=win32 ?_Lockit_ctor(a)_Lockit@std@@CAXPAV12(a)H@Z(ptr long) _Lockit__Lockit_ctor_locktype +@ cdecl -arch=win64 ?_Lockit_ctor(a)_Lockit@std@@CAXPEAV12(a)H@Z(ptr long) _Lockit__Lockit_ctor_locktype +@ cdecl ?_Lockit_ctor(a)_Lockit@std@@SAXH(a)Z(long) _Lockit_init +@ cdecl -arch=win32 ?_Lockit_dtor(a)_Lockit@std@@CAXPAV12@@Z(ptr) _Lockit__Lockit_dtor +@ cdecl -arch=win64 ?_Lockit_dtor(a)_Lockit@std@@CAXPEAV12@@Z(ptr) _Lockit__Lockit_dtor +@ cdecl ?_Lockit_dtor(a)_Lockit@std@@SAXH(a)Z(long) _Lockit_free @ stub -arch=win32 ?_MP_Add(a)tr1@std@@YAXQA_K_K(a)Z @ stub -arch=win64 ?_MP_Add(a)tr1@std@@YAXQEA_K_K(a)Z @ stub -arch=win32 ?_MP_Get(a)tr1@std@@YA_KQA_K(a)Z diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 5dd4471..f9c508a 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -57,8 +57,10 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: init_cxx_funcs(); set_exception_vtable(); + init_lockit(); break; case DLL_PROCESS_DETACH: + free_lockit(); break; }

1 0

Piotr Caban : msvcp90: Added basic_string_char:: find_first_of implementation.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: ab612bc650c8aa1c8be72964bb4cd3bbe6e6ce63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab612bc650c8aa1c8be72964b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 14:04:05 2011 +0200 msvcp90: Added basic_string_char::find_first_of implementation. --- dlls/msvcp90/msvcp90.spec | 32 +++++++------- dlls/msvcp90/string.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab612bc650c8aa1c8be72…

1 0

Travis Athougies : d3dx9_36: Implemented ID3DXConstantTable_SetFloatArray and ID3DXConstantTable_SetFloat .
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 3fdcce1863c29f042ffe387933d1314d5fc5b657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fdcce1863c29f042ffe38793… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Jun 21 12:14:30 2011 -0700 d3dx9_36: Implemented ID3DXConstantTable_SetFloatArray and ID3DXConstantTable_SetFloat. --- dlls/d3dx9_36/shader.c | 66 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b8a6909..8cebcbe 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1,6 +1,7 @@ /* * Copyright 2008 Luis Busquets * Copyright 2009 Matteo Bruni + * Copyright 2011 Travis Athougies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -630,6 +631,11 @@ static inline ID3DXConstantTableImpl *impl_from_ID3DXConstantTable(ID3DXConstant return CONTAINING_RECORD(iface, ID3DXConstantTableImpl, ID3DXConstantTable_iface); } +static inline int is_vertex_shader(DWORD version) +{ + return (version & 0xFFFF0000) == 0xFFFE0000; +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable* iface, REFIID riid, void** ppvObject) { @@ -801,6 +807,52 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant return NULL; } +static HRESULT set_float_array(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, const void *data, + UINT count, D3DXPARAMETER_TYPE type) +{ + ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + + D3DXCONSTANT_DESC desc; + HRESULT hr; + UINT i, desc_count = 1; + float row[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + + hr = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &desc_count); + if (FAILED(hr)) + { + TRACE("ID3DXConstantTable_GetConstantDesc failed: %08x", hr); + return D3DERR_INVALIDCALL; + } + + switch (desc.RegisterSet) + { + case D3DXRS_FLOAT4: + for (i = 0; i < count && i < desc.RegisterCount; i++) + { + /* We need the for loop since each IDirect3DDevice9_Set*ShaderConstantF expects a float4 */ + switch(type) + { + case D3DXPT_FLOAT: + row[0] = ((float *)data)[i]; + break; + default: + FIXME("Unhandled type passed to set_float_array\n"); + return D3DERR_INVALIDCALL; + } + if (is_vertex_shader(This->desc.Version)) + IDirect3DDevice9_SetVertexShaderConstantF(device, desc.RegisterIndex + i, row, 1); + else + IDirect3DDevice9_SetPixelShaderConstantF(device, desc.RegisterIndex + i, row, 1); + } + break; + default: + FIXME("Handle other register sets\n"); + return E_NOTIMPL; + } + + return D3D_OK; +} + static HRESULT WINAPI ID3DXConstantTableImpl_SetDefaults(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); @@ -859,24 +911,24 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetIntArray(ID3DXConstantTable* ifa return E_NOTIMPL; } -static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, +static HRESULT WINAPI ID3DXConstantTableImpl_SetFloat(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, D3DXHANDLE constant, FLOAT f) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %f): stub\n", This, device, constant, f); + TRACE("(%p)->(%p, %p, %f)\n", This, device, constant, f); - return E_NOTIMPL; + return ID3DXConstantTable_SetFloatArray(iface, device, constant, &f, 1); } -static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device, - D3DXHANDLE constant, CONST FLOAT* f, UINT count) +static HRESULT WINAPI ID3DXConstantTableImpl_SetFloatArray(ID3DXConstantTable *iface, LPDIRECT3DDEVICE9 device, + D3DXHANDLE constant, CONST FLOAT *f, UINT count) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); - FIXME("(%p)->(%p, %p, %p, %d): stub\n", This, device, constant, f, count); + TRACE("(%p)->(%p, %p, %p, %d)\n", This, device, constant, f, count); - return E_NOTIMPL; + return set_float_array(iface, device, constant, f, count, D3DXPT_FLOAT); } static HRESULT WINAPI ID3DXConstantTableImpl_SetVector(ID3DXConstantTable* iface, LPDIRECT3DDEVICE9 device,

1 0

Henri Verbeet : d3d8: Implement IDirect3DSurface8 private data handling on top of wined3d_resource .
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: f6bfdd47c9b7aaf51d11d18ef8a6a8743eaa0df8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6bfdd47c9b7aaf51d11d18ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:07 2011 +0200 d3d8: Implement IDirect3DSurface8 private data handling on top of wined3d_resource. --- dlls/d3d8/surface.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 8a07244..dfda50f 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static inline IDirect3DSurface8Impl *impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DSurface8Impl, lpVtbl); +} + /* IDirect3DSurface8 IUnknown parts follow: */ static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; @@ -131,42 +136,53 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, return D3D_OK; } -static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(IDirect3DSurface8 *iface, REFGUID guid, + const void *data, DWORD data_size, DWORD flags) +{ + IDirect3DSurface8Impl *surface = impl_from_IDirect3DSurface8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", - iface, debugstr_guid(refguid), pData, SizeOfData, Flags); + iface, debugstr_guid(guid), data, data_size, flags); wined3d_mutex_lock(); - hr = wined3d_surface_set_private_data(This->wined3d_surface, refguid, pData, SizeOfData, Flags); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(IDirect3DSurface8 *iface, REFGUID guid, + void *data, DWORD *data_size) +{ + IDirect3DSurface8Impl *surface = impl_from_IDirect3DSurface8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", - iface, debugstr_guid(refguid), pData, pSizeOfData); + iface, debugstr_guid(guid), data, data_size); wined3d_mutex_lock(); - hr = wined3d_surface_get_private_data(This->wined3d_surface, refguid, pData, pSizeOfData); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_get_private_data(resource, guid, data, data_size); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(IDirect3DSurface8 *iface, REFGUID guid) +{ + IDirect3DSurface8Impl *surface = impl_from_IDirect3DSurface8(iface); + struct wined3d_resource *resource; HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); wined3d_mutex_lock(); - hr = wined3d_surface_free_private_data(This->wined3d_surface, refguid); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_free_private_data(resource, guid); wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : ddraw: Implement surface private data handling on top of wined3d_resource.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: acd8c5872566d7c639c9052aefed5f8b10a3875b URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd8c5872566d7c639c9052ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:08 2011 +0200 ddraw: Implement surface private data handling on top of wined3d_resource. --- dlls/ddraw/surface.c | 12 +++++++++--- dlls/wined3d/surface.c | 17 ----------------- dlls/wined3d/wined3d.spec | 3 --- include/wine/wined3d.h | 5 ----- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 412bc29..1b70d7e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1957,13 +1957,15 @@ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *Data, DWORD Size, DWORD Flags) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, tag %s, data %p, data_size %u, flags %#x.\n", iface, debugstr_guid(tag), Data, Size, Flags); EnterCriticalSection(&ddraw_cs); - hr = wined3d_surface_set_private_data(This->wined3d_surface, tag, Data, Size, Flags); + resource = wined3d_surface_get_resource(This->wined3d_surface); + hr = wined3d_resource_set_private_data(resource, tag, Data, Size, Flags); LeaveCriticalSection(&ddraw_cs); switch(hr) { @@ -2001,6 +2003,7 @@ static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface, static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *Data, DWORD *Size) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, tag %s, data %p, data_size %p.\n", @@ -2010,7 +2013,8 @@ static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - hr = wined3d_surface_get_private_data(This->wined3d_surface, tag, Data, Size); + resource = wined3d_surface_get_resource(This->wined3d_surface); + hr = wined3d_resource_get_private_data(resource, tag, Data, Size); LeaveCriticalSection(&ddraw_cs); return hr; } @@ -2040,12 +2044,14 @@ static HRESULT WINAPI ddraw_surface4_GetPrivateData(IDirectDrawSurface4 *iface, static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface, REFGUID tag) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, tag %s.\n", iface, debugstr_guid(tag)); EnterCriticalSection(&ddraw_cs); - hr = wined3d_surface_free_private_data(This->wined3d_surface, tag); + resource = wined3d_surface_get_resource(This->wined3d_surface); + hr = wined3d_resource_free_private_data(resource, tag); LeaveCriticalSection(&ddraw_cs); return hr; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d3b54c0..945640f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2704,23 +2704,6 @@ ULONG CDECL wined3d_surface_decref(struct wined3d_surface *surface) return refcount; } -HRESULT CDECL wined3d_surface_set_private_data(struct wined3d_surface *surface, - REFGUID riid, const void *data, DWORD data_size, DWORD flags) -{ - return wined3d_resource_set_private_data(&surface->resource, riid, data, data_size, flags); -} - -HRESULT CDECL wined3d_surface_get_private_data(const struct wined3d_surface *surface, - REFGUID guid, void *data, DWORD *data_size) -{ - return wined3d_resource_get_private_data(&surface->resource, guid, data, data_size); -} - -HRESULT CDECL wined3d_surface_free_private_data(struct wined3d_surface *surface, REFGUID refguid) -{ - return wined3d_resource_free_private_data(&surface->resource, refguid); -} - DWORD CDECL wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD priority) { return resource_set_priority(&surface->resource, priority); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 6bb4df8..7131b03 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -209,7 +209,6 @@ @ cdecl wined3d_surface_create(ptr long long long long long long long long long long long ptr ptr ptr) @ cdecl wined3d_surface_decref(ptr) @ cdecl wined3d_surface_flip(ptr ptr long) -@ cdecl wined3d_surface_free_private_data(ptr ptr) @ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_clipper(ptr) @ cdecl wined3d_surface_get_flip_status(ptr long) @@ -218,7 +217,6 @@ @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) @ cdecl wined3d_surface_get_priority(ptr) -@ cdecl wined3d_surface_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_incref(ptr) @@ -234,7 +232,6 @@ @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_set_palette(ptr ptr) @ cdecl wined3d_surface_set_priority(ptr long) -@ cdecl wined3d_surface_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_surface_unmap(ptr) @ cdecl wined3d_surface_update_overlay(ptr ptr ptr ptr long ptr) @ cdecl wined3d_surface_update_overlay_z_order(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 588a7fa..40879ff 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2421,7 +2421,6 @@ HRESULT __cdecl wined3d_surface_create(struct wined3d_device *device, UINT width void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_surface **surface); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_flip(struct wined3d_surface *surface, struct wined3d_surface *override, DWORD flags); -HRESULT __cdecl wined3d_surface_free_private_data(struct wined3d_surface *surface, REFGUID guid); HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); struct wined3d_clipper * __cdecl wined3d_surface_get_clipper(const struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags); @@ -2430,8 +2429,6 @@ struct wined3d_palette * __cdecl wined3d_surface_get_palette(const struct wined3 void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_priority(const struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_get_private_data(const struct wined3d_surface *surface, - REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); ULONG __cdecl wined3d_surface_incref(struct wined3d_surface *surface); @@ -2449,8 +2446,6 @@ HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *m HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette); DWORD __cdecl wined3d_surface_set_priority(struct wined3d_surface *surface, DWORD new_priority); -HRESULT __cdecl wined3d_surface_set_private_data(struct wined3d_surface *surface, - REFGUID guid, const void *data, DWORD data_size, DWORD flags); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_update_overlay(struct wined3d_surface *surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect, DWORD flags, const WINEDDOVERLAYFX *fx);

1 0

Henri Verbeet : wined3d: Invalidate STATE_STREAMSRC when dropping VBOs.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 14bc0e9ef23902d122274609cb574adecc03e34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14bc0e9ef23902d122274609c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:09 2011 +0200 wined3d: Invalidate STATE_STREAMSRC when dropping VBOs. --- dlls/wined3d/buffer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 58352c9..1199d3c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1070,6 +1070,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("Dynamic buffer, dropping VBO\n"); buffer_unload(&buffer->resource); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; + device_invalidate_state(device, STATE_STREAMSRC); } else {

1 0

Henri Verbeet : wined3d: Make the context parameter to isStateDirty() const .
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 42db8e2bfa9a70279090e119557f4b05aa95c4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=42db8e2bfa9a70279090e1195… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:10 2011 +0200 wined3d: Make the context parameter to isStateDirty() const. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e6e4aac..c35f51e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1805,7 +1805,7 @@ void device_update_stream_info(struct wined3d_device *device, const struct wined void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; -static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state) +static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { DWORD idx = state / (sizeof(*context->isStateDirty) * CHAR_BIT); BYTE shift = state & ((sizeof(*context->isStateDirty) * CHAR_BIT) - 1);

1 0

Vincent Povirk : gdiplus: Properly clean up the new metafile data.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 698fddf99b01560ebfdc1f4a827398778dccaa64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=698fddf99b01560ebfdc1f4a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 21 12:48:11 2011 -0500 gdiplus: Properly clean up the new metafile data. --- dlls/gdiplus/image.c | 16 +++++++++++++++- dlls/gdiplus/metafile.c | 4 ++++ 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 10376f5..161a5b3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2027,7 +2027,21 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) DeleteDC(((GpBitmap*)image)->hdc); DeleteObject(((GpBitmap*)image)->hbitmap); } - else if (image->type != ImageTypeMetafile) + else if (image->type == ImageTypeMetafile) + { + GpMetafile *metafile = (GpMetafile*)image; + GdipFree(metafile->comment_data); + DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); + DeleteEnhMetaFile(metafile->hemf); + if (metafile->record_graphics) + { + WARN("metafile closed while recording\n"); + /* not sure what to do here; for now just prevent the graphics from functioning or using this object */ + metafile->record_graphics->image = NULL; + metafile->record_graphics->busy = TRUE; + } + } + else { WARN("invalid image: %p\n", image); return ObjectBusy; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 26dba93..322aecf 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -307,6 +307,10 @@ GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) metafile->hemf = CloseEnhMetaFile(metafile->record_dc); metafile->record_dc = NULL; + GdipFree(metafile->comment_data); + metafile->comment_data = NULL; + metafile->comment_data_size = 0; + return stat; }

1 0

Michael Mc Donnell : d3dx9/tests: Add UpdateSemantics test.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 4df270a8bd3c4f7302230952a2abbfc232183a52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df270a8bd3c4f7302230952a… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Tue May 24 19:43:47 2011 +0200 d3dx9/tests: Add UpdateSemantics test. --- dlls/d3dx9_36/tests/mesh.c | 418 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 418 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4df270a8bd3c4f7302230…

1 0