January 2011 - Wine-Commits

Michael Stefaniuc : mshtml: COM cleanup for the ICustomDoc iface.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: f2c4a122615c9404f72ced0c6eab730168de30cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c4a122615c9404f72ced0c6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:10:03 2011 +0100 mshtml: COM cleanup for the ICustomDoc iface. --- dlls/mshtml/htmldoc.c | 25 +++++++++++++------------ dlls/mshtml/mshtml_private.h | 4 +--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 259f0e9..12e0947 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2054,18 +2054,21 @@ HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, * ICustomDoc implementation */ -#define CUSTOMDOC_THIS(iface) DEFINE_THIS(HTMLDocumentObj, CustomDoc, iface) +static inline HTMLDocumentObj *impl_from_ICustomDoc(ICustomDoc *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentObj, ICustomDoc_iface); +} static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, void **ppv) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); if(htmldoc_qi(&This->basedoc, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; if(IsEqualGUID(&IID_ICustomDoc, riid)) { TRACE("(%p)->(IID_ICustomDoc %p)\n", This, ppv); - *ppv = CUSTOMDOC(This); + *ppv = &This->ICustomDoc_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -2080,7 +2083,7 @@ static HRESULT WINAPI CustomDoc_QueryInterface(ICustomDoc *iface, REFIID riid, v static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -2090,7 +2093,7 @@ static ULONG WINAPI CustomDoc_AddRef(ICustomDoc *iface) static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref = %u\n", This, ref); @@ -2112,7 +2115,7 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) if(This->client) IOleObject_SetClientSite(&This->basedoc.IOleObject_iface, NULL); if(This->hostui) - ICustomDoc_SetUIHandler(CUSTOMDOC(This), NULL); + ICustomDoc_SetUIHandler(&This->ICustomDoc_iface, NULL); if(This->in_place_active) IOleInPlaceObjectWindowless_InPlaceDeactivate(&This->basedoc.IOleInPlaceObjectWindowless_iface); if(This->ipsite) @@ -2139,7 +2142,7 @@ static ULONG WINAPI CustomDoc_Release(ICustomDoc *iface) static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandler *pUIHandler) { - HTMLDocumentObj *This = CUSTOMDOC_THIS(iface); + HTMLDocumentObj *This = impl_from_ICustomDoc(iface); IOleCommandTarget *cmdtrg; HRESULT hres; @@ -2167,8 +2170,6 @@ static HRESULT WINAPI CustomDoc_SetUIHandler(ICustomDoc *iface, IDocHostUIHandle return S_OK; } -#undef CUSTOMDOC_THIS - static const ICustomDocVtbl CustomDocVtbl = { CustomDoc_QueryInterface, CustomDoc_AddRef, @@ -2203,10 +2204,10 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) if(!doc) return E_OUTOFMEMORY; - init_dispex(&doc->dispex, (IUnknown*)CUSTOMDOC(doc), &HTMLDocumentObj_dispex); - init_doc(&doc->basedoc, (IUnknown*)CUSTOMDOC(doc), &doc->dispex.IDispatchEx_iface); + init_dispex(&doc->dispex, (IUnknown*)&doc->ICustomDoc_iface, &HTMLDocumentObj_dispex); + init_doc(&doc->basedoc, (IUnknown*)&doc->ICustomDoc_iface, &doc->dispex.IDispatchEx_iface); - doc->lpCustomDocVtbl = &CustomDocVtbl; + doc->ICustomDoc_iface.lpVtbl = &CustomDocVtbl; doc->ref = 1; doc->basedoc.doc_obj = doc; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b7e377a..ad3d2ae 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -406,7 +406,7 @@ static inline ULONG htmldoc_release(HTMLDocument *This) struct HTMLDocumentObj { HTMLDocument basedoc; DispatchEx dispex; - const ICustomDocVtbl *lpCustomDocVtbl; + ICustomDoc ICustomDoc_iface; LONG ref; @@ -624,8 +624,6 @@ struct HTMLDocumentNode { struct list plugin_hosts; }; -#define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) - #define NSEVENTLIST(x) ((nsIDOMEventListener*) &(x)->lpDOMEventListenerVtbl) #define HTTPNEG(x) ((IHttpNegotiate2*) &(x)->lpHttpNegotiate2Vtbl)

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in BSCallback.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: fb92f979dd9fa4427eafc4018df9bb47901de33f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb92f979dd9fa4427eafc4018… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:13:16 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in BSCallback. --- dlls/mshtml/mshtml_private.h | 4 - dlls/mshtml/navigate.c | 143 ++++++++++++++++++++++-------------------- 2 files changed, 74 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb92f979dd9fa4427eafc…

