wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DPixelShader9 iface.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: b09078b0169be4f4cb8ac8eb2f7cde34d2e1844f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09078b0169be4f4cb8ac8eb2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 12:05:01 2011 +0200 d3d9: COM cleanup for the IDirect3DPixelShader9 iface. --- dlls/d3d9/d3d9_private.h | 5 ++--- dlls/d3d9/device.c | 2 +- dlls/d3d9/shader.c | 21 +++++++++++++-------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index db783d8..db059bf 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -428,9 +428,8 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, * IDirect3DPixelShader implementation structure */ typedef struct IDirect3DPixelShader9Impl { - /* IUnknown fields */ - const IDirect3DPixelShader9Vtbl *lpVtbl; - LONG ref; + IDirect3DPixelShader9 IDirect3DPixelShader9_iface; + LONG ref; struct wined3d_shader *wined3d_shader; IDirect3DDevice9Ex *parentDevice; } IDirect3DPixelShader9Impl; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2f7a38f..ed5abd4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2598,7 +2598,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(IDirect3DDevice9Ex } TRACE("Created pixel shader %p.\n", object); - *shader = (IDirect3DPixelShader9 *)object; + *shader = &object->IDirect3DPixelShader9_iface; return D3D_OK; } diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index 66f1c07..31ccfaa 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -153,7 +153,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Im static inline IDirect3DPixelShader9Impl *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, IDirect3DPixelShader9_iface); } static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *iface, REFIID riid, void **object) @@ -176,7 +176,7 @@ static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *ifa static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = (IDirect3DPixelShader9Impl *)iface; + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); ULONG refcount = InterlockedIncrement(&shader->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -194,7 +194,7 @@ static ULONG WINAPI d3d9_pixelshader_AddRef(IDirect3DPixelShader9 *iface) static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) { - IDirect3DPixelShader9Impl *shader = (IDirect3DPixelShader9Impl *)iface; + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); ULONG refcount = InterlockedDecrement(&shader->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -214,11 +214,14 @@ static ULONG WINAPI d3d9_pixelshader_Release(IDirect3DPixelShader9 *iface) return refcount; } -static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, + IDirect3DDevice9 **device) { + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)((IDirect3DPixelShader9Impl *)iface)->parentDevice; + *device = (IDirect3DDevice9 *)shader->parentDevice; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -226,14 +229,16 @@ static HRESULT WINAPI d3d9_pixelshader_GetDevice(IDirect3DPixelShader9 *iface, I return D3D_OK; } -static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, UINT *data_size) +static HRESULT WINAPI d3d9_pixelshader_GetFunction(IDirect3DPixelShader9 *iface, void *data, + UINT *data_size) { + IDirect3DPixelShader9Impl *shader = impl_from_IDirect3DPixelShader9(iface); HRESULT hr; TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); wined3d_mutex_lock(); - hr = wined3d_shader_get_byte_code(((IDirect3DPixelShader9Impl *)iface)->wined3d_shader, data, data_size); + hr = wined3d_shader_get_byte_code(shader->wined3d_shader, data, data_size); wined3d_mutex_unlock(); return hr; @@ -265,7 +270,7 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, IDirect3DDevice9Impl HRESULT hr; shader->ref = 1; - shader->lpVtbl = &d3d9_pixelshader_vtbl; + shader->IDirect3DPixelShader9_iface.lpVtbl = &d3d9_pixelshader_vtbl; wined3d_mutex_lock(); hr = wined3d_shader_create_ps(device->wined3d_device, byte_code, NULL, shader,

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DPixelShader9 for an app provided iface.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 704f0efe0c931c12b0a6827467b949cac52b752c URL: http://source.winehq.org/git/wine.git/?a=commit;h=704f0efe0c931c12b0a682746… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 12:03:20 2011 +0200 d3d9: Use unsafe_impl_from_IDirect3DPixelShader9 for an app provided iface. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 3 ++- dlls/d3d9/shader.c | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index b259ed5..db783d8 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -437,6 +437,7 @@ typedef struct IDirect3DPixelShader9Impl { HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, IDirect3DDevice9Impl *device, const DWORD *byte_code) DECLSPEC_HIDDEN; +IDirect3DPixelShader9Impl *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) DECLSPEC_HIDDEN; /* --------------- */ /* IDirect3DQuery9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 89f292a..2f7a38f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2607,13 +2607,14 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(IDirect3DDevice9Ex *if IDirect3DPixelShader9 *shader) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DPixelShader9Impl *shader_obj = unsafe_impl_from_IDirect3DPixelShader9(shader); HRESULT hr; TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); hr = wined3d_device_set_pixel_shader(This->wined3d_device, - shader ? ((IDirect3DPixelShader9Impl *)shader)->wined3d_shader : NULL); + shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c index c36600d..66f1c07 100644 --- a/dlls/d3d9/shader.c +++ b/dlls/d3d9/shader.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include <assert.h> #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); @@ -150,6 +151,11 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Im return D3D_OK; } +static inline IDirect3DPixelShader9Impl *impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DPixelShader9Impl, lpVtbl); +} + static HRESULT WINAPI d3d9_pixelshader_QueryInterface(IDirect3DPixelShader9 *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); @@ -276,3 +282,12 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, IDirect3DDevice9Impl return D3D_OK; } + +IDirect3DPixelShader9Impl *unsafe_impl_from_IDirect3DPixelShader9(IDirect3DPixelShader9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d9_pixelshader_vtbl); + + return impl_from_IDirect3DPixelShader9(iface); +}

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DIndexBuffer9 iface.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: db1dd9022538b37584603a099cdc2ab2fb412b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1dd9022538b37584603a099… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 12:02:25 2011 +0200 d3d9: COM cleanup for the IDirect3DIndexBuffer9 iface. --- dlls/d3d9/buffer.c | 38 ++++++++++++++++++++++++-------------- dlls/d3d9/d3d9_private.h | 6 ++---- dlls/d3d9/device.c | 2 +- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 7d35927..6e91b00 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -302,7 +302,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im static inline IDirect3DIndexBuffer9Impl *impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DIndexBuffer9Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DIndexBuffer9Impl, IDirect3DIndexBuffer9_iface); } static HRESULT WINAPI d3d9_indexbuffer_QueryInterface(IDirect3DIndexBuffer9 *iface, REFIID riid, void **object) @@ -326,7 +326,7 @@ static HRESULT WINAPI d3d9_indexbuffer_QueryInterface(IDirect3DIndexBuffer9 *ifa static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) { - IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface; + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); ULONG refcount = InterlockedIncrement(&buffer->ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -344,7 +344,7 @@ static ULONG WINAPI d3d9_indexbuffer_AddRef(IDirect3DIndexBuffer9 *iface) static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) { - IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface; + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); ULONG refcount = InterlockedDecrement(&buffer->ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -364,11 +364,14 @@ static ULONG WINAPI d3d9_indexbuffer_Release(IDirect3DIndexBuffer9 *iface) return refcount; } -static HRESULT WINAPI d3d9_indexbuffer_GetDevice(IDirect3DIndexBuffer9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI d3d9_indexbuffer_GetDevice(IDirect3DIndexBuffer9 *iface, + IDirect3DDevice9 **device) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); + TRACE("iface %p, device %p.\n", iface, device); - *device = (IDirect3DDevice9 *)((IDirect3DIndexBuffer9Impl *)iface)->parentDevice; + *device = (IDirect3DDevice9 *)buffer->parentDevice; IDirect3DDevice9_AddRef(*device); TRACE("Returning device %p.\n", *device); @@ -430,12 +433,13 @@ static HRESULT WINAPI d3d9_indexbuffer_FreePrivateData(IDirect3DIndexBuffer9 *if static DWORD WINAPI d3d9_indexbuffer_SetPriority(IDirect3DIndexBuffer9 *iface, DWORD priority) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); DWORD previous; TRACE("iface %p, priority %u.\n", iface, priority); wined3d_mutex_lock(); - previous = wined3d_buffer_set_priority(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer, priority); + previous = wined3d_buffer_set_priority(buffer->wineD3DIndexBuffer, priority); wined3d_mutex_unlock(); return previous; @@ -443,12 +447,13 @@ static DWORD WINAPI d3d9_indexbuffer_SetPriority(IDirect3DIndexBuffer9 *iface, D static DWORD WINAPI d3d9_indexbuffer_GetPriority(IDirect3DIndexBuffer9 *iface) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); DWORD priority; TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - priority = wined3d_buffer_get_priority(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer); + priority = wined3d_buffer_get_priority(buffer->wineD3DIndexBuffer); wined3d_mutex_unlock(); return priority; @@ -456,10 +461,12 @@ static DWORD WINAPI d3d9_indexbuffer_GetPriority(IDirect3DIndexBuffer9 *iface) static void WINAPI d3d9_indexbuffer_PreLoad(IDirect3DIndexBuffer9 *iface) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_preload(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer); + wined3d_buffer_preload(buffer->wineD3DIndexBuffer); wined3d_mutex_unlock(); } @@ -473,14 +480,14 @@ static D3DRESOURCETYPE WINAPI d3d9_indexbuffer_GetType(IDirect3DIndexBuffer9 *if static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, UINT offset, UINT size, void **data, DWORD flags) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); HRESULT hr; TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", iface, offset, size, data, flags); wined3d_mutex_lock(); - hr = wined3d_buffer_map(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer, - offset, size, (BYTE **)data, flags); + hr = wined3d_buffer_map(buffer->wineD3DIndexBuffer, offset, size, (BYTE **)data, flags); wined3d_mutex_unlock(); return hr; @@ -488,18 +495,21 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface, static HRESULT WINAPI d3d9_indexbuffer_Unlock(IDirect3DIndexBuffer9 *iface) { + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_buffer_unmap(((IDirect3DIndexBuffer9Impl *)iface)->wineD3DIndexBuffer); + wined3d_buffer_unmap(buffer->wineD3DIndexBuffer); wined3d_mutex_unlock(); return D3D_OK; } -static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3DINDEXBUFFER_DESC *desc) +static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, + D3DINDEXBUFFER_DESC *desc) { - IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface; + IDirect3DIndexBuffer9Impl *buffer = impl_from_IDirect3DIndexBuffer9(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -555,7 +565,7 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl { HRESULT hr; - buffer->lpVtbl = &d3d9_indexbuffer_vtbl; + buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->ref = 1; buffer->format = wined3dformat_from_d3dformat(format); diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 9171181..b259ed5 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -272,10 +272,8 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im */ typedef struct IDirect3DIndexBuffer9Impl { - /* IUnknown fields */ - const IDirect3DIndexBuffer9Vtbl *lpVtbl; - LONG ref; - + IDirect3DIndexBuffer9 IDirect3DIndexBuffer9_iface; + LONG ref; struct wined3d_buffer *wineD3DIndexBuffer; IDirect3DDevice9Ex *parentDevice; enum wined3d_format_id format; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0c726d9..89f292a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -885,7 +885,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(IDirect3DDevice9Ex } TRACE("Created index buffer %p.\n", object); - *buffer = (IDirect3DIndexBuffer9 *)object; + *buffer = &object->IDirect3DIndexBuffer9_iface; return D3D_OK; }

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DIndexBuffer9 for an app provided iface.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 875d6900c6faf88d6ba53d1fa8598936ed33bc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=875d6900c6faf88d6ba53d1fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 12:01:01 2011 +0200 d3d9: Use unsafe_impl_from_IDirect3DIndexBuffer9 for an app provided iface. --- dlls/d3d9/buffer.c | 10 ++++++++++ dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 8a86e6e..7d35927 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include <assert.h> #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); @@ -573,3 +574,12 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl return D3D_OK; } + +IDirect3DIndexBuffer9Impl *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d9_indexbuffer_vtbl); + + return impl_from_IDirect3DIndexBuffer9(iface); +} diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 87ff3fd..9171181 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -283,6 +283,7 @@ typedef struct IDirect3DIndexBuffer9Impl HRESULT indexbuffer_init(IDirect3DIndexBuffer9Impl *buffer, IDirect3DDevice9Impl *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; +IDirect3DIndexBuffer9Impl *unsafe_impl_from_IDirect3DIndexBuffer9(IDirect3DIndexBuffer9 *iface) DECLSPEC_HIDDEN; /* --------------------- */ /* IDirect3DBaseTexture9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5aa324e..0c726d9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2528,8 +2528,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 *pIndexData) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DIndexBuffer9Impl *ib = unsafe_impl_from_IDirect3DIndexBuffer9(pIndexData); HRESULT hr; - IDirect3DIndexBuffer9Impl *ib = (IDirect3DIndexBuffer9Impl *) pIndexData; TRACE("iface %p, buffer %p.\n", iface, pIndexData);

