December 2010 - Wine-commits

Michael Stefaniuc : mshtml: COM cleanup for the IOleDocument iface.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 041c6ec3627bfd4100f9d8d2884b1ae4f07eafc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=041c6ec3627bfd4100f9d8d28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:17:39 2010 +0100 mshtml: COM cleanup for the IOleDocument iface. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 3 +-- dlls/mshtml/oleobj.c | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0c0fb0a..c0aef86 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1746,7 +1746,7 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IOleObject_iface; }else if(IsEqualGUID(&IID_IOleDocument, riid)) { TRACE("(%p)->(IID_IOleDocument, %p)\n", This, ppv); - *ppv = OLEDOC(This); + *ppv = &This->IOleDocument_iface; }else if(IsEqualGUID(&IID_IOleDocumentView, riid)) { TRACE("(%p)->(IID_IOleDocumentView, %p)\n", This, ppv); *ppv = DOCVIEW(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 381939e..fa92722 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -352,7 +352,7 @@ struct HTMLDocument { IPersistHistory IPersistHistory_iface; IMonikerProp IMonikerProp_iface; IOleObject IOleObject_iface; - const IOleDocumentVtbl *lpOleDocumentVtbl; + IOleDocument IOleDocument_iface; const IOleDocumentViewVtbl *lpOleDocumentViewVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; const IViewObjectExVtbl *lpViewObjectExVtbl; @@ -626,7 +626,6 @@ struct HTMLDocumentNode { #define HTMLWINDOW3(x) ((IHTMLWindow3*) &(x)->lpHTMLWindow3Vtbl) #define HTMLWINDOW4(x) ((IHTMLWindow4*) &(x)->lpHTMLWindow4Vtbl) -#define OLEDOC(x) ((IOleDocument*) &(x)->lpOleDocumentVtbl) #define DOCVIEW(x) ((IOleDocumentView*) &(x)->lpOleDocumentViewVtbl) #define OLEWIN(x) ((IOleWindow*) &(x)->lpOleInPlaceActiveObjectVtbl) #define ACTOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 2dafbf8..7d63f5d 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -490,30 +490,33 @@ static const IOleObjectVtbl OleObjectVtbl = { * IOleDocument implementation */ -#define OLEDOC_THIS(iface) DEFINE_THIS(HTMLDocument, OleDocument, iface) +static inline HTMLDocument *impl_from_IOleDocument(IOleDocument *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IOleDocument_iface); +} static HRESULT WINAPI OleDocument_QueryInterface(IOleDocument *iface, REFIID riid, void **ppv) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); return htmldoc_query_interface(This, riid, ppv); } static ULONG WINAPI OleDocument_AddRef(IOleDocument *iface) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); return htmldoc_addref(This); } static ULONG WINAPI OleDocument_Release(IOleDocument *iface) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); return htmldoc_release(This); } static HRESULT WINAPI OleDocument_CreateView(IOleDocument *iface, IOleInPlaceSite *pIPSite, IStream *pstm, DWORD dwReserved, IOleDocumentView **ppView) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); HRESULT hres; TRACE("(%p)->(%p %p %d %p)\n", This, pIPSite, pstm, dwReserved, ppView); @@ -544,7 +547,7 @@ static HRESULT WINAPI OleDocument_CreateView(IOleDocument *iface, IOleInPlaceSit static HRESULT WINAPI OleDocument_GetDocMiscStatus(IOleDocument *iface, DWORD *pdwStatus) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); FIXME("(%p)->(%p)\n", This, pdwStatus); return E_NOTIMPL; } @@ -552,13 +555,11 @@ static HRESULT WINAPI OleDocument_GetDocMiscStatus(IOleDocument *iface, DWORD *p static HRESULT WINAPI OleDocument_EnumViews(IOleDocument *iface, IEnumOleDocumentViews **ppEnum, IOleDocumentView **ppView) { - HTMLDocument *This = OLEDOC_THIS(iface); + HTMLDocument *This = impl_from_IOleDocument(iface); FIXME("(%p)->(%p %p)\n", This, ppEnum, ppView); return E_NOTIMPL; } -#undef OLEDOC_THIS - static const IOleDocumentVtbl OleDocumentVtbl = { OleDocument_QueryInterface, OleDocument_AddRef, @@ -871,7 +872,7 @@ void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) void HTMLDocument_OleObj_Init(HTMLDocument *This) { This->IOleObject_iface.lpVtbl = &OleObjectVtbl; - This->lpOleDocumentVtbl = &OleDocumentVtbl; + This->IOleDocument_iface.lpVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; This->IOleContainer_iface.lpVtbl = &OleContainerVtbl;

1 0

Michael Stefaniuc : inkobj: Remove inkcollector.c as it is dead code.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: fd7e34f195d334f9e17cec5ca73ca6c62f2c5c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd7e34f195d334f9e17cec5ca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:07:21 2010 +0100 inkobj: Remove inkcollector.c as it is dead code. --- dlls/inkobj/Makefile.in | 1 - dlls/inkobj/inkcollector.c | 413 -------------------------------------------- 2 files changed, 0 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd7e34f195d334f9e17ce…

1 0

Michael Stefaniuc : avifil32: Use an iface instead of a vtbl pointer in ITmpFileImpl.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 9b1a6a5d408aa272d0e4c8baf7015f2cce440896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1a6a5d408aa272d0e4c8baf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:10:03 2010 +0100 avifil32: Use an iface instead of a vtbl pointer in ITmpFileImpl. --- dlls/avifil32/tmpfile.c | 169 ++++++++++++++++++++++------------------------ 1 files changed, 81 insertions(+), 88 deletions(-) diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 49b5a0a..3bdd50a 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -34,102 +34,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(avifile); /***********************************************************************/ -static HRESULT WINAPI ITmpFile_fnQueryInterface(IAVIFile* iface,REFIID refiid,LPVOID *obj); -static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile* iface); -static ULONG WINAPI ITmpFile_fnRelease(IAVIFile* iface); -static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile*iface,AVIFILEINFOW*afi,LONG size); -static HRESULT WINAPI ITmpFile_fnGetStream(IAVIFile*iface,PAVISTREAM*avis,DWORD fccType,LONG lParam); -static HRESULT WINAPI ITmpFile_fnCreateStream(IAVIFile*iface,PAVISTREAM*avis,AVISTREAMINFOW*asi); -static HRESULT WINAPI ITmpFile_fnWriteData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG size); -static HRESULT WINAPI ITmpFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpData,LONG *size); -static HRESULT WINAPI ITmpFile_fnEndRecord(IAVIFile*iface); -static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); - -static const struct IAVIFileVtbl itmpft = { - ITmpFile_fnQueryInterface, - ITmpFile_fnAddRef, - ITmpFile_fnRelease, - ITmpFile_fnInfo, - ITmpFile_fnGetStream, - ITmpFile_fnCreateStream, - ITmpFile_fnWriteData, - ITmpFile_fnReadData, - ITmpFile_fnEndRecord, - ITmpFile_fnDeleteStream -}; - typedef struct _ITmpFileImpl { - /* IUnknown stuff */ - const IAVIFileVtbl *lpVtbl; + IAVIFile IAVIFile_iface; LONG ref; - /* IAVIFile stuff */ AVIFILEINFOW fInfo; PAVISTREAM *ppStreams; } ITmpFileImpl; -PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) { - ITmpFileImpl *tmpFile; - int i; - - tmpFile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITmpFileImpl)); - if (tmpFile == NULL) - return NULL; - - tmpFile->lpVtbl = &itmpft; - tmpFile->ref = 1; - memset(&tmpFile->fInfo, 0, sizeof(tmpFile->fInfo)); - - tmpFile->fInfo.dwStreams = nStreams; - tmpFile->ppStreams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(PAVISTREAM)); - if (tmpFile->ppStreams == NULL) { - HeapFree(GetProcessHeap(), 0, tmpFile); - return NULL; - } - - for (i = 0; i < nStreams; i++) { - AVISTREAMINFOW sInfo; - - tmpFile->ppStreams[i] = ppStreams[i]; - - AVIStreamAddRef(ppStreams[i]); - AVIStreamInfoW(ppStreams[i], &sInfo, sizeof(sInfo)); - if (i == 0) { - tmpFile->fInfo.dwScale = sInfo.dwScale; - tmpFile->fInfo.dwRate = sInfo.dwRate; - if (!sInfo.dwScale || !sInfo.dwRate) { - tmpFile->fInfo.dwScale = 1; - tmpFile->fInfo.dwRate = 100; - } - } - - if (tmpFile->fInfo.dwSuggestedBufferSize < sInfo.dwSuggestedBufferSize) - tmpFile->fInfo.dwSuggestedBufferSize = sInfo.dwSuggestedBufferSize; - - { - register DWORD tmp; - - tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), - tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000); - if (tmpFile->fInfo.dwLength < tmp) - tmpFile->fInfo.dwLength = tmp; - - tmp = sInfo.rcFrame.right - sInfo.rcFrame.left; - if (tmpFile->fInfo.dwWidth < tmp) - tmpFile->fInfo.dwWidth = tmp; - tmp = sInfo.rcFrame.bottom - sInfo.rcFrame.top; - if (tmpFile->fInfo.dwHeight < tmp) - tmpFile->fInfo.dwHeight = tmp; - } - } - - return (PAVIFILE)tmpFile; +static inline ITmpFileImpl *impl_from_IAVIFile(IAVIFile *iface) +{ + return CONTAINING_RECORD(iface, ITmpFileImpl, IAVIFile_iface); } static HRESULT WINAPI ITmpFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, LPVOID *obj) { - ITmpFileImpl *This = (ITmpFileImpl *)iface; + ITmpFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(refiid), obj); @@ -146,7 +67,7 @@ static HRESULT WINAPI ITmpFile_fnQueryInterface(IAVIFile *iface, REFIID refiid, static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface) { - ITmpFileImpl *This = (ITmpFileImpl *)iface; + ITmpFileImpl *This = impl_from_IAVIFile(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -156,7 +77,7 @@ static ULONG WINAPI ITmpFile_fnAddRef(IAVIFile *iface) static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) { - ITmpFileImpl *This = (ITmpFileImpl *)iface; + ITmpFileImpl *This = impl_from_IAVIFile(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) -> %d\n", iface, ref); @@ -182,7 +103,7 @@ static ULONG WINAPI ITmpFile_fnRelease(IAVIFile *iface) static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface, AVIFILEINFOW *afi, LONG size) { - ITmpFileImpl *This = (ITmpFileImpl *)iface; + ITmpFileImpl *This = impl_from_IAVIFile(iface); TRACE("(%p,%p,%d)\n",iface,afi,size); @@ -201,7 +122,7 @@ static HRESULT WINAPI ITmpFile_fnInfo(IAVIFile *iface, static HRESULT WINAPI ITmpFile_fnGetStream(IAVIFile *iface, PAVISTREAM *avis, DWORD fccType, LONG lParam) { - ITmpFileImpl *This = (ITmpFileImpl *)iface; + ITmpFileImpl *This = impl_from_IAVIFile(iface); ULONG nStream = (ULONG)-1; @@ -283,3 +204,75 @@ static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, return AVIERR_UNSUPPORTED; } + +static const struct IAVIFileVtbl itmpft = { + ITmpFile_fnQueryInterface, + ITmpFile_fnAddRef, + ITmpFile_fnRelease, + ITmpFile_fnInfo, + ITmpFile_fnGetStream, + ITmpFile_fnCreateStream, + ITmpFile_fnWriteData, + ITmpFile_fnReadData, + ITmpFile_fnEndRecord, + ITmpFile_fnDeleteStream +}; + +PAVIFILE AVIFILE_CreateAVITempFile(int nStreams, const PAVISTREAM *ppStreams) +{ + ITmpFileImpl *tmpFile; + int i; + + tmpFile = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ITmpFileImpl)); + if (tmpFile == NULL) + return NULL; + + tmpFile->IAVIFile_iface.lpVtbl = &itmpft; + tmpFile->ref = 1; + memset(&tmpFile->fInfo, 0, sizeof(tmpFile->fInfo)); + + tmpFile->fInfo.dwStreams = nStreams; + tmpFile->ppStreams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(PAVISTREAM)); + if (tmpFile->ppStreams == NULL) { + HeapFree(GetProcessHeap(), 0, tmpFile); + return NULL; + } + + for (i = 0; i < nStreams; i++) { + AVISTREAMINFOW sInfo; + + tmpFile->ppStreams[i] = ppStreams[i]; + + AVIStreamAddRef(ppStreams[i]); + AVIStreamInfoW(ppStreams[i], &sInfo, sizeof(sInfo)); + if (i == 0) { + tmpFile->fInfo.dwScale = sInfo.dwScale; + tmpFile->fInfo.dwRate = sInfo.dwRate; + if (!sInfo.dwScale || !sInfo.dwRate) { + tmpFile->fInfo.dwScale = 1; + tmpFile->fInfo.dwRate = 100; + } + } + + if (tmpFile->fInfo.dwSuggestedBufferSize < sInfo.dwSuggestedBufferSize) + tmpFile->fInfo.dwSuggestedBufferSize = sInfo.dwSuggestedBufferSize; + + { + register DWORD tmp; + + tmp = MulDiv(AVIStreamSampleToTime(ppStreams[i], sInfo.dwLength), + tmpFile->fInfo.dwScale, tmpFile->fInfo.dwRate * 1000); + if (tmpFile->fInfo.dwLength < tmp) + tmpFile->fInfo.dwLength = tmp; + + tmp = sInfo.rcFrame.right - sInfo.rcFrame.left; + if (tmpFile->fInfo.dwWidth < tmp) + tmpFile->fInfo.dwWidth = tmp; + tmp = sInfo.rcFrame.bottom - sInfo.rcFrame.top; + if (tmpFile->fInfo.dwHeight < tmp) + tmpFile->fInfo.dwHeight = tmp; + } + } + + return (PAVIFILE)tmpFile; +}

1 0

Michael Stefaniuc : wuapi: Use an iface instead of a vtbl pointer in wucf.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: af4c6c8155b606c61a6b12ff76ff661117ba9654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4c6c8155b606c61a6b12ff7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Dec 23 02:11:33 2010 +0100 wuapi: Use an iface instead of a vtbl pointer in wucf. --- dlls/wuapi/main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index b6ec061..06b271e 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -39,13 +39,13 @@ typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); typedef struct _wucf { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } wucf; static inline wucf *impl_from_IClassFactory( IClassFactory *iface ) { - return (wucf *)((char *)iface - FIELD_OFFSET( wucf, vtbl )); + return CONTAINING_RECORD(iface, wucf, IClassFactory_iface); } static HRESULT WINAPI wucf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -112,8 +112,8 @@ static const struct IClassFactoryVtbl wucf_vtbl = wucf_LockServer }; -static wucf sessioncf = { &wucf_vtbl, UpdateSession_create }; -static wucf updatescf = { &wucf_vtbl, AutomaticUpdates_create }; +static wucf sessioncf = { { &wucf_vtbl }, UpdateSession_create }; +static wucf updatescf = { { &wucf_vtbl }, AutomaticUpdates_create }; static HINSTANCE instance; @@ -141,11 +141,11 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) if (IsEqualGUID( rclsid, &CLSID_UpdateSession )) { - cf = (IClassFactory *)&sessioncf.vtbl; + cf = &sessioncf.IClassFactory_iface; } else if (IsEqualGUID( rclsid, &CLSID_AutomaticUpdates )) { - cf = (IClassFactory *)&updatescf.vtbl; + cf = &updatescf.IClassFactory_iface; } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv );

