October 2008 - Wine-Commits

Jacek Caban : mshtml: Get rid of setup_nswindow.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 27eb80cc3abb18c24e9f1f67fb32fc000d66990d URL: http://source.winehq.org/git/wine.git/?a=commit;h=27eb80cc3abb18c24e9f1f67f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:26:18 2008 -0500 mshtml: Get rid of setup_nswindow. It's no longer needed. --- dlls/mshtml/htmlwindow.c | 102 ------------------------------------------ dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsevents.c | 1 - 3 files changed, 0 insertions(+), 104 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 76efb9d..1027399 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1177,108 +1177,6 @@ static dispex_static_data_t HTMLWindow_dispex = { HTMLWindow_iface_tids }; -static const char wineConfig_func[] = -"window.__defineGetter__(\"external\",function() {\n" -" return window.__wineWindow__.external;\n" -"});\n" -"window.__wineWindow__ = wineWindow;\n"; - -static void astr_to_nswstr(const char *str, nsAString *nsstr) -{ - LPWSTR wstr; - int len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - wstr = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, len); - - nsAString_Init(nsstr, wstr); - - heap_free(wstr); -} - -static nsresult call_js_func(nsIScriptContainer *script_container, nsISupports *target, - const char *name, const char *body, - PRUint32 argc, const char **arg_names, nsIArray *argv) -{ - nsACString name_str; - nsAString body_str; - JSObject func_obj, jsglobal; - nsIVariant *jsret; - nsresult nsres; - - nsres = nsIScriptContainer_GetGlobalObject(script_container, &jsglobal); - if(NS_FAILED(nsres)) - ERR("GetGlobalObject: %08x\n", nsres); - - nsACString_Init(&name_str, name); - astr_to_nswstr(body, &body_str); - - nsres = nsIScriptContainer_CompileFunction(script_container, jsglobal, &name_str, argc, arg_names, - &body_str, NULL, 1, FALSE, &func_obj); - - nsACString_Finish(&name_str); - nsAString_Finish(&body_str); - - if(NS_FAILED(nsres)) { - ERR("CompileFunction failed: %08x\n", nsres); - return nsres; - } - - nsres = nsIScriptContainer_CallFunction(script_container, target, jsglobal, func_obj, argv, &jsret); - - nsIScriptContainer_DropScriptObject(script_container, func_obj); - nsIScriptContainer_DropScriptObject(script_container, jsglobal); - if(NS_FAILED(nsres)) { - ERR("CallFunction failed: %08x\n", nsres); - return nsres; - } - - nsIVariant_Release(jsret); - return NS_OK; -} - -void setup_nswindow(HTMLWindow *This) -{ - nsIScriptContainer *script_container; - nsIDOMWindow *nswindow; - nsIDOMDocument *domdoc; - nsIWritableVariant *nsvar; - nsIMutableArray *argv; - nsresult nsres; - - static const char *args[] = {"wineWindow"}; - - TRACE("(%p)\n", This); - - nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &domdoc); - nsres = nsIDOMDocument_QueryInterface(domdoc, &IID_nsIScriptContainer, (void**)&script_container); - nsIDOMDocument_Release(domdoc); - if(NS_FAILED(nsres)) { - TRACE("Could not get nsIDOMScriptContainer: %08x\n", nsres); - return; - } - - nsIWebBrowser_GetContentDOMWindow(This->doc->nscontainer->webbrowser, &nswindow); - - nsvar = create_nsvariant(); - nsres = nsIWritableVariant_SetAsInterface(nsvar, &IID_IDispatch, HTMLWINDOW2(This)); - if(NS_FAILED(nsres)) - ERR("SetAsInterface failed: %08x\n", nsres); - - argv = create_nsarray(); - nsres = nsIMutableArray_AppendElement(argv, (nsISupports*)nsvar, FALSE); - nsIWritableVariant_Release(nsvar); - if(NS_FAILED(nsres)) - ERR("AppendElement failed: %08x\n", nsres); - - call_js_func(script_container, (nsISupports*)nswindow/*HTMLWINDOW2(This)*/, "wineConfig", - wineConfig_func, 1, args, (nsIArray*)argv); - - nsIMutableArray_Release(argv); - nsIScriptContainer_Release(script_container); -} - HTMLWindow *HTMLWindow_Create(HTMLDocument *doc) { HTMLWindow *ret = heap_alloc_zero(sizeof(HTMLWindow)); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cac1117..7243600 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -467,7 +467,6 @@ HTMLWindow *nswindow_to_window(const nsIDOMWindow*); HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLDocument*); HTMLLocation *HTMLLocation_Create(HTMLDocument*); IOmNavigator *OmNavigator_Create(void); -void setup_nswindow(HTMLWindow*); void HTMLDocument_HTMLDocument3_Init(HTMLDocument*); void HTMLDocument_HTMLDocument5_Init(HTMLDocument*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index d226ccb..b6cc0f8 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -139,7 +139,6 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event update_nsdocument(This->doc); connect_scripts(This->doc); - setup_nswindow(This->doc->window); if(This->editor_controller) { nsIController_Release(This->editor_controller);

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLOptionElementFactory::create .
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 8162797af060abaa46c1d014209379b3f4e1545e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8162797af060abaa46c1d0142… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:26:01 2008 -0500 mshtml: Use stored nsdoc in IHTMLOptionElementFactory::create. --- dlls/mshtml/htmloption.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 4c93088..4fca490 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -448,7 +448,6 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory IHTMLOptionElement **optelem) { HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); - nsIDOMDocument *nsdoc; nsIDOMElement *nselem; nsAString option_str; nsresult nsres; @@ -456,21 +455,18 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory static const PRUnichar optionW[] = {'O','P','T','I','O','N',0}; - TRACE("(%p)->(v v v v %p)\n", This, optelem); + TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_variant(&text), debugstr_variant(&value), + debugstr_variant(&defaultselected), debugstr_variant(&selected), optelem); - *optelem = NULL; - if(!This->doc->nscontainer) - return E_FAIL; - - nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; + if(!This->doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } + *optelem = NULL; + nsAString_Init(&option_str, optionW); - nsres = nsIDOMDocument_CreateElement(nsdoc, &option_str, &nselem); - nsIDOMDocument_Release(nsdoc); + nsres = nsIDOMHTMLDocument_CreateElement(This->doc->nsdoc, &option_str, &nselem); nsAString_Finish(&option_str); if(NS_FAILED(nsres)) { ERR("CreateElement failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLElement::insertAdjacentText.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 4283f5ac401d1f20c96cdea9d819205c88322d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4283f5ac401d1f20c96cdea9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:25:39 2008 -0500 mshtml: Use stored nsdoc in IHTMLElement::insertAdjacentText. --- dlls/mshtml/htmlelem.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 0a5c686..7967d62 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -979,25 +979,21 @@ static HRESULT WINAPI HTMLElement_insertAdjacentText(IHTMLElement *iface, BSTR w BSTR text) { HTMLElement *This = HTMLELEM_THIS(iface); - nsresult nsres; - nsIDOMDocument *nsdoc; nsIDOMNode *nsnode; nsAString ns_text; + nsresult nsres; HRESULT hr; TRACE("(%p)->(%s %s)\n", This, debugstr_w(where), debugstr_w(text)); - nsres = nsIWebNavigation_GetDocument(This->node.doc->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres) || !nsdoc) - { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; + if(!This->node.doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - nsAString_Init(&ns_text, text); - nsres = nsIDOMDocument_CreateTextNode(nsdoc, &ns_text, (nsIDOMText **)&nsnode); - nsIDOMDocument_Release(nsdoc); + nsAString_Init(&ns_text, text); + nsres = nsIDOMDocument_CreateTextNode(This->node.doc->nsdoc, &ns_text, (nsIDOMText **)&nsnode); nsAString_Finish(&ns_text); if(NS_FAILED(nsres) || !nsnode)

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMOptionElement::put_text.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: c3ea7272a326e7eed123084fe095aaa89c2f910e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3ea7272a326e7eed123084fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:25:47 2008 -0500 mshtml: Use stored nsdoc in IHTMOptionElement::put_text. --- dlls/mshtml/htmloption.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index accae83..4c93088 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -180,7 +180,6 @@ static HRESULT WINAPI HTMLOptionElement_get_index(IHTMLOptionElement *iface, LON static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR v) { HTMLOptionElement *This = HTMLOPTION_THIS(iface); - nsIDOMDocument *nsdoc; nsIDOMText *text_node; nsAString text_str; nsIDOMNode *tmp; @@ -188,6 +187,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + if(!This->element.node.doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + while(1) { nsIDOMNode *child; @@ -205,19 +209,12 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR } } - nsres = nsIWebNavigation_GetDocument(This->element.node.doc->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) { - ERR("GetDocument failed: %08x\n", nsres); - return S_OK; - } - nsAString_Init(&text_str, v); - nsres = nsIDOMDocument_CreateTextNode(nsdoc, &text_str, &text_node); - nsIDOMDocument_Release(nsdoc); + nsres = nsIDOMHTMLDocument_CreateTextNode(This->element.node.doc->nsdoc, &text_str, &text_node); nsAString_Finish(&text_str); if(NS_FAILED(nsres)) { ERR("CreateTextNode failed: %08x\n", nsres); - return S_OK; + return E_FAIL; } nsres = nsIDOMHTMLOptionElement_AppendChild(This->nsoption, (nsIDOMNode*)text_node, &tmp);

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLElement::insertAdjacentHTML.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: ccef2eab80434f77a5e6b2de797cb407c360c111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccef2eab80434f77a5e6b2de7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:25:31 2008 -0500 mshtml: Use stored nsdoc in IHTMLElement::insertAdjacentHTML. --- dlls/mshtml/htmlelem.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index f11c235..0a5c686 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -918,26 +918,22 @@ static HRESULT WINAPI HTMLElement_insertAdjacentHTML(IHTMLElement *iface, BSTR w BSTR html) { HTMLElement *This = HTMLELEM_THIS(iface); - nsresult nsres; - nsIDOMDocument *nsdoc; nsIDOMDocumentRange *nsdocrange; nsIDOMRange *range; nsIDOMNSRange *nsrange; nsIDOMNode *nsnode; nsAString ns_html; + nsresult nsres; HRESULT hr; TRACE("(%p)->(%s %s)\n", This, debugstr_w(where), debugstr_w(html)); - nsres = nsIWebNavigation_GetDocument(This->node.doc->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres)) - { - ERR("GetDocument failed: %08x\n", nsres); - return E_FAIL; + if(!This->node.doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; } - nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentRange, (void **)&nsdocrange); - nsIDOMDocument_Release(nsdoc); + nsres = nsIDOMDocument_QueryInterface(This->node.doc->nsdoc, &IID_nsIDOMDocumentRange, (void **)&nsdocrange); if(NS_FAILED(nsres)) { ERR("getting nsIDOMDocumentRange failed: %08x\n", nsres);

1 0

Jacek Caban : mshtml: Use stored nsdoc in exec_indent.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 8423450ccf919d19b6caaca4ffafccf9764f52f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8423450ccf919d19b6caaca4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:25:23 2008 -0500 mshtml: Use stored nsdoc in exec_indent. --- dlls/mshtml/txtrange.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index ff35568..3f383d1 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1746,7 +1746,6 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) { nsIDOMDocumentFragment *fragment; nsIDOMElement *blockquote_elem, *p_elem; - nsIDOMDocument *nsdoc; nsIDOMNode *tmp; nsAString tag_str; @@ -1755,18 +1754,19 @@ static HRESULT exec_indent(HTMLTxtRange *This, VARIANT *in, VARIANT *out) TRACE("(%p)->(%p %p)\n", This, in, out); - nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); + if(!This->doc->nsdoc) { + WARN("NULL nsdoc\n"); + return E_NOTIMPL; + } nsAString_Init(&tag_str, blockquoteW); - nsIDOMDocument_CreateElement(nsdoc, &tag_str, &blockquote_elem); + nsIDOMHTMLDocument_CreateElement(This->doc->nsdoc, &tag_str, &blockquote_elem); nsAString_Finish(&tag_str); nsAString_Init(&tag_str, pW); - nsIDOMDocument_CreateElement(nsdoc, &tag_str, &p_elem); + nsIDOMDocument_CreateElement(This->doc->nsdoc, &tag_str, &p_elem); nsAString_Finish(&tag_str); - nsIDOMDocument_Release(nsdoc); - nsIDOMRange_ExtractContents(This->nsrange, &fragment); nsIDOMElement_AppendChild(p_elem, (nsIDOMNode*)fragment, &tmp); nsIDOMDocumentFragment_Release(fragment);

1 0

Jacek Caban : mshtml: Use stored nsdoc in IHTMLTxtRange::expand.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 08efe6de3e340429acfaefad787a566bb156e00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=08efe6de3e340429acfaefad7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 15:25:15 2008 -0500 mshtml: Use stored nsdoc in IHTMLTxtRange::expand. --- dlls/mshtml/txtrange.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index c35834f..ff35568 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -1308,22 +1308,10 @@ static HRESULT WINAPI HTMLTxtRange_expand(IHTMLTxtRange *iface, BSTR Unit, VARIA } case RU_TEXTEDIT: { - nsIDOMDocument *nsdoc; - nsIDOMHTMLDocument *nshtmldoc; nsIDOMHTMLElement *nsbody = NULL; nsresult nsres; - nsres = nsIWebNavigation_GetDocument(This->doc->nscontainer->navigation, &nsdoc); - if(NS_FAILED(nsres) || !nsdoc) { - ERR("GetDocument failed: %08x\n", nsres); - break; - } - - nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); - nsIDOMDocument_Release(nsdoc); - - nsres = nsIDOMHTMLDocument_GetBody(nshtmldoc, &nsbody); - nsIDOMHTMLDocument_Release(nshtmldoc); + nsres = nsIDOMHTMLDocument_GetBody(This->doc->nsdoc, &nsbody); if(NS_FAILED(nsres) || !nsbody) { ERR("Could not get body: %08x\n", nsres); break;

1 0

Dmitry Timoshkov : winmm: The buffer provided by an application is valid only in the mmioOpen( FOURCC_MEM) case.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: 5d24cb456565e4a00429248cf5f70453687b8f16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d24cb456565e4a00429248cf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Oct 10 12:27:45 2008 +0900 winmm: The buffer provided by an application is valid only in the mmioOpen(FOURCC_MEM) case. --- dlls/winmm/mmio.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 42f1d32..4bad745 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -570,11 +570,8 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, wm->info.dwFlags &= ~MMIO_ALLOCBUF; } - wm->bBufferLoaded = FALSE; - if (pchBuffer) { wm->info.pchBuffer = pchBuffer; - wm->bBufferLoaded = TRUE; } else if (cchBuffer) { if (!(wm->info.pchBuffer = HeapAlloc(GetProcessHeap(), 0, cchBuffer))) return MMIOERR_OUTOFMEMORY; @@ -588,6 +585,7 @@ static MMRESULT MMIO_SetBuffer(WINE_MMIO* wm, void* pchBuffer, LONG cchBuffer, wm->info.pchEndRead = wm->info.pchBuffer; wm->info.pchEndWrite = wm->info.pchBuffer + cchBuffer; wm->info.lBufOffset = wm->info.lDiskOffset; + wm->bBufferLoaded = FALSE; return MMSYSERR_NOERROR; } @@ -669,6 +667,8 @@ HMMIO MMIO_Open(LPSTR szFileName, MMIOINFO* refmminfo, DWORD dwOpenFlags, refmminfo->wErrorRet = MMIO_SetBuffer(wm, refmminfo->pchBuffer, refmminfo->cchBuffer, 0); if (refmminfo->wErrorRet != MMSYSERR_NOERROR) goto error1; + if (wm->info.fccIOProc == FOURCC_MEM) + wm->bBufferLoaded = TRUE; } /* see mmioDosIOProc for that one */

1 0

Alexandre Julliard : stdole2: Add some missing attributes and fix some typos.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: fec569cf68fcef2e0e1d4649e533f483ff080266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec569cf68fcef2e0e1d4649e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 10 12:54:35 2008 +0200 stdole2: Add some missing attributes and fix some typos. --- include/stdole2.idl | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index 187982c..0aa52c8 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -35,7 +35,7 @@ library stdole typedef unsigned long HRESULT; typedef void *VARIANT; typedef unsigned long SCODE; - + typedef struct GUID { unsigned long Data1; unsigned short Data2; @@ -64,7 +64,8 @@ library stdole [ odl, - uuid(00000000-0000-0000-C000-000000000046) + uuid(00000000-0000-0000-C000-000000000046), + hidden ] interface IUnknown { @@ -82,7 +83,8 @@ library stdole [ odl, - uuid(00020400-0000-0000-C000-000000000046) + uuid(00020400-0000-0000-C000-000000000046), + restricted ] interface IDispatch : IUnknown { @@ -119,7 +121,8 @@ library stdole [ odl, - uuid(00020404-0000-0000-C000-000000000046) + uuid(00020404-0000-0000-C000-000000000046), + hidden ] interface IEnumVARIANT : IUnknown { @@ -188,12 +191,9 @@ library stdole typedef [uuid(BF030645-9069-101B-AE2D-08002B2EC713), public] VARIANT_BOOL OLE_ENABLEDEFAULTBOOL; - /* FIXME: widl can't cope with enum attributes yet */ - /* [ uuid(6650430A-BE0F-101A-8BBB-00AA00300CAB) ] - */ enum OLE_TRISTATE { Unchecked = 0, Checked = 1, @@ -225,12 +225,12 @@ library stdole helpstring("Font Object"), hidden ] - interface IFont { + interface IFont : IUnknown { [propget] HRESULT Name([out, retval] BSTR *pname); [propput] HRESULT Name([in] BSTR pname); [propget] HRESULT Size([out, retval] CURRENCY *psize); - [propput] HRESULT Size([in] BSTR psize); + [propput] HRESULT Size([in] CURRENCY psize); [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); [propput] HRESULT Bold([in] VARIANT_BOOL pbold); @@ -300,7 +300,7 @@ library stdole helpstring("Picture Object"), hidden ] - interface IPicture /*: IUnknown*/ { + interface IPicture : IUnknown { [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); @@ -353,7 +353,7 @@ library stdole [id(0x2)] OLE_HANDLE hPal; [id(0x3), readonly] short Type; [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; - [id(0x5), readonly] OLE_XSIZE_HIMETRIC Height; + [id(0x5), readonly] OLE_YSIZE_HIMETRIC Height; methods: [id(0x6)] void Render(int hdc, long x, @@ -377,12 +377,9 @@ library stdole interface IPicture; }; - /* FIXME: widl can't cope with enum attributes yet */ - /* [ uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) ] - */ enum LoadPictureConstants { Default = 0, Monochrome = 1,

1 0

Alexandre Julliard : widl: Add support for attributes on enum, struct and union definitions.
by Alexandre Julliard Oct. 10, 2008

Oct. 10, 2008

Module: wine Branch: master Commit: b4b8a342d7fbc35863ac1fbcaf6833d01d42d35c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b8a342d7fbc35863ac1fbca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 10 12:54:05 2008 +0200 widl: Add support for attributes on enum, struct and union definitions. --- tools/widl/parser.y | 199 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 122 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4b8a342d7fbc35863ac1…

1 0