August 2012 - Wine-commits - list.winehq.org

Vincent Povirk : ole32: Add support for reading BSTR properties.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 0a5086ab64f2c35e2f462cf4e77118733a80f2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5086ab64f2c35e2f462cf4e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 27 17:28:23 2012 -0500 ole32: Add support for reading BSTR properties. --- dlls/ole32/stg_prop.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ole32/tests/propvariant.c | 10 ++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 103f145..d7d340f 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -58,6 +58,7 @@ #include "dictionary.h" #include "storage32.h" #include "enumx.h" +#include "oleauto.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); @@ -1125,6 +1126,40 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, } break; } + case VT_BSTR: + { + DWORD count, wcount; + + StorageUtl_ReadDWord(data, 0, &count); + if (codepage == CP_UNICODE && count % 2) + { + WARN("Unicode string has odd number of bytes\n"); + hr = STG_E_INVALIDHEADER; + } + else + { + if (codepage == CP_UNICODE) + wcount = count / 2; + else + wcount = MultiByteToWideChar(codepage, 0, (LPCSTR)(data + sizeof(DWORD)), count, NULL, 0); + + prop->u.bstrVal = SysAllocStringLen(NULL, wcount); /* FIXME: use allocator? */ + + if (prop->u.bstrVal) + { + if (codepage == CP_UNICODE) + memcpy(prop->u.bstrVal, data + sizeof(DWORD), count); + else + MultiByteToWideChar(codepage, 0, (LPCSTR)(data + sizeof(DWORD)), count, prop->u.bstrVal, wcount); + + prop->u.bstrVal[wcount - 1] = '\0'; + TRACE("Read string value %s\n", debugstr_w(prop->u.bstrVal)); + } + else + hr = STG_E_INSUFFICIENTMEMORY; + } + break; + } case VT_BLOB: { DWORD count; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index ec1dfd7..5f7adba 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -395,18 +395,16 @@ static void test_propertytovariant(void) CP_WINUNICODE, &propvar, &allocator); ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); - todo_wine ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); - if (propvar.vt == VT_BSTR) - ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); PropVariantClear(&propvar); ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_bstr_mb, CP_UTF8, &propvar, &allocator); ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); - todo_wine ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); - if (propvar.vt == VT_BSTR) - ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); PropVariantClear(&propvar); }

1 0

