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

Frédéric Delanoy : crypt32: Remove dead code ( Clang).
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: f73733b8b0fc43188acd4c40bb0bc4f5af75d92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f73733b8b0fc43188acd4c40b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Jul 3 19:37:04 2011 +0200 crypt32: Remove dead code (Clang). --- dlls/crypt32/base64.c | 2 -- dlls/crypt32/chain.c | 1 - dlls/crypt32/encode.c | 1 - dlls/crypt32/object.c | 2 -- 4 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 9a3079a..a01a7b6 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -234,7 +234,6 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, strcpy(ptr, trailer); ptr += strlen(ptr); strcpy(ptr, sep); - ptr += strlen(sep); } *pcchString = charsNeeded - 1; } @@ -429,7 +428,6 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, strcpyW(ptr, trailer); ptr += strlenW(ptr); strcpyW(ptr, sep); - ptr += strlenW(sep); } *pcchString = charsNeeded - 1; } diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8af49f4..4bc2d05 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3302,7 +3302,6 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) { LPCWSTR ptr = server_name; - matches = TRUE; do { LPCWSTR dot = strchrW(ptr, '.'), end; /* 254 is the maximum DNS label length, see RFC 1035 */ diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 6b61337..05a3558 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1841,7 +1841,6 @@ static BOOL WINAPI CRYPT_AsnEncodePolicyQualifierUserNotice( CERT_NAME_VALUE displayTextValue; DWORD cItem = 0; - ret = TRUE; if (notice->pNoticeReference) { items[cItem].encodeFunc = CRYPT_AsnEncodeNoticeReference; diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 2587c4d..cff96f9 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -1111,7 +1111,6 @@ static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, strcpyW(str, pathLengthHeader); str += strlenW(pathLengthHeader); strcpyW(str, pathLength); - str += strlenW(pathLength); } LocalFree(info); } @@ -2468,7 +2467,6 @@ static BOOL WINAPI CRYPT_FormatSpcFinancialCriteria(DWORD dwCertEncodingType, else { strcpyW(str, notAvailable); - str += strlenW(notAvailable); } } }

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DIndexBuffer9 iface.
by Alexandre Julliard July 5, 2011

July 5, 2011

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

Maarten Lankhorst : winegstreamer: Fix setcaps call.
by Alexandre Julliard July 5, 2011

July 5, 2011

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

Alex Stanev : advapi32: Set *lpSize properly in GetUserNameA.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: 82b7a4166f99e10133bcc4de869ccfb1587933dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7a4166f99e10133bcc4de8… Author: Alex Stanev <alex(a)stanev.org> Date: Sat Jul 2 11:49:44 2011 +0300 advapi32: Set *lpSize properly in GetUserNameA. --- dlls/advapi32/advapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi.c b/dlls/advapi32/advapi.c index e135fa5..7025a21 100644 --- a/dlls/advapi32/advapi.c +++ b/dlls/advapi32/advapi.c @@ -65,7 +65,7 @@ GetUserNameA( LPSTR lpszName, LPDWORD lpSize ) ret = GetUserNameW( buffer, &sizeW ); if (ret) - WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); + *lpSize = WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpszName, *lpSize, NULL, NULL ); else *lpSize = sizeW;

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DPixelShader9 for an app provided iface.
by Alexandre Julliard July 5, 2011

July 5, 2011

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

Jacek Caban : propkeydef.h: Fixed DEFINE_PROPERTYKEY define.
by Alexandre Julliard July 5, 2011

July 5, 2011

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

Dan Kegel : d3dcompiler_43: Don't crash on long TRACE().
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: b732d428deef72d8c4ec4cea06072b3d1db7b682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b732d428deef72d8c4ec4cea0… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jul 3 00:33:34 2011 +0000 d3dcompiler_43: Don't crash on long TRACE(). --- dlls/d3dcompiler_43/compiler.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 0969ae8..7f4ebdb 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -359,7 +359,7 @@ static HRESULT preprocess_shader(const void *data, SIZE_T data_size, int size; ID3DBlob *buffer; - TRACE("Preprocessor messages:\n%s", wpp_messages); + TRACE("Preprocessor messages:\n%s", debugstr_a(wpp_messages)); if (error_messages) {

1 0

Jacek Caban : propvarutil.h: Fixed inline syntax.
by Alexandre Julliard July 5, 2011

July 5, 2011

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

Michael Stefaniuc : d3d8: COM cleanup for the IDirect3DSurface8 iface.
by Alexandre Julliard July 5, 2011

July 5, 2011

Module: wine Branch: master Commit: d615be8eeab3487f5d6d1a78f5982c5d8533fa4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d615be8eeab3487f5d6d1a78f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 00:41:12 2011 +0200 d3d8: COM cleanup for the IDirect3DSurface8 iface. --- dlls/d3d8/d3d8_private.h | 5 ++--- dlls/d3d8/device.c | 8 ++++---- dlls/d3d8/surface.c | 44 +++++++++++++++++++++++++++----------------- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3043478..0c0f2b1 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -240,9 +240,8 @@ HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl */ struct IDirect3DSurface8Impl { - /* IUnknown fields */ - const IDirect3DSurface8Vtbl *lpVtbl; - LONG ref; + IDirect3DSurface8 IDirect3DSurface8_iface; + LONG ref; struct wined3d_surface *wined3d_surface; IDirect3DDevice8 *parentDevice; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7771990..dd45f1f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -905,7 +905,7 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(IDirect3DDevice8Impl *device, } TRACE("Created surface %p.\n", object); - *ppSurface = (IDirect3DSurface8 *)object; + *ppSurface = &object->IDirect3DSurface8_iface; return D3D_OK; } @@ -2874,7 +2874,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * IUnknown_Release(d3d_surface->parentDevice); d3d_surface->parentDevice = NULL; - IDirect3DSurface8_Release((IDirect3DSurface8 *)d3d_surface); + IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); d3d_surface->forwardReference = container_parent; return hr; @@ -2907,7 +2907,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par d3d_surface->container = (IUnknown *)&device->IDirect3DDevice8_iface; /* Implicit surfaces are created with an refcount of 0 */ - IUnknown_Release((IUnknown *)d3d_surface); + IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); return hr; } @@ -2937,7 +2937,7 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa d3d_surface->container = (IUnknown *)&device->IDirect3DDevice8_iface; /* Implicit surfaces are created with an refcount of 0 */ - IUnknown_Release((IUnknown *)d3d_surface); + IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); return hr; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 846a7db..3424dcb 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -26,12 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static inline IDirect3DSurface8Impl *impl_from_IDirect3DSurface8(IDirect3DSurface8 *iface) { - return CONTAINING_RECORD(iface, IDirect3DSurface8Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DSurface8Impl, IDirect3DSurface8_iface); } /* IDirect3DSurface8 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 iface, REFIID riid, LPVOID *ppobj) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(IDirect3DSurface8 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -48,8 +50,9 @@ static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 if return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static ULONG WINAPI IDirect3DSurface8Impl_AddRef(IDirect3DSurface8 *iface) +{ + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); TRACE("iface %p.\n", iface); @@ -75,8 +78,9 @@ static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) { } } -static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static ULONG WINAPI IDirect3DSurface8Impl_Release(IDirect3DSurface8 *iface) +{ + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); TRACE("iface %p.\n", iface); @@ -106,9 +110,10 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { } /* IDirect3DSurface8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, IDirect3DDevice8 **device) +static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, + IDirect3DDevice8 **device) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -190,8 +195,10 @@ static HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(IDirect3DSurface8 *i } /* IDirect3DSurface8 Interface follow: */ -static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 iface, REFIID riid, void **ppContainer) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(IDirect3DSurface8 *iface, REFIID riid, + void **ppContainer) +{ + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); HRESULT res; TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer); @@ -206,7 +213,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 ifac static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_DESC *desc) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -229,8 +236,10 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(IDirect3DSurface8 *iface, D3 return D3D_OK; } -static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(IDirect3DSurface8 *iface, + D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) +{ + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); HRESULT hr; TRACE("iface %p, locked_rect %p, rect %p, flags %#x.\n", iface, pLockedRect, pRect, Flags); @@ -259,8 +268,9 @@ static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D return hr; } -static HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(LPDIRECT3DSURFACE8 iface) { - IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; +static HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(IDirect3DSurface8 *iface) +{ + IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -310,7 +320,7 @@ HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *devic { HRESULT hr; - surface->lpVtbl = &Direct3DSurface8_Vtbl; + surface->IDirect3DSurface8_iface.lpVtbl = &Direct3DSurface8_Vtbl; surface->ref = 1; /* FIXME: Check MAX bounds of MultisampleQuality. */

1 0

Mariusz Pluciński : shell32: Add support of KF_REDIRECT_DEL_SOURCE_CONTENTS flag to redirection.
by Alexandre Julliard July 5, 2011

July 5, 2011

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