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

Benjamin Arai : oleaut32: Conformance test and patch for VarCat.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 700adac9aca86a0aab85952ac0d4472a2e4dd842 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=700adac9aca86a0aab85952… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Mon Jul 10 09:24:47 2006 -0700 oleaut32: Conformance test and patch for VarCat. --- dlls/oleaut32/tests/vartest.c | 319 +++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/variant.c | 150 +++++++++++++++---- 2 files changed, 439 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=700adac9aca86a0aab8…

1 0

James Hawkins : msi: AppSearchReg shouldn't create the key it' s looking for if it doesn't exist.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 3b506c640866025eb791e806d756330cdb2b01d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3b506c640866025eb791e80… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Jul 9 20:17:42 2006 -0700 msi: AppSearchReg shouldn't create the key it's looking for if it doesn't exist. --- dlls/msi/appsearch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 44c5256..6f173dc 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -310,7 +310,7 @@ static UINT ACTION_AppSearchReg(MSIPACKA goto end; } - rc = RegCreateKeyW(rootKey, keyPath, &key); + rc = RegOpenKeyW(rootKey, keyPath, &key); if (rc) { TRACE("RegCreateKeyW returned %d\n", rc);

1 0

Ivan Gyurdiev : wined3d: Improve GetAdapterMonitor stub.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: ed9848930b3acd81f507c6d24b941b604ede8978 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed9848930b3acd81f507c6d… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jul 10 20:32:47 2006 -0600 wined3d: Improve GetAdapterMonitor stub. --- dlls/wined3d/directx.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d9bb59c..dea1cef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -820,11 +820,14 @@ static HRESULT WINAPI IWineD3DImpl_Regi static HMONITOR WINAPI IWineD3DImpl_GetAdapterMonitor(IWineD3D *iface, UINT Adapter) { IWineD3DImpl *This = (IWineD3DImpl *)iface; - FIXME_(d3d_caps)("(%p)->(Adptr:%d)\n", This, Adapter); + POINT pt = { -1, -1 }; + if (Adapter >= IWineD3DImpl_GetAdapterCount(iface)) { return NULL; } - return WINED3D_OK; + + FIXME_(d3d_caps)("(%p): returning the primary monitor for adapter %d\n", This, Adapter); + return MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY); } /* FIXME: GetAdapterModeCount and EnumAdapterModes currently only returns modes

1 0

Ivan Gyurdiev : wined3d: More flow control instructions.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 33293df1430a875aaa8a2c4428e327a7c3cb7fc2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33293df1430a875aaa8a2c4… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jul 10 04:35:15 2006 -0600 wined3d: More flow control instructions. - Implement call, callnz, label, and ret - Implement support for NOT modifier --- dlls/wined3d/baseshader.c | 12 ++++++++++-- dlls/wined3d/glsl_shader.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/pixelshader.c | 22 ++++++++++++++++++---- dlls/wined3d/vertexshader.c | 12 ++++++++---- dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 77 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=33293df1430a875aaa8…

1 0

Ivan Gyurdiev : wined3d: More flow control instructions
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 6ede56495a33aef4ddaf1bff117546741da498eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ede56495a33aef4ddaf1bf… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Mon Jul 10 03:11:35 2006 -0600 wined3d: More flow control instructions - Implement if, else, endif, rep, endrep, break - Implement ifc, breakc, using undocumented comparison bits in the instruction token - Fix bug in main loop processing of codes with no dst token - Fix bug in GLSL output modifier processing of codes with no dst token - Fix bug in loop implementation (src1 contains the integer data, src0 is aL) - Add versioning for all the instructions above, and remove GLSL_REQUIRED thing, which is useless and should be removed from all opcodes in general. --- dlls/wined3d/baseshader.c | 39 ++++++++++++----- dlls/wined3d/glsl_shader.c | 91 +++++++++++++++++++++++++++++++++++----- dlls/wined3d/pixelshader.c | 20 ++++----- dlls/wined3d/vertexshader.c | 20 ++++----- dlls/wined3d/wined3d_private.h | 22 +++++++++- 5 files changed, 147 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6ede56495a33aef4dda…

1 0

Ivan Gyurdiev : wined3d: Clamp texcoord output between 0 and 1.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 8068fc3b9c7d696f62588679aba9a412672d5532 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8068fc3b9c7d696f6258867… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Jul 9 22:51:52 2006 -0600 wined3d: Clamp texcoord output between 0 and 1. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 25f295a..4eb8494 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -640,7 +640,7 @@ void pshader_hw_texcoord(SHADER_OPCODE_A pshader_get_write_mask(dst, tmp); if (hex_version != D3DPS_VERSION(1,4)) { DWORD reg = dst & D3DSP_REGNUM_MASK; - shader_addline(buffer, "MOV T%lu%s, fragment.texcoord[%lu];\n", reg, tmp, reg); + shader_addline(buffer, "MOV_SAT T%lu%s, fragment.texcoord[%lu];\n", reg, tmp, reg); } else { DWORD reg1 = dst & D3DSP_REGNUM_MASK; DWORD reg2 = src[0] & D3DSP_REGNUM_MASK; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f132dec..0d0ed3a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1245,7 +1245,7 @@ void pshader_glsl_texcoord(SHADER_OPCODE if (hex_version != D3DPS_VERSION(1,4)) { DWORD reg = arg->dst & D3DSP_REGNUM_MASK; - shader_addline(buffer, "%s = gl_TexCoord[%lu];\n", tmpReg, reg); + shader_addline(buffer, "%s = clamp(gl_TexCoord[%lu], 0.0, 1.0);\n", tmpReg, reg); } else { DWORD reg2 = arg->src[0] & D3DSP_REGNUM_MASK; shader_addline(buffer, "%s = gl_TexCoord[%lu]%s;\n", tmpStr, reg2, tmpMask);

1 0

Ivan Gyurdiev : wined3d: Place immediate constants in the same array as global constants.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: e9de563e415788946b955be01b023705cff3342c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9de563e415788946b955be… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Jul 9 22:51:03 2006 -0600 wined3d: Place immediate constants in the same array as global constants. - move DEF, DEFI, DEFB handling into the register counting pass - keep track of defined constants as a linked list (because there's a few of them) - apply immediate constants after global constants in the constant loading function - both types of constants now get loaded with array notation in the shader (into the same array) --- dlls/wined3d/arb_program_shader.c | 106 ++++++++--------- dlls/wined3d/baseshader.c | 60 +++++++--- dlls/wined3d/glsl_shader.c | 231 ++++++++++++++++++------------------- dlls/wined3d/pixelshader.c | 25 +++- dlls/wined3d/vertexshader.c | 22 +++- dlls/wined3d/wined3d_private.h | 21 ++- 6 files changed, 259 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e9de563e415788946b9…

1 0

Ivan Gyurdiev : wined3d: Fix off-by-one constants bug.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 345dd49eda7f53977c829d9ce1c4b460a37d191b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=345dd49eda7f53977c829d9… Author: Ivan Gyurdiev <ivg231(a)gmail.com> Date: Sun Jul 9 22:52:23 2006 -0600 wined3d: Fix off-by-one constants bug. --- dlls/wined3d/device.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7176954..45dd144 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4654,7 +4654,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, MAX_VSHADER_CONSTANTS - (start + 1)); + int i, cnt = min(count, MAX_VSHADER_CONSTANTS - start); TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4681,7 +4681,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int cnt = min(count, MAX_VSHADER_CONSTANTS - (start + 1)); + int cnt = min(count, MAX_VSHADER_CONSTANTS - start); TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count); @@ -4700,7 +4700,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, MAX_VSHADER_CONSTANTS - (start + 1)); + int i, cnt = min(count, MAX_VSHADER_CONSTANTS - start); TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4728,7 +4728,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int cnt = min(count, MAX_VSHADER_CONSTANTS - (start + 1)); + int cnt = min(count, MAX_VSHADER_CONSTANTS - start); TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count); @@ -4747,7 +4747,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, MAX_VSHADER_CONSTANTS - (start + 1)); + int i, cnt = min(count, MAX_VSHADER_CONSTANTS - start); TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4775,7 +4775,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int cnt = min(count, MAX_VSHADER_CONSTANTS - (start + 1)); + int cnt = min(count, MAX_VSHADER_CONSTANTS - start); TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count); @@ -4836,7 +4836,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, MAX_PSHADER_CONSTANTS - (start + 1)); + int i, cnt = min(count, MAX_PSHADER_CONSTANTS - start); TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4863,7 +4863,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int cnt = min(count, MAX_PSHADER_CONSTANTS - (start + 1)); + int cnt = min(count, MAX_PSHADER_CONSTANTS - start); TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count); @@ -4882,7 +4882,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, MAX_PSHADER_CONSTANTS - (start + 1)); + int i, cnt = min(count, MAX_PSHADER_CONSTANTS - start); TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4910,7 +4910,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int cnt = min(count, MAX_PSHADER_CONSTANTS - (start + 1)); + int cnt = min(count, MAX_PSHADER_CONSTANTS - start); TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count); @@ -4929,7 +4929,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int i, cnt = min(count, MAX_PSHADER_CONSTANTS - (start + 1)); + int i, cnt = min(count, MAX_PSHADER_CONSTANTS - start); TRACE("(iface %p, srcData %p, start %d, count %d)\n", iface, srcData, start, count); @@ -4957,7 +4957,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl UINT count) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - int cnt = min(count, MAX_PSHADER_CONSTANTS - (start + 1)); + int cnt = min(count, MAX_PSHADER_CONSTANTS - start); TRACE("(iface %p, dstData %p, start %d, count %d)\n", iface, dstData, start, count);

1 0

Stefan Dösinger : ddraw: Palette refcounting fix.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 915174d8d9b1b067d87d96b96e7fed6c8d1a1704 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=915174d8d9b1b067d87d96b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jul 10 10:53:11 2006 +0200 ddraw: Palette refcounting fix. Do not AddRef the DirectDraw interfaces in CreatePalette of older interface version, and add a test for that. --- dlls/ddraw/ddraw.c | 1 + dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/ddraw_thunks.c | 18 ++++++++++-- dlls/ddraw/palette.c | 7 ++++- dlls/ddraw/tests/refcount.c | 62 +++++++++++++++++++++++++++++++++---------- 5 files changed, 70 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cec7821..bd13d56 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3007,6 +3007,7 @@ IDirectDrawImpl_CreatePalette(IDirectDra } IDirectDraw7_AddRef(iface); + object->ifaceToRelease = (IUnknown *) iface; *Palette = ICOM_INTERFACE(object, IDirectDrawPalette); return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 74bed0e..5cf9312 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -393,6 +393,7 @@ struct IDirectDrawPaletteImpl /* IDirectDrawPalette fields */ IDirectDrawImpl *ddraw_owner; + IUnknown *ifaceToRelease; }; const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl; diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 7ccc65d..c0b0641 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -236,10 +236,13 @@ IDirectDrawImpl_CreatePalette(LPDIRECTDR dwFlags, pEntries, ppPalette, pUnkOuter); if(SUCCEEDED(hr) && *ppPalette) { + IDirectDrawPaletteImpl *impl = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, *ppPalette); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw, IDirectDraw7, This)); + impl->ifaceToRelease = NULL; + } return hr; } @@ -251,18 +254,21 @@ IDirectDraw2Impl_CreatePalette(LPDIRECTD IUnknown *pUnkOuter) { HRESULT hr; - return IDirectDraw7_CreatePalette(COM_INTERFACE_CAST(IDirectDrawImpl, + hr = IDirectDraw7_CreatePalette(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw2, IDirectDraw7, This), dwFlags, pEntries, ppPalette, pUnkOuter); if(SUCCEEDED(hr) && *ppPalette) { + IDirectDrawPaletteImpl *impl = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, *ppPalette); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, - IDirectDraw, + IDirectDraw2, IDirectDraw7, This)); + impl->ifaceToRelease = NULL; } + return hr; } static HRESULT WINAPI @@ -272,18 +278,22 @@ IDirectDraw4Impl_CreatePalette(LPDIRECTD IUnknown *pUnkOuter) { HRESULT hr; - return IDirectDraw7_CreatePalette(COM_INTERFACE_CAST(IDirectDrawImpl, + hr = IDirectDraw7_CreatePalette(COM_INTERFACE_CAST(IDirectDrawImpl, IDirectDraw4, IDirectDraw7, This), dwFlags, pEntries, ppPalette, pUnkOuter); if(SUCCEEDED(hr) && *ppPalette) { + IDirectDrawPaletteImpl *impl = ICOM_OBJECT(IDirectDrawPaletteImpl, IDirectDrawPalette, *ppPalette); IDirectDraw7_Release(COM_INTERFACE_CAST(IDirectDrawImpl, - IDirectDraw, + IDirectDraw4, IDirectDraw7, This)); + IDirectDraw4_AddRef(This); + impl->ifaceToRelease = (IUnknown *) This; } + return hr; } static HRESULT WINAPI diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 97a9ef4..03bdb3a 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -21,6 +21,8 @@ #include "config.h" #include "winerror.h" #include "wine/debug.h" +#define COBJMACROS + #include <assert.h> #include <string.h> @@ -104,7 +106,10 @@ IDirectDrawPaletteImpl_Release(IDirectDr if (ref == 0) { IWineD3DPalette_Release(This->wineD3DPalette); - IDirectDraw7_Release(ICOM_INTERFACE(This->ddraw_owner, IDirectDraw7)); + if(This->ifaceToRelease) + { + IUnknown_Release(This->ifaceToRelease); + } HeapFree(GetProcessHeap(), 0, This); } diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 6e27665..9dceda6 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -47,32 +47,42 @@ static void test_ddraw_objects(void) { HRESULT hr; unsigned long ref; - IDirectDraw7 *DDraw; + IDirectDraw7 *DDraw7; + IDirectDraw4 *DDraw4; + IDirectDraw4 *DDraw2; + IDirectDraw4 *DDraw1; IDirectDrawPalette *palette; IDirectDrawSurface7 *surface; PALETTEENTRY Table[256]; DDSURFACEDESC2 ddsd; - hr = pDirectDrawCreateEx(NULL, (void **) &DDraw, &IID_IDirectDraw7, NULL); + hr = pDirectDrawCreateEx(NULL, (void **) &DDraw7, &IID_IDirectDraw7, NULL); ok(hr == DD_OK || hr==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %lx\n", hr); - if(!DDraw) + if(!DDraw7) { trace("Couldn't create DDraw interface, skipping tests\n"); return; } - ref = getRefcount( (IUnknown *) DDraw); + hr = IDirectDraw7_QueryInterface(DDraw7, &IID_IDirectDraw4, (void **) &DDraw4); + ok(hr == DD_OK, "IDirectDraw7_QueryInterface returned %08lx\n", hr); + hr = IDirectDraw7_QueryInterface(DDraw7, &IID_IDirectDraw2, (void **) &DDraw2); + ok(hr == DD_OK, "IDirectDraw7_QueryInterface returned %08lx\n", hr); + hr = IDirectDraw7_QueryInterface(DDraw7, &IID_IDirectDraw, (void **) &DDraw1); + ok(hr == DD_OK, "IDirectDraw7_QueryInterface returned %08lx\n", hr); + + ref = getRefcount( (IUnknown *) DDraw7); ok(ref == 1, "Got refcount %ld, expected 1\n", ref); /* Fails without a cooplevel */ - hr = IDirectDraw7_CreatePalette(DDraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + hr = IDirectDraw7_CreatePalette(DDraw7, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); ok(hr == DDERR_NOCOOPERATIVELEVELSET, "CreatePalette returned %08lx\n", hr); /* This check is before the cooplevel check */ - hr = IDirectDraw7_CreatePalette(DDraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, (void *) 0xdeadbeef); + hr = IDirectDraw7_CreatePalette(DDraw7, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, (void *) 0xdeadbeef); ok(hr == CLASS_E_NOAGGREGATION, "CreatePalette returned %08lx\n", hr); - hr = IDirectDraw7_SetCooperativeLevel(DDraw, 0, DDSCL_NORMAL); + hr = IDirectDraw7_SetCooperativeLevel(DDraw7, 0, DDSCL_NORMAL); ok(hr == DD_OK, "SetCooperativeLevel failed with %08lx\n", hr); memset(&ddsd, 0, sizeof(ddsd)); @@ -85,22 +95,22 @@ static void test_ddraw_objects(void) U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_PALETTEINDEXED8 | DDPF_RGB; U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; - hr = IDirectDraw7_CreateSurface(DDraw, &ddsd, &surface, NULL); + hr = IDirectDraw7_CreateSurface(DDraw7, &ddsd, &surface, NULL); ok(hr == DD_OK, "CreateSurface failed with %08lx\n", hr); /* DDraw refcount increased by 1 */ - ref = getRefcount( (IUnknown *) DDraw); + ref = getRefcount( (IUnknown *) DDraw7); ok(ref == 2, "Got refcount %ld, expected 2\n", ref); /* Surface refcount starts with 1 */ ref = getRefcount( (IUnknown *) surface); ok(ref == 1, "Got refcount %ld, expected 1\n", ref); - hr = IDirectDraw7_CreatePalette(DDraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + hr = IDirectDraw7_CreatePalette(DDraw7, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); ok(hr == DD_OK, "CreatePalette returned %08lx\n", hr); /* DDraw refcount increased by 1 */ - ref = getRefcount( (IUnknown *) DDraw); + ref = getRefcount( (IUnknown *) DDraw7); ok(ref == 3, "Got refcount %ld, expected 3\n", ref); /* Palette starts with 1 */ @@ -119,7 +129,7 @@ static void test_ddraw_objects(void) IDirectDrawSurface7_Release(surface); /* Incresed before - decrease now */ - ref = getRefcount( (IUnknown *) DDraw); + ref = getRefcount( (IUnknown *) DDraw7); ok(ref == 2, "Got refcount %ld, expected 2\n", ref); /* Releasing the surface detaches the palette */ @@ -129,10 +139,34 @@ static void test_ddraw_objects(void) IDirectDrawPalette_Release(palette); /* Incresed before - decrease now */ - ref = getRefcount( (IUnknown *) DDraw); + ref = getRefcount( (IUnknown *) DDraw7); ok(ref == 1, "Got refcount %ld, expected 1\n", ref); - IDirectDraw7_Release(DDraw); + /* Not all interfaces are AddRefed when a palette is created */ + hr = IDirectDraw4_CreatePalette(DDraw4, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette returned %08lx\n", hr); + ref = getRefcount( (IUnknown *) DDraw4); + ok(ref == 2, "Got refcount %ld, expected 2\n", ref); + IDirectDrawPalette_Release(palette); + + /* No addref here */ + hr = IDirectDraw2_CreatePalette(DDraw2, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette returned %08lx\n", hr); + ref = getRefcount( (IUnknown *) DDraw2); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + IDirectDrawPalette_Release(palette); + + /* No addref here */ + hr = IDirectDraw_CreatePalette(DDraw1, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, Table, &palette, NULL); + ok(hr == DD_OK, "CreatePalette returned %08lx\n", hr); + ref = getRefcount( (IUnknown *) DDraw1); + ok(ref == 1, "Got refcount %ld, expected 1\n", ref); + IDirectDrawPalette_Release(palette); + + IDirectDraw7_Release(DDraw7); + IDirectDraw4_Release(DDraw4); + IDirectDraw2_Release(DDraw2); + IDirectDraw_Release(DDraw1); } static void test_iface_refcnt(void)

1 0

Stefan Dösinger : ddraw: Split up the ddraw refcount.
by Alexandre Julliard July 11, 2006

July 11, 2006

Module: wine Branch: refs/heads/master Commit: 0a81295782bc6e48bfccb2b8ae23ae66982d87f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0a81295782bc6e48bfccb2b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jul 10 16:06:33 2006 +0200 ddraw: Split up the ddraw refcount. --- dlls/ddraw/ddraw.c | 115 +++++++++++--------- dlls/ddraw/ddraw_private.h | 5 + dlls/ddraw/ddraw_thunks.c | 160 +++++++++++++++++++++++----- dlls/ddraw/direct3d.c | 60 +++++++--- dlls/ddraw/main.c | 27 +++-- dlls/ddraw/surface.c | 28 ++++- dlls/ddraw/tests/refcount.c | 248 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 529 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0a81295782bc6e48bfc…

1 0