September 2013 - Wine-commits

Stefan Dösinger : wined3d: Don' t clamp texture lookups in the ARB fixed function fragment pipe.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 37c4f3a88c0cb11248e92a6834c7352b0a969445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c4f3a88c0cb11248e92a683… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:11 2013 +0200 wined3d: Don't clamp texture lookups in the ARB fixed function fragment pipe. --- dlls/wined3d/arb_program_shader.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aad30e9..9f02d21 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6176,7 +6176,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; UINT lowest_disabled_stage; const char *textype; - const char *instr, *sat; + const char *instr; char colorcor_dst[8]; GLuint ret; DWORD arg0, arg1, arg2; @@ -6316,12 +6316,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con default: textype = "unexpected_textype"; break; } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - sat = ""; - else - sat = "_SAT"; - if(settings->op[stage].projected == proj_none) { instr = "TEX"; } else if(settings->op[stage].projected == proj_count4 || @@ -6356,8 +6350,8 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); } - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) { shader_addline(&buffer, "MAD_SAT ret.x, tex%u.z, luminance%u.x, luminance%u.y;\n", @@ -6367,11 +6361,11 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } else if(settings->op[stage].projected == proj_count3) { shader_addline(&buffer, "MOV ret, fragment.texcoord[%u];\n", stage); shader_addline(&buffer, "MOV ret.w, ret.z;\n"); - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); } else { - shader_addline(&buffer, "%s%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", - instr, sat, stage, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", + instr, stage, stage, stage, textype); } sprintf(colorcor_dst, "tex%u", stage);

1 0

Stefan Dösinger : wined3d: Use the ftoa helper function in the ARB shader backend.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: b73464a41337992c612e14035375c0da70d7eb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73464a41337992c612e14035… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:12 2013 +0200 wined3d: Use the ftoa helper function in the ARB shader backend. This is the ARB equivalent to e0494afa007a1d1ba2f4b649beedca27cb20808e. --- dlls/wined3d/arb_program_shader.c | 94 ++++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 76 +++++------------------------- dlls/wined3d/shader.c | 5 ++ dlls/wined3d/utils.c | 49 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++ 5 files changed, 127 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b73464a41337992c612e1…

1 0

Stefan Dösinger : ddraw/tests: Test DDCAPS2_TEXTUREMANAGE compatibility, with other flags.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 8da09ba196e6e9256ae93698729aa69776ff5270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da09ba196e6e9256ae936987… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 4 23:19:20 2013 +0200 ddraw/tests: Test DDCAPS2_TEXTUREMANAGE compatibility, with other flags. --- dlls/ddraw/ddraw.c | 15 +++++++ dlls/ddraw/tests/ddraw4.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 26f1984..652d20b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2699,6 +2699,21 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } + if (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + if (!(DDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + if (DDSD->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY " + "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + } + /* According to the msdn this flag is ignored by CreateSurface */ if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index fbaa6ca..b0e014d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3819,6 +3819,101 @@ static void test_coop_level_activateapp(void) IDirectDraw4_Release(ddraw); } +static void test_texturemanage(void) +{ + IDirectDraw4 *ddraw; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface4 *surface; + unsigned int i; + DDCAPS hal_caps, hel_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + static const struct + { + DWORD caps_in, caps2_in; + HRESULT hr; + DWORD caps_out, caps2_out; + } + tests[] = + { + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0}, + + {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, 0, DD_OK, + DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, + {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY, 0}, + }; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create IDirectDraw4 object, skipping tests.\n"); + return; + } + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps) + { + skip("Managed textures not supported, skipping managed texture test.\n"); + IDirectDraw4_Release(ddraw); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = tests[i].caps_in; + ddsd.ddsCaps.dwCaps2 = tests[i].caps2_in; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (FAILED(hr)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + + ok(ddsd.ddsCaps.dwCaps == tests[i].caps_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps_out, ddsd.ddsCaps.dwCaps, i); + ok(ddsd.ddsCaps.dwCaps2 == tests[i].caps2_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps2_out, ddsd.ddsCaps.dwCaps2, i); + + IDirectDrawSurface4_Release(surface); + } + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -3849,4 +3944,5 @@ START_TEST(ddraw4) test_coop_level_versions(); test_lighting_interface_versions(); test_coop_level_activateapp(); + test_texturemanage(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2ed1b94..5197ccea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3633,6 +3633,101 @@ static void test_coop_level_activateapp(void) IDirectDraw7_Release(ddraw); } +static void test_texturemanage(void) +{ + IDirectDraw7 *ddraw; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface7 *surface; + unsigned int i; + DDCAPS hal_caps, hel_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + static const struct + { + DWORD caps_in, caps2_in; + HRESULT hr; + DWORD caps_out, caps2_out; + } + tests[] = + { + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0}, + + {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, 0, DD_OK, + DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, + {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY, 0}, + }; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create IDirectDraw7 object, skipping tests.\n"); + return; + } + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps) + { + skip("Managed textures not supported, skipping managed texture test.\n"); + IDirectDraw7_Release(ddraw); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = tests[i].caps_in; + ddsd.ddsCaps.dwCaps2 = tests[i].caps2_in; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (FAILED(hr)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + + ok(ddsd.ddsCaps.dwCaps == tests[i].caps_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps_out, ddsd.ddsCaps.dwCaps, i); + ok(ddsd.ddsCaps.dwCaps2 == tests[i].caps2_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps2_out, ddsd.ddsCaps.dwCaps2, i); + + IDirectDrawSurface7_Release(surface); + } + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -3671,4 +3766,5 @@ START_TEST(ddraw7) test_fog_special(); test_lighting_interface_versions(); test_coop_level_activateapp(); + test_texturemanage(); }

1 0

Stefan Dösinger : ddraw: Create managed pool textures.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: b88daee3bce083f8121117e9d0bece715eb8490c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88daee3bce083f8121117e9d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:14 2013 +0200 ddraw: Create managed pool textures. The surfaces are already in WINED3D_POOL_MANAGED. --- dlls/ddraw/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6435774..b7136e1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5607,9 +5607,9 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac else layers = 1; - /* DDSCAPS_SYSTEMMEMORY textures are in WINED3D_POOL_SYSTEM_MEM. - * Should I forward the MANAGED cap to the managed pool? */ - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + pool = WINED3D_POOL_MANAGED; + else if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) pool = WINED3D_POOL_SYSTEM_MEM; else pool = WINED3D_POOL_DEFAULT;