1 0

Alexandre Julliard : include: Define the Scriptlet class in mshtml.idl.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 080d6462dfa7defedd2b0aa904ea61bf471dc1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=080d6462dfa7defedd2b0aa90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 21:25:44 2010 +0100 include: Define the Scriptlet class in mshtml.idl. --- include/mshtmdid.h | 20 +++++++++ include/mshtml.idl | 116 ++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 127 insertions(+), 9 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 1e9ab77..c6dc2e7 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -946,6 +946,26 @@ #define DISPID_IHTMLDOCUMENT6_IE8_GETELEMENTBYID DISPID_OMDOCUMENT+105 #define DISPID_IHTMLDOCUMENT6_UPDATESETTINGS DISPID_OMDOCUMENT+106 +/* DWebBridgeEvents */ +#define DISPID_DWEBBRIDGEEVENTS_ONSCRIPTLETEVENT 1 +#define DISPID_DWEBBRIDGEEVENTS_ONREADYSTATECHANGE DISPID_HTMLDOCUMENTEVENTS_ONREADYSTATECHANGE +#define DISPID_DWEBBRIDGEEVENTS_ONCLICK DISPID_HTMLDOCUMENTEVENTS_ONCLICK +#define DISPID_DWEBBRIDGEEVENTS_ONDBLCLICK DISPID_HTMLDOCUMENTEVENTS_ONDBLCLICK +#define DISPID_DWEBBRIDGEEVENTS_ONKEYDOWN DISPID_HTMLDOCUMENTEVENTS_ONKEYDOWN +#define DISPID_DWEBBRIDGEEVENTS_ONKEYUP DISPID_HTMLDOCUMENTEVENTS_ONKEYUP +#define DISPID_DWEBBRIDGEEVENTS_ONKEYPRESS DISPID_HTMLDOCUMENTEVENTS_ONKEYPRESS +#define DISPID_DWEBBRIDGEEVENTS_ONMOUSEDOWN DISPID_HTMLDOCUMENTEVENTS_ONMOUSEDOWN +#define DISPID_DWEBBRIDGEEVENTS_ONMOUSEMOVE DISPID_HTMLDOCUMENTEVENTS_ONMOUSEMOVE +#define DISPID_DWEBBRIDGEEVENTS_ONMOUSEUP DISPID_HTMLDOCUMENTEVENTS_ONMOUSEUP + +/* IWebBridge */ +#define DISPID_IWEBBRIDGE_URL 1 +#define DISPID_IWEBBRIDGE_SCROLLBAR 2 +#define DISPID_IWEBBRIDGE_EMBED 3 +#define DISPID_IWEBBRIDGE_EVENT DISPID_IHTMLWINDOW2_EVENT +#define DISPID_IWEBBRIDGE_READYSTATE DISPID_READYSTATE +#define DISPID_IWEBBRIDGE_ABOUTBOX DISPID_ABOUTBOX + /* IHTMLEmbedElement */ #define DISPID_IHTMLEMBEDELEMENT_HIDDEN DISPID_OBJECT+10 #define DISPID_IHTMLEMBEDELEMENT_PALETTE DISPID_OBJECT+4 diff --git a/include/mshtml.idl b/include/mshtml.idl index 0269b66..f7dde54 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -93,6 +93,15 @@ typedef enum _SELECTION_TYPE { } SELECTION_TYPE; [ + version(4.0), + uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) +] +library MSHTML +{ + +importlib("stdole2.tlb"); + +[ odl, oleautomation, dual, @@ -143,15 +152,6 @@ interface IHTMLFiltersCollection : IDispatch [retval, out] VARIANT *pvarResult); } -[ - version(4.0), - uuid(3050F1C5-98B5-11CF-BB82-00AA00BDCE0B) -] -library MSHTML -{ - -importlib("stdole2.tlb"); - /***************************************************************************** * IHTMLStyle interface */ @@ -13138,6 +13138,104 @@ coclass HTMLDocument } /***************************************************************************** + * DWebBridgeEvents dispinterface + */ +[ + hidden, + uuid(a6d897ff-0a95-11d1-b0ba-006008166e11) +] +dispinterface DWebBridgeEvents +{ +properties: +methods: + [id(DISPID_DWEBBRIDGEEVENTS_ONSCRIPTLETEVENT)] + void onscriptletevent([in] BSTR name,[in] VARIANT eventData); + + [id(DISPID_DWEBBRIDGEEVENTS_ONREADYSTATECHANGE)] + void onreadystatechange(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONCLICK)] + VARIANT_BOOL onclick(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONDBLCLICK)] + VARIANT_BOOL ondblclick(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONKEYDOWN)] + void onkeydown(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONKEYUP)] + void onkeyup(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONKEYPRESS)] + VARIANT_BOOL onkeypress(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONMOUSEDOWN)] + void onmousedown(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONMOUSEMOVE)] + void onmousemove(); + + [id(DISPID_DWEBBRIDGEEVENTS_ONMOUSEUP)] + void onmouseup(); +} + +/***************************************************************************** + * IWebBridge interface + */ +[ + odl, + oleautomation, + dual, + uuid(ae24fdad-03c6-11d1-8b76-0080c744f389) +] +interface IWebBridge : IDispatch +{ + [propput, id(DISPID_IWEBBRIDGE_URL)] + HRESULT URL([in] BSTR v); + + [propget, id(DISPID_IWEBBRIDGE_URL)] + HRESULT URL([retval, out] BSTR * p); + + [propput, id(DISPID_IWEBBRIDGE_SCROLLBAR)] + HRESULT Scrollbar([in] VARIANT_BOOL v); + + [propget, id(DISPID_IWEBBRIDGE_SCROLLBAR)] + HRESULT Scrollbar([retval, out] VARIANT_BOOL * p); + + [propput, id(DISPID_IWEBBRIDGE_EMBED)] + HRESULT embed([in] VARIANT_BOOL v); + + [propget, id(DISPID_IWEBBRIDGE_EMBED)] + HRESULT embed([retval, out] VARIANT_BOOL * p); + + [propget, id(DISPID_IWEBBRIDGE_EVENT)] + HRESULT event([retval, out] IDispatch* * p); + + [propget, id(DISPID_IWEBBRIDGE_READYSTATE)] + HRESULT readyState([retval, out] long * p); + + [id(DISPID_IWEBBRIDGE_ABOUTBOX)] + HRESULT AboutBox(); +} + +/***************************************************************************** + * Scriptlet coclass + */ +[ + control, + helpstring("Microsoft Scriptlet Component"), + progid("ScriptBridge.ScriptBridge.1"), + vi_progid("ScriptBridge.ScriptBridge"), + threading(apartment), + uuid(ae24fdae-03c6-11d1-8b76-0080c744f389) +] +coclass Scriptlet +{ + [default] interface IWebBridge; + [source, default] dispinterface DWebBridgeEvents; +} + +/***************************************************************************** * IHTMLEmbedElement interface */ [

