April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winex11: Separate the XIM process-wide setup from the IME creation.
by Alexandre Julliard 11 Apr '08

11 Apr '08

Module: wine Branch: master Commit: 5c30e9ae00d4666b1ae0666d97275179b9f4fd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c30e9ae00d4666b1ae0666d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 12:29:01 2008 +0200 winex11: Separate the XIM process-wide setup from the IME creation. --- dlls/winex11.drv/x11drv.h | 3 +- dlls/winex11.drv/x11drv_main.c | 7 +++-- dlls/winex11.drv/xim.c | 46 +++++++++++++++++++++++++-------------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 20dd91c..d6b2b20 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -274,8 +274,9 @@ extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev); extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap); /* XIM support */ +extern BOOL X11DRV_InitXIM( const char *input_style ); extern XIC X11DRV_CreateIC(XIM xim, Display *display, Window win); -extern XIM X11DRV_SetupXIM(Display *display, const char *input_style); +extern XIM X11DRV_SetupXIM(Display *display); extern void X11DRV_XIMLookupChars( const char *str, DWORD count ); extern void X11DRV_ForceXIMReset(HWND hwnd); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index b8f0b45..1c221bc 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -538,6 +538,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); X11DRV_InitClipboard(); + if (use_xim) use_xim = X11DRV_InitXIM( input_style ); return TRUE; } @@ -649,12 +650,12 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (TRACE_ON(synchronous)) XSynchronize( data->display, True ); wine_tsx11_unlock(); - if (use_xim && !(data->xim = X11DRV_SetupXIM( data->display, input_style ))) - WARN("Input Method is not available\n"); - set_queue_display_fd( data->display ); TlsSetValue( thread_data_tls_index, data ); + + if (use_xim) data->xim = X11DRV_SetupXIM( data->display ); X11DRV_SetCursor( NULL ); + return data; } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 4505ecd..f389db7 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -37,9 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); BOOL ximInComposeMode=FALSE; -static XIMStyle ximStyle = 0; -static XIMStyle ximStyleRoot = 0; - /* moved here from imm32 for dll separation */ static DWORD dwCompStringLength = 0; static LPBYTE CompositionString = NULL; @@ -56,6 +53,10 @@ static DWORD dwPreeditPos = 0; /* inorder to enable deadkey support */ #define STYLE_NONE (XIMPreeditNothing | XIMStatusNothing) +static XIMStyle ximStyle = 0; +static XIMStyle ximStyleRoot = 0; +static XIMStyle ximStyleRequest = STYLE_CALLBACK; + static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset, DWORD selLength, LPWSTR lpComp, DWORD dwCompLen) { @@ -327,16 +328,13 @@ void X11DRV_ForceXIMReset(HWND hwnd) } /*********************************************************************** -* X11DRV Ime creation -*/ -XIM X11DRV_SetupXIM(Display *display, const char *input_style) + * X11DRV_InitXIM + * + * Process-wide XIM initialization. + */ +BOOL X11DRV_InitXIM( const char *input_style ) { - XIMStyle ximStyleRequest, ximStyleCallback, ximStyleNone; - XIMStyles *ximStyles = NULL; - INT i; - XIM xim; - - ximStyleRequest = STYLE_CALLBACK; + BOOL ret; if (!strcasecmp(input_style, "offthespot")) ximStyleRequest = STYLE_OFFTHESPOT; @@ -346,17 +344,31 @@ XIM X11DRV_SetupXIM(Display *display, const char *input_style) ximStyleRequest = STYLE_ROOT; wine_tsx11_lock(); - - if(!XSupportsLocale()) + if (!(ret = XSupportsLocale())) { WARN("X does not support locale.\n"); - goto err; } - if(XSetLocaleModifiers("") == NULL) + else if (XSetLocaleModifiers("") == NULL) { WARN("Could not set locale modifiers.\n"); - goto err; + ret = FALSE; } + wine_tsx11_unlock(); + return ret; +} + + +/*********************************************************************** +* X11DRV Ime creation +*/ +XIM X11DRV_SetupXIM( Display *display ) +{ + XIMStyle ximStyleCallback, ximStyleNone; + XIMStyles *ximStyles = NULL; + INT i; + XIM xim; + + wine_tsx11_lock(); xim = XOpenIM(display, NULL, NULL, NULL); if (xim == NULL)