1 0

Stefan Dösinger : ddraw: Enumerate DXT2 and DXT4.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 22fc22d28b655aff30a3f0517af1fd5086cf9e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fc22d28b655aff30a3f0517… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:15 2013 +0200 ddraw: Enumerate DXT2 and DXT4. --- dlls/ddraw/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 449b5b8..9be17c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1073,7 +1073,9 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_P8_UINT, /* FOURCC codes */ WINED3DFMT_DXT1, + WINED3DFMT_DXT2, WINED3DFMT_DXT3, + WINED3DFMT_DXT4, WINED3DFMT_DXT5, };

1 0

Michael Stefaniuc : dplayx: Simplify ref-counting for IDirectPlaySP.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 744f94be4abcbf65627d45b57746a80c8e6799e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=744f94be4abcbf65627d45b57… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:50:58 2013 +0200 dplayx: Simplify ref-counting for IDirectPlaySP. --- dlls/dplayx/dplaysp.c | 71 +++++++++++++----------------------------------- 1 files changed, 19 insertions(+), 52 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index aac2811..52fe09f 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -44,7 +44,6 @@ typedef struct IDirectPlaySPImpl IDirectPlaySPImpl; typedef struct tagDirectPlaySPIUnknownData { - LONG ulObjRef; CRITICAL_SECTION DPSP_lock; } DirectPlaySPIUnknownData; @@ -61,13 +60,13 @@ typedef struct tagDirectPlaySPData } DirectPlaySPData; #define DPSP_IMPL_FIELDS \ - LONG ulInterfaceRef; \ DirectPlaySPIUnknownData* unk; \ DirectPlaySPData* sp; struct IDirectPlaySPImpl { const IDirectPlaySPVtbl *lpVtbl; + LONG ref; DPSP_IMPL_FIELDS }; @@ -194,79 +193,47 @@ static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) } static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid, - void **ppvObj ) + void **ppv ) { - IDirectPlaySPImpl *This = (IDirectPlaySPImpl *)iface; - TRACE("(%p)->(%s,%p)\n", This, debugstr_guid( riid ), ppvObj ); + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid( riid ), ppv ); - *ppvObj = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( *This ) ); - - if( *ppvObj == NULL ) - { - return DPERR_OUTOFMEMORY; - } - - CopyMemory( *ppvObj, This, sizeof( *This ) ); - (*(IDirectPlaySPImpl**)ppvObj)->ulInterfaceRef = 0; - - if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) - { - IDirectPlaySPImpl *This = *ppvObj; - This->lpVtbl = &directPlaySPVT; - } - else + if ( IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectPlaySP, riid ) ) { - /* Unsupported interface */ - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return E_NOINTERFACE; + *ppv = iface; + IDirectPlaySP_AddRef( iface ); + return S_OK; } - IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); - - return S_OK; + FIXME( "Unsupported interface %s\n", debugstr_guid( riid ) ); + *ppv = NULL; + return E_NOINTERFACE; } static ULONG WINAPI IDirectPlaySPImpl_AddRef( IDirectPlaySP *iface ) { IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedIncrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedIncrement( &This->ulInterfaceRef ); + ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "ref count incremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); + TRACE( "(%p) ref=%d\n", This, ref ); - return ulObjRefCount; + return ref; } static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) { IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); - ULONG ulInterfaceRefCount, ulObjRefCount; - - ulObjRefCount = InterlockedDecrement( &This->unk->ulObjRef ); - ulInterfaceRefCount = InterlockedDecrement( &This->ulInterfaceRef ); + ULONG ref = InterlockedDecrement( &This->ref ); - TRACE( "ref count decremented to %u:%u for %p\n", - ulInterfaceRefCount, ulObjRefCount, This ); - - /* Deallocate if this is the last reference to the object */ - if( ulObjRefCount == 0 ) - { - DPSP_DestroyDirectPlaySP( This ); - DPSP_DestroyIUnknown( This ); - } + TRACE( "(%p) ref=%d\n", This, ref ); - if( ulInterfaceRefCount == 0 ) + if( !ref ) { + DPSP_DestroyDirectPlaySP( This ); + DPSP_DestroyIUnknown( This ); HeapFree( GetProcessHeap(), 0, This ); } - return ulInterfaceRefCount; + return ref; } static HRESULT WINAPI IDirectPlaySPImpl_AddMRUEntry( IDirectPlaySP *iface, LPCWSTR lpSection,