1 0

Alexandre Julliard : mshtml: Convert the classes registration to the IRegistrar mechanism.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 20310d1d6c0a5e516038e60b1786a51534db3680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20310d1d6c0a5e516038e60b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 22 21:26:11 2010 +0100 mshtml: Convert the classes registration to the IRegistrar mechanism. --- dlls/mshtml/Makefile.in | 4 + dlls/mshtml/main.c | 10 +- dlls/mshtml/mshtml.inf | 203 --------------------------- dlls/mshtml/mshtml_classes.idl | 299 ++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_tlb.idl | 19 +++ 5 files changed, 329 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20310d1d6c0a5e516038e…

1 0

Jacek Caban : urlmon: Converted more registration process to IRegistrar mechanism.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: fcc4c4647673e96fea5086ccc006a1f19493eb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc4c4647673e96fea5086ccc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 22 19:01:07 2010 +0100 urlmon: Converted more registration process to IRegistrar mechanism. --- dlls/urlmon/Makefile.in | 1 - dlls/urlmon/regsvr.c | 543 --------------------------------------------- dlls/urlmon/rsrc.rc | 3 + dlls/urlmon/urlmon.inf | 37 +--- dlls/urlmon/urlmon.rgs | 75 +++++++ dlls/urlmon/urlmon_main.c | 40 ++++ 6 files changed, 120 insertions(+), 579 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcc4c4647673e96fea508…