1 0

David Hedberg : urlmon: Move protocol flags for wininet based protocols into a common header.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 2b5c18c35b913482c58d060001178fbf11ef19ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5c18c35b913482c58d06000… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon Jan 3 03:47:37 2011 +0100 urlmon: Move protocol flags for wininet based protocols into a common header. --- dlls/urlmon/protocol.c | 30 ------------------------------ dlls/urlmon/urlmon_main.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 669343b..2ca1629 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -23,36 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -/* Flags are needed for, among other things, return HRESULTs from the Read function - * to conform to native. For example, Read returns: - * - * 1. E_PENDING if called before the request has completed, - * (flags = 0) - * 2. S_FALSE after all data has been read and S_OK has been reported, - * (flags = FLAG_REQUEST_COMPLETE | FLAG_ALL_DATA_READ | FLAG_RESULT_REPORTED) - * 3. INET_E_DATA_NOT_AVAILABLE if InternetQueryDataAvailable fails. The first time - * this occurs, INET_E_DATA_NOT_AVAILABLE will also be reported to the sink, - * (flags = FLAG_REQUEST_COMPLETE) - * but upon subsequent calls to Read no reporting will take place, yet - * InternetQueryDataAvailable will still be called, and, on failure, - * INET_E_DATA_NOT_AVAILABLE will still be returned. - * (flags = FLAG_REQUEST_COMPLETE | FLAG_RESULT_REPORTED) - * - * FLAG_FIRST_DATA_REPORTED and FLAG_LAST_DATA_REPORTED are needed for proper - * ReportData reporting. For example, if OnResponse returns S_OK, Continue will - * report BSCF_FIRSTDATANOTIFICATION, and when all data has been read Read will - * report BSCF_INTERMEDIATEDATANOTIFICATION|BSCF_LASTDATANOTIFICATION. However, - * if OnResponse does not return S_OK, Continue will not report data, and Read - * will report BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION when all - * data has been read. - */ -#define FLAG_REQUEST_COMPLETE 0x0001 -#define FLAG_FIRST_CONTINUE_COMPLETE 0x0002 -#define FLAG_FIRST_DATA_REPORTED 0x0004 -#define FLAG_ALL_DATA_READ 0x0008 -#define FLAG_LAST_DATA_REPORTED 0x0010 -#define FLAG_RESULT_REPORTED 0x0020 - static inline HRESULT report_progress(Protocol *protocol, ULONG status_code, LPCWSTR status_text) { return IInternetProtocolSink_ReportProgress(protocol->protocol_sink, status_code, status_text); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index ea33f15..dc6d3fc 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -115,6 +115,36 @@ struct ProtocolVtbl { void (*close_connection)(Protocol*); }; +/* Flags are needed for, among other things, return HRESULTs from the Read function + * to conform to native. For example, Read returns: + * + * 1. E_PENDING if called before the request has completed, + * (flags = 0) + * 2. S_FALSE after all data has been read and S_OK has been reported, + * (flags = FLAG_REQUEST_COMPLETE | FLAG_ALL_DATA_READ | FLAG_RESULT_REPORTED) + * 3. INET_E_DATA_NOT_AVAILABLE if InternetQueryDataAvailable fails. The first time + * this occurs, INET_E_DATA_NOT_AVAILABLE will also be reported to the sink, + * (flags = FLAG_REQUEST_COMPLETE) + * but upon subsequent calls to Read no reporting will take place, yet + * InternetQueryDataAvailable will still be called, and, on failure, + * INET_E_DATA_NOT_AVAILABLE will still be returned. + * (flags = FLAG_REQUEST_COMPLETE | FLAG_RESULT_REPORTED) + * + * FLAG_FIRST_DATA_REPORTED and FLAG_LAST_DATA_REPORTED are needed for proper + * ReportData reporting. For example, if OnResponse returns S_OK, Continue will + * report BSCF_FIRSTDATANOTIFICATION, and when all data has been read Read will + * report BSCF_INTERMEDIATEDATANOTIFICATION|BSCF_LASTDATANOTIFICATION. However, + * if OnResponse does not return S_OK, Continue will not report data, and Read + * will report BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION when all + * data has been read. + */ +#define FLAG_REQUEST_COMPLETE 0x0001 +#define FLAG_FIRST_CONTINUE_COMPLETE 0x0002 +#define FLAG_FIRST_DATA_REPORTED 0x0004 +#define FLAG_ALL_DATA_READ 0x0008 +#define FLAG_LAST_DATA_REPORTED 0x0010 +#define FLAG_RESULT_REPORTED 0x0020 + HRESULT protocol_start(Protocol*,IInternetProtocol*,IUri*,IInternetProtocolSink*,IInternetBindInfo*); HRESULT protocol_continue(Protocol*,PROTOCOLDATA*); HRESULT protocol_read(Protocol*,void*,ULONG,ULONG*);

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLLocation iface.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: ed9c65b1ba80a438d181a025eebdcfe7c0186da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9c65b1ba80a438d181a025e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:12:05 2011 +0100 mshtml: COM cleanup for the IHTMLLocation iface. --- dlls/mshtml/htmllocation.c | 69 +++++++++++++++++++++-------------------- dlls/mshtml/htmlwindow.c | 8 ++-- dlls/mshtml/mshtml_private.h | 4 +-- 3 files changed, 40 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed9c65b1ba80a438d181a…