1 0

Michael Stefaniuc : dplayx: Remove commented out TRACEs that mimic +tid functionality.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 07e59757971841e5bf8848bfca94cbe0c535ae62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e59757971841e5bf8848bfc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:54:27 2013 +0200 dplayx: Remove commented out TRACEs that mimic +tid functionality. --- dlls/dplayx/dplaysp.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 52fe09f..03169e3 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -655,9 +655,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D LPDP_SPPLAYERDATA lpPlayerEntry; LPVOID lpPlayerData; -/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ - TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", - This, idPlayer, lpData, dwDataSize, dwFlags ); + TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags ); hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry ); if( FAILED(hr) ) @@ -703,9 +701,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void ** IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); HRESULT hr = DP_OK; -/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ - TRACE( "(%p)->(%p,%p,0x%08x)\n", - This, lplpData, lpdwDataSize, dwFlags ); + TRACE( "(%p)->(%p,%p,0x%08x)\n", This, lplpData, lpdwDataSize, dwFlags ); #if 0 /* This is what the documentation says... */ @@ -757,9 +753,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l IDirectPlaySPImpl *This = impl_from_IDirectPlaySP( iface ); LPVOID lpSpData; -/* TRACE( "Called on process 0x%08lx\n", GetCurrentProcessId() ); */ - TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", - This, lpData, dwDataSize, dwFlags ); + TRACE( "(%p)->(%p,0x%08x,0x%08x)\n", This, lpData, dwDataSize, dwFlags ); #if 0 /* This is what the documentation says... */