1 0

Eryk Wieliczko : msvcrt/tests: Add _fcvt_s tests.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: b74ef16d99f3c2f7e4a0a7e453c71b6da2c70310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b74ef16d99f3c2f7e4a0a7e45… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Dec 22 23:10:56 2010 +0100 msvcrt/tests: Add _fcvt_s tests. --- dlls/msvcrt/tests/printf.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 87efd16..d32ef73 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -40,6 +40,8 @@ static int (__cdecl *p__vsnwprintf_s)(wchar_t *str, size_t sizeOfBuffer, __ms_va_list valist); static int (__cdecl *p__ecvt_s)(char *buffer, size_t length, double number, int ndigits, int *decpt, int *sign); +static int (__cdecl *p__fcvt_s)(char *buffer, size_t length, double number, + int ndigits, int *decpt, int *sign); static void init( void ) { @@ -49,6 +51,7 @@ static void init( void ) p__vscwprintf = (void *)GetProcAddress(hmod, "_vscwprintf"); p__vsnwprintf_s = (void *)GetProcAddress(hmod, "_vsnwprintf_s"); p__ecvt_s = (void *)GetProcAddress(hmod, "_ecvt_s"); + p__fcvt_s = (void *)GetProcAddress(hmod, "_fcvt_s"); } static void test_sprintf( void ) @@ -799,7 +802,7 @@ static void test_xcvt(void) "_fcvt() decimal point wrong, got %d expected %d\n", decpt, test_cvt_testcases[i].expdecpt_f); ok( sign == test_cvt_testcases[i].expsign, - "_ecvt() sign wrong, got %d expected %d\n", sign, + "_fcvt() sign wrong, got %d expected %d\n", sign, test_cvt_testcases[i].expsign); } @@ -823,7 +826,29 @@ static void test_xcvt(void) free(str); } else - win_skip("_ecvt_s not available\n"); + win_skip("_ecvt_s not available\n"); + + if (p__fcvt_s) + { + str = malloc(1024); + for( i = 0; strcmp( test_cvt_testcases[i].expstr_e, "END"); i++){ + decpt = sign = 100; + err = p__fcvt_s(str, 1024, test_cvt_testcases[i].value, test_cvt_testcases[i].nrdigits, &decpt, &sign); + ok(err == 0, "_fcvt_s() failed with error code %d", err); + ok( 0 == strncmp( str, test_cvt_testcases[i].expstr_f, 15), + "_fcvt_s() bad return, got \n'%s' expected \n'%s'\n", str, + test_cvt_testcases[i].expstr_e); + ok( decpt == test_cvt_testcases[i].expdecpt_f, + "_fcvt_s() decimal point wrong, got %d expected %d\n", decpt, + test_cvt_testcases[i].expdecpt_e); + ok( sign == test_cvt_testcases[i].expsign, + "_fcvt_s() sign wrong, got %d expected %d\n", sign, + test_cvt_testcases[i].expsign); + } + free(str); + } + else + todo_wine win_skip("_fcvt_s not available\n"); } static int __cdecl _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...)

