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

Henri Verbeet : d3d9: Implement IDirect3DCubeTexture9 private data handling on top of wined3d_resource .
by Alexandre Julliard 20 Jun '11

20 Jun '11

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

Henri Verbeet : d3d9: Implement IDirect3DTexture9 private data handling on top of wined3d_resource .
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: a989afe364767f287a30a55db1f3ea9c13dad466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a989afe364767f287a30a55db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 17 21:00:02 2011 +0200 d3d9: Implement IDirect3DTexture9 private data handling on top of wined3d_resource. --- dlls/d3d9/texture.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 970028b..b0ccd6f 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -108,13 +108,15 @@ static HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(IDirect3DTexture9 *if REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(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; @@ -124,13 +126,15 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(IDirect3DTexture9 *if REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(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; @@ -140,12 +144,14 @@ static HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(IDirect3DTexture9 *i REFGUID refguid) { IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(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;

1 0

Henri Verbeet : d3d9: Implement IDirect3DVolumeTexture9 private data handling on top of wined3d_resource .
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: ffb58ed445170390a4c5d06bf4b385184a0a366d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb58ed445170390a4c5d06bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 17 21:00:03 2011 +0200 d3d9: Implement IDirect3DVolumeTexture9 private data handling on top of wined3d_resource. --- dlls/d3d9/volumetexture.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index d5a1bcc..ac79c91 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -107,13 +107,15 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_SetPrivateData(IDirect3DVolume REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(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; @@ -123,13 +125,15 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetPrivateData(IDirect3DVolume REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(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; @@ -139,12 +143,14 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_FreePrivateData(IDirect3DVolum REFGUID refguid) { IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(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;

1 0

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

20 Jun '11

Module: wine Branch: master Commit: ccf2ff7089b71161a272c4dcd5424df757963eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf2ff7089b71161a272c4dcd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 17 21:00:04 2011 +0200 d3d8: Implement IDirect3DCubeTexture8 private data handling on top of wined3d_resource. --- dlls/d3d8/cubetexture.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 304508b..6b8caf1 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -109,13 +109,15 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(IDirect3DCubeText REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(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; @@ -125,13 +127,15 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetPrivateData(IDirect3DCubeText REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(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; @@ -141,12 +145,14 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_FreePrivateData(IDirect3DCubeTex REFGUID refguid) { IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(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;

1 0

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

20 Jun '11

Module: wine Branch: master Commit: 5b077584d213a7df31956004f2bb338bce08078f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b077584d213a7df31956004f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 17 21:00:05 2011 +0200 d3d8: Implement IDirect3DTexture8 private data handling on top of wined3d_resource. --- dlls/d3d8/texture.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 20cb6ed..b74a8e4 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -108,13 +108,15 @@ static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(IDirect3DTexture8 *if REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(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; @@ -124,13 +126,15 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(IDirect3DTexture8 *if REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(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; @@ -140,12 +144,14 @@ static HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(IDirect3DTexture8 *i REFGUID refguid) { IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(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;

1 0

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

20 Jun '11

Module: wine Branch: master Commit: 792060d67f6c9dce08e7cd9ecdeaa3efc2dbc1c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792060d67f6c9dce08e7cd9ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 17 21:00:06 2011 +0200 d3d8: Implement IDirect3DVolumeTexture8 private data handling on top of wined3d_resource. --- dlls/d3d8/volumetexture.c | 12 +++++++++--- dlls/wined3d/texture.c | 17 ----------------- dlls/wined3d/wined3d.spec | 3 --- include/wine/wined3d.h | 5 ----- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index df95401..356b47b 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -107,13 +107,15 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(IDirect3DVolume REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(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; @@ -123,13 +125,15 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetPrivateData(IDirect3DVolume REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(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; @@ -139,12 +143,14 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_FreePrivateData(IDirect3DVolum REFGUID refguid) { IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(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 2ca32a0..eb4fa75 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -457,23 +457,6 @@ struct wined3d_resource * CDECL wined3d_texture_get_resource(struct wined3d_text return &texture->resource; } -HRESULT CDECL wined3d_texture_set_private_data(struct wined3d_texture *texture, - REFGUID guid, const void *data, DWORD data_size, DWORD flags) -{ - return wined3d_resource_set_private_data(&texture->resource, guid, data, data_size, flags); -} - -HRESULT CDECL wined3d_texture_get_private_data(const struct wined3d_texture *texture, - REFGUID guid, void *data, DWORD *data_size) -{ - return wined3d_resource_get_private_data(&texture->resource, guid, data, data_size); -} - -HRESULT CDECL wined3d_texture_free_private_data(struct wined3d_texture *texture, REFGUID guid) -{ - return wined3d_resource_free_private_data(&texture->resource, guid); -} - DWORD CDECL wined3d_texture_set_priority(struct wined3d_texture *texture, DWORD priority) { return resource_set_priority(&texture->resource, priority); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3391089..6bb4df8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,14 +259,12 @@ @ cdecl wined3d_texture_create_3d(ptr long long long long long long long ptr ptr ptr) @ cdecl wined3d_texture_create_cube(ptr long long long long long ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) -@ cdecl wined3d_texture_free_private_data(ptr ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) @ cdecl wined3d_texture_get_autogen_filter_type(ptr) @ cdecl wined3d_texture_get_level_count(ptr) @ cdecl wined3d_texture_get_lod(ptr) @ 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) @@ -274,7 +272,6 @@ @ cdecl wined3d_texture_set_autogen_filter_type(ptr long) @ cdecl wined3d_texture_set_lod(ptr long) @ cdecl wined3d_texture_set_priority(ptr long) -@ cdecl wined3d_texture_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_vertex_declaration_create(ptr ptr long ptr ptr ptr) @ cdecl wined3d_vertex_declaration_create_from_fvf(ptr long ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 93f864a..588a7fa 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2495,15 +2495,12 @@ HRESULT __cdecl wined3d_texture_create_cube(struct wined3d_device *device, UINT UINT level_count, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture); ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); -HRESULT __cdecl wined3d_texture_free_private_data(struct wined3d_texture *texture, REFGUID guid); void __cdecl wined3d_texture_generate_mipmaps(struct wined3d_texture *texture); WINED3DTEXTUREFILTERTYPE __cdecl wined3d_texture_get_autogen_filter_type(const struct wined3d_texture *texture); DWORD __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); DWORD __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); 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); @@ -2513,8 +2510,6 @@ HRESULT __cdecl wined3d_texture_set_autogen_filter_type(struct wined3d_texture * WINED3DTEXTUREFILTERTYPE filter_type); DWORD __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod); DWORD __cdecl wined3d_texture_set_priority(struct wined3d_texture *texture, DWORD priority); -HRESULT __cdecl wined3d_texture_set_private_data(struct wined3d_texture *texture, - REFGUID guid, const void *data, DWORD data_size, DWORD flags); HRESULT __cdecl wined3d_vertex_declaration_create(struct wined3d_device *device, const WINED3DVERTEXELEMENT *elements, UINT element_count, void *parent,

1 0

Andrew Eikum : winecoreaudio: Set AudioQueue volume, not AudioDevice volume .
by Alexandre Julliard 20 Jun '11

20 Jun '11

Module: wine Branch: master Commit: 096fb434eb7ceed5879249e5094b7aeb0140d7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=096fb434eb7ceed5879249e50… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 17 15:49:48 2011 -0500 winecoreaudio: Set AudioQueue volume, not AudioDevice volume. We want to control the volume for each particular stream, not the entire system-wide device. --- dlls/winecoreaudio.drv/mmdevdrv.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 26c9286..fd5e5ad 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -2289,7 +2289,6 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = /* index == -1 means set all channels, otherwise sets only the given channel */ static HRESULT ca_setvol(ACImpl *This, UINT32 index) { - AudioObjectPropertyAddress addr; float level; OSStatus sc; @@ -2308,14 +2307,9 @@ static HRESULT ca_setvol(ACImpl *This, UINT32 index) level = This->session->master_vol * This->session->channel_vols[index] * This->vols[index]; - addr.mScope = This->scope; - addr.mSelector = kAudioDevicePropertyVolumeScalar; - addr.mElement = index + 1; - - sc = AudioObjectSetPropertyData(This->adevid, &addr, 0, NULL, - sizeof(float), &level); + sc = AudioQueueSetParameter(This->aqueue, kAudioQueueParam_Volume, level); if(sc != noErr){ - WARN("Setting _VolumeScalar property failed: %lx\n", sc); + WARN("Setting _Volume property failed: %lx\n", sc); return E_FAIL; } @@ -2514,6 +2508,7 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; + WARN("AudioQueue doesn't support per-channel volume control\n"); ret = ca_setvol(This, index); OSSpinLockUnlock(&This->lock); @@ -2675,6 +2670,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; + WARN("AudioQueue doesn't support per-channel volume control\n"); ret = ca_session_setvol(session, index); LeaveCriticalSection(&session->lock);

1 0

Jacek Caban : mshtml: Use replace_node_by_html instead of document. write for conditional comments.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: fe105adff0562a66dedb9ea5437b83fe0c1fa1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe105adff0562a66dedb9ea54… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 17 16:18:05 2011 +0200 mshtml: Use replace_node_by_html instead of document.write for conditional comments. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mutation.c | 79 +++++++++++++++--------------------------- 3 files changed, 30 insertions(+), 52 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1d0e6c0..603ae9b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -98,7 +98,7 @@ static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) return NULL; } -static HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, const WCHAR *html) +HRESULT replace_node_by_html(nsIDOMHTMLDocument *nsdoc, nsIDOMNode *nsnode, const WCHAR *html) { nsIDOMDocumentFragment *nsfragment; nsIDOMDocumentRange *nsdocrange; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 275bd81..cc17a64 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -753,6 +753,7 @@ IHTMLStyleSheetsCollection *HTMLStyleSheetsCollection_Create(nsIDOMStyleSheetLis void detach_selection(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; +HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*); HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 2117e49..0dc0785 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -44,14 +44,12 @@ static const IID NS_ICONTENTUTILS_CID = static nsIContentUtils *content_utils; -static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *comment) +static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *comment) { - DWORD len; int majorv = 0, minorv = 0; const PRUnichar *ptr, *end; - nsAString nsstr; PRUnichar *buf; - nsresult nsres; + DWORD len; enum { CMP_EQ, @@ -64,7 +62,7 @@ static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *commen static const PRUnichar endifW[] = {'<','!','[','e','n','d','i','f',']'}; if(comment[0] != '[' || comment[1] != 'i' || comment[2] != 'f') - return FALSE; + return NULL; ptr = comment+3; while(isspaceW(*ptr)) @@ -89,28 +87,28 @@ static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *commen } if(!isspaceW(*ptr++)) - return FALSE; + return NULL; while(isspaceW(*ptr)) ptr++; if(ptr[0] != 'I' || ptr[1] != 'E') - return FALSE; + return NULL; ptr +=2; if(!isspaceW(*ptr++)) - return FALSE; + return NULL; while(isspaceW(*ptr)) ptr++; if(!isdigitW(*ptr)) - return FALSE; + return NULL; while(isdigitW(*ptr)) majorv = majorv*10 + (*ptr++ - '0'); if(*ptr == '.') { ptr++; if(!isdigitW(*ptr)) - return FALSE; + return NULL; while(isdigitW(*ptr)) minorv = minorv*10 + (*ptr++ - '0'); } @@ -118,74 +116,64 @@ static BOOL handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar *commen while(isspaceW(*ptr)) ptr++; if(ptr[0] != ']' || ptr[1] != '>') - return FALSE; + return NULL; ptr += 2; len = strlenW(ptr); if(len < sizeof(endifW)/sizeof(WCHAR)) - return FALSE; + return NULL; end = ptr + len-sizeof(endifW)/sizeof(WCHAR); if(memcmp(end, endifW, sizeof(endifW))) - return FALSE; + return NULL; switch(cmpt) { case CMP_EQ: if(majorv == IE_MAJOR_VERSION && minorv == IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_LT: if(majorv > IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv > IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_LTE: if(majorv > IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv >= IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_GT: if(majorv < IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv < IE_MINOR_VERSION) break; - return FALSE; + return NULL; case CMP_GTE: if(majorv < IE_MAJOR_VERSION) break; if(majorv == IE_MAJOR_VERSION && minorv <= IE_MINOR_VERSION) break; - return FALSE; + return NULL; } buf = heap_alloc((end-ptr+1)*sizeof(WCHAR)); if(!buf) - return FALSE; + return NULL; memcpy(buf, ptr, (end-ptr)*sizeof(WCHAR)); buf[end-ptr] = 0; - nsAString_InitDepend(&nsstr, buf); - - /* FIXME: Find better way to insert HTML to document. */ - nsres = nsIDOMHTMLDocument_Write(doc->nsdoc, &nsstr); - nsAString_Finish(&nsstr); - heap_free(buf); - if(NS_FAILED(nsres)) { - ERR("Write failed: %08x\n", nsres); - return FALSE; - } - return TRUE; + return buf; } static nsresult run_insert_comment(HTMLDocumentNode *doc, nsISupports *comment_iface, nsISupports *arg2) { const PRUnichar *comment; nsIDOMComment *nscomment; + PRUnichar *replace_html; nsAString comment_str; - BOOL remove_comment; nsresult nsres; nsres = nsISupports_QueryInterface(comment_iface, &IID_nsIDOMComment, (void**)&nscomment); @@ -200,32 +188,21 @@ static nsresult run_insert_comment(HTMLDocumentNode *doc, nsISupports *comment_i return nsres; nsAString_GetData(&comment_str, &comment); - remove_comment = handle_insert_comment(doc, comment); + replace_html = handle_insert_comment(doc, comment); nsAString_Finish(&comment_str); - if(remove_comment) { - nsIDOMNode *nsparent, *tmp; - nsAString magic_str; + if(replace_html) { + HRESULT hres; - static const PRUnichar remove_comment_magicW[] = - {'#','!','w','i','n','e', 'r','e','m','o','v','e','!','#',0}; - - nsAString_InitDepend(&magic_str, remove_comment_magicW); - nsres = nsIDOMComment_SetData(nscomment, &magic_str); - nsAString_Finish(&magic_str); - if(NS_FAILED(nsres)) - ERR("SetData failed: %08x\n", nsres); - - nsIDOMComment_GetParentNode(nscomment, &nsparent); - if(nsparent) { - nsIDOMNode_RemoveChild(nsparent, (nsIDOMNode*)nscomment, &tmp); - nsIDOMNode_Release(nsparent); - nsIDOMNode_Release(tmp); - } + hres = replace_node_by_html(doc->nsdoc, (nsIDOMNode*)nscomment, replace_html); + heap_free(replace_html); + if(FAILED(hres)) + nsres = NS_ERROR_FAILURE; } + nsIDOMComment_Release(nscomment); - return NS_OK; + return nsres; } static nsresult run_bind_to_tree(HTMLDocumentNode *doc, nsISupports *nsiface, nsISupports *arg2)

1 0

Damjan Jovanovic : include: Add RPC_PROTSEQ_VECTOR.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 878a588800ba6c78b674e831f692431f1b37bf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=878a588800ba6c78b674e831f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Jun 17 15:39:34 2011 +0200 include: Add RPC_PROTSEQ_VECTOR. --- include/rpcdce.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index 9507a82..5edb501 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -85,6 +85,20 @@ typedef struct ULONG Stats[1]; } RPC_STATS_VECTOR; +typedef struct _RPC_PROTSEQ_VECTORA +{ + unsigned int Count; + unsigned char *Protseq[1]; +} RPC_PROTSEQ_VECTORA; + +typedef struct _RPC_PROTSEQ_VECTORW +{ + unsigned int count; + unsigned short *Protseq[1]; +} RPC_PROTSEQ_VECTORW; + +DECL_WINELIB_TYPE_AW(RPC_PROTSEQ_VECTOR) + typedef I_RPC_HANDLE *RPC_EP_INQ_HANDLE; #define RPC_C_EP_ALL_ELTS 0

1 0

Damjan Jovanovic : rpcrt4: Add stubs for RpcNetworkInqProtseqs.
by Alexandre Julliard 17 Jun '11

17 Jun '11

Module: wine Branch: master Commit: 57b7044cd6616e4435e8ebe0b594cee699fbc626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b7044cd6616e4435e8ebe0b… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Jun 17 15:40:33 2011 +0200 rpcrt4: Add stubs for RpcNetworkInqProtseqs. --- dlls/rpcrt4/rpc_server.c | 18 ++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 9fd4cf6..3a9ecf8 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -825,6 +825,24 @@ static RPC_STATUS RPCRT4_use_protseq(RpcServerProtseq* ps, const char *endpoint) } /*********************************************************************** + * RpcNetworkInqProtseqsA (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcNetworkInqProtseqsA( RPC_PROTSEQ_VECTORA* ProtSeqVector ) +{ + FIXME("(%p): stub\n", ProtSeqVector); + return RPC_S_NO_PROTSEQS_REGISTERED; +} + +/*********************************************************************** + * RpcNetworkInqProtseqsW (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcNetworkInqProtseqsW( RPC_PROTSEQ_VECTORW* ProtSeqVector ) +{ + FIXME("(%p): stub\n", ProtSeqVector); + return RPC_S_NO_PROTSEQS_REGISTERED; +} + +/*********************************************************************** * RpcServerInqBindings (RPCRT4.@) */ RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index b88c16d..598e60e 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -409,8 +409,8 @@ @ stdcall RpcMgmtStatsVectorFree(ptr) @ stdcall RpcMgmtStopServerListening(ptr) @ stdcall RpcMgmtWaitServerListen() -@ stub RpcNetworkInqProtseqsA -@ stub RpcNetworkInqProtseqsW +@ stdcall RpcNetworkInqProtseqsA(ptr) +@ stdcall RpcNetworkInqProtseqsW(ptr) @ stdcall RpcNetworkIsProtseqValidA(ptr) @ stdcall RpcNetworkIsProtseqValidW(ptr) @ stub RpcNsBindingInqEntryNameA

1 0