March 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Add missing checkGLcall's to buffer_Map().
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: ec10c1ed8d15297767de27af61e9e1dc7f9c608a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec10c1ed8d15297767de27af6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:16 2010 +0100 wined3d: Add missing checkGLcall's to buffer_Map(). --- dlls/wined3d/buffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 46131af..6fefe87 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1180,10 +1180,12 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, GLbitfield mapflags = buffer_gl_map_flags(flags); This->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, This->resource.size, mapflags)); + checkGLcall("glMapBufferRange"); } else { This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + checkGLcall("glMapBufferARB"); } LEAVE_GL();

1 0

Henri Verbeet : wined3d: Simplify the IWineD3DDeviceImpl_ClearSurface() surface loading code.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 509b038cf5b0c54d7a430d0848a34dcc19166880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509b038cf5b0c54d7a430d084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:18 2010 +0100 wined3d: Simplify the IWineD3DDeviceImpl_ClearSurface() surface loading code. --- dlls/wined3d/device.c | 78 ++++++++++++++++++++++-------------------------- 1 files changed, 36 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a0c2df..4df5399 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4305,15 +4305,42 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, return WINED3D_OK; } +static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const WINED3DVIEWPORT *viewport, + const RECT *scissor_rect, const WINED3DRECT *clear_rect) +{ + /* partial viewport*/ + if (viewport->X != 0 || viewport->Y != 0 + || viewport->Width < target->currentDesc.Width + || viewport->Height < target->currentDesc.Height) + return FALSE; + + /* partial scissor rect */ + if (scissor_rect && (scissor_rect->left > 0 || scissor_rect->top > 0 + || scissor_rect->right < target->currentDesc.Width + || scissor_rect->bottom < target->currentDesc.Height)) + return FALSE; + + /* partial clear rect */ + if (clear_rect && (clear_rect->x1 > 0 || clear_rect->y1 > 0 + || clear_rect->x2 < target->currentDesc.Width + || clear_rect->y2 < target->currentDesc.Height)) + return FALSE; + + return TRUE; +} + /* Not called from the VTable (internal subroutine) */ -HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, - CONST WINED3DRECT* pRects, DWORD Flags, WINED3DCOLOR Color, - float Z, DWORD Stencil) { +HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, + const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) +{ + IWineD3DStateBlockImpl *stateblock = This->stateBlock; + const RECT *scissor_rect = stateblock->renderState[WINED3DRS_SCISSORTESTENABLE] ? &stateblock->scissorRect : NULL; + const WINED3DRECT *clear_rect = (Count > 0 && pRects) ? pRects : NULL; + const WINED3DVIEWPORT *vp = &stateblock->viewport; GLbitfield glMask = 0; unsigned int i; WINED3DRECT curRect; RECT vp_rect; - const WINED3DVIEWPORT *vp = &This->stateBlock->viewport; UINT drawable_width, drawable_height; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; struct wined3d_context *context; @@ -4327,29 +4354,10 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa * the drawable up to date. We have to check all settings that limit the clear area though. Do not bother * checking all this if the dest surface is in the drawable anyway. */ - if((Flags & WINED3DCLEAR_TARGET) && !(target->Flags & SFLAG_INDRAWABLE)) { - while(1) { - if(vp->X != 0 || vp->Y != 0 || - vp->Width < target->currentDesc.Width || vp->Height < target->currentDesc.Height) { - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - break; - } - if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE] && ( - This->stateBlock->scissorRect.left > 0 || This->stateBlock->scissorRect.top > 0 || - This->stateBlock->scissorRect.right < target->currentDesc.Width || - This->stateBlock->scissorRect.bottom < target->currentDesc.Height)) { - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - break; - } - if(Count > 0 && pRects && ( - pRects[0].x1 > 0 || pRects[0].y1 > 0 || - pRects[0].x2 < target->currentDesc.Width || - pRects[0].y2 < target->currentDesc.Height)) { - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - break; - } - break; - } + if (Flags & WINED3DCLEAR_TARGET && !(target->Flags & SFLAG_INDRAWABLE)) + { + if (!is_full_clear(target, vp, scissor_rect, clear_rect)) + IWineD3DSurface_LoadLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, NULL); } context = context_acquire(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); @@ -4374,22 +4382,8 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa glMask = glMask | GL_DEPTH_BUFFER_BIT; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); - if (vp->X != 0 || vp->Y != 0 || - vp->Width < depth_stencil->currentDesc.Width || vp->Height < depth_stencil->currentDesc.Height) { - surface_load_ds_location(This->stencilBufferTarget, context, location); - } - else if (This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE] && ( - This->stateBlock->scissorRect.left > 0 || This->stateBlock->scissorRect.top > 0 || - This->stateBlock->scissorRect.right < depth_stencil->currentDesc.Width || - This->stateBlock->scissorRect.bottom < depth_stencil->currentDesc.Height)) { + if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) surface_load_ds_location(This->stencilBufferTarget, context, location); - } - else if (Count > 0 && pRects && ( - pRects[0].x1 > 0 || pRects[0].y1 > 0 || - pRects[0].x2 < depth_stencil->currentDesc.Width || - pRects[0].y2 < depth_stencil->currentDesc.Height)) { - surface_load_ds_location(This->stencilBufferTarget, context, location); - } } if (Flags & WINED3DCLEAR_TARGET) {

1 0

Henri Verbeet : wined3d: Don' t change the draw buffer in IWineD3DDeviceImpl_SetFrontBackBuffers().
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: e9dbd5bff85488417ea3e4f2d40f37efc1759e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9dbd5bff85488417ea3e4f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:19 2010 +0100 wined3d: Don't change the draw buffer in IWineD3DDeviceImpl_SetFrontBackBuffers(). This should be handled by the context's draw buffer management. --- dlls/wined3d/device.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4df5399..3d4a48b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5743,28 +5743,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa if(Swapchain->backBuffer[0] != Back) { TRACE("Changing the back buffer from %p to %p\n", Swapchain->backBuffer, Back); - /* What to do about the context here in the case of multithreading? Not sure. - * This function is called by IDirect3D7::CreateDevice so in theory its initialization code - */ - WARN("No active context?\n"); - - ENTER_GL(); - if(!Swapchain->backBuffer[0]) { - /* GL was told to draw to the front buffer at creation, - * undo that - */ - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - /* Set the backbuffer count to 1 because other code uses it to fing the back buffers */ - Swapchain->presentParms.BackBufferCount = 1; - } else if (!Back) { - /* That makes problems - disable for now */ - /* glDrawBuffer(GL_FRONT); */ - checkGLcall("glDrawBuffer(GL_FRONT)"); - /* We have lost our back buffer, set this to 0 to avoid confusing other code */ - Swapchain->presentParms.BackBufferCount = 0; - } - LEAVE_GL(); + /* Update the backbuffer count. */ + if (!Swapchain->backBuffer[0]) Swapchain->presentParms.BackBufferCount = 1; + else if (!Back) Swapchain->presentParms.BackBufferCount = 0; if(Swapchain->backBuffer[0]) {

1 0

Alexandre Julliard : makefiles: Add more shell functions to generate the main makefile.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 50231941ee7aeaed146bfda44b169dfcb74d7f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50231941ee7aeaed146bfda44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 16 22:00:02 2010 +0100 makefiles: Add more shell functions to generate the main makefile. --- Makefile.in | 8 - aclocal.m4 | 86 +++-- configure | 1335 ++++++++++++++++++++--------------------------------------- 3 files changed, 516 insertions(+), 913 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50231941ee7aeaed146bf…

1 0

Henri Verbeet : wined3d: Don' t use filtering on textures that need complex fixups in swapchain_blit().
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 60e98cc3ad463d3451becb1033c97cb19445a6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e98cc3ad463d3451becb103… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:14 2010 +0100 wined3d: Don't use filtering on textures that need complex fixups in swapchain_blit(). For example, interpolating palette indices doesn't have the desired result. Should we really want filtering for these cases we could implement it inside the relevant shaders, after the fixup, but I doubt it's worth the effort. --- dlls/wined3d/swapchain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c99b1c9..df1638f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -152,6 +152,9 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * tex_bottom /= src_h; } + if (is_complex_fixup(backbuffer->resource.format_desc->color_fixup)) + gl_filter = GL_NEAREST; + ENTER_GL(); context_bind_fbo(context2, GL_DRAW_FRAMEBUFFER, NULL);

1 0

Henri Verbeet : wined3d: Use "gl_filter" in the non-FBO path of swapchain_blit() as well.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: c48adfe20177fc0745d2df6307d7ea010772bc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48adfe20177fc0745d2df630… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:13 2010 +0100 wined3d: Use "gl_filter" in the non-FBO path of swapchain_blit() as well. --- dlls/wined3d/swapchain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 79c2bd8..c99b1c9 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -161,8 +161,8 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * device->blitter->set_shader((IWineD3DDevice *) device, backbuffer->resource.format_desc, backbuffer->texture_target, backbuffer->pow2Width, backbuffer->pow2Height); - glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); + glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); context_set_draw_buffer(context, GL_BACK);

1 0

Henri Verbeet : wined3d: Simplify context_apply_attachment_filter_states() flow a bit.
by Alexandre Julliard March 17, 2010

March 17, 2010

Module: wine Branch: master Commit: 2b86950c3b8ea908cb02ded037b491cf21fa517b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b86950c3b8ea908cb02ded03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:17 2010 +0100 wined3d: Simplify context_apply_attachment_filter_states() flow a bit. --- dlls/wined3d/context.c | 57 ++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4d28cd4..6fd877c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -116,15 +116,16 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) /* GL locking is done by the caller */ static void context_apply_attachment_filter_states(IWineD3DSurface *surface) { - const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; - IWineD3DDeviceImpl *device = surface_impl->resource.device; IWineD3DBaseTextureImpl *texture_impl; - BOOL update_minfilter = FALSE; - BOOL update_magfilter = FALSE; /* Update base texture states array */ if (SUCCEEDED(IWineD3DSurface_GetContainer(surface, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { + IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; + IWineD3DDeviceImpl *device = surface_impl->resource.device; + BOOL update_minfilter = FALSE; + BOOL update_magfilter = FALSE; + if (texture_impl->baseTexture.texture_rgb.states[WINED3DTEXSTA_MINFILTER] != WINED3DTEXF_POINT || texture_impl->baseTexture.texture_rgb.states[WINED3DTEXSTA_MIPFILTER] != WINED3DTEXF_NONE) { @@ -146,33 +147,37 @@ static void context_apply_attachment_filter_states(IWineD3DSurface *surface) } IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); - } - - if (update_minfilter || update_magfilter) - { - GLenum target, bind_target; - GLint old_binding; - target = surface_impl->texture_target; - if (target == GL_TEXTURE_2D) + if (update_minfilter || update_magfilter) { - bind_target = GL_TEXTURE_2D; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - } else if (target == GL_TEXTURE_RECTANGLE_ARB) { - bind_target = GL_TEXTURE_RECTANGLE_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); - } else { - bind_target = GL_TEXTURE_CUBE_MAP_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + GLenum target, bind_target; + GLint old_binding; + + target = surface_impl->texture_target; + if (target == GL_TEXTURE_2D) + { + bind_target = GL_TEXTURE_2D; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); + } + else if (target == GL_TEXTURE_RECTANGLE_ARB) + { + bind_target = GL_TEXTURE_RECTANGLE_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); + } + else + { + bind_target = GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + } + + glBindTexture(bind_target, surface_impl->texture_name); + if (update_minfilter) glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + if (update_magfilter) glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glBindTexture(bind_target, old_binding); } - glBindTexture(bind_target, surface_impl->texture_name); - if (update_minfilter) glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - if (update_magfilter) glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glBindTexture(bind_target, old_binding); + checkGLcall("apply_attachment_filter_states()"); } - - checkGLcall("apply_attachment_filter_states()"); } /* GL locking is done by the caller */

1 0

Paul Vriens : gdiplus/tests: Fix a test failure on Win98/WinMe.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 0513eb506efdc89e26ef18e6564275a5d82e3a8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0513eb506efdc89e26ef18e65… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 11:00:59 2010 +0100 gdiplus/tests: Fix a test failure on Win98/WinMe. --- dlls/gdiplus/tests/graphics.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b2dc9b2..9dffd52 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2415,7 +2415,10 @@ static void test_GdipGetNearestColor(void) expect(Ok, status); status = GdipGetNearestColor(graphics, &color); expect(Ok, status); - todo_wine expect(0xffa8b8e8, color); + todo_wine + ok(color == 0xffa8b8e8 || + broken(color == 0xffa0b8e0), /* Win98/WinMe */ + "Expected ffa8b8e8, got %.8x\n", color); GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap);

1 0

Nikolay Sivov : ole32: Turn FIXME to TRACE for CoGetTreatAsClass.
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 825a63569233abf991e9fd90bbb5e0cf081d9c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825a63569233abf991e9fd90b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 22:51:56 2010 +0300 ole32: Turn FIXME to TRACE for CoGetTreatAsClass. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 583a9cb..12f8314 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2956,7 +2956,7 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) HRESULT res = S_OK; LONG len = sizeof(szClsidNew); - FIXME("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); + TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey);

1 0

David Hedberg : shell32: SHCreatePropSheetExtArrayEx should check if the key itself contains the clsid of the shell extension .
by Alexandre Julliard March 16, 2010

March 16, 2010

Module: wine Branch: master Commit: 50c7cf5111d581f12d7f34116bd0d7f6ec819531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c7cf5111d581f12d7f34116… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Tue Mar 16 01:32:45 2010 +0100 shell32: SHCreatePropSheetExtArrayEx should check if the key itself contains the clsid of the shell extension. --- dlls/shell32/shellord.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 940633e..9e6425c 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1807,34 +1807,40 @@ HPSXA WINAPI SHCreatePropSheetExtArrayEx(HKEY hKey, LPCWSTR pszSubKey, UINT max_ break; } - dwClsidSize = sizeof(szClsidHandler); - if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) + /* The CLSID is stored either in the key itself or in its default value. */ + if (!SUCCEEDED(lRet = SHCLSIDFromStringW(szHandler, &clsid))) { - /* Force a NULL-termination and convert the string */ - szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; - if (SUCCEEDED(SHCLSIDFromStringW(szClsidHandler, &clsid))) + dwClsidSize = sizeof(szClsidHandler); + if (SHGetValueW(hkPropSheetHandlers, szHandler, NULL, NULL, szClsidHandler, &dwClsidSize) == ERROR_SUCCESS) { - /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. - Only if both interfaces are supported it's a real shell extension. - Then call IShellExtInit's Initialize method. */ - if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + /* Force a NULL-termination and convert the string */ + szClsidHandler[(sizeof(szClsidHandler) / sizeof(szClsidHandler[0])) - 1] = 0; + lRet = SHCLSIDFromStringW(szClsidHandler, &clsid); + } + } + + if (SUCCEEDED(lRet)) + { + /* Attempt to get an IShellPropSheetExt and an IShellExtInit instance. + Only if both interfaces are supported it's a real shell extension. + Then call IShellExtInit's Initialize method. */ + if (SUCCEEDED(CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER/* | CLSCTX_NO_CODE_DOWNLOAD */, &IID_IShellPropSheetExt, (LPVOID *)&pspsx))) + { + if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) { - if (SUCCEEDED(pspsx->lpVtbl->QueryInterface(pspsx, &IID_IShellExtInit, (PVOID *)&psxi))) + if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) { - if (SUCCEEDED(psxi->lpVtbl->Initialize(psxi, NULL, pDataObj, hKey))) - { - /* Add the IShellPropSheetExt instance to the array */ - psxa->pspsx[psxa->uiCount++] = pspsx; - } - else - { - psxi->lpVtbl->Release(psxi); - pspsx->lpVtbl->Release(pspsx); - } + /* Add the IShellPropSheetExt instance to the array */ + psxa->pspsx[psxa->uiCount++] = pspsx; } else + { + psxi->lpVtbl->Release(psxi); pspsx->lpVtbl->Release(pspsx); + } } + else + pspsx->lpVtbl->Release(pspsx); } }

1 0