1 0

André Hentschel : qmgr/tests: Use a temporary path to avoid failures.
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: c71998d742ff41b028ff4400b67d0f91658fb040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71998d742ff41b028ff4400b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 22 23:28:44 2010 +0100 qmgr/tests: Use a temporary path to avoid failures. --- dlls/qmgr/tests/job.c | 66 +++++++++--------------------------------------- 1 files changed, 13 insertions(+), 53 deletions(-) diff --git a/dlls/qmgr/tests/job.c b/dlls/qmgr/tests/job.c index d0e2306..f972547 100644 --- a/dlls/qmgr/tests/job.c +++ b/dlls/qmgr/tests/job.c @@ -28,65 +28,26 @@ /* Globals used by many tests */ static const WCHAR test_displayName[] = {'T', 'e', 's', 't', 0}; -static const WCHAR test_remoteNameA[] = {'r','e','m','o','t','e','A', 0}; -static const WCHAR test_remoteNameB[] = {'r','e','m','o','t','e','B', 0}; -static const WCHAR test_localNameA[] = {'l','o','c','a','l','A', 0}; -static const WCHAR test_localNameB[] = {'l','o','c','a','l','B', 0}; -static WCHAR *test_currentDir; -static WCHAR *test_remotePathA; -static WCHAR *test_remotePathB; -static WCHAR *test_localPathA; -static WCHAR *test_localPathB; +static WCHAR test_remotePathA[MAX_PATH]; +static WCHAR test_remotePathB[MAX_PATH]; +static WCHAR test_localPathA[MAX_PATH]; +static WCHAR test_localPathB[MAX_PATH]; static IBackgroundCopyManager *test_manager; static IBackgroundCopyJob *test_job; static GUID test_jobId; static BG_JOB_TYPE test_type; -static BOOL init_paths(void) +static VOID init_paths(void) { - static const WCHAR format[] = {'%','s','\\','%','s', 0}; - DWORD n; + WCHAR tmpDir[MAX_PATH]; + WCHAR prefix[] = {'q', 'm', 'g', 'r', 0}; - n = GetCurrentDirectoryW(0, NULL); - if (n == 0) - { - skip("Couldn't get current directory size\n"); - return FALSE; - } - - test_currentDir = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - test_localPathA - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_localNameA)) * sizeof(WCHAR)); - test_localPathB - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_localNameB)) * sizeof(WCHAR)); - test_remotePathA - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_remoteNameA)) * sizeof(WCHAR)); - test_remotePathB - = HeapAlloc(GetProcessHeap(), 0, - (n + 1 + lstrlenW(test_remoteNameB)) * sizeof(WCHAR)); - - if (!test_currentDir || !test_localPathA || !test_localPathB - || !test_remotePathA || !test_remotePathB) - { - skip("Couldn't allocate memory for full paths\n"); - return FALSE; - } + GetTempPathW(MAX_PATH, tmpDir); - if (GetCurrentDirectoryW(n, test_currentDir) != n - 1) - { - skip("Couldn't get current directory\n"); - return FALSE; - } - - wsprintfW(test_localPathA, format, test_currentDir, test_localNameA); - wsprintfW(test_localPathB, format, test_currentDir, test_localNameB); - wsprintfW(test_remotePathA, format, test_currentDir, test_remoteNameA); - wsprintfW(test_remotePathB, format, test_currentDir, test_remoteNameB); - - return TRUE; + GetTempFileNameW(tmpDir, prefix, 0, test_localPathA); + GetTempFileNameW(tmpDir, prefix, 0, test_localPathB); + GetTempFileNameW(tmpDir, prefix, 0, test_remotePathA); + GetTempFileNameW(tmpDir, prefix, 0, test_remotePathB); } /* Generic test setup */ @@ -545,8 +506,7 @@ START_TEST(job) }; const test_t *test; - if (!init_paths()) - return; + init_paths(); CoInitialize(NULL);