1 0

David Hedberg : shell32: Fix test error on certain w2k8 setups.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 2a809403d94450112b359d58e4cb49bf43051f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a809403d94450112b359d58e… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Jan 2 22:55:32 2011 +0100 shell32: Fix test error on certain w2k8 setups. --- dlls/shell32/tests/ebrowser.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index a221f97..6d9dbb1 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -1706,6 +1706,8 @@ static void test_InputObject(void) process_msgs(); hr = IInputObject_TranslateAcceleratorIO(pio, &msg_a); todo_wine ok(hr == (found ? S_OK : S_FALSE), "Got 0x%08x (%04x)\n", hr, i); + if(i == VK_F5) + Sleep(1000); /* Needed for w2k8 (64bit) */ } process_msgs();

1 0

Michael Stefaniuc : mshtml: Use ifaces instead of vtbl pointers in HTMLFrameBase.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 6b793e94ad94d5f5f69b621286e55cbcb5f07aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b793e94ad94d5f5f69b62128… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 00:59:45 2011 +0100 mshtml: Use ifaces instead of vtbl pointers in HTMLFrameBase. --- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmlframebase.c | 100 ++++++++++++++++++++++-------------------- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 6 +-- 5 files changed, 57 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b793e94ad94d5f5f69b6…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLImageElementFactory iface.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 726312c535e40de0212a0357c0ba76d2c236532b URL: http://source.winehq.org/git/wine.git/?a=commit;h=726312c535e40de0212a0357c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:05:51 2011 +0100 mshtml: COM cleanup for the IHTMLImageElementFactory iface. --- dlls/mshtml/htmlimg.c | 35 +++++++++++++++++++---------------- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 3 +-- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 6fb02cd..1008f87 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -693,21 +693,24 @@ HRESULT HTMLImgElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, return S_OK; } -#define HTMLIMGFACTORY_THIS(iface) DEFINE_THIS(HTMLImageElementFactory, HTMLImageElementFactory, iface) +static inline HTMLImageElementFactory *impl_from_IHTMLImageElementFactory(IHTMLImageElementFactory *iface) +{ + return CONTAINING_RECORD(iface, HTMLImageElementFactory, IHTMLImageElementFactory_iface); +} static HRESULT WINAPI HTMLImageElementFactory_QueryInterface(IHTMLImageElementFactory *iface, REFIID riid, void **ppv) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_Unknown %p)\n", This, ppv); - *ppv = HTMLIMGFACTORY(This); + *ppv = &This->IHTMLImageElementFactory_iface; }else if(IsEqualGUID(&IID_IHTMLImageElementFactory, riid)) { TRACE("(%p)->(IID_IHTMLImageElementFactory %p)\n", This, ppv); - *ppv = HTMLIMGFACTORY(This); + *ppv = &This->IHTMLImageElementFactory_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; @@ -722,7 +725,7 @@ static HRESULT WINAPI HTMLImageElementFactory_QueryInterface(IHTMLImageElementFa static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *iface) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -732,7 +735,7 @@ static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *ifa static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *iface) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -746,7 +749,7 @@ static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *if static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElementFactory *iface, UINT *pctinfo) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%p)\n", This, pctinfo); return E_NOTIMPL; } @@ -754,7 +757,7 @@ static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElement static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfo(IHTMLImageElementFactory *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -763,7 +766,7 @@ static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFac REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; @@ -774,7 +777,7 @@ static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *i DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; @@ -807,7 +810,7 @@ static LONG var_to_size(const VARIANT *v) static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *iface, VARIANT width, VARIANT height, IHTMLImgElement **img_elem) { - HTMLImageElementFactory *This = HTMLIMGFACTORY_THIS(iface); + HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); IHTMLImgElement *img; HTMLElement *elem; nsIDOMHTMLElement *nselem; @@ -855,8 +858,6 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return S_OK; } -#undef HTMLIMGFACTORY_THIS - static const IHTMLImageElementFactoryVtbl HTMLImageElementFactoryVtbl = { HTMLImageElementFactory_QueryInterface, HTMLImageElementFactory_AddRef, @@ -890,7 +891,8 @@ static HRESULT HTMLImageElementFactory_value(DispatchEx *dispex, LCID lcid, width = argc >= 1 ? params->rgvarg + (params->cArgs - 1) : ∅ height = argc >= 2 ? params->rgvarg + (params->cArgs - 2) : ∅ - hres = IHTMLImageElementFactory_create(HTMLIMGFACTORY(This), *width, *height, &img); + hres = IHTMLImageElementFactory_create(&This->IHTMLImageElementFactory_iface, *width, *height, + &img); if(FAILED(hres)) return hres; @@ -924,11 +926,12 @@ HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLWindow *window) ret = heap_alloc(sizeof(HTMLImageElementFactory)); - ret->lpHTMLImageElementFactoryVtbl = &HTMLImageElementFactoryVtbl; + ret->IHTMLImageElementFactory_iface.lpVtbl = &HTMLImageElementFactoryVtbl; ret->ref = 1; ret->window = window; - init_dispex(&ret->dispex, (IUnknown*)HTMLIMGFACTORY(ret), &HTMLImageElementFactory_dispex); + init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLImageElementFactory_iface, + &HTMLImageElementFactory_dispex); return ret; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5a936e7..f0be07b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -244,7 +244,7 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) if(This->image_factory) { This->image_factory->window = NULL; - IHTMLImageElementFactory_Release(HTMLIMGFACTORY(This->image_factory)); + IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); } if(This->location) { @@ -670,7 +670,7 @@ static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageEleme if(!This->image_factory) This->image_factory = HTMLImageElementFactory_Create(This); - *p = HTMLIMGFACTORY(This->image_factory); + *p = &This->image_factory->IHTMLImageElementFactory_iface; IHTMLImageElementFactory_AddRef(*p); return S_OK; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 70046b2..df3b023 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -237,7 +237,7 @@ typedef struct { typedef struct { DispatchEx dispex; - const IHTMLImageElementFactoryVtbl *lpHTMLImageElementFactoryVtbl; + IHTMLImageElementFactory IHTMLImageElementFactory_iface; LONG ref; @@ -634,7 +634,6 @@ struct HTMLDocumentNode { #define HTMLTEXTCONT(x) ((IHTMLTextContainer*) &(x)->lpHTMLTextContainerVtbl) -#define HTMLIMGFACTORY(x) ((IHTMLImageElementFactory*) &(x)->lpHTMLImageElementFactoryVtbl) #define HTMLLOCATION(x) ((IHTMLLocation*) &(x)->lpHTMLLocationVtbl) #define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLOptionElement* ifaces.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 118379d642e8ad064a3cfa56b05771f93ced54cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=118379d642e8ad064a3cfa56b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:04:25 2011 +0100 mshtml: COM cleanup for the IHTMLOptionElement* ifaces. --- dlls/mshtml/htmloption.c | 86 +++++++++++++++++++++--------------------- dlls/mshtml/htmlwindow.c | 4 +- dlls/mshtml/mshtml_private.h | 3 +- 3 files changed, 46 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=118379d642e8ad064a3cf…

