wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Hans Leidekker : wbemprox: Return selected properties only from IWbemClassObject::Next.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 8343aed4c299b691d76b2c6f3554cd98b6ee2ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8343aed4c299b691d76b2c6f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:19:30 2014 +0200 wbemprox: Return selected properties only from IWbemClassObject::Next. --- dlls/wbemprox/class.c | 29 ++++++++++++++++++----------- dlls/wbemprox/query.c | 4 ++-- dlls/wbemprox/table.c | 25 ------------------------- dlls/wbemprox/wbemprox_private.h | 3 ++- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 5a9e2e4..afb9f8c 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -511,23 +511,30 @@ static HRESULT WINAPI class_object_Next( CIMTYPE *pType, LONG *plFlavor ) { - struct class_object *co = impl_from_IWbemClassObject( iface ); - struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); - struct view *view = ec->query->view; - BSTR property; + struct class_object *obj = impl_from_IWbemClassObject( iface ); + struct enum_class_object *iter = impl_from_IEnumWbemClassObject( obj->iter ); + struct view *view = iter->query->view; + BSTR prop; HRESULT hr; + UINT i; TRACE("%p, %08x, %p, %p, %p, %p\n", iface, lFlags, strName, pVal, pType, plFlavor); - if (!(property = get_property_name( co->name, co->index_property ))) return WBEM_S_NO_MORE_DATA; - if ((hr = get_propval( view, co->index, property, pVal, pType, plFlavor ) != S_OK)) + for (i = obj->index_property; i < view->table->num_cols; i++) { - SysFreeString( property ); - return hr; + if (is_method( view->table, i )) continue; + if (!is_selected_prop( view, view->table->columns[i].name )) continue; + if (!(prop = SysAllocString( view->table->columns[i].name ))) return E_OUTOFMEMORY; + if ((hr = get_propval( view, obj->index, prop, pVal, pType, plFlavor )) != S_OK) + { + SysFreeString( prop ); + return hr; + } + obj->index_property = i + 1; + *strName = prop; + return S_OK; } - *strName = property; - co->index_property++; - return S_OK; + return WBEM_S_NO_MORE_DATA; } static HRESULT WINAPI class_object_EndEnumeration( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index e4c4fcd..c97b52b 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -424,7 +424,7 @@ done: return hr; } -static BOOL is_selected_prop( const struct view *view, const WCHAR *name ) +BOOL is_selected_prop( const struct view *view, const WCHAR *name ) { const struct property *prop = view->proplist; @@ -563,7 +563,7 @@ done: return ret; } -static inline BOOL is_method( const struct table *table, UINT column ) +BOOL is_method( const struct table *table, UINT column ) { return table->columns[column].type & COL_FLAG_METHOD; } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index bbd3f5e..7a5b1c1 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -406,28 +406,3 @@ BSTR get_method_name( const WCHAR *class, UINT index ) release_table( table ); return NULL; } - -BSTR get_property_name( const WCHAR *class, UINT index ) -{ - struct table *table; - UINT i, count = 0; - BSTR ret; - - if (!(table = grab_table( class ))) return NULL; - - for (i = 0; i < table->num_cols; i++) - { - if (!(table->columns[i].type & COL_FLAG_METHOD)) - { - if (index == count) - { - ret = SysAllocString( table->columns[i].name ); - release_table( table ); - return ret; - } - count++; - } - } - release_table( table ); - return NULL; -} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index c047ac1..0eeb0c7 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -192,6 +192,7 @@ HRESULT get_column_index( const struct table *, const WCHAR *, UINT * ) DECLSPEC HRESULT get_value( const struct table *, UINT, UINT, LONGLONG * ) DECLSPEC_HIDDEN; BSTR get_value_bstr( const struct table *, UINT, UINT ) DECLSPEC_HIDDEN; HRESULT set_value( const struct table *, UINT, UINT, LONGLONG, CIMTYPE ) DECLSPEC_HIDDEN; +BOOL is_method( const struct table *, UINT ) DECLSPEC_HIDDEN; HRESULT get_method( const struct table *, const WCHAR *, class_method ** ) DECLSPEC_HIDDEN; HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, CIMTYPE *, LONG * ) DECLSPEC_HIDDEN; @@ -200,10 +201,10 @@ HRESULT to_longlong( VARIANT *, LONGLONG *, CIMTYPE * ) DECLSPEC_HIDDEN; SAFEARRAY *to_safearray( const struct array *, CIMTYPE ) DECLSPEC_HIDDEN; VARTYPE to_vartype( CIMTYPE ) DECLSPEC_HIDDEN; void destroy_array( struct array *, CIMTYPE ) DECLSPEC_HIDDEN; +BOOL is_selected_prop( const struct view *, const WCHAR * ) DECLSPEC_HIDDEN; HRESULT get_properties( const struct view *, LONG, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT get_object( const WCHAR *, IWbemClassObject ** ) DECLSPEC_HIDDEN; BSTR get_method_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; -BSTR get_property_name( const WCHAR *, UINT ) DECLSPEC_HIDDEN; void set_variant( VARTYPE, LONGLONG, void *, VARIANT * ) DECLSPEC_HIDDEN; HRESULT create_signature( const WCHAR *, const WCHAR *, enum param_direction, IWbemClassObject ** ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Return selected properties only from IWbemClassObject::GetNames.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: c9abb27d89b7a531c0a873264cc0ac3eb04ff624 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9abb27d89b7a531c0a873264… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:18:39 2014 +0200 wbemprox: Return selected properties only from IWbemClassObject::GetNames. --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index fdfcc16..e4c4fcd 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -964,7 +964,7 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) SAFEARRAY *sa; BSTR str; LONG i; - UINT num_props = count_properties( view ); + UINT num_props = count_selected_properties( view ); if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; @@ -973,6 +973,7 @@ HRESULT get_properties( const struct view *view, LONG flags, SAFEARRAY **props ) BOOL is_system; if (is_method( view->table, i )) continue; + if (!is_selected_prop( view, view->table->columns[i].name )) continue; is_system = is_system_prop( view->table->columns[i].name ); if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue;

1 0

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Address.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 91414e8ef8340a5afafb3418d6024c100e7dfb8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91414e8ef8340a5afafb3418d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 11 09:55:59 2014 +1000 dpnet: Cleanup IDirectPlay8Address. --- dlls/dpnet/address.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 796e8a4..9266fea 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -58,24 +58,24 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_QueryInterface(IDirectPlay8Address static ULONG WINAPI IDirectPlay8AddressImpl_AddRef(IDirectPlay8Address *iface) { IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - ULONG refCount = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); + TRACE("(%p) ref=%u\n", This, ref); - return refCount; + return ref; } static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) { IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); + TRACE("(%p) ref=%u\n", This, ref); - if (!refCount) { + if (!ref) { HeapFree(GetProcessHeap(), 0, This); } - return refCount; + return ref; } /* returns name of given GUID */ @@ -312,17 +312,24 @@ static const IDirectPlay8AddressVtbl DirectPlay8Address_Vtbl = IDirectPlay8AddressImpl_BuildFromDirectPlay4Address }; -HRESULT DPNET_CreateDirectPlay8Address(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { - IDirectPlay8AddressImpl* client; +HRESULT DPNET_CreateDirectPlay8Address(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) +{ + IDirectPlay8AddressImpl* client; + HRESULT ret; - TRACE("(%p, %s, %p)\n", punkOuter, debugstr_guid(riid), ppobj); - - client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8AddressImpl)); - if (NULL == client) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - client->IDirectPlay8Address_iface.lpVtbl = &DirectPlay8Address_Vtbl; - client->ref = 0; /* will be inited with QueryInterface */ - return IDirectPlay8AddressImpl_QueryInterface (&client->IDirectPlay8Address_iface, riid, ppobj); + TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppobj); + + *ppobj = NULL; + + client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8AddressImpl)); + if (!client) + return E_OUTOFMEMORY; + + client->IDirectPlay8Address_iface.lpVtbl = &DirectPlay8Address_Vtbl; + client->ref = 1; + + ret = IDirectPlay8AddressImpl_QueryInterface(&client->IDirectPlay8Address_iface, riid, ppobj); + IDirectPlay8AddressImpl_Release(&client->IDirectPlay8Address_iface); + + return ret; }