Vincent Povirk : ole32: Fix typo.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 284f3cc04746997727bee6e9c2aa7de76f1efecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=284f3cc04746997727bee6e9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 27 17:28:56 2012 -0500 ole32: Fix typo. --- dlls/ole32/stg_prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index d7d340f..98f562d 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1093,7 +1093,7 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, DWORD count; StorageUtl_ReadDWord(data, 0, &count); - if (codepage == CP_UNICODE && count / 2) + if (codepage == CP_UNICODE && count % 2) { WARN("Unicode string has odd number of bytes\n"); hr = STG_E_INVALIDHEADER;

1 0

Francois Gouget : msvcp100: Make some locale and string functions static.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: d2fc8007d2356af4c8ee32b4ed24adadcf8fb1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fc8007d2356af4c8ee32b4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 28 00:40:39 2012 +0200 msvcp100: Make some locale and string functions static. --- dlls/msvcp100/locale.c | 14 +++++++------- dlls/msvcp100/string.c | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2fc8007d2356af4c8ee3…

1 0

Jacek Caban : d3d8: Use proper helpers for iface calls.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 1524cc2ab7c20123fc6dee708073958fcdc7fbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1524cc2ab7c20123fc6dee708… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 12:27:34 2012 +0200 d3d8: Use proper helpers for iface calls. --- dlls/d3d8/buffer.c | 8 ++++---- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/directx.c | 2 +- dlls/d3d8/surface.c | 6 +++--- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/tests/device.c | 8 ++++---- dlls/d3d8/texture.c | 8 ++++---- dlls/d3d8/volume.c | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index b0a11ad..775595a 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -34,7 +34,7 @@ static HRESULT WINAPI d3d8_vertexbuffer_QueryInterface(IDirect3DVertexBuffer8 *i || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DVertexBuffer8_AddRef(iface); *object = iface; return S_OK; } @@ -302,7 +302,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * } buffer->parent_device = &device->IDirect3DDevice8_iface; - IUnknown_AddRef(buffer->parent_device); + IDirect3DDevice8_AddRef(buffer->parent_device); return D3D_OK; } @@ -329,7 +329,7 @@ static HRESULT WINAPI d3d8_indexbuffer_QueryInterface(IDirect3DIndexBuffer8 *ifa || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DIndexBuffer8_AddRef(iface); *object = iface; return S_OK; } @@ -596,7 +596,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de } buffer->parent_device = &device->IDirect3DDevice8_iface; - IUnknown_AddRef(buffer->parent_device); + IDirect3DDevice8_AddRef(buffer->parent_device); return D3D_OK; } diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index fa7cb48..d90161f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -307,7 +307,7 @@ static HRESULT WINAPI d3d8_device_QueryInterface(IDirect3DDevice8 *iface, REFIID if (IsEqualGUID(riid, &IID_IDirect3DDevice8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DDevice8_AddRef(iface); *out = iface; return S_OK; } @@ -2845,7 +2845,7 @@ static HRESULT CDECL device_parent_create_texture_surface(struct wined3d_device_ wined3d_surface_incref(*surface); d3d_surface->container = container_parent; - IUnknown_Release(d3d_surface->parent_device); + IDirect3DDevice8_Release(d3d_surface->parent_device); d3d_surface->parent_device = NULL; IDirect3DSurface8_Release(&d3d_surface->IDirect3DSurface8_iface); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 89c2fcc..4339251 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -49,7 +49,7 @@ static HRESULT WINAPI d3d8_QueryInterface(IDirect3D8 *iface, REFIID riid, void * if (IsEqualGUID(riid, &IID_IDirect3D8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3D8_AddRef(iface); *out = iface; return S_OK; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 91d263c..3a0f862 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -36,7 +36,7 @@ static HRESULT WINAPI d3d8_surface_QueryInterface(IDirect3DSurface8 *iface, REFI || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DSurface8_AddRef(iface); *out = iface; return S_OK; } @@ -69,7 +69,7 @@ static ULONG WINAPI d3d8_surface_AddRef(IDirect3DSurface8 *iface) if (ref == 1) { if (surface->parent_device) - IUnknown_AddRef(surface->parent_device); + IDirect3DDevice8_AddRef(surface->parent_device); wined3d_mutex_lock(); wined3d_surface_incref(surface->wined3d_surface); wined3d_mutex_unlock(); @@ -359,7 +359,7 @@ HRESULT surface_init(struct d3d8_surface *surface, struct d3d8_device *device, } surface->parent_device = &device->IDirect3DDevice8_iface; - IUnknown_AddRef(surface->parent_device); + IDirect3DDevice8_AddRef(surface->parent_device); return D3D_OK; } diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 0410fb8..3482900 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -35,7 +35,7 @@ static HRESULT WINAPI d3d8_swapchain_QueryInterface(IDirect3DSwapChain8 *iface, if (IsEqualGUID(riid, &IID_IDirect3DSwapChain8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DSwapChain8_AddRef(iface); *out = iface; return S_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index ddb72c6..b16d5bf 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -121,7 +121,7 @@ static HRESULT reset_device(IDirect3DDevice8 *device, HWND device_window, BOOL w #define CHECK_RELEASE(obj,d,rc) \ if (obj) { \ int tmp1, rc_new = rc; \ - IUnknown_Release( obj ); \ + IUnknown_Release( (IUnknown*)obj ); \ tmp1 = get_refcount( (IUnknown *)d ); \ ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \ } @@ -168,7 +168,7 @@ static void check_mipmap_levels(IDirect3DDevice8 *device, UINT width, UINT heigh } else trace("CreateTexture failed: %#08x\n", hr); - if (texture) IUnknown_Release( texture ); + if (texture) IDirect3DDevice8_Release( texture ); } static void test_mipmap_levels(void) @@ -210,10 +210,10 @@ static void test_mipmap_levels(void) cleanup: if (pDevice) { - UINT refcount = IUnknown_Release( pDevice ); + UINT refcount = IDirect3DDevice8_Release( pDevice ); ok(!refcount, "Device has %u references left.\n", refcount); } - if (pD3d) IUnknown_Release( pD3d ); + if (pD3d) IDirect3D8_Release( pD3d ); DestroyWindow( hwnd ); } diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 59bc693..f139d4e 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -45,7 +45,7 @@ static HRESULT WINAPI d3d8_texture_2d_QueryInterface(IDirect3DTexture8 *iface, R || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DTexture8_AddRef(iface); *out = iface; return S_OK; } @@ -413,7 +413,7 @@ static HRESULT WINAPI d3d8_texture_cube_QueryInterface(IDirect3DCubeTexture8 *if || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DCubeTexture8_AddRef(iface); *out = iface; return S_OK; } @@ -433,7 +433,7 @@ static ULONG WINAPI d3d8_texture_cube_AddRef(IDirect3DCubeTexture8 *iface) if (ref == 1) { - IUnknown_AddRef(texture->parent_device); + IDirect3DDevice8_AddRef(texture->parent_device); wined3d_mutex_lock(); wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock(); @@ -806,7 +806,7 @@ static HRESULT WINAPI d3d8_texture_3d_QueryInterface(IDirect3DVolumeTexture8 *if || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DVolumeTexture8_AddRef(iface); *out = iface; return S_OK; } diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 5c77193..ecd4bb1 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -35,7 +35,7 @@ static HRESULT WINAPI d3d8_volume_QueryInterface(IDirect3DVolume8 *iface, REFIID if (IsEqualGUID(riid, &IID_IDirect3DVolume8) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + IDirect3DVolume8_AddRef(iface); *out = iface; return S_OK; }

1 0

Jacek Caban : ddraw: Use proper helpers for iface calls.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 4551135f7a42ac8de6d2e78011328b713fcc68ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4551135f7a42ac8de6d2e7801… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 12:27:48 2012 +0200 ddraw: Use proper helpers for iface calls. --- dlls/ddraw/material.c | 2 +- dlls/ddraw/surface.c | 20 ++++++++++---------- dlls/ddraw/vertexbuffer.c | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 4b44726..5317bf5 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -75,7 +75,7 @@ static HRESULT WINAPI d3d_material3_QueryInterface(IDirect3DMaterial3 *iface, RE if (IsEqualGUID(&IID_IUnknown, riid)) { - IUnknown_AddRef(iface); + IDirect3DMaterial3_AddRef(iface); *obp = iface; TRACE(" Creating IUnknown interface at %p.\n", *obp); return S_OK; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2357790..df85526 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5440,13 +5440,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 * if (!iface) return NULL; if (iface->lpVtbl != &ddraw_surface7_vtbl) { - HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface7, (void **)&iface); + HRESULT hr = IDirectDrawSurface7_QueryInterface(iface, &IID_IDirectDrawSurface7, (void **)&iface); if (FAILED(hr)) { WARN("Object %p doesn't expose interface IDirectDrawSurface7.\n", iface); return NULL; } - IUnknown_Release(iface); + IDirectDrawSurface7_Release(iface); } return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface7_iface); } @@ -5456,13 +5456,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface4(IDirectDrawSurface4 * if (!iface) return NULL; if (iface->lpVtbl != &ddraw_surface4_vtbl) { - HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface4, (void **)&iface); + HRESULT hr = IDirectDrawSurface4_QueryInterface(iface, &IID_IDirectDrawSurface4, (void **)&iface); if (FAILED(hr)) { WARN("Object %p doesn't expose interface IDirectDrawSurface4.\n", iface); return NULL; } - IUnknown_Release(iface); + IDirectDrawSurface4_Release(iface); } return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface4_iface); } @@ -5472,13 +5472,13 @@ static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSur if (!iface) return NULL; if (iface->lpVtbl != &ddraw_surface3_vtbl) { - HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface3, (void **)&iface); + HRESULT hr = IDirectDrawSurface3_QueryInterface(iface, &IID_IDirectDrawSurface3, (void **)&iface); if (FAILED(hr)) { WARN("Object %p doesn't expose interface IDirectDrawSurface3.\n", iface); return NULL; } - IUnknown_Release(iface); + IDirectDrawSurface3_Release(iface); } return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface3_iface); } @@ -5488,13 +5488,13 @@ static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSur if (!iface) return NULL; if (iface->lpVtbl != &ddraw_surface2_vtbl) { - HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface2, (void **)&iface); + HRESULT hr = IDirectDrawSurface2_QueryInterface(iface, &IID_IDirectDrawSurface2, (void **)&iface); if (FAILED(hr)) { WARN("Object %p doesn't expose interface IDirectDrawSurface2.\n", iface); return NULL; } - IUnknown_Release(iface); + IDirectDrawSurface2_Release(iface); } return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface2_iface); } @@ -5504,13 +5504,13 @@ struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface(IDirectDrawSurface *if if (!iface) return NULL; if (iface->lpVtbl != &ddraw_surface1_vtbl) { - HRESULT hr = IUnknown_QueryInterface(iface, &IID_IDirectDrawSurface, (void **)&iface); + HRESULT hr = IDirectDrawSurface_QueryInterface(iface, &IID_IDirectDrawSurface, (void **)&iface); if (FAILED(hr)) { WARN("Object %p doesn't expose interface IDirectDrawSurface.\n", iface); return NULL; } - IUnknown_Release(iface); + IDirectDrawSurface_Release(iface); } return CONTAINING_RECORD(iface, struct ddraw_surface, IDirectDrawSurface_iface); } diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 1fd33e7..29feb87 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -66,21 +66,21 @@ static HRESULT WINAPI d3d_vertex_buffer7_QueryInterface(IDirect3DVertexBuffer7 * if ( IsEqualGUID( &IID_IUnknown, riid ) ) { - IUnknown_AddRef(iface); + IDirect3DVertexBuffer7_AddRef(iface); *obj = iface; TRACE(" Creating IUnknown interface at %p.\n", *obj); return S_OK; } if ( IsEqualGUID( &IID_IDirect3DVertexBuffer, riid ) ) { - IUnknown_AddRef(iface); + IDirect3DVertexBuffer7_AddRef(iface); *obj = &buffer->IDirect3DVertexBuffer_iface; TRACE(" Creating IDirect3DVertexBuffer interface %p\n", *obj); return S_OK; } if ( IsEqualGUID( &IID_IDirect3DVertexBuffer7, riid ) ) { - IUnknown_AddRef(iface); + IDirect3DVertexBuffer7_AddRef(iface); *obj = iface; TRACE(" Creating IDirect3DVertexBuffer7 interface %p\n", *obj); return S_OK;

1 0

Jacek Caban : dsound: Use proper helpers for iface calls.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 3f353e00255110df44890b943015aa120906e4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f353e00255110df44890b943… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 27 12:28:04 2012 +0200 dsound: Use proper helpers for iface calls. --- dlls/dsound/dsound_main.c | 4 ++-- dlls/dsound/propset.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 9c550eb..3fded64 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -655,7 +655,7 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) } static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) +DSCF_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppobj) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -665,7 +665,7 @@ DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) IsEqualIID(riid, &IID_IClassFactory)) { *ppobj = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } *ppobj = NULL; diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index eb4c195..d14a388 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -68,9 +68,7 @@ static IKsPrivatePropertySetImpl *impl_from_IKsPropertySet(IKsPropertySet *iface /* IUnknown methods */ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface( - LPKSPROPERTYSET iface, - REFIID riid, - LPVOID *ppobj ) + IKsPropertySet *iface, REFIID riid, void **ppobj) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); @@ -78,7 +76,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface( if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IKsPropertySet)) { *ppobj = iface; - IUnknown_AddRef(iface); + IKsPropertySet_AddRef(iface); return S_OK; } *ppobj = NULL;