1 0

Michael Stefaniuc : dplayx: Remove the unused lock from IDirectPlaySPImpl.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 95fcb495032b9e3ab68a5b2ec1cd1f1ab2f953cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=95fcb495032b9e3ab68a5b2ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:57:16 2013 +0200 dplayx: Remove the unused lock from IDirectPlaySPImpl. --- dlls/dplayx/dplaysp.c | 43 +------------------------------------------ 1 files changed, 1 insertions(+), 42 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 03169e3..e8fea40 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -34,19 +34,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); /* Prototypes */ -static BOOL DPSP_CreateIUnknown( LPVOID lpSP ); -static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ); static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ); static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ); /* Predefine the interface */ typedef struct IDirectPlaySPImpl IDirectPlaySPImpl; -typedef struct tagDirectPlaySPIUnknownData -{ - CRITICAL_SECTION DPSP_lock; -} DirectPlaySPIUnknownData; - typedef struct tagDirectPlaySPData { LPVOID lpSpRemoteData; @@ -60,7 +53,6 @@ typedef struct tagDirectPlaySPData } DirectPlaySPData; #define DPSP_IMPL_FIELDS \ - DirectPlaySPIUnknownData* unk; \ DirectPlaySPData* sp; struct IDirectPlaySPImpl @@ -111,9 +103,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) } /* Initialize it */ - if( DPSP_CreateIUnknown( *ppvObj ) && - DPSP_CreateDirectPlaySP( *ppvObj, dp ) - ) + if( DPSP_CreateDirectPlaySP( *ppvObj, dp ) ) { IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); return S_OK; @@ -121,7 +111,6 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) /* Initialize failed, destroy it */ DPSP_DestroyDirectPlaySP( *ppvObj ); - DPSP_DestroyIUnknown( *ppvObj ); HeapFree( GetProcessHeap(), 0, *ppvObj ); *ppvObj = NULL; @@ -129,35 +118,6 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) return DPERR_NOMEMORY; } -static BOOL DPSP_CreateIUnknown( LPVOID lpSP ) -{ - IDirectPlaySPImpl *This = lpSP; - - This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); - - if ( This->unk == NULL ) - { - return FALSE; - } - - InitializeCriticalSection( &This->unk->DPSP_lock ); - This->unk->DPSP_lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlaySPImpl*->DirectPlaySPIUnknownData*->DPSP_lock"); - - return TRUE; -} - -static BOOL DPSP_DestroyIUnknown( LPVOID lpSP ) -{ - IDirectPlaySPImpl *This = lpSP; - - This->unk->DPSP_lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->unk->DPSP_lock ); - HeapFree( GetProcessHeap(), 0, This->unk ); - - return TRUE; -} - - static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ) { IDirectPlaySPImpl *This = lpSP; @@ -229,7 +189,6 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) if( !ref ) { DPSP_DestroyDirectPlaySP( This ); - DPSP_DestroyIUnknown( This ); HeapFree( GetProcessHeap(), 0, This ); }

1 0

Michael Stefaniuc : dplayx: Merge the extra struct into IDirectPlaySPImpl.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 11756086b4fef4d6769a315b93fd7cf0a1ee0333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11756086b4fef4d6769a315b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 4 23:59:07 2013 +0200 dplayx: Merge the extra struct into IDirectPlaySPImpl. --- dlls/dplayx/dplaysp.c | 122 ++++++++++++------------------------------------- 1 files changed, 30 insertions(+), 92 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index e8fea40..780834c 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -33,34 +33,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); -/* Prototypes */ -static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ); -static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ); - -/* Predefine the interface */ -typedef struct IDirectPlaySPImpl IDirectPlaySPImpl; - -typedef struct tagDirectPlaySPData -{ - LPVOID lpSpRemoteData; - DWORD dwSpRemoteDataSize; /* Size of data pointed to by lpSpRemoteData */ - - LPVOID lpSpLocalData; - DWORD dwSpLocalDataSize; /* Size of data pointed to by lpSpLocalData */ - - IDirectPlayImpl *dplay; /* FIXME: This should perhaps be iface not impl */ - -} DirectPlaySPData; - -#define DPSP_IMPL_FIELDS \ - DirectPlaySPData* sp; - -struct IDirectPlaySPImpl +typedef struct IDirectPlaySPImpl { const IDirectPlaySPVtbl *lpVtbl; LONG ref; - DPSP_IMPL_FIELDS -}; + void *remote_data; + DWORD remote_data_size; + void *local_data; + DWORD local_data_size; + IDirectPlayImpl *dplay; /* FIXME: This should perhaps be iface not impl */ +} IDirectPlaySPImpl; /* Forward declaration of virtual tables */ static const IDirectPlaySPVtbl directPlaySPVT; @@ -92,6 +74,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) { IDirectPlaySPImpl *This = *ppvObj; This->lpVtbl = &directPlaySPVT; + This->dplay = dp; } else { @@ -102,49 +85,8 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) return E_NOINTERFACE; } - /* Initialize it */ - if( DPSP_CreateDirectPlaySP( *ppvObj, dp ) ) - { - IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); - return S_OK; - } - - /* Initialize failed, destroy it */ - DPSP_DestroyDirectPlaySP( *ppvObj ); - - HeapFree( GetProcessHeap(), 0, *ppvObj ); - *ppvObj = NULL; - - return DPERR_NOMEMORY; -} - -static BOOL DPSP_CreateDirectPlaySP( void *lpSP, IDirectPlayImpl *dp ) -{ - IDirectPlaySPImpl *This = lpSP; - - This->sp = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->sp) ) ); - - if ( This->sp == NULL ) - { - return FALSE; - } - - This->sp->dplay = dp; - - return TRUE; -} - -static BOOL DPSP_DestroyDirectPlaySP( LPVOID lpSP ) -{ - IDirectPlaySPImpl *This = lpSP; - - HeapFree( GetProcessHeap(), 0, This->sp->lpSpRemoteData ); - HeapFree( GetProcessHeap(), 0, This->sp->lpSpLocalData ); - - /* FIXME: Need to delete player queue */ - - HeapFree( GetProcessHeap(), 0, This->sp ); - return TRUE; + IDirectPlaySP_AddRef( (LPDIRECTPLAYSP)*ppvObj ); + return S_OK; } static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) @@ -188,7 +130,8 @@ static ULONG WINAPI IDirectPlaySPImpl_Release( IDirectPlaySP *iface ) if( !ref ) { - DPSP_DestroyDirectPlaySP( This ); + HeapFree( GetProcessHeap(), 0, This->remote_data ); + HeapFree( GetProcessHeap(), 0, This->local_data ); HeapFree( GetProcessHeap(), 0, This ); } @@ -269,7 +212,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPPlayerData( IDirectPlaySP *iface, D TRACE( "(%p)->(0x%08x,%p,%p,0x%08x)\n", This, idPlayer, lplpData, lpdwDataSize, dwFlags ); - hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerData ); + hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerData ); if( FAILED(hr) ) { @@ -336,9 +279,8 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi data.dwMessageSize = 0; /* Pass this message to the dplay interface to handle */ - hr = DP_HandleMessage( This->sp->dplay, lpMessageBody, dwMessageBodySize, - lpMessageHeader, wCommandId, wVersion, - &data.lpMessage, &data.dwMessageSize ); + hr = DP_HandleMessage( This->dplay, lpMessageBody, dwMessageBodySize, lpMessageHeader, + wCommandId, wVersion, &data.lpMessage, &data.dwMessageSize ); if( FAILED(hr) ) { @@ -352,7 +294,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_HandleMessage( IDirectPlaySP *iface, voi data.idNameServer = 0; data.lpISP = iface; - hr = (This->sp->dplay->dp2->spData.lpCB->Reply)( &data ); + hr = This->dplay->dp2->spData.lpCB->Reply( &data ); if( FAILED(hr) ) { @@ -616,7 +558,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D TRACE( "(%p)->(0x%08x,%p,0x%08x,0x%08x)\n", This, idPlayer, lpData, dwDataSize, dwFlags ); - hr = DP_GetSPPlayerData( This->sp->dplay, idPlayer, (LPVOID*)&lpPlayerEntry ); + hr = DP_GetSPPlayerData( This->dplay, idPlayer, (void**)&lpPlayerEntry ); if( FAILED(hr) ) { /* Player must not exist */ @@ -637,7 +579,7 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPPlayerData( IDirectPlaySP *iface, D lpPlayerEntry->dwPlayerRemoteDataSize = dwDataSize; } - hr = DP_SetSPPlayerData( This->sp->dplay, idPlayer, lpPlayerEntry ); + hr = DP_SetSPPlayerData( This->dplay, idPlayer, lpPlayerEntry ); return hr; } @@ -684,23 +626,19 @@ static HRESULT WINAPI IDirectPlaySPImpl_GetSPData( IDirectPlaySP *iface, void ** /* Yes, we're supposed to return a pointer to the memory we have stored! */ if( dwFlags == DPSET_REMOTE ) { - *lpdwDataSize = This->sp->dwSpRemoteDataSize; - *lplpData = This->sp->lpSpRemoteData; + *lpdwDataSize = This->remote_data_size; + *lplpData = This->remote_data; - if( This->sp->lpSpRemoteData == NULL ) - { + if( !This->remote_data ) hr = DPERR_GENERIC; - } } else if( dwFlags == DPSET_LOCAL ) { - *lpdwDataSize = This->sp->dwSpLocalDataSize; - *lplpData = This->sp->lpSpLocalData; + *lpdwDataSize = This->local_data_size; + *lplpData = This->local_data; - if( This->sp->lpSpLocalData == NULL ) - { + if( !This->local_data ) hr = DPERR_GENERIC; - } } return hr; @@ -737,15 +675,15 @@ static HRESULT WINAPI IDirectPlaySPImpl_SetSPData( IDirectPlaySP *iface, void *l /* If we have data already allocated, free it and replace it */ if( dwFlags == DPSET_REMOTE ) { - HeapFree( GetProcessHeap(), 0, This->sp->lpSpRemoteData ); - This->sp->dwSpRemoteDataSize = dwDataSize; - This->sp->lpSpRemoteData = lpSpData; + HeapFree( GetProcessHeap(), 0, This->remote_data ); + This->remote_data_size = dwDataSize; + This->remote_data = lpSpData; } else if ( dwFlags == DPSET_LOCAL ) { - HeapFree( GetProcessHeap(), 0, This->sp->lpSpLocalData ); - This->sp->lpSpLocalData = lpSpData; - This->sp->dwSpLocalDataSize = dwDataSize; + HeapFree( GetProcessHeap(), 0, This->local_data ); + This->local_data = lpSpData; + This->local_data_size = dwDataSize; } return DP_OK;

1 0

Michael Stefaniuc : dplayx: Finish the COM cleanup for IDirectPlaySP.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: a3ba1b8ff0d986f755c9cb679fe3706dc1ac2f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ba1b8ff0d986f755c9cb679… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Sep 5 00:00:03 2013 +0200 dplayx: Finish the COM cleanup for IDirectPlaySP. --- dlls/dplayx/dplaysp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 780834c..e8269df 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct IDirectPlaySPImpl { - const IDirectPlaySPVtbl *lpVtbl; + IDirectPlaySP IDirectPlaySP_iface; LONG ref; void *remote_data; DWORD remote_data_size; @@ -73,7 +73,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) if( IsEqualGUID( &IID_IDirectPlaySP, riid ) ) { IDirectPlaySPImpl *This = *ppvObj; - This->lpVtbl = &directPlaySPVT; + This->IDirectPlaySP_iface.lpVtbl = &directPlaySPVT; This->dplay = dp; } else @@ -91,7 +91,7 @@ HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) static inline IDirectPlaySPImpl *impl_from_IDirectPlaySP( IDirectPlaySP *iface ) { - return CONTAINING_RECORD( iface, IDirectPlaySPImpl, lpVtbl ); + return CONTAINING_RECORD( iface, IDirectPlaySPImpl, IDirectPlaySP_iface ); } static HRESULT WINAPI IDirectPlaySPImpl_QueryInterface( IDirectPlaySP *iface, REFIID riid,

1 0