April 2014 - Wine-Commits - list.winehq.org

Hans Leidekker : wbemprox: Implement Win32_Processor.CurrentClockSpeed.
by Alexandre Julliard April 30, 2014

April 30, 2014

Module: wine Branch: master Commit: ed1f005e14b78aaacb4012d13ba1f7b450cc5616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1f005e14b78aaacb4012d13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 30 10:20:05 2014 +0200 wbemprox: Implement Win32_Processor.CurrentClockSpeed. --- dlls/wbemprox/builtin.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8f4b362..1ca4137 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -129,6 +129,8 @@ static const WCHAR prop_csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; static const WCHAR prop_currentbitsperpixelW[] = {'C','u','r','r','e','n','t','B','i','t','s','P','e','r','P','i','x','e','l',0}; +static const WCHAR prop_currentclockspeedW[] = + {'C','u','r','r','e','n','t','C','l','o','c','k','S','p','e','e','d',0}; static const WCHAR prop_currenthorizontalresW[] = {'C','u','r','r','e','n','t','H','o','r','i','z','o','n','t','a','l','R','e','s','o','l','u','t','i','o','n',0}; static const WCHAR prop_currentverticalresW[] = @@ -440,6 +442,7 @@ static const struct column col_processor[] = { { prop_addresswidthW, CIM_UINT16, VT_I4 }, { prop_cpustatusW, CIM_UINT16 }, + { prop_currentclockspeedW, CIM_UINT32, VT_I4 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_familyW, CIM_UINT16, VT_I4 }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -746,6 +749,7 @@ struct record_processor { UINT16 addresswidth; UINT16 cpu_status; + UINT32 currentclockspeed; const WCHAR *device_id; UINT16 family; const WCHAR *manufacturer; @@ -1959,7 +1963,7 @@ static void get_processor_name( WCHAR *name ) regs_to_str( regs, 16, name + 32 ); } } -static UINT get_processor_maxclockspeed( void ) +static UINT get_processor_currentclockspeed( UINT index ) { PROCESSOR_POWER_INFORMATION *info; UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); @@ -1968,7 +1972,21 @@ static UINT get_processor_maxclockspeed( void ) if ((info = heap_alloc( size ))) { status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); - if (!status) ret = info[0].MaxMhz; + if (!status) ret = info[index].CurrentMhz; + heap_free( info ); + } + return ret; +} +static UINT get_processor_maxclockspeed( UINT index ) +{ + PROCESSOR_POWER_INFORMATION *info; + UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); + NTSTATUS status; + + if ((info = heap_alloc( size ))) + { + status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); + if (!status) ret = info[index].MaxMhz; heap_free( info ); } return ret; @@ -1986,7 +2004,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; - UINT i, offset = 0, maxclockspeed, num_cores, num_logical_processors, count = get_processor_count(); + UINT i, offset = 0, num_cores, num_logical_processors, count = get_processor_count(); enum fill_status status = FILL_STATUS_UNFILTERED; if (!resize_table( table, count, sizeof(*rec) )) return FILL_STATUS_FAILED; @@ -1995,7 +2013,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * get_processor_manufacturer( manufacturer ); get_processor_name( name ); - maxclockspeed = get_processor_maxclockspeed(); num_logical_processors = get_logical_processor_count( &num_cores ) / count; num_cores /= count; @@ -2004,11 +2021,12 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec = (struct record_processor *)(table->data + offset); rec->addresswidth = get_osarchitecture() == os_32bitW ? 32 : 64; rec->cpu_status = 1; /* CPU Enabled */ + rec->currentclockspeed = get_processor_currentclockspeed( i ); sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); rec->family = 2; /* Unknown */ rec->manufacturer = heap_strdupW( manufacturer ); - rec->maxclockspeed = maxclockspeed; + rec->maxclockspeed = get_processor_maxclockspeed( i ); rec->name = heap_strdupW( name ); rec->num_cores = num_cores; rec->num_logical_processors = num_logical_processors;

1 0

Piotr Caban : msvcrt: Handle seh exceptions rethrowing in cxx_frame_handler.
by Alexandre Julliard April 30, 2014

April 30, 2014