1 0

Henri Verbeet : ddraw/tests: Add some basic material tests.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 7bdbb8c890e1f2525daf9a55e0034dfd5355380a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bdbb8c890e1f2525daf9a55e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 30 12:36:15 2014 +0200 ddraw/tests: Add some basic material tests. --- dlls/ddraw/tests/ddraw1.c | 225 ++++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw2.c | 197 ++++++++++++++++++++++++++++++++++----- dlls/ddraw/tests/ddraw4.c | 218 ++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw7.c | 44 +++++++++ 4 files changed, 631 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bdbb8c890e1f2525daf9…

1 0

Henri Verbeet : ddraw: Only output a warning when clearing a viewport without background material.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 27a0b8a5f0a1e385efd451f615d2bba24899ff46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a0b8a5f0a1e385efd451f61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 22:02:48 2014 +0200 ddraw: Only output a warning when clearing a viewport without background material. --- dlls/ddraw/viewport.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index e557161..a1126ec 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -665,16 +665,13 @@ static HRESULT WINAPI d3d_viewport_Clear(IDirect3DViewport3 *iface, if (flags & D3DCLEAR_TARGET) { - if (This->background == NULL) { - ERR(" Trying to clear the color buffer without background material!\n"); - } + if (!This->background) + WARN("No background material set.\n"); else - { - color = ((int)((This->background->mat.u.diffuse.u1.r) * 255) << 16) - | ((int) ((This->background->mat.u.diffuse.u2.g) * 255) << 8) - | ((int) ((This->background->mat.u.diffuse.u3.b) * 255) << 0) - | ((int) ((This->background->mat.u.diffuse.u4.a) * 255) << 24); - } + color = D3DRGBA(This->background->mat.u.diffuse.u1.r, + This->background->mat.u.diffuse.u2.g, + This->background->mat.u.diffuse.u3.b, + This->background->mat.u.diffuse.u4.a); } /* Need to temporarily activate viewport to clear it. Previously active one will be restored

1 0

Henri Verbeet : ddraw: Reject setting a 0 material handle in d3d_viewport_SetBackground().
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 4ff220f94b30db5c9b58734270ba9599cb1c7101 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff220f94b30db5c9b5873427… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 22:02:47 2014 +0200 ddraw: Reject setting a 0 material handle in d3d_viewport_SetBackground(). --- dlls/ddraw/viewport.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 99c6ec9..e557161 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -524,39 +524,18 @@ static HRESULT WINAPI d3d_viewport_LightElements(IDirect3DViewport3 *iface, return DDERR_UNSUPPORTED; } -/***************************************************************************** - * IDirect3DViewport3::SetBackground - * - * Sets the background material - * - * Params: - * hMat: Handle from a IDirect3DMaterial interface - * - * Returns: - * D3D_OK on success - * - *****************************************************************************/ -static HRESULT WINAPI d3d_viewport_SetBackground(IDirect3DViewport3 *iface, D3DMATERIALHANDLE hMat) +static HRESULT WINAPI d3d_viewport_SetBackground(IDirect3DViewport3 *iface, D3DMATERIALHANDLE material) { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); struct d3d_material *m; - TRACE("iface %p, material %#x.\n", iface, hMat); + TRACE("iface %p, material %#x.\n", iface, material); wined3d_mutex_lock(); - if (!hMat) - { - viewport->background = NULL; - TRACE("Setting background to NULL\n"); - wined3d_mutex_unlock(); - return D3D_OK; - } - - m = ddraw_get_object(&viewport->ddraw->d3ddevice->handle_table, hMat - 1, DDRAW_HANDLE_MATERIAL); - if (!m) + if (!(m = ddraw_get_object(&viewport->ddraw->d3ddevice->handle_table, material - 1, DDRAW_HANDLE_MATERIAL))) { - WARN("Invalid material handle.\n"); + WARN("Invalid material handle %#x.\n", material); wined3d_mutex_unlock(); return DDERR_INVALIDPARAMS; }

1 0

Henri Verbeet : ddraw: Disable lighting when a 0 material handle is set.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 91a615ee4dc4efb7ef9929d6422421ccd2f039e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a615ee4dc4efb7ef9929d64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 22:02:46 2014 +0200 ddraw: Disable lighting when a 0 material handle is set. --- dlls/ddraw/device.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 88142a9..925d97e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3571,15 +3571,11 @@ static HRESULT WINAPI d3d_device7_DrawPrimitive_FPUPreserve(IDirect3DDevice7 *if static void setup_lighting(const struct d3d_device *device, DWORD fvf, DWORD flags) { - BOOL enable; + BOOL enable = TRUE; /* Ignore the D3DFVF_XYZRHW case here, wined3d takes care of that */ - if (flags & D3DDP_DONOTLIGHT) + if (!device->material || !(fvf & D3DFVF_NORMAL) || (flags & D3DDP_DONOTLIGHT)) enable = FALSE; - else if (!(fvf & D3DFVF_NORMAL)) - enable = FALSE; - else - enable = TRUE; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, enable); }

1 0

Henri Verbeet : ddraw/tests: Handle the Windows 8 testbot in test_primary_palette().
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: 174dbaf0f338a4174577ef38c88cb3ab931f92a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174dbaf0f338a4174577ef38c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 22:02:45 2014 +0200 ddraw/tests: Handle the Windows 8 testbot in test_primary_palette(). --- dlls/ddraw/tests/ddraw1.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 4 files changed, 68 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index b62d351..a48cf55 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3987,6 +3987,22 @@ static void test_primary_palette(void) hr = IDirectDrawSurface_SetPalette(primary, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + /* The Windows 8 testbot attaches the palette to the backbuffer as well, + * and is generally somewhat broken with respect to 8 bpp / palette + * handling. */ + if (SUCCEEDED(IDirectDrawSurface_GetPalette(backbuffer, &tmp))) + { + win_skip("Broken palette handling detected, skipping tests.\n"); + IDirectDrawPalette_Release(tmp); + IDirectDrawPalette_Release(palette); + /* The Windows 8 testbot keeps extra references to the primary and + * backbuffer while in 8 bpp mode. */ + hr = IDirectDraw_RestoreDisplayMode(ddraw); + ok(SUCCEEDED(hr), "Failed to restore display mode, hr %#x.\n", hr); + goto done; + } + refcount = get_refcount((IUnknown *)palette); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); @@ -4027,6 +4043,7 @@ static void test_primary_palette(void) hr = IDirectDrawSurface_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); +done: refcount = IDirectDrawSurface_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = IDirectDrawSurface_Release(primary); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ce3be71..cd038c5 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -5092,6 +5092,22 @@ static void test_primary_palette(void) hr = IDirectDrawSurface_SetPalette(primary, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + /* The Windows 8 testbot attaches the palette to the backbuffer as well, + * and is generally somewhat broken with respect to 8 bpp / palette + * handling. */ + if (SUCCEEDED(IDirectDrawSurface_GetPalette(backbuffer, &tmp))) + { + win_skip("Broken palette handling detected, skipping tests.\n"); + IDirectDrawPalette_Release(tmp); + IDirectDrawPalette_Release(palette); + /* The Windows 8 testbot keeps extra references to the primary and + * backbuffer while in 8 bpp mode. */ + hr = IDirectDraw2_RestoreDisplayMode(ddraw); + ok(SUCCEEDED(hr), "Failed to restore display mode, hr %#x.\n", hr); + goto done; + } + refcount = get_refcount((IUnknown *)palette); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); @@ -5132,6 +5148,7 @@ static void test_primary_palette(void) hr = IDirectDrawSurface_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); +done: refcount = IDirectDrawSurface_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = IDirectDrawSurface_Release(primary); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 68f32ee..8becc1f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5752,6 +5752,22 @@ static void test_primary_palette(void) hr = IDirectDrawSurface4_SetPalette(primary, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + /* The Windows 8 testbot attaches the palette to the backbuffer as well, + * and is generally somewhat broken with respect to 8 bpp / palette + * handling. */ + if (SUCCEEDED(IDirectDrawSurface4_GetPalette(backbuffer, &tmp))) + { + win_skip("Broken palette handling detected, skipping tests.\n"); + IDirectDrawPalette_Release(tmp); + IDirectDrawPalette_Release(palette); + /* The Windows 8 testbot keeps extra references to the primary and + * backbuffer while in 8 bpp mode. */ + hr = IDirectDraw4_RestoreDisplayMode(ddraw); + ok(SUCCEEDED(hr), "Failed to restore display mode, hr %#x.\n", hr); + goto done; + } + refcount = get_refcount((IUnknown *)palette); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); @@ -5792,6 +5808,7 @@ static void test_primary_palette(void) hr = IDirectDrawSurface4_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); +done: refcount = IDirectDrawSurface4_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = IDirectDrawSurface4_Release(primary); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index bed5cb8..375403c 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5631,6 +5631,22 @@ static void test_primary_palette(void) hr = IDirectDrawSurface7_SetPalette(primary, palette); ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + /* The Windows 8 testbot attaches the palette to the backbuffer as well, + * and is generally somewhat broken with respect to 8 bpp / palette + * handling. */ + if (SUCCEEDED(IDirectDrawSurface7_GetPalette(backbuffer, &tmp))) + { + win_skip("Broken palette handling detected, skipping tests.\n"); + IDirectDrawPalette_Release(tmp); + IDirectDrawPalette_Release(palette); + /* The Windows 8 testbot keeps extra references to the primary and + * backbuffer while in 8 bpp mode. */ + hr = IDirectDraw7_RestoreDisplayMode(ddraw); + ok(SUCCEEDED(hr), "Failed to restore display mode, hr %#x.\n", hr); + goto done; + } + refcount = get_refcount((IUnknown *)palette); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); @@ -5671,6 +5687,7 @@ static void test_primary_palette(void) hr = IDirectDrawSurface7_GetPalette(primary, &tmp); ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); +done: refcount = IDirectDrawSurface7_Release(backbuffer); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = IDirectDrawSurface7_Release(primary);