1 0

Michael Stefaniuc : mshtml: COM cleanup for the IConnectionPoint* ifaces.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 7f9f1697123b6ed7e10671791192a173cac4e906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9f1697123b6ed7e10671791… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 3 01:02:57 2011 +0100 mshtml: COM cleanup for the IConnectionPoint* ifaces. --- dlls/mshtml/conpoint.c | 61 +++++++++++++++++++++-------------------- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 5 +-- 4 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f9f1697123b6ed7e1067…

1 0

Hwang YunSong : reg: Update Korean resource.
by Alexandre Julliard Jan. 3, 2011

Jan. 3, 2011

Module: wine Branch: master Commit: 792d15562dbdf789ce820eddb2fbeeeb1f08d892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=792d15562dbdf789ce820eddb… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Jan 2 21:07:58 2011 +0900 reg: Update Korean resource. --- programs/reg/Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/reg/Ko.rc b/programs/reg/Ko.rc index 46efd91..9590ec5 100644 --- a/programs/reg/Ko.rc +++ b/programs/reg/Ko.rc @@ -3,7 +3,7 @@ * Korean language support * * Copyright 2008 Andrew Riedi - * Copyright 2008 YunSong Hwang + * Copyright 2008,2010 YunSong Hwang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,17 +22,19 @@ #include "reg.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "��ɾ� ��:\n\nREG [ ADD | DELETE | QUERY ]\nREG ��ɾ� /?\n" - STRING_ADD_USAGE, "REG ADD �� [/v �� | /ve] [/t ��] [/s �и��ȣ] [/d ��Ÿ] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE Ű �̸� [/v �� | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY Ű �̸� [/v ��| /ve] [/s]\n" - STRING_SUCCESS, "�۾�� ϴ�\n" - STRING_INVALID_KEY, "��: �ùٸ�� Ű �̸�\n" - STRING_INVALID_CMDLINE, "��:�ùٸ�� ɶ�� Ű��\n" - STRING_NO_REMOTE, "��: �� ӽſ� Ű�� ϴ� �� ʽ��ϴ�\n" - STRING_CANNOT_FIND, "��: �� ý��ۿ�� Ʈ�� Ű�� ã�� ϴ�\n" + STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n" + STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n" + STRING_SUCCESS, "작업이 성공적으로 끝났습니다\n" + STRING_INVALID_KEY, "에러: 올바르지 않은 키 이름\n" + STRING_INVALID_CMDLINE, "에러:올바르지 않은 명령라인 매개변수\n" + STRING_NO_REMOTE, "에러: 원격 머신에 키를 더하는 것은 가능하지 않습니다\n" + STRING_CANNOT_FIND, "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n" }

1 0