1 0

Nikolay Sivov : oleaut32: Fix null parameters handling in ICreateTypeLib2:: CreateTypeInfo().
by Alexandre Julliard 23 Dec '10

23 Dec '10

Module: wine Branch: master Commit: 623abfcaaed2f8809b7398984eea6d85f9162355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=623abfcaaed2f8809b7398984… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 22 23:50:51 2010 +0300 oleaut32: Fix null parameters handling in ICreateTypeLib2::CreateTypeInfo(). --- dlls/oleaut32/tests/typelib.c | 10 ++++++++++ dlls/oleaut32/typelib2.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 495561a..aab340e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1406,6 +1406,16 @@ static void test_CreateTypeLib(void) { SysFreeString(name); SysFreeString(helpfile); + /* invalid parameters */ + hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, &createti); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + + hres = ICreateTypeLib_CreateTypeInfo(createtl, NULL, TKIND_INTERFACE, NULL); + ok(hres == E_INVALIDARG, "got %08x\n", hres); + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index e0e78ee..8fc8a92 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -4389,20 +4389,21 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo( ICreateTypeLib2 * iface, LPOLESTR szName, TYPEKIND tkind, - ICreateTypeInfo **ppCTInfo) + ICreateTypeInfo **tinfo) { ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; char *name; - TRACE("(%p,%s,%d,%p)\n", iface, debugstr_w(szName), tkind, ppCTInfo); + TRACE("(%p,%s,%d,%p)\n", iface, debugstr_w(szName), tkind, tinfo); + + if (!szName || !tinfo) return E_INVALIDARG; ctl2_encode_name(This, szName, &name); if(ctl2_find_name(This, name) != -1) return TYPE_E_NAMECONFLICT; - *ppCTInfo = (ICreateTypeInfo *)ICreateTypeInfo2_Constructor(This, szName, tkind); - - if (!*ppCTInfo) return E_OUTOFMEMORY; + *tinfo = (ICreateTypeInfo *)ICreateTypeInfo2_Constructor(This, szName, tkind); + if (!*tinfo) return E_OUTOFMEMORY; return S_OK; }

1 0