1 0

Jacek Caban : propkeydef.h: Fixed DEFINE_PROPERTYKEY define.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: a2e0f0f4de7331618af6d52977899009e59dca91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2e0f0f4de7331618af6d5297… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 14:00:20 2011 +0200 propkeydef.h: Fixed DEFINE_PROPERTYKEY define. --- include/propkeydef.h | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/propkeydef.h b/include/propkeydef.h index ab8a7e6..189af7f 100644 --- a/include/propkeydef.h +++ b/include/propkeydef.h @@ -33,18 +33,16 @@ #ifdef INITGUID #ifdef __cplusplus #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - EXTERN_C const PROPERTYKEY name = \ + EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY; \ - const PROPERTYKEY name = \ + const PROPERTYKEY DECLSPEC_SELECTANY name DECLSPEC_HIDDEN = \ { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }, pid } #endif #else #define DEFINE_PROPERTYKEY(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8, pid) \ - EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN DECLSPEC_SELECTANY + EXTERN_C const PROPERTYKEY name DECLSPEC_HIDDEN #endif #ifndef IsEqualPropertyKey

1 0

Maarten Lankhorst : winegstreamer: Fix setcaps call.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 715921fea080187ec8a9513ab8b80c6e1c7ab636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715921fea080187ec8a9513ab… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 5 14:25:28 2011 +0200 winegstreamer: Fix setcaps call. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 46cd9ec..c28f9b7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -727,7 +727,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS gst_pad_set_event_function(mypad, event_sink); gst_pad_set_bufferalloc_function(mypad, request_buffer_sink); gst_pad_set_acceptcaps_function(mypad, accept_caps_sink); - gst_pad_set_acceptcaps_function(mypad, setcaps_sink); + gst_pad_set_setcaps_function(mypad, setcaps_sink); if (!strcmp(typename, "audio/x-raw-int") || !strcmp(typename, "audio/x-raw-float")) {

1 0

Alistair Leslie-Hughes : msxml3: clang corrections.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 5f1262825c2dc72d7f6cf407a89d5aba0bb5449f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f1262825c2dc72d7f6cf407a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 3 18:14:12 2011 +1000 msxml3: clang corrections. --- dlls/msxml3/saxreader.c | 1 - dlls/msxml3/tests/domdoc.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index f1c2b4b..4f0a5f1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1998,7 +1998,6 @@ static HRESULT internal_parse( TRACE("(%p)->(%s)\n", This, debugstr_variant(&varInput)); - hr = S_OK; switch(V_VT(&varInput)) { case VT_BSTR: diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index fd62062..bced22c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5553,6 +5553,7 @@ static void test_cloneNode(void ) hr = IXMLDOMNode_get_attributes(node_clone, &mapAttr); ok(hr == S_OK, "ret %08x\n", hr ); hr = IXMLDOMNamedNodeMap_get_length(mapAttr, &attr_cnt1); + ok(hr == S_OK, "ret %08x\n", hr ); ok(attr_cnt1 == 3, "Attribute count should be 3 (%d)\n", attr_cnt1); IXMLDOMNamedNodeMap_Release(mapAttr); @@ -9746,6 +9747,7 @@ static void test_get_attributes(void) str = SysAllocString( szComplete4 ); hr = IXMLDOMDocument_loadXML(doc, str, &b); + ok(hr == S_OK, "got %08x\n", hr); SysFreeString(str); hr = IXMLDOMDocument_get_attributes(doc, NULL);

1 0

Jacek Caban : propvarutil.h: Fixed inline syntax.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: d46081e67da336bb135cd8a1433194372dbcaa97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46081e67da336bb135cd8a14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 12:57:09 2011 +0200 propvarutil.h: Fixed inline syntax. --- include/propvarutil.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/propvarutil.h b/include/propvarutil.h index 1764422..e830885 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -46,14 +46,14 @@ HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar); #ifndef NO_PROPVAR_INLINES -HRESULT inline InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar) +inline HRESULT InitPropVariantFromBoolean(BOOL fVal, PROPVARIANT *ppropvar) { ppropvar->vt = VT_BOOL; ppropvar->boolVal = fVal ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } -HRESULT inline InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) +inline HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) { HRESULT hres;

1 0

Mariusz Pluciński : shell32/tests: Remove duplicated test of known folder.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 92ff88155af83901fe0438b9dbeea919cc354d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92ff88155af83901fe0438b9d… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 5 11:07:38 2011 +0200 shell32/tests: Remove duplicated test of known folder. --- dlls/shell32/tests/shellpath.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3a3c597..dbfff5c 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -901,7 +901,6 @@ struct knownFolderDef { static const struct knownFolderDef known_folders[] = { KNOWN_FOLDER(FOLDERID_AddNewPrograms, NO_CSIDL), - KNOWN_FOLDER(FOLDERID_AddNewPrograms, NO_CSIDL), KNOWN_FOLDER(FOLDERID_AdminTools, CSIDL_ADMINTOOLS), KNOWN_FOLDER(FOLDERID_AppUpdates, NO_CSIDL), KNOWN_FOLDER(FOLDERID_CDBurning, CSIDL_CDBURN_AREA),

1 0

Mariusz Pluciński : shell32: Add support of KF_REDIRECT_DEL_SOURCE_CONTENTS flag to redirection.
by Alexandre Julliard 05 Jul '11

05 Jul '11

Module: wine Branch: master Commit: 9435f3ce1574bd11f279d5be384eb7760e40eba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9435f3ce1574bd11f279d5be3… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Tue Jul 5 11:07:30 2011 +0200 shell32: Add support of KF_REDIRECT_DEL_SOURCE_CONTENTS flag to redirection. --- dlls/shell32/shellpath.c | 20 +++++++++++++++++++- dlls/shell32/tests/shellpath.c | 1 - 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index b5209a6..58e2006 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3232,12 +3232,30 @@ static HRESULT redirect_known_folder( lstrcpyW(dstPath, pszTargetPath); ZeroMemory(&fileOp, sizeof(fileOp)); - fileOp.wFunc = FO_COPY; + + if(flags & KF_REDIRECT_DEL_SOURCE_CONTENTS) + fileOp.wFunc = FO_MOVE; + else + fileOp.wFunc = FO_COPY; + fileOp.pFrom = srcPath; fileOp.pTo = dstPath; fileOp.fFlags = FOF_NO_UI; hr = (SHFileOperationW(&fileOp)==0 ? S_OK : E_FAIL); + + if(flags & KF_REDIRECT_DEL_SOURCE_CONTENTS) + { + ZeroMemory(srcPath, sizeof(srcPath)); + lstrcpyW(srcPath, lpSrcPath); + + ZeroMemory(&fileOp, sizeof(fileOp)); + fileOp.wFunc = FO_DELETE; + fileOp.pFrom = srcPath; + fileOp.fFlags = FOF_NO_UI; + + hr = (SHFileOperationW(&fileOp)==0 ? S_OK : E_FAIL); + } } CoTaskMemFree(lpSrcPath); diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 0be43f4..3a3c597 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1397,7 +1397,6 @@ static void test_knownFolders(void) /* check if original directory was really removed */ dwAttributes = GetFileAttributesW(sExamplePath); - todo_wine ok(dwAttributes==INVALID_FILE_ATTRIBUTES, "directory should not exist, but has attributes: 0x%08x\n", dwAttributes );

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2011