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

Damjan Jovanovic : include: Fix an RPC_PROTSEQ_VECTORW typo.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: fe2376e63b47735b368820a87ea0d4115940230c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2376e63b47735b368820a87… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jun 19 18:05:13 2011 +0200 include: Fix an RPC_PROTSEQ_VECTORW typo. --- include/rpcdce.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index 5edb501..6b3bd3a 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -93,7 +93,7 @@ typedef struct _RPC_PROTSEQ_VECTORA typedef struct _RPC_PROTSEQ_VECTORW { - unsigned int count; + unsigned int Count; unsigned short *Protseq[1]; } RPC_PROTSEQ_VECTORW;

1 0

Francois Gouget : explorer: Make explorer_wnd_proc() static.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: d415cf5f30efeed6a4c21e886c021fe00b325980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d415cf5f30efeed6a4c21e886… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 19 14:09:31 2011 +0200 explorer: Make explorer_wnd_proc() static. --- programs/explorer/explorer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 6411c16..d04457b 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -116,7 +116,7 @@ static void do_exit(int code) ExitProcess(code); } -LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { explorer_info *info = (explorer_info*)GetWindowLongPtrW(hwnd,EXPLORER_INFO_INDEX);

1 0

Andrew Eikum : mmdevapi: Implement ISimpleAudioVolume::{Set, Get}Mute.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 0085689f5df0396963de8ce18efb11baa29f0d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0085689f5df0396963de8ce18… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 20 09:31:51 2011 -0500 mmdevapi: Implement ISimpleAudioVolume::{Set, Get}Mute. --- dlls/mmdevapi/tests/capture.c | 16 ++++---- dlls/mmdevapi/tests/render.c | 17 +++++---- dlls/winealsa.drv/mmdevdrv.c | 44 ++++++++++++++++++++---- dlls/winecoreaudio.drv/mmdevdrv.c | 29 +++++++++++++--- dlls/wineoss.drv/mmdevdrv.c | 67 ++++++++++++++++++++++++++++-------- 5 files changed, 128 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0085689f5df0396963de8…

1 0

Stefan Dösinger : wined3d: Link STATE_BASEVERTEXINDEX to STATE_VDECL.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 73cec67c14ff6e8f454e949d2c7507ec550d88f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73cec67c14ff6e8f454e949d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 18 13:47:34 2011 +0200 wined3d: Link STATE_BASEVERTEXINDEX to STATE_VDECL. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 632388c..568ae87 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5063,7 +5063,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }, WINED3D_GL_EXT_NONE }, { STATE_BASEVERTEXINDEX, { 0, NULL, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, - { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, + { STATE_BASEVERTEXINDEX, { STATE_VDECL, NULL, }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0

Stefan Dösinger : wined3d: Use base_vertex_index in drawStridedSlow, and only for indexed draws.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 2daa16c96ce5ce2a9bff2634574358687cfd866a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daa16c96ce5ce2a9bff26345… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 18 00:43:06 2011 +0200 wined3d: Use base_vertex_index in drawStridedSlow, and only for indexed draws. --- dlls/wined3d/drawprim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index d5a656e..3d86782 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -75,7 +75,7 @@ static void drawStridedSlow(struct wined3d_device *device, const struct wined3d_ UINT vx_index; const struct wined3d_state *state = &device->stateBlock->state; const struct wined3d_stream_state *streams = state->streams; - LONG SkipnStrides = startIdx + state->load_base_vertex_index; + LONG SkipnStrides = startIdx; BOOL pixelShader = use_ps(state); BOOL specular_fog = FALSE; const BYTE *texCoords[WINED3DDP_MAXTEXCOORD]; @@ -230,9 +230,9 @@ static void drawStridedSlow(struct wined3d_device *device, const struct wined3d_ { /* Indexed so work out the number of strides to skip */ if (idxSize == 2) - SkipnStrides = pIdxBufS[startIdx + vx_index] + state->load_base_vertex_index; + SkipnStrides = pIdxBufS[startIdx + vx_index] + state->base_vertex_index; else - SkipnStrides = pIdxBufL[startIdx + vx_index] + state->load_base_vertex_index; + SkipnStrides = pIdxBufL[startIdx + vx_index] + state->base_vertex_index; } tmp_tex_mask = tex_mask;

1 0

Andrew Eikum : winealsa.drv: Be less choosey about sample rates.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: c6312990ab6f39edd9cc68a28aa5a74686fe1651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6312990ab6f39edd9cc68a28… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 17 15:49:55 2011 -0500 winealsa.drv: Be less choosey about sample rates. --- dlls/winealsa.drv/mmdevdrv.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 23f76e3..02b0438 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1146,12 +1146,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, goto exit; } - if(fmt->nSamplesPerSec < min || fmt->nSamplesPerSec > max || - (fmt->nSamplesPerSec != 48000 && - fmt->nSamplesPerSec != 44100 && - fmt->nSamplesPerSec != 22050 && - fmt->nSamplesPerSec != 11025 && - fmt->nSamplesPerSec != 8000)){ + if(fmt->nSamplesPerSec < min || fmt->nSamplesPerSec > max){ hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; }

1 0

Andrew Eikum : mmdevapi: Don't crash if a driver fails to load.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: f50829c36e389d1fae176a53ec6e4a050ba3f9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50829c36e389d1fae176a53e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 17 15:49:51 2011 -0500 mmdevapi: Don't crash if a driver fails to load. --- dlls/mmdevapi/devenum.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index f8ec363..7acc3f6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -824,6 +824,9 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { MMDevEnumImpl *This = MMDevEnumerator; + if(!drvs.pGetAudioEndpoint) + return AUDCLNT_E_SERVICE_NOT_RUNNING; + if (!This) { This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));

1 0

Jacek Caban : include: Moved DXGI_FORMAT declaration to dxgiformat.h.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: a1d55ee77b1931c8f255f237f1010e1b985e860c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d55ee77b1931c8f255f237f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 18 15:06:13 2011 +0200 include: Moved DXGI_FORMAT declaration to dxgiformat.h. --- include/Makefile.in | 1 + include/dxgiformat.h | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 94 +--------------------------------------- 3 files changed, 119 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1d55ee77b1931c8f255f…

1 0

Andrew Eikum : mmdevapi: Fix refcounts in IAudioClient::GetService.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: a93efd5346b689d04762b763819e3db2304373d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a93efd5346b689d04762b7638… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 20 09:31:22 2011 -0500 mmdevapi: Fix refcounts in IAudioClient::GetService. --- dlls/winealsa.drv/mmdevdrv.c | 16 ++++++++++++---- dlls/winecoreaudio.drv/mmdevdrv.c | 26 ++++++++++++++++++-------- dlls/wineoss.drv/mmdevdrv.c | 16 ++++++++++++---- 3 files changed, 42 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b96e5f5..23f76e3 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1666,16 +1666,20 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; }else if(IsEqualIID(riid, &IID_IAudioClock)){ + IAudioClock_AddRef(&This->IAudioClock_iface); *ppv = &This->IAudioClock_iface; }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ + IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ @@ -1684,7 +1688,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ @@ -1694,7 +1699,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ @@ -1704,13 +1710,13 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); LeaveCriticalSection(&This->lock); return S_OK; } @@ -2245,6 +2251,8 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; + ret->ref = 1; + ret->client = client; if(client){ ret->session = client->session; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index fd5e5ad..fd3ed1b 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1459,16 +1459,20 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ OSSpinLockUnlock(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; }else if(IsEqualIID(riid, &IID_IAudioClock)){ + IAudioClock_AddRef(&This->IAudioClock_iface); *ppv = &This->IAudioClock_iface; }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ + IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ @@ -1477,7 +1481,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return E_OUTOFMEMORY; } - } + }else + IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ @@ -1487,7 +1492,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return E_OUTOFMEMORY; } - } + }else + IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ @@ -1497,13 +1503,13 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, OSSpinLockUnlock(&This->lock); return E_OUTOFMEMORY; } - } + }else + ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); OSSpinLockUnlock(&This->lock); return S_OK; } @@ -2035,6 +2041,8 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; + ret->ref = 1; + ret->client = client; if(client){ ret->session = client->session; @@ -2082,10 +2090,12 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ - OSSpinLockLock(&This->client->lock); - This->client->session_wrapper = NULL; - OSSpinLockUnlock(&This->client->lock); - AudioClient_Release(&This->client->IAudioClient_iface); + if(This->client){ + OSSpinLockLock(&This->client->lock); + This->client->session_wrapper = NULL; + OSSpinLockUnlock(&This->client->lock); + AudioClient_Release(&This->client->IAudioClient_iface); + } HeapFree(GetProcessHeap(), 0, This); } return ref; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c6f561e..c8359a9 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1381,16 +1381,20 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface); *ppv = &This->IAudioRenderClient_iface; }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){ if(This->dataflow != eCapture){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_WRONG_ENDPOINT_TYPE; } + IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface); *ppv = &This->IAudioCaptureClient_iface; }else if(IsEqualIID(riid, &IID_IAudioClock)){ + IAudioClock_AddRef(&This->IAudioClock_iface); *ppv = &This->IAudioClock_iface; }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){ + IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface); *ppv = &This->IAudioStreamVolume_iface; }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){ if(!This->session_wrapper){ @@ -1399,7 +1403,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface); *ppv = &This->session_wrapper->IAudioSessionControl2_iface; }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){ @@ -1409,7 +1414,8 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface); *ppv = &This->session_wrapper->IChannelAudioVolume_iface; }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){ @@ -1419,13 +1425,13 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient *iface, REFIID riid, LeaveCriticalSection(&This->lock); return E_OUTOFMEMORY; } - } + }else + ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface); *ppv = &This->session_wrapper->ISimpleAudioVolume_iface; } if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); LeaveCriticalSection(&This->lock); return S_OK; } @@ -1951,6 +1957,8 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->ISimpleAudioVolume_iface.lpVtbl = &SimpleAudioVolume_Vtbl; ret->IChannelAudioVolume_iface.lpVtbl = &ChannelAudioVolume_Vtbl; + ret->ref = 1; + ret->client = client; if(client){ ret->session = client->session;

1 0

Henri Verbeet : d3d9: Implement IDirect3DCubeTexture9 private data handling on top of wined3d_resource .
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 732338ab356991b2fb245f04fd0497a2bc7087e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=732338ab356991b2fb245f04f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 17 21:00:01 2011 +0200 d3d9: Implement IDirect3DCubeTexture9 private data handling on top of wined3d_resource. --- dlls/d3d9/cubetexture.c | 12 +++++++++--- dlls/wined3d/texture.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index a4b07f0..bc29035 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -112,13 +112,15 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetPrivateData(IDirect3DCubeText REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(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); wined3d_mutex_lock(); - hr = wined3d_texture_set_private_data(This->wined3d_texture, refguid, pData, SizeOfData, Flags); + resource = wined3d_texture_get_resource(This->wined3d_texture); + hr = wined3d_resource_set_private_data(resource, refguid, pData, SizeOfData, Flags); wined3d_mutex_unlock(); return hr; @@ -128,13 +130,15 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetPrivateData(IDirect3DCubeText REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); - hr = wined3d_texture_get_private_data(This->wined3d_texture, refguid, pData, pSizeOfData); + resource = wined3d_texture_get_resource(This->wined3d_texture); + hr = wined3d_resource_get_private_data(resource, refguid, pData, pSizeOfData); wined3d_mutex_unlock(); return hr; @@ -144,12 +148,14 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_FreePrivateData(IDirect3DCubeTex REFGUID refguid) { IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); - hr = wined3d_texture_free_private_data(This->wined3d_texture, refguid); + resource = wined3d_texture_get_resource(This->wined3d_texture); + hr = wined3d_resource_free_private_data(resource, refguid); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 72d0d4a..2ca32a0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -450,6 +450,13 @@ ULONG CDECL wined3d_texture_decref(struct wined3d_texture *texture) return refcount; } +struct wined3d_resource * CDECL wined3d_texture_get_resource(struct wined3d_texture *texture) +{ + TRACE("texture %p.\n", texture); + + return &texture->resource; +} + HRESULT CDECL wined3d_texture_set_private_data(struct wined3d_texture *texture, REFGUID guid, const void *data, DWORD data_size, DWORD flags) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ab8d943..3391089 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -267,6 +267,7 @@ @ cdecl wined3d_texture_get_parent(ptr) @ cdecl wined3d_texture_get_priority(ptr) @ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr) +@ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fccdaf3..93f864a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2504,6 +2504,7 @@ void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture) DWORD __cdecl wined3d_texture_get_priority(const struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_get_private_data(const struct wined3d_texture *texture, REFGUID guid, void *data, DWORD *data_size); +struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(struct wined3d_texture *texture, UINT sub_resource_idx); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture);

1 0