1 0

Vincent Povirk : gdiplus/tests: Fix image leak in graphics test.
by Alexandre Julliard 30 Apr '14

30 Apr '14

Module: wine Branch: master Commit: efc1d791a38aca1d5bb0095e9bbcef3c4becc934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc1d791a38aca1d5bb0095e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 29 13:08:02 2014 -0500 gdiplus/tests: Fix image leak in graphics test. --- dlls/gdiplus/tests/graphics.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9fb1347..bd227dc 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -92,7 +92,7 @@ static REAL units_scale(GpUnit from, GpUnit to, REAL dpi) return pixels_to_units(pixels, to, dpi); } -static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale) +static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL scale, GpImage **image) { GpStatus status; union @@ -117,11 +117,8 @@ static GpGraphics *create_graphics(REAL res_x, REAL res_y, GpUnit unit, REAL sca status = GdipGetImageGraphicsContext(u.image, &graphics); expect(Ok, status); - /* image is intentionally leaked to make sure that there is no - side effects after its destruction. - status = GdipDisposeImage(u.image); - expect(Ok, status); - */ + + *image = u.image; status = GdipGetDpiX(graphics, &res); expect(Ok, status); @@ -3519,7 +3516,9 @@ static void test_GdipMeasureString(void) for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale); + GpImage *image; + + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); lf.lfHeight = 0xdeadbeef; status = GdipGetLogFontW(font, graphics, &lf); @@ -3570,6 +3569,9 @@ todo_wine status = GdipDeleteGraphics(graphics); expect(Ok, status); + + status = GdipDisposeImage(image); + expect(Ok, status); } GdipDeleteFont(font); @@ -3593,8 +3595,9 @@ todo_wine for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { REAL unit_scale; + GpImage *image; - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale); + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); lf.lfHeight = 0xdeadbeef; status = GdipGetLogFontW(font, graphics, &lf); @@ -3664,6 +3667,9 @@ todo_wine status = GdipDeleteGraphics(graphics); expect(Ok, status); + + status = GdipDisposeImage(image); + expect(Ok, status); } GdipDeleteFont(font); @@ -3701,12 +3707,13 @@ static void test_transform(void) }; GpStatus status; GpGraphics *graphics; + GpImage *image; GpPointF ptf[2]; UINT i; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale); + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].scale, &image); ptf[0].X = td[i].in[0].X; ptf[0].Y = td[i].in[0].Y; ptf[1].X = td[i].in[1].X; @@ -3725,6 +3732,8 @@ static void test_transform(void) expectf(td[i].in[1].Y, ptf[1].Y); status = GdipDeleteGraphics(graphics); expect(Ok, status); + status = GdipDisposeImage(image); + expect(Ok, status); } }