Module: wine Branch: master Commit: 36309142d0ed5755a7e6b8c80a973e56c88320d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36309142d0ed5755a7e6b8c80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 30 13:51:35 2014 +0200 msvcrt: Handle seh exceptions rethrowing in cxx_frame_handler. --- dlls/msvcrt/except_i386.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 7f521cc..2a4ef9d 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -522,17 +522,21 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame } if (!descr->tryblock_count) return ExceptionContinueSearch; - if(rec->ExceptionCode == CXX_EXCEPTION) + if(rec->ExceptionCode == CXX_EXCEPTION && + rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) { - if (rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) - { - EXCEPTION_RECORD *exc_record = msvcrt_get_thread_data()->exc_record; - rec->ExceptionInformation[1] = exc_record->ExceptionInformation[1]; - rec->ExceptionInformation[2] = exc_record->ExceptionInformation[2]; - TRACE("detect rethrow: obj: %lx, type: %lx\n", - rec->ExceptionInformation[1], rec->ExceptionInformation[2]); + *rec = *msvcrt_get_thread_data()->exc_record; + rec->ExceptionFlags &= ~EH_UNWINDING; + if(TRACE_ON(seh)) { + TRACE("detect rethrow: exception code: %x\n", rec->ExceptionCode); + if(rec->ExceptionCode == CXX_EXCEPTION) + TRACE("re-propage: obj: %lx, type: %lx\n", + rec->ExceptionInformation[1], rec->ExceptionInformation[2]); } + } + if(rec->ExceptionCode == CXX_EXCEPTION) + { exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (rec->ExceptionInformation[0] > CXX_FRAME_MAGIC_VC8 &&

1 0

Henri Verbeet : ddraw/tests: Add some basic material tests.
by Alexandre Julliard April 30, 2014

April 30, 2014

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: Disable lighting when a 0 material handle is set.
by Alexandre Julliard April 30, 2014

April 30, 2014

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: Reject setting a 0 material handle in d3d_viewport_SetBackground().
by Alexandre Julliard April 30, 2014

April 30, 2014

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

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Address.
by Alexandre Julliard April 30, 2014

April 30, 2014

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: Only output a warning when clearing a viewport without background material.
by Alexandre Julliard April 30, 2014

April 30, 2014

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

Vincent Povirk : gdiplus/tests: Fix image leak in graphics test.
by Alexandre Julliard April 30, 2014

April 30, 2014

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

Henri Verbeet : ddraw/tests: Handle the Windows 8 testbot in test_primary_palette().
by Alexandre Julliard April 30, 2014

April 30, 2014

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

Henri Verbeet : ddraw: Cleanup d3d_execute_buffer_QueryInterface().
by Alexandre Julliard April 29, 2014

April 29, 2014

Module: wine Branch: master Commit: 77da84b06a22c52135658542fdf5b018718fec0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=77da84b06a22c52135658542f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 29 10:41:05 2014 +0200 ddraw: Cleanup d3d_execute_buffer_QueryInterface(). --- dlls/ddraw/executebuffer.c | 43 +++++++++++-------------------------------- 1 file changed, 11 insertions(+), 32 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 83755c2..4e9baad 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -420,45 +420,24 @@ static inline struct d3d_execute_buffer *impl_from_IDirect3DExecuteBuffer(IDirec return CONTAINING_RECORD(iface, struct d3d_execute_buffer, IDirect3DExecuteBuffer_iface); } -/***************************************************************************** - * IDirect3DExecuteBuffer::QueryInterface - * - * Well, a usual QueryInterface function. Don't know fur sure which - * interfaces it can Query. - * - * Params: - * riid: The interface ID queried for - * obj: Address to return the interface pointer at - * - * Returns: - * D3D_OK in case of a success (S_OK? Think it's the same) - * OLE_E_ENUM_NOMORE if the interface wasn't found. - * (E_NOINTERFACE?? Don't know what I really need) - * - *****************************************************************************/ -static HRESULT WINAPI d3d_execute_buffer_QueryInterface(IDirect3DExecuteBuffer *iface, REFIID riid, void **obj) +static HRESULT WINAPI d3d_execute_buffer_QueryInterface(IDirect3DExecuteBuffer *iface, REFIID iid, void **out) { - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - *obj = NULL; - - if ( IsEqualGUID( &IID_IUnknown, riid ) ) { - IDirect3DExecuteBuffer_AddRef(iface); - *obj = iface; - TRACE(" Creating IUnknown interface at %p.\n", *obj); - return S_OK; - } - if ( IsEqualGUID( &IID_IDirect3DExecuteBuffer, riid ) ) { + if (IsEqualGUID(&IID_IDirect3DExecuteBuffer, iid) + || IsEqualGUID(&IID_IUnknown, iid)) + { IDirect3DExecuteBuffer_AddRef(iface); - *obj = iface; - TRACE(" Creating IDirect3DExecuteBuffer interface %p\n", *obj); - return S_OK; + *out = iface; + return S_OK; } - FIXME("(%p): interface for IID %s NOT found!\n", iface, debugstr_guid(riid)); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; return E_NOINTERFACE; } - /***************************************************************************** * IDirect3DExecuteBuffer::AddRef *

1 0