1 0

Dmitry Timoshkov : gdiplus/tests: Fix font leak.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 31544a73da14830da036e04e46b18fa798fce460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31544a73da14830da036e04e4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 27 14:11:40 2012 +0900 gdiplus/tests: Fix font leak. --- dlls/gdiplus/tests/graphics.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1cd847d..db2542b 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3836,6 +3836,8 @@ todo_wine expectf_(height, rect.Height, height / 15.0); expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 15.0); } + + GdipDeleteFont(font); } status = GdipDeleteGraphics(graphics);

1 0

Dmitry Timoshkov : gdiplus: Fix font leak.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 2e31f7a80a506ec4f0641aa0c228fb2a3a831093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e31f7a80a506ec4f0641aa0c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 27 14:11:47 2012 +0900 gdiplus: Fix font leak. --- dlls/gdiplus/graphicspath.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8533902..80d9244 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -971,6 +971,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT return status; get_log_fontW(font, NULL, &lfw); + GdipDeleteFont(font); hfont = CreateFontIndirectW(&lfw); if (!hfont) {

1 0

Dmitry Timoshkov : gdiplus: get_log_fontW helper requires a valid graphics object.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 3f35a11426dacc21403d78285310da661f93fcd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f35a11426dacc21403d78285… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 27 14:12:01 2012 +0900 gdiplus: get_log_fontW helper requires a valid graphics object. --- dlls/gdiplus/graphicspath.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 80d9244..16f5e2d 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -946,6 +946,7 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT LOGFONTW lfw; HANDLE hfont; HDC dc; + GpGraphics *graphics; GpPath *backup; struct format_string_args args; int i; @@ -966,26 +967,40 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT scaled_layout_rect.Width = layoutRect->Width * native_height / emSize; scaled_layout_rect.Height = layoutRect->Height * native_height / emSize; + if ((status = GdipClonePath(path, &backup)) != Ok) + return status; + + dc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(dc, &graphics); + if (status != Ok) + { + DeleteDC(dc); + GdipDeletePath(backup); + return status; + } + status = GdipCreateFont(family, native_height, style, UnitPixel, &font); if (status != Ok) + { + GdipDeleteGraphics(graphics); + DeleteDC(dc); + GdipDeletePath(backup); return status; + } - get_log_fontW(font, NULL, &lfw); + get_log_fontW(font, graphics, &lfw); GdipDeleteFont(font); + GdipDeleteGraphics(graphics); + hfont = CreateFontIndirectW(&lfw); if (!hfont) { WARN("Failed to create font\n"); + DeleteDC(dc); + GdipDeletePath(backup); return GenericError; } - if ((status = GdipClonePath(path, &backup)) != Ok) - { - DeleteObject(hfont); - return status; - } - - dc = CreateCompatibleDC(0); SelectObject(dc, hfont); GetTextMetricsW(dc, &textmetric);

1 0

Michael Stefaniuc : dplayx: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 27 Aug '12

27 Aug '12

Module: wine Branch: master Commit: 66bd68a809725020f1644684f5f0b86022390c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bd68a809725020f1644684f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 27 13:23:37 2012 +0200 dplayx: Avoid TRUE:FALSE conditional expressions. --- dlls/dplayx/dplay.c | 4 ++-- dlls/dplayx/dplobby.c | 4 ++-- dlls/dplayx/name_server.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 1bcb386..7636546 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2853,11 +2853,11 @@ static HRESULT DP_SecureOpen FIXME( "Not all data fields are correct. Need new parameter\n" ); - data.bCreate = (dwFlags & DPOPEN_CREATE ) ? TRUE : FALSE; + data.bCreate = (dwFlags & DPOPEN_CREATE ) != 0; data.lpSPMessageHeader = (dwFlags & DPOPEN_CREATE ) ? NULL : NS_GetNSAddr( This->dp2->lpNameServerData ); data.lpISP = This->dp2->spData.lpISP; - data.bReturnStatus = (dwFlags & DPOPEN_RETURNSTATUS) ? TRUE : FALSE; + data.bReturnStatus = (dwFlags & DPOPEN_RETURNSTATUS) != 0; data.dwOpenFlags = dwFlags; data.dwSessionFlags = This->dp2->lpSessionDesc->dwFlags; diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 3e7efc7..9adc67a 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -1704,7 +1704,7 @@ static HRESULT WINAPI IDirectPlayLobby3WImpl_WaitForConnectionSettings ( LPDIRECTPLAYLOBBY3 iface, DWORD dwFlags ) { HRESULT hr = DP_OK; - BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE; + BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL); TRACE( "(%p)->(0x%08x)\n", iface, dwFlags ); @@ -1721,7 +1721,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings ( LPDIRECTPLAYLOBBY3A iface, DWORD dwFlags ) { HRESULT hr = DP_OK; - BOOL bStartWait = (dwFlags & DPLWAIT_CANCEL) ? FALSE : TRUE; + BOOL bStartWait = !(dwFlags & DPLWAIT_CANCEL); TRACE( "(%p)->(0x%08x)\n", iface, dwFlags ); diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index 0acdc5f..258bdad 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -208,7 +208,7 @@ HRESULT NS_SendSessionRequestBroadcast( LPCGUID lpcGuid, data.lpMessage = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, data.dwMessageSize ); data.lpISP = lpSpData->lpISP; - data.bReturnStatus = (dwFlags & DPENUMSESSIONS_RETURNSTATUS) ? TRUE : FALSE; + data.bReturnStatus = (dwFlags & DPENUMSESSIONS_RETURNSTATUS) != 0; lpMsg = (LPDPMSG_ENUMSESSIONSREQUEST)(((BYTE*)data.lpMessage)+lpSpData->dwSPHeaderSize);

1 0