1 0

Jacek Caban : msctf: Added ITfInputProcessorProfileMgr interface stub implementation.
by Alexandre Julliard 29 Apr '14

29 Apr '14

Module: wine Branch: master Commit: b84e112dd60e9fb6f4d04e82115fcb46e71f9693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84e112dd60e9fb6f4d04e821… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 29 15:35:44 2014 +0200 msctf: Added ITfInputProcessorProfileMgr interface stub implementation. --- dlls/msctf/inputprocessor.c | 134 ++++++++++++++++++++++++++++++++++--- dlls/msctf/tests/inputprocessor.c | 13 ++++ 2 files changed, 136 insertions(+), 11 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 5115a84..f1595f8 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -64,7 +64,7 @@ typedef struct tagInputProcessorProfilesSink { typedef struct tagInputProcessorProfiles { ITfInputProcessorProfiles ITfInputProcessorProfiles_iface; ITfSource ITfSource_iface; - /* const ITfInputProcessorProfileMgrVtbl *InputProcessorProfileMgrVtbl; */ + ITfInputProcessorProfileMgr ITfInputProcessorProfileMgr_iface; /* const ITfInputProcessorProfilesExVtbl *InputProcessorProfilesExVtbl; */ /* const ITfInputProcessorProfileSubstituteLayoutVtbl *InputProcessorProfileSubstituteLayoutVtbl; */ LONG refCount; @@ -171,28 +171,31 @@ static void add_userkey( REFCLSID rclsid, LANGID langid, RegCloseKey(key); } -static HRESULT WINAPI InputProcessorProfiles_QueryInterface(ITfInputProcessorProfiles *iface, REFIID iid, LPVOID *ppvOut) +static HRESULT WINAPI InputProcessorProfiles_QueryInterface(ITfInputProcessorProfiles *iface, REFIID iid, void **ppv) { InputProcessorProfiles *This = impl_from_ITfInputProcessorProfiles(iface); - *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfInputProcessorProfiles)) { - *ppvOut = &This->ITfInputProcessorProfiles_iface; + *ppv = &This->ITfInputProcessorProfiles_iface; + } + else if (IsEqualIID(iid, &IID_ITfInputProcessorProfileMgr)) + { + *ppv = &This->ITfInputProcessorProfileMgr_iface; } else if (IsEqualIID(iid, &IID_ITfSource)) { - *ppvOut = &This->ITfSource_iface; + *ppv = &This->ITfSource_iface; } - - if (*ppvOut) + else { - ITfInputProcessorProfiles_AddRef(iface); - return S_OK; + *ppv = NULL; + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; } - WARN("unsupported interface: %s\n", debugstr_guid(iid)); - return E_NOINTERFACE; + ITfInputProcessorProfiles_AddRef(iface); + return S_OK; } static ULONG WINAPI InputProcessorProfiles_AddRef(ITfInputProcessorProfiles *iface) @@ -685,6 +688,114 @@ static const ITfInputProcessorProfilesVtbl InputProcessorProfilesVtbl = InputProcessorProfiles_SubstituteKeyboardLayout }; +static inline InputProcessorProfiles *impl_from_ITfInputProcessorProfileMgr(ITfInputProcessorProfileMgr *iface) +{ + return CONTAINING_RECORD(iface, InputProcessorProfiles, ITfInputProcessorProfileMgr_iface); +} + +static HRESULT WINAPI InputProcessorProfileMgr_QueryInterface(ITfInputProcessorProfileMgr *iface, REFIID riid, void **ppv) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + return ITfInputProcessorProfiles_QueryInterface(&This->ITfInputProcessorProfiles_iface, riid, ppv); +} + +static ULONG WINAPI InputProcessorProfileMgr_AddRef(ITfInputProcessorProfileMgr *iface) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + return ITfInputProcessorProfiles_AddRef(&This->ITfInputProcessorProfiles_iface); +} + +static ULONG WINAPI InputProcessorProfileMgr_Release(ITfInputProcessorProfileMgr *iface) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + return ITfInputProcessorProfiles_Release(&This->ITfInputProcessorProfiles_iface); +} + +static HRESULT WINAPI InputProcessorProfileMgr_ActivateProfile(ITfInputProcessorProfileMgr *iface, DWORD dwProfileType, + LANGID langid, REFCLSID clsid, REFGUID guidProfile, HKL hkl, DWORD dwFlags) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%d %x %s %s %p %x)\n", This, dwProfileType, langid, debugstr_guid(clsid), + debugstr_guid(guidProfile), hkl, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InputProcessorProfileMgr_DeactivateProfile(ITfInputProcessorProfileMgr *iface, DWORD dwProfileType, + LANGID langid, REFCLSID clsid, REFGUID guidProfile, HKL hkl, DWORD dwFlags) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%d %x %s %s %p %x)\n", This, dwProfileType, langid, debugstr_guid(clsid), + debugstr_guid(guidProfile), hkl, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InputProcessorProfileMgr_GetProfile(ITfInputProcessorProfileMgr *iface, DWORD dwProfileType, + LANGID langid, REFCLSID clsid, REFGUID guidProfile, HKL hkl, TF_INPUTPROCESSORPROFILE *pProfile) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%d %x %s %s %p %p)\n", This, dwProfileType, langid, debugstr_guid(clsid), + debugstr_guid(guidProfile), hkl, pProfile); + return E_NOTIMPL; +} + +static HRESULT WINAPI InputProcessorProfileMgr_EnumProfiles(ITfInputProcessorProfileMgr *iface, LANGID langid, + IEnumTfInputProcessorProfiles **ppEnum) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%x %p)\n", This, langid, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI InputProcessorProfileMgr_ReleaseInputProcessor(ITfInputProcessorProfileMgr *iface, REFCLSID rclsid, + DWORD dwFlags) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%s %x)\n", This, debugstr_guid(rclsid), dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InputProcessorProfileMgr_RegisterProfile(ITfInputProcessorProfileMgr *iface, REFCLSID rclsid, + LANGID langid, REFGUID guidProfile, const WCHAR *pchDesc, ULONG cchDesc, const WCHAR *pchIconFile, + ULONG cchFile, ULONG uIconIndex, HKL hklsubstitute, DWORD dwPreferredLayout, BOOL bEnabledByDefault, + DWORD dwFlags) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%s %x %s %s %d %s %u %u %p %x %x %x)\n", This, debugstr_guid(rclsid), langid, debugstr_guid(guidProfile), + debugstr_w(pchDesc), cchDesc, debugstr_w(pchIconFile), cchFile, uIconIndex, hklsubstitute, dwPreferredLayout, + bEnabledByDefault, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InputProcessorProfileMgr_UnregisterProfile(ITfInputProcessorProfileMgr *iface, REFCLSID rclsid, + LANGID langid, REFGUID guidProfile, DWORD dwFlags) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%s %x %s %x)\n", This, debugstr_guid(rclsid), langid, debugstr_guid(guidProfile), dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InputProcessorProfileMgr_GetActiveProfile(ITfInputProcessorProfileMgr *iface, REFGUID catid, + TF_INPUTPROCESSORPROFILE *pProfile) +{ + InputProcessorProfiles *This = impl_from_ITfInputProcessorProfileMgr(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(catid), pProfile); + return E_NOTIMPL; +} + +static const ITfInputProcessorProfileMgrVtbl InputProcessorProfileMgrVtbl = { + InputProcessorProfileMgr_QueryInterface, + InputProcessorProfileMgr_AddRef, + InputProcessorProfileMgr_Release, + InputProcessorProfileMgr_ActivateProfile, + InputProcessorProfileMgr_DeactivateProfile, + InputProcessorProfileMgr_GetProfile, + InputProcessorProfileMgr_EnumProfiles, + InputProcessorProfileMgr_ReleaseInputProcessor, + InputProcessorProfileMgr_RegisterProfile, + InputProcessorProfileMgr_UnregisterProfile, + InputProcessorProfileMgr_GetActiveProfile +}; + /***************************************************** * ITfSource functions *****************************************************/ @@ -782,6 +893,7 @@ HRESULT InputProcessorProfiles_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut This->ITfInputProcessorProfiles_iface.lpVtbl= &InputProcessorProfilesVtbl; This->ITfSource_iface.lpVtbl = &InputProcessorProfilesSourceVtbl; + This->ITfInputProcessorProfileMgr_iface.lpVtbl = &InputProcessorProfileMgrVtbl; This->refCount = 1; This->currentLanguage = GetUserDefaultLCID(); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 89d1e1a..f457dbb 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2186,6 +2186,18 @@ static void test_AssociateFocus(void) sink_check_ok(&test_OnPopContext,"OnPopContext"); } +static void test_QI(void) +{ + ITfInputProcessorProfileMgr *ipp_mgr; + HRESULT hres; + + /* A trivial test, probably worth moving once more will be added. */ + hres = ITfInputProcessorProfiles_QueryInterface(g_ipp, &IID_ITfInputProcessorProfileMgr, (void**)&ipp_mgr); + ok(hres == S_OK, "Could not get ITfInputProcessorProfileMgr iface: %08x\n", hres); + + ITfInputProcessorProfileMgr_Release(ipp_mgr); +} + START_TEST(inputprocessor) { if (SUCCEEDED(initialize())) @@ -2212,6 +2224,7 @@ START_TEST(inputprocessor) test_ThreadMgrUnadviseSinks(); test_UnregisterCategory(); test_Unregister(); + test_QI(); } else skip("Unable to create InputProcessor\n");

1 0

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 April 2014