1 0

Maarten Lankhorst : quartz: Add stubs for the IMediaSeeking interface in SeekingPassThru.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: bd324db0597b450cff8b4bc87d20d852319d2196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd324db0597b450cff8b4bc87… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 16:34:23 2008 -0700 quartz: Add stubs for the IMediaSeeking interface in SeekingPassThru. --- dlls/quartz/control.c | 420 ++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 330 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd324db0597b450cff8b4…

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesOutputChannel.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 139da784bf1bae0fa19184a3a46be1449efbee1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=139da784bf1bae0fa19184a3a… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 13:25:14 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesOutputChannel. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 11 +++++++++++ include/Makefile.in | 1 + include/gdiplus.h | 2 ++ include/gdipluscolor.h | 37 +++++++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b9d4c59..236714c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -526,7 +526,7 @@ @ stdcall GdipSetImageAttributesColorMatrix(ptr long long ptr ptr long) @ stdcall GdipSetImageAttributesGamma(ptr long long long) @ stdcall GdipSetImageAttributesNoOp(ptr long long) -@ stub GdipSetImageAttributesOutputChannel +@ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) @ stub GdipSetImageAttributesOutputChannelColorProfile @ stub GdipSetImageAttributesRemapTable @ stub GdipSetImageAttributesThreshold diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 5562c91..61cf012 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -123,3 +123,14 @@ GpStatus WINGDIPAPI GdipSetImageAttributesNoOp(GpImageAttributes *imageAttr, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, ColorChannelFlags channelFlags) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/Makefile.in b/include/Makefile.in index efcd92c..11ee8b6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -195,6 +195,7 @@ SRCDIR_INCLUDES = \ fci.h \ fdi.h \ gdiplus.h \ + gdipluscolor.h \ gdipluscolormatrix.h \ gdiplusenums.h \ gdiplusflat.h \ diff --git a/include/gdiplus.h b/include/gdiplus.h index 9e72f52..c8385db 100644 --- a/include/gdiplus.h +++ b/include/gdiplus.h @@ -34,6 +34,7 @@ namespace Gdiplus #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" @@ -53,6 +54,7 @@ namespace Gdiplus #include "gdipluspixelformats.h" #include "gdiplusmetaheader.h" #include "gdiplusimaging.h" +#include "gdipluscolor.h" #include "gdipluscolormatrix.h" #include "gdiplusgpstubs.h" diff --git a/include/gdipluscolor.h b/include/gdipluscolor.h new file mode 100644 index 0000000..5c8e53f --- /dev/null +++ b/include/gdipluscolor.h @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2808 Google (Lei Zhang) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _GDIPLUSCOLOR_H +#define _GDIPLUSCOLOR_H + +enum ColorChannelFlags +{ + ColorChannelFlagsC, + ColorChannelFlagsM, + ColorChannelFlagsY, + ColorChannelFlagsK, + ColorChannelFlagsLast +}; + +#ifndef __cplusplus + +typedef enum ColorChannelFlags ColorChannelFlags; + +#endif /* end of c typedefs */ + +#endif /* _GDIPLUSCOLOR_H */

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetImageAttributesOutputChannelColorProfile.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 5ba99f4eb556b4d0b3518d91404460e8b7e05e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba99f4eb556b4d0b3518d914… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 13:26:48 2008 -0700 gdiplus: Add a stub for GdipSetImageAttributesOutputChannelColorProfile. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/imageattributes.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 236714c..8157f4f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -527,7 +527,7 @@ @ stdcall GdipSetImageAttributesGamma(ptr long long long) @ stdcall GdipSetImageAttributesNoOp(ptr long long) @ stdcall GdipSetImageAttributesOutputChannel(ptr long long long) -@ stub GdipSetImageAttributesOutputChannelColorProfile +@ stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) @ stub GdipSetImageAttributesRemapTable @ stub GdipSetImageAttributesThreshold @ stub GdipSetImageAttributesToIdentity diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 61cf012..b74fc66 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -134,3 +134,15 @@ GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannel(GpImageAttributes *image return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetImageAttributesOutputChannelColorProfile(GpImageAttributes *imageAttr, + ColorAdjustType type, BOOL enableFlag, + GDIPCONST WCHAR *colorProfileFilename) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Jacek Caban : jscript: Added IObjectSafety tests.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: b9117b6166de3c8f27483ace5225f5c63975f85e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9117b6166de3c8f27483ace5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 10 10:37:17 2008 +0200 jscript: Added IObjectSafety tests. --- dlls/jscript/tests/Makefile.in | 1 + dlls/jscript/tests/jscript.c | 64 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/Makefile.in b/dlls/jscript/tests/Makefile.in index 2201a4a..d707ed5 100644 --- a/dlls/jscript/tests/Makefile.in +++ b/dlls/jscript/tests/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = jscript.dll IMPORTS = ole32 kernel32 +EXTRALIBS = -luuid CTESTS = \ jscript.c diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index a811ef2..2fec01c 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -18,16 +18,74 @@ #define COBJMACROS -#include <initguid.h> - #include <ole2.h> #include <activscp.h> +#include <objsafe.h> #include "wine/test.h" static const CLSID CLSID_JScript = {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}}; +static void test_safety(IUnknown *unk) +{ + IObjectSafety *safety; + DWORD supported, enabled; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IObjectSafety, (void**)&safety); + ok(hres == S_OK, "Could not get IObjectSafety: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_NULL, &supported, NULL); + ok(hres == E_POINTER, "GetInterfaceSafetyOptions failed: %08x, expected E_POINTER\n", hres); + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_NULL, NULL, &enabled); + ok(hres == E_POINTER, "GetInterfaceSafetyOptions failed: %08x, expected E_POINTER\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_NULL, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScript, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == INTERFACE_USES_DISPEX, "enabled=%x\n", enabled); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER + |INTERFACESAFE_FOR_UNTRUSTED_CALLER, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); + ok(hres == E_FAIL, "SetInterfaceSafetyOptions failed: %08x\n, expected E_FAIL", hres); + + hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER, + INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); + ok(hres == S_OK, "SetInterfaceSafetyOptions failed: %08x\n", hres); + + supported = enabled = 0xdeadbeef; + hres = IObjectSafety_GetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, &supported, &enabled); + ok(hres == S_OK, "GetInterfaceSafetyOptions failed: %08x\n", hres); + ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "supported=%x\n", supported); + ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER), + "enabled=%x\n", enabled); + + IObjectSafety_Release(safety); +} + static void test_jscript(void) { IActiveScriptParse *parse; @@ -47,6 +105,8 @@ static void test_jscript(void) hres = IUnknown_QueryInterface(unk, &IID_IActiveScriptParse, (void**)&parse); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + test_safety(unk); + IActiveScriptParse_Release(parse); IActiveScript_Release(script); IUnknown_Release(unk);

1 0

Jacek Caban : include: Added ICanHandleException interface.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: ea215f790dd151fdf5b13000c37c53ff183a588f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea215f790dd151fdf5b13000c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 10 10:37:54 2008 +0200 include: Added ICanHandleException interface. --- include/dispex.idl | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/include/dispex.idl b/include/dispex.idl index 5891f08..b44448e 100644 --- a/include/dispex.idl +++ b/include/dispex.idl @@ -176,3 +176,15 @@ interface IObjectIdentity : IUnknown HRESULT IsEqualObject( [in] IUnknown *punk); } + +[ + object, + uuid(c5598e60-b307-11d1-b27d-006008c3fbfb), + pointer_default(unique) +] +interface ICanHandleException : IUnknown +{ + HRESULT CanHandleException( + [in] EXCEPINFO *pExcepInfo, + [in] VARIANT *pvar); +}

1 0

Jacek Caban : mshtml.idl: Added DispHTMLWindow2 dispinterface.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 2f9b7741ca97798baf3d416553bfbb2c3926f450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9b7741ca97798baf3d41655… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 10 10:37:39 2008 +0200 mshtml.idl: Added DispHTMLWindow2 dispinterface. --- include/mshtmdid.h | 36 +++++ include/mshtml.idl | 392 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 428 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f9b7741ca97798baf3d4…

1 0

Jacek Caban : mshtml: Correctly handle NULL req in get_nscontainer_from_load_group.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 732682b08cf3b64267045cf0ab051fb84af43aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=732682b08cf3b64267045cf0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 10 10:38:05 2008 +0200 mshtml: Correctly handle NULL req in get_nscontainer_from_load_group. --- dlls/mshtml/nsio.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 0331882..53ad33e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -656,6 +656,9 @@ static NSContainer *get_nscontainer_from_load_group(nsChannel *This) return NULL; } + if(!req) + return NULL; + nsres = nsIRequest_QueryInterface(req, &IID_nsIChannel, (void**)&channel); nsIRequest_Release(req); if(NS_FAILED(nsres)) {

1 0

Maarten Lankhorst : quartz: Add a stub for SeekingPassThru.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 65e6bbd1861d403c364800c8aea29456c55680d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e6bbd1861d403c364800c8a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 9 13:12:55 2008 -0700 quartz: Add a stub for SeekingPassThru. --- dlls/quartz/control.c | 170 ++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/main.c | 1 + dlls/quartz/quartz_private.h | 1 + 3 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index f6851bb..4d30716 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -29,6 +29,176 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); +typedef struct PassThruImpl { + const ISeekingPassThruVtbl *IPassThru_vtbl; + const IUnknownVtbl * IInner_vtbl; + + LONG ref; + IUnknown * pUnkOuter; + BOOL bUnkOuterValid; + BOOL bAggregatable; +} PassThruImpl; + +static HRESULT WINAPI SeekInner_QueryInterface(IUnknown * iface, + REFIID riid, + LPVOID *ppvObj) { + ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); + TRACE("(%p)->(%s (%p), %p)\n", This, debugstr_guid(riid), riid, ppvObj); + + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + + if (IsEqualGUID(&IID_IUnknown, riid)) + { + *ppvObj = &(This->IInner_vtbl); + TRACE(" returning IUnknown interface (%p)\n", *ppvObj); + } else if (IsEqualGUID(&IID_ISeekingPassThru, riid)) { + *ppvObj = &(This->IPassThru_vtbl); + TRACE(" returning IMediaSeeking interface (%p)\n", *ppvObj); + } else { + *ppvObj = NULL; + FIXME("unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)(*ppvObj)); + return S_OK; +} + +static ULONG WINAPI SeekInner_AddRef(IUnknown * iface) { + ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %d\n", This, ref); + + return ref; +} + +static ULONG WINAPI SeekInner_Release(IUnknown * iface) { + ICOM_THIS_MULTI(PassThruImpl, IInner_vtbl, iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %d\n", This, ref); + + if (ref == 0) + { + CoTaskMemFree(This); + } + return ref; +} + +static const IUnknownVtbl IInner_VTable = +{ + SeekInner_QueryInterface, + SeekInner_AddRef, + SeekInner_Release +}; + +/* Generic functions for aggegration */ +static HRESULT WINAPI SeekOuter_QueryInterface(PassThruImpl *This, REFIID riid, LPVOID *ppv) +{ + if (This->bAggregatable) + This->bUnkOuterValid = TRUE; + + if (This->pUnkOuter) + { + if (This->bAggregatable) + return IUnknown_QueryInterface(This->pUnkOuter, riid, ppv); + + if (IsEqualIID(riid, &IID_IUnknown)) + { + HRESULT hr; + + IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); + hr = IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); + IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); + This->bAggregatable = TRUE; + return hr; + } + + *ppv = NULL; + return E_NOINTERFACE; + } + + return IUnknown_QueryInterface((IUnknown *)&(This->IInner_vtbl), riid, ppv); +} + +static ULONG WINAPI SeekOuter_AddRef(PassThruImpl *This) +{ + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_AddRef(This->pUnkOuter); + return IUnknown_AddRef((IUnknown *)&(This->IInner_vtbl)); +} + +static ULONG WINAPI SeekOuter_Release(PassThruImpl *This) +{ + if (This->pUnkOuter && This->bUnkOuterValid) + return IUnknown_Release(This->pUnkOuter); + return IUnknown_Release((IUnknown *)&(This->IInner_vtbl)); +} + +static HRESULT WINAPI SeekingPassThru_QueryInterface(ISeekingPassThru *iface, REFIID riid, LPVOID *ppvObj) +{ + ICOM_THIS_MULTI(PassThruImpl, IPassThru_vtbl, iface); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + + return SeekOuter_QueryInterface(This, riid, ppvObj); +} + +static ULONG WINAPI SeekingPassThru_AddRef(ISeekingPassThru *iface) +{ + ICOM_THIS_MULTI(PassThruImpl, IPassThru_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return SeekOuter_AddRef(This); +} + +static ULONG WINAPI SeekingPassThru_Release(ISeekingPassThru *iface) +{ + ICOM_THIS_MULTI(PassThruImpl, IPassThru_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + return SeekOuter_Release(This); +} + +static HRESULT WINAPI SeekingPassThru_Init(ISeekingPassThru *iface, BOOL renderer, IPin *pin) +{ + ICOM_THIS_MULTI(PassThruImpl, IPassThru_vtbl, iface); + + FIXME("(%p/%p)->(%d, %p) stub\n", This, iface, renderer, pin); + + return S_OK; +} + +static const ISeekingPassThruVtbl ISeekingPassThru_Vtbl = +{ + SeekingPassThru_QueryInterface, + SeekingPassThru_AddRef, + SeekingPassThru_Release, + SeekingPassThru_Init +}; + +HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + PassThruImpl *fimpl; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + *ppObj = fimpl = CoTaskMemAlloc(sizeof(*fimpl)); + if (!fimpl) + return E_OUTOFMEMORY; + + fimpl->pUnkOuter = pUnkOuter; + fimpl->bUnkOuterValid = FALSE; + fimpl->bAggregatable = FALSE; + fimpl->IInner_vtbl = &IInner_VTable; + fimpl->IPassThru_vtbl = &ISeekingPassThru_Vtbl; + fimpl->ref = 1; + return S_OK; +} typedef HRESULT (*SeekFunc)( IMediaSeeking *to, LPVOID arg ); diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index fa08d73..24fb1bf 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -60,6 +60,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { + { &CLSID_SeekingPassThru, SeekingPassThru_create }, { &CLSID_FilterGraph, FilterGraph_create }, { &CLSID_FilterGraphNoThread, FilterGraphNoThread_create }, { &CLSID_FilterMapper, FilterMapper_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 528b59b..9f92ad6 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -57,6 +57,7 @@ HRESULT VideoRendererDefault_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv); +HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT EnumMonikerImpl_Create(IMoniker ** ppMoniker, ULONG nMonikerCount, IEnumMoniker ** ppEnum);

1 0

Lei Zhang : gdiplus: Add a stub for GdipSetCustomLineCapStrokeJoin.
by Alexandre Julliard 10 Apr '08

10 Apr '08

Module: wine Branch: master Commit: 1131685a94ea1e23784af7b9e5854c56df369470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1131685a94ea1e23784af7b9e… Author: Lei Zhang <thestig(a)google.com> Date: Wed Apr 9 12:49:02 2008 -0700 gdiplus: Add a stub for GdipSetCustomLineCapStrokeJoin. --- dlls/gdiplus/customlinecap.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 544f856..ce44243 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -162,3 +162,14 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, return NotImplemented; } + +GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap* custom, + GpLineJoin join) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 598c663..f191aeb 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -517,7 +517,7 @@ @ stdcall GdipSetCustomLineCapBaseCap(ptr long) @ stdcall GdipSetCustomLineCapBaseInset(ptr long) @ stdcall GdipSetCustomLineCapStrokeCaps(ptr long long) -@ stub GdipSetCustomLineCapStrokeJoin +@ stdcall GdipSetCustomLineCapStrokeJoin(ptr long) @ stub GdipSetCustomLineCapWidthScale @ stub GdipSetEffectParameters @ stub GdipSetEmpty

1 0