June 2012 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Moved global_props from HTMLOuterWindow to HTMLInnerWindow.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 2698fe0b3fce9dcc18455e753cb44d285bfb6cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2698fe0b3fce9dcc18455e753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:05:48 2012 +0200 mshtml: Moved global_props from HTMLOuterWindow to HTMLInnerWindow. --- dlls/mshtml/htmlframe.c | 2 +- dlls/mshtml/htmliframe.c | 2 +- dlls/mshtml/htmlwindow.c | 27 ++++++++++++++------------- dlls/mshtml/mshtml_private.h | 10 +++++----- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 13f6bd4..749df4b 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -231,7 +231,7 @@ static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, if(!This->framebase.content_window) return DISP_E_UNKNOWNNAME; - return search_window_props(This->framebase.content_window, name, grfdex, pid); + return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, pid); } static HRESULT HTMLFrameElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 03ebb47..3cae237 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -202,7 +202,7 @@ static HRESULT HTMLIFrame_get_dispid(HTMLDOMNode *iface, BSTR name, if(!This->framebase.content_window) return DISP_E_UNKNOWNNAME; - return search_window_props(This->framebase.content_window, name, grfdex, pid); + return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, pid); } static HRESULT HTMLIFrame_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4a696b7..94731ec 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -180,8 +180,6 @@ static ULONG WINAPI HTMLWindow2_AddRef(IHTMLWindow2 *iface) static void release_outer_window(HTMLOuterWindow *This) { - unsigned i; - remove_target_tasks(This->task_magic); set_window_bscallback(This, NULL); set_current_mon(This, NULL); @@ -212,13 +210,9 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->screen) IHTMLScreen_Release(This->screen); - for(i=0; i < This->global_prop_cnt; i++) - heap_free(This->global_props[i].name); - This->window_ref->window = NULL; windowref_release(This->window_ref); - heap_free(This->global_props); release_script_hosts(This); if(This->nswindow) @@ -230,8 +224,15 @@ static void release_outer_window(HTMLOuterWindow *This) static void release_inner_window(HTMLInnerWindow *This) { + unsigned i; + htmldoc_release(&This->doc->basedoc); release_dispex(&This->dispex); + + for(i=0; i < This->global_prop_cnt; i++) + heap_free(This->global_props[i].name); + heap_free(This->global_props); + heap_free(This); } @@ -2186,7 +2187,7 @@ static HRESULT WINAPI WindowDispEx_Invoke(IDispatchEx *iface, DISPID dispIdMembe pDispParams, pVarResult, pExcepInfo, puArgErr); } -static global_prop_t *alloc_global_prop(HTMLOuterWindow *This, global_prop_type_t type, BSTR name) +static global_prop_t *alloc_global_prop(HTMLInnerWindow *This, global_prop_type_t type, BSTR name) { if(This->global_prop_cnt == This->global_prop_size) { global_prop_t *new_props; @@ -2213,12 +2214,12 @@ static global_prop_t *alloc_global_prop(HTMLOuterWindow *This, global_prop_type_ return This->global_props + This->global_prop_cnt++; } -static inline DWORD prop_to_dispid(HTMLOuterWindow *This, global_prop_t *prop) +static inline DWORD prop_to_dispid(HTMLInnerWindow *This, global_prop_t *prop) { return MSHTML_DISPID_CUSTOM_MIN + (prop-This->global_props); } -HRESULT search_window_props(HTMLOuterWindow *This, BSTR bstrName, DWORD grfdex, DISPID *pid) +HRESULT search_window_props(HTMLInnerWindow *This, BSTR bstrName, DWORD grfdex, DISPID *pid) { DWORD i; ScriptHost *script_host; @@ -2232,7 +2233,7 @@ HRESULT search_window_props(HTMLOuterWindow *This, BSTR bstrName, DWORD grfdex, } } - if(find_global_prop(This, bstrName, grfdex, &script_host, &id)) { + if(find_global_prop(This->base.outer_window, bstrName, grfdex, &script_host, &id)) { global_prop_t *prop; prop = alloc_global_prop(This, GLOBAL_SCRIPTVAR, bstrName); @@ -2252,7 +2253,7 @@ HRESULT search_window_props(HTMLOuterWindow *This, BSTR bstrName, DWORD grfdex, static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { HTMLWindow *This = impl_from_IDispatchEx(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; HRESULT hres; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -2450,10 +2451,10 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD HRESULT hres; idx = id - MSHTML_DISPID_CUSTOM_MIN; - if(idx >= This->base.outer_window->global_prop_cnt) + if(idx >= This->global_prop_cnt) return DISP_E_MEMBERNOTFOUND; - prop = This->base.outer_window->global_props+idx; + prop = This->global_props+idx; switch(prop->type) { case GLOBAL_SCRIPTVAR: { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 010542e..004a4b4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -344,10 +344,6 @@ struct HTMLOuterWindow { IHTMLScreen *screen; IOmHistory *history; - global_prop_t *global_props; - DWORD global_prop_cnt; - DWORD global_prop_size; - struct list children; struct list sibling_entry; struct list entry; @@ -358,6 +354,10 @@ struct HTMLInnerWindow { DispatchEx dispex; HTMLDocumentNode *doc; + + global_prop_t *global_props; + DWORD global_prop_cnt; + DWORD global_prop_size; }; typedef enum { @@ -850,7 +850,7 @@ HRESULT exec_script(HTMLOuterWindow*,const WCHAR*,const WCHAR*,VARIANT*) DECLSPE void set_script_mode(HTMLOuterWindow*,SCRIPTMODE) DECLSPEC_HIDDEN; BOOL find_global_prop(HTMLOuterWindow*,BSTR,DWORD,ScriptHost**,DISPID*) DECLSPEC_HIDDEN; IDispatch *get_script_disp(ScriptHost*) DECLSPEC_HIDDEN; -HRESULT search_window_props(HTMLOuterWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN; +HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Moved option_factory from HTMLOuterWindow to HTMLInnerWindow.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c77b8bfdd9a25e4b36f4b1f7738b7e9e41cd4d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77b8bfdd9a25e4b36f4b1f77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:05:58 2012 +0200 mshtml: Moved option_factory from HTMLOuterWindow to HTMLInnerWindow. --- dlls/mshtml/htmloption.c | 9 ++++++--- dlls/mshtml/htmlwindow.c | 21 +++++++++++++-------- dlls/mshtml/mshtml_private.h | 7 ++++--- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index ad3e8fb..8bc0f40 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -517,15 +517,18 @@ static const IHTMLOptionElementFactoryVtbl HTMLOptionElementFactoryVtbl = { HTMLOptionElementFactory_create }; -HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLOuterWindow *window) +HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionElementFactory **ret_ptr) { HTMLOptionElementFactory *ret; - ret = heap_alloc(sizeof(HTMLOptionElementFactory)); + ret = heap_alloc(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; ret->IHTMLOptionElementFactory_iface.lpVtbl = &HTMLOptionElementFactoryVtbl; ret->ref = 1; ret->window = window; - return ret; + *ret_ptr = ret; + return S_OK; } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 94731ec..f6d6212 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -192,11 +192,6 @@ static void release_outer_window(HTMLOuterWindow *This) if(This->frame_element) This->frame_element->content_window = NULL; - if(This->option_factory) { - This->option_factory->window = NULL; - IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface); - } - if(This->image_factory) { This->image_factory->window = NULL; IHTMLImageElementFactory_Release(&This->image_factory->IHTMLImageElementFactory_iface); @@ -233,6 +228,11 @@ static void release_inner_window(HTMLInnerWindow *This) heap_free(This->global_props[i].name); heap_free(This->global_props); + if(This->option_factory) { + This->option_factory->window = NULL; + IHTMLOptionElementFactory_Release(&This->option_factory->IHTMLOptionElementFactory_iface); + } + heap_free(This); } @@ -1083,12 +1083,17 @@ static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen ** static HRESULT WINAPI HTMLWindow2_get_Option(IHTMLWindow2 *iface, IHTMLOptionElementFactory **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); - if(!window->option_factory) - window->option_factory = HTMLOptionElementFactory_Create(window); + if(!window->option_factory) { + HRESULT hres; + + hres = HTMLOptionElementFactory_Create(window, &window->option_factory); + if(FAILED(hres)) + return hres; + } *p = &window->option_factory->IHTMLOptionElementFactory_iface; IHTMLOptionElementFactory_AddRef(*p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 004a4b4..35800d8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -269,7 +269,7 @@ typedef struct { LONG ref; - HTMLOuterWindow *window; + HTMLInnerWindow *window; } HTMLOptionElementFactory; typedef struct { @@ -338,7 +338,6 @@ struct HTMLOuterWindow { IInternetSecurityManager *secmgr; - HTMLOptionElementFactory *option_factory; HTMLImageElementFactory *image_factory; HTMLLocation *location; IHTMLScreen *screen; @@ -355,6 +354,8 @@ struct HTMLInnerWindow { HTMLDocumentNode *doc; + HTMLOptionElementFactory *option_factory; + global_prop_t *global_props; DWORD global_prop_cnt; DWORD global_prop_size; @@ -660,7 +661,7 @@ HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,H HRESULT update_window_doc(HTMLOuterWindow*) DECLSPEC_HIDDEN; HTMLOuterWindow *nswindow_to_window(const nsIDOMWindow*) DECLSPEC_HIDDEN; void get_top_window(HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; -HTMLOptionElementFactory *HTMLOptionElementFactory_Create(HTMLOuterWindow*) DECLSPEC_HIDDEN; +HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow*,HTMLOptionElementFactory**) DECLSPEC_HIDDEN; HTMLImageElementFactory *HTMLImageElementFactory_Create(HTMLOuterWindow*) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLOuterWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Moved script_hosts from HTMLOuterWindow to HTMLInnerWindow.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: bb02767f15ec3ecc51f467ef16d90aac3c2519d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb02767f15ec3ecc51f467ef1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:06:09 2012 +0200 mshtml: Moved script_hosts from HTMLOuterWindow to HTMLInnerWindow. --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlwindow.c | 15 ++++++++------- dlls/mshtml/mshtml_private.h | 15 ++++++++------- dlls/mshtml/mutation.c | 2 +- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/script.c | 28 +++++++++++++++------------- 7 files changed, 35 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb02767f15ec3ecc51f46…

1 0

Jacek Caban : mshtml: Store event object in HTMLInnerWindow instead of HTMLOuterWindow.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: c73b135686d145c760c9c66622489ca4dbd81c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c73b135686d145c760c9c6662… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 25 14:06:27 2012 +0200 mshtml: Store event object in HTMLInnerWindow instead of HTMLOuterWindow. --- dlls/mshtml/htmlevent.c | 10 ++++++---- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4b201c4..ca966ba 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -989,6 +989,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode IHTMLEventObj *prev_event; nsIDOMNode *parent, *nsnode; BOOL prevent_default = FALSE; + HTMLInnerWindow *window; HTMLDOMNode *node; PRUint16 node_type; nsresult nsres; @@ -996,7 +997,8 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); - prev_event = doc->basedoc.window->event; + window = doc->basedoc.window->base.inner_window; + prev_event = window->event; if(set_event) { hres = get_node(doc, target, TRUE, &node); if(FAILED(hres)) @@ -1004,9 +1006,9 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode event_obj = create_event(node, eid, nsevent); node_release(node); - doc->basedoc.window->event = &event_obj->IHTMLEventObj_iface; + window->event = &event_obj->IHTMLEventObj_iface; }else { - doc->basedoc.window->event = NULL; + window->event = NULL; } nsIDOMNode_GetNodeType(target, &node_type); @@ -1070,7 +1072,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(event_obj && event_obj->prevent_default) prevent_default = TRUE; - doc->basedoc.window->event = prev_event; + window->event = prev_event; if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index c20d765..dc6d9af 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1027,7 +1027,7 @@ static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocumen static HRESULT WINAPI HTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - HTMLOuterWindow *window = This->outer_window; + HTMLInnerWindow *window = This->inner_window; TRACE("(%p)->(%p)\n", This, p); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index de0a237..31532cd 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -331,8 +331,6 @@ struct HTMLOuterWindow { IUri *uri; BSTR url; - IHTMLEventObj *event; - SCRIPTMODE scriptmode; IInternetSecurityManager *secmgr; @@ -355,6 +353,8 @@ struct HTMLInnerWindow { struct list script_hosts; + IHTMLEventObj *event; + HTMLOptionElementFactory *option_factory; global_prop_t *global_props;

1 0

Piotr Caban : msvcp90: Added partial num_get<wchar> and num_get<short> implementation.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 4732e3f75c11255e8ecef51267519874056b9970 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4732e3f75c11255e8ecef5126… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 25 15:48:39 2012 +0200 msvcp90: Added partial num_get<wchar> and num_get<short> implementation. --- dlls/msvcp90/locale.c | 288 +++++++++++++++++++++++++++++++++++---------- dlls/msvcp90/msvcp90.spec | 52 ++++---- 2 files changed, 250 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4732e3f75c11255e8ecef…

1 0

Nikolay Sivov : msxml3: Implement internalEntityDecl() for writer.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: acce94a04ee35f01dd77fa8aedf7255443941c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acce94a04ee35f01dd77fa8ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 13:56:53 2012 +0400 msxml3: Implement internalEntityDecl() for writer. --- dlls/msxml3/mxwriter.c | 28 ++++++++++++++++++++++------ dlls/msxml3/tests/saxreader.c | 21 +++++++++++++++++++++ 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b9989b2..f03ceb0 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -42,6 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); static const WCHAR emptyW[] = {0}; static const WCHAR spaceW[] = {' '}; static const WCHAR quotW[] = {'\"'}; +static const WCHAR closetagW[] = {'>','\r','\n'}; /* should be ordered as encoding names are sorted */ typedef enum @@ -1455,7 +1456,6 @@ static HRESULT WINAPI SAXDeclHandler_elementDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *model, int n_model) { static const WCHAR elementW[] = {'<','!','E','L','E','M','E','N','T',' '}; - static const WCHAR closeelementW[] = {'>','\r','\n'}; mxwriter *This = impl_from_ISAXDeclHandler( iface ); TRACE("(%p)->(%s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, @@ -1470,7 +1470,7 @@ static HRESULT WINAPI SAXDeclHandler_elementDecl(ISAXDeclHandler *iface, } if (n_model) write_output_buffer(This->buffer, model, n_model); - write_output_buffer(This->buffer, closeelementW, sizeof(closeelementW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -1482,7 +1482,7 @@ static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, { mxwriter *This = impl_from_ISAXDeclHandler( iface ); static const WCHAR attlistW[] = {'<','!','A','T','T','L','I','S','T',' '}; - static const WCHAR closeelementW[] = {'>','\r','\n'}; + static const WCHAR closetagW[] = {'>','\r','\n'}; TRACE("(%p)->(%s:%d %s:%d %s:%d %s:%d %s:%d)\n", This, debugstr_wn(element, n_element), n_element, debugstr_wn(attr, n_attr), n_attr, debugstr_wn(type, n_type), n_type, debugstr_wn(Default, n_default), n_default, @@ -1512,7 +1512,7 @@ static HRESULT WINAPI SAXDeclHandler_attributeDecl(ISAXDeclHandler *iface, if (n_value) write_output_buffer_quoted(This->buffer, value, n_value); - write_output_buffer(This->buffer, closeelementW, sizeof(closeelementW)/sizeof(WCHAR)); + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); return S_OK; } @@ -1521,9 +1521,25 @@ static HRESULT WINAPI SAXDeclHandler_internalEntityDecl(ISAXDeclHandler *iface, const WCHAR *name, int n_name, const WCHAR *value, int n_value) { mxwriter *This = impl_from_ISAXDeclHandler( iface ); - FIXME("(%p)->(%s:%d %s:%d): stub\n", This, debugstr_wn(name, n_name), n_name, + static const WCHAR entityW[] = {'<','!','E','N','T','I','T','Y',' '}; + + TRACE("(%p)->(%s:%d %s:%d)\n", This, debugstr_wn(name, n_name), n_name, debugstr_wn(value, n_value), n_value); - return E_NOTIMPL; + + if (!name || !value) return E_INVALIDARG; + + write_output_buffer(This->buffer, entityW, sizeof(entityW)/sizeof(WCHAR)); + if (n_name) { + write_output_buffer(This->buffer, name, n_name); + write_output_buffer(This->buffer, spaceW, sizeof(spaceW)/sizeof(WCHAR)); + } + + if (n_value) + write_output_buffer_quoted(This->buffer, value, n_value); + + write_output_buffer(This->buffer, closetagW, sizeof(closetagW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXDeclHandler_externalEntityDecl(ISAXDeclHandler *iface, diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 5efe44e..2858583 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -4488,6 +4488,27 @@ static void test_mxwriter_dtd(void) V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* internal entities */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXDeclHandler_internalEntityDecl(decl, NULL, 0, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXDeclHandler_internalEntityDecl(decl, _bstr_("name"), -1, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXDeclHandler_internalEntityDecl(decl, _bstr_("name"), strlen("name"), _bstr_("value"), strlen("value")); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<!ENTITY name \"value\">\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); ISAXLexicalHandler_Release(lexical); ISAXDeclHandler_Release(decl);

1 0

Nikolay Sivov : msxml3: Basic refcount test for IMXNamespacePrefixes.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 924a4e13710fa8eeac3e729b6c90e94bbc9c99b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=924a4e13710fa8eeac3e729b6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 23 15:03:42 2012 +0400 msxml3: Basic refcount test for IMXNamespacePrefixes. --- dlls/msxml3/tests/domdoc.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 0c9d65a..4bbbe56 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10484,8 +10484,10 @@ static void test_domobj_dispex(IUnknown *obj) static void test_mxnamespacemanager(void) { static const char xmluriA[] = "http://www.w3.org/XML/1998/namespace"; + IMXNamespacePrefixes *prefixes; IVBMXNamespaceManager *mgr2; IMXNamespaceManager *nsmgr; + IUnknown *unk1, *unk2; WCHAR buffW[250]; IDispatch *disp; IUnknown *unk; @@ -10503,6 +10505,28 @@ static void test_mxnamespacemanager(void) hr = IMXNamespaceManager_QueryInterface(nsmgr, &IID_IVBMXNamespaceManager, (void**)&mgr2); EXPECT_HR(hr, S_OK); + + EXPECT_REF(nsmgr, 2); + EXPECT_REF(mgr2, 2); + prefixes = NULL; + hr = IVBMXNamespaceManager_getDeclaredPrefixes(mgr2, &prefixes); + if (hr == S_OK) + { + ok(prefixes != NULL, "got %p\n", prefixes); + EXPECT_REF(nsmgr, 2); + EXPECT_REF(mgr2, 2); + EXPECT_REF(prefixes, 1); + + IVBMXNamespaceManager_QueryInterface(mgr2, &IID_IUnknown, (void**)&unk1); + IMXNamespacePrefixes_QueryInterface(prefixes, &IID_IUnknown, (void**)&unk2); + + EXPECT_REF(mgr2, 3); + EXPECT_REF(prefixes, 2); + + IUnknown_Release(unk1); + IUnknown_Release(unk2); + IMXNamespacePrefixes_Release(prefixes); + } IVBMXNamespaceManager_Release(mgr2); hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, NULL);

1 0

Erich Hoover : hhctrl.ocx: Add icons for the table of contents TreeView control.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: fc413c70a5f4383bdd7e3c393c4429a8a712a5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc413c70a5f4383bdd7e3c393… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jun 22 11:07:19 2012 -0600 hhctrl.ocx: Add icons for the table of contents TreeView control. --- dlls/hhctrl.ocx/Makefile.in | 4 ++- dlls/hhctrl.ocx/content.c | 5 +++- dlls/hhctrl.ocx/help.c | 41 +++++++++++++++++++++++++++++++++++---- dlls/hhctrl.ocx/hhctrl.h | 5 ++++ dlls/hhctrl.ocx/hhctrl.rc | 3 ++ dlls/hhctrl.ocx/hhtreeview.bmp | Bin 0 -> 3194 bytes dlls/hhctrl.ocx/hhtreeview.svg | 18 +++++++++++++++++ dlls/hhctrl.ocx/resource.h | 7 ++++++ 8 files changed, 76 insertions(+), 7 deletions(-) diff --git a/dlls/hhctrl.ocx/Makefile.in b/dlls/hhctrl.ocx/Makefile.in index 05b3e35..289cc39 100644 --- a/dlls/hhctrl.ocx/Makefile.in +++ b/dlls/hhctrl.ocx/Makefile.in @@ -16,6 +16,8 @@ IDL_TLB_SRCS = hhctrl_tlb.idl RC_SRCS = hhctrl.rc PO_SRCS = hhctrl.rc -SVG_SRCS = hhtoolbar.svg +SVG_SRCS = \ + hhtoolbar.svg \ + hhtreeview.svg @MAKE_DLL_RULES@ diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index d246c49..28bda11 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -22,6 +22,7 @@ #include "hhctrl.h" #include "stream.h" +#include "resource.h" #include "wine/debug.h" @@ -267,10 +268,12 @@ static void insert_content_item(HWND hwnd, ContentItem *parent, ContentItem *ite TVINSERTSTRUCTW tvis; memset(&tvis, 0, sizeof(tvis)); - tvis.u.item.mask = TVIF_TEXT|TVIF_PARAM; + tvis.u.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE|TVIF_SELECTEDIMAGE; tvis.u.item.cchTextMax = strlenW(item->name)+1; tvis.u.item.pszText = item->name; tvis.u.item.lParam = (LPARAM)item; + tvis.u.item.iImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; + tvis.u.item.iSelectedImage = item->child ? HHTV_FOLDER : HHTV_DOCUMENT; tvis.hParent = parent ? parent->id : 0; tvis.hInsertAfter = TVI_LAST; diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index ef41ec2..3acb024 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -707,6 +707,24 @@ static LRESULT CALLBACK Child_WndProc(HWND hWnd, UINT message, WPARAM wParam, LP return OnTabChange(hWnd); case TVN_SELCHANGEDW: return OnTopicChange(info, (void*)((NMTREEVIEWW *)lParam)->itemNew.lParam); + case TVN_ITEMEXPANDINGW: { + TVITEMW *item = &((NMTREEVIEWW *)lParam)->itemNew; + HWND hwndTreeView = info->tabs[TAB_CONTENTS].hwnd; + + item->mask = TVIF_IMAGE|TVIF_SELECTEDIMAGE; + if (item->state & TVIS_EXPANDED) + { + item->iImage = HHTV_FOLDER; + item->iSelectedImage = HHTV_FOLDER; + } + else + { + item->iImage = HHTV_OPENFOLDER; + item->iSelectedImage = HHTV_OPENFOLDER; + } + SendMessageW(hwndTreeView, TVM_SETITEMW, 0, (LPARAM)item); + return 0; + } case NM_DBLCLK: if(!info) return 0; @@ -1163,18 +1181,29 @@ static BOOL HH_AddHTMLPane(HHInfo *pHHInfo) static BOOL AddContentTab(HHInfo *info) { + HIMAGELIST hImageList; + HBITMAP hBitmap; + HWND hWnd; + if(info->tabs[TAB_CONTENTS].id == -1) return TRUE; /* No "Contents" tab */ - info->tabs[TAB_CONTENTS].hwnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, - szEmpty, WS_CHILD | WS_BORDER | 0x25, 50, 50, 100, 100, - info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL); - if(!info->tabs[TAB_CONTENTS].hwnd) { + hWnd = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, szEmpty, WS_CHILD | WS_BORDER | TVS_LINESATROOT + | TVS_SHOWSELALWAYS | TVS_HASBUTTONS, 50, 50, 100, 100, + info->WinType.hwndNavigation, NULL, hhctrl_hinstance, NULL); + if(!hWnd) { ERR("Could not create treeview control\n"); return FALSE; } + hImageList = ImageList_Create(16, 16, ILC_COLOR32, 0, HHTV_NUMBITMAPS); + hBitmap = LoadBitmapW(hhctrl_hinstance, MAKEINTRESOURCEW(IDB_HHTREEVIEW)); + ImageList_Add(hImageList, hBitmap, NULL); + SendMessageW(hWnd, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImageList); + + info->contents.hImageList = hImageList; + info->tabs[TAB_CONTENTS].hwnd = hWnd; ResizeTabChild(info, TAB_CONTENTS); - ShowWindow(info->tabs[TAB_CONTENTS].hwnd, SW_SHOW); + ShowWindow(hWnd, SW_SHOW); return TRUE; } @@ -1729,6 +1758,8 @@ void ReleaseHelpViewer(HHInfo *info) ReleaseIndex(info); ReleaseSearch(info); + if(info->contents.hImageList) + ImageList_Destroy(info->contents.hImageList); if(info->WinType.hwndHelp) DestroyWindow(info->WinType.hwndHelp); diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 73b2a6b..eea7f7f 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -135,6 +135,10 @@ typedef struct { } SearchTab; typedef struct { + HIMAGELIST hImageList; +} ContentsTab; + +typedef struct { IOleClientSite *client_site; IWebBrowser2 *web_browser; IOleObject *wb_object; @@ -158,6 +162,7 @@ typedef struct { IndexItem *index; IndexPopup popup; SearchTab search; + ContentsTab contents; HWND hwndTabCtrl; HWND hwndSizeBar; HFONT hFont; diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 4ec8fe9..a9ccee2 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -76,3 +76,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: hhtoolbar.bmp */ IDB_HHTOOLBAR BITMAP hhtoolbar.bmp + +/* @makedep: hhtreeview.bmp */ +IDB_HHTREEVIEW BITMAP hhtreeview.bmp diff --git a/dlls/hhctrl.ocx/hhtreeview.bmp b/dlls/hhctrl.ocx/hhtreeview.bmp new file mode 100644 index 0000000..b8e262c Binary files /dev/null and b/dlls/hhctrl.ocx/hhtreeview.bmp differ diff --git a/dlls/hhctrl.ocx/hhtreeview.svg b/dlls/hhctrl.ocx/hhtreeview.svg new file mode 100644 index 0000000..6b8517f --- /dev/null +++ b/dlls/hhctrl.ocx/hhtreeview.svg @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg id="bitmap:48-32" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="48" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <metadata id="metadata3206"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g id="layer1" transform="translate(0 -1036.4)"> + <image id="icon:16-32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAHCSURB VDiNpZAxa5NRFIafc+9XLCni4BC6FBycMnbrLpkcgtDVX6C70D/g4lZX/4coxLlgxFkpiiSSUGm/ JiXfveee45AmNlhawXc53HvPee55X+l2u/yPqt3d3Tfu/viatwt3fzIYDI5uBJhZr9fr3TMzzAx3 B+D09PR+v98/7HQ6z5fNOWdCCGU4HH6s67oAVDlnV1UmkwmllBUkhMD29nYHeLuEAkyn06qU8qqu 64MrgIyqYmZrkHa73drc3KTVahFjJITAaDRiPB4/XFlQVVMtHH5IzJo/P4EA4MyB+erWPQB7++zs 7ccYvlU5Z08pMW2cl88eIXLZeDUpXzsBkNQ5eP1+p0opmaoCTgzw6fjs6gLLsp58FB60t0DcK1Ul 54yIEIMQ43Uj68pquDmCeJVztpwzuBNE2LgBoMVpslHMCUEAFgDVxQbzVAiA+aK5uGPmmDtZF3Vp oUm2ArhqQaRiUjcMf81p1G60UEVhcjZfAFTVUkrgkS+jc06mDX9nvq4YhJ9nlxZExMwMEaHJRutO dWuIIsJFUoBSuTvHJ4YIfP46unV4qdlsjsBRZRtb/XfHd5+C8+P7+J8BIoxFwovfRxYhnhxjpzEA AAAASUVORK5CYII= " height="16" width="16" y="1036.4" x="16"/> + <image id="icon:16-32-5" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB70lEQVQ4jaWRPU9UURCGn3Pu3V3D JdkQPxIbLbUwITZa2xmjBYX/wFhSE2Jniw2thTT4L9QYCqOFCdGYWIkRSQR2AQP7cWbOjMWyuAsE Cyc51Zn3mZn3hf+sMD8//8LdH5zy1xGRhwsLC+/PBMzNze3OzMw0zQwzw90BaLfbrKysvKqq6v6w eW1tDYClpaU+4ACliLiqsrW1Rc55DFKr1W63Wq19d8fdqaoKd2d2dvbT4uLizRGAoKqY2Rhkenp6 cmpqiqqqKIqCGCOdTofl5eUbw61KVTXVTM5/3xAgInQ6HUIIhBCIMQKQUvIjgIh4SmkMkHNmuLa7 nwCo6pGJZUrJVJWcMy8/Rna7EaidGZ1Vd2u3Ht/rhhi/laqKiJBzZqcbefLoDkUMhxkB7qdCktq5 p8/fXi9FxEQEMyPgTDQKPv/4jftATziWOxBj4Mr5CULAShEx1QGgiIEiBmIIJ4Qjk+n1MvEiAH4Y 48C0sigoYqBRxhPCvhjdlMnmNIo4PNNKVbWUEvt9aE7W2dzr00sZ98G0vmaS2pgVZRHY3O0NTggh mJnxdbvO5UtNdg6EnhjdpEei4yfFEFjfPiCGuFm6w+oGrP6qc61Z583qT7Kd7vxotVt7ZLfXZW5c ePdho7oKzucv3/8pHKl1zJ79AVcbTQP9EwlzAAAAAElFTkSuQmCC " height="16" width="16" y="1036.4" x="32"/> + <image id="icon:16-32-9" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA3ElEQVQ4jZ2SsQ2DMBBF/4GlhAoJ eQYMs6RMkXGQ2YIREqXNMJgFaOipTIrIyITDhPzqLPv+f3cyNU3z7Pv+imO6VVX1AABoraej0lpP zkm4YhgGWGsBAEQ0R7maiBDHMdI0XaDMBtZaGGMWDb6ICGVZrmYR/kEpFSTgJPyHPsG3fiLI85xJ HDFNJ0RRFCYAgK7rFpdFUQBIAIwAzvsjcAREBKKEbV4RGGPmmlvehyhgoJTaIOAXuxqhbVs22W2f M2IJOJPdf5Bl2SZmSEJK+arr+nKkSUp5/yuN0xtUUV+5ugGgGgAAAABJRU5ErkJggg== " height="16" width="16" y="1036.4" x="0"/> + </g> +</svg> diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 560a0c3..0faa9da 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -41,3 +41,10 @@ #define HHTB_CONTRACT 4 #define HHTB_EXPAND 5 #define HHTB_NUMBITMAPS HHTB_EXPAND + +#define IDB_HHTREEVIEW 1001 +/* IDB_HHTREEVIEW bitmaps: */ +#define HHTV_DOCUMENT 0 +#define HHTV_FOLDER 1 +#define HHTV_OPENFOLDER 2 +#define HHTV_NUMBITMAPS HHTV_OPENFOLDER

1 0

Dmitry Timoshkov : windowscodecs: Add WICImagingCategories registration.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: 40185b6c6e5aca9e55d1f94740d4f39c27f06a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=40185b6c6e5aca9e55d1f9474… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 22 15:12:54 2012 +0900 windowscodecs: Add WICImagingCategories registration. --- dlls/windowscodecs/regsvr.c | 102 +++++++++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 1 + 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index b73b645..a422747 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1788,6 +1788,104 @@ static struct regsvr_pixelformat const pixelformat_list[] = { { NULL } /* list terminator */ }; +struct regsvr_category +{ + const CLSID *clsid; /* NULL for end of list */ +}; + +static const struct regsvr_category category_list[] = { + { &CATID_WICBitmapDecoders }, + { &CATID_WICBitmapEncoders }, + { &CATID_WICFormatConverters }, + { &CATID_WICMetadataReader }, + { &CATID_WICPixelFormats }, + { NULL } +}; + +static HRESULT register_categories(const struct regsvr_category *list) +{ + LONG res; + WCHAR buf[39]; + HKEY coclass_key, categories_key, instance_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + StringFromGUID2(&CLSID_WICImagingCategories, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &categories_key, NULL); + if (res != ERROR_SUCCESS) + { + RegCloseKey(coclass_key); + return HRESULT_FROM_WIN32(res); + } + + res = RegCreateKeyExW(categories_key, instance_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &instance_key, NULL); + + for (; res == ERROR_SUCCESS && list->clsid; list++) + { + HKEY instance_clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(instance_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &instance_clsid_key, NULL); + if (res == ERROR_SUCCESS) + { + res = RegSetValueExW(instance_clsid_key, clsid_valuename, 0, REG_SZ, + (const BYTE *)buf, 78); + RegCloseKey(instance_clsid_key); + } + } + + RegCloseKey(instance_key); + RegCloseKey(categories_key); + RegCloseKey(coclass_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +static HRESULT unregister_categories(const struct regsvr_category *list) +{ + LONG res; + WCHAR buf[39]; + HKEY coclass_key, categories_key, instance_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); + + StringFromGUID2(&CLSID_WICImagingCategories, buf, 39); + res = RegOpenKeyExW(coclass_key, buf, 0, + KEY_READ | KEY_WRITE, &categories_key); + if (res != ERROR_SUCCESS) + { + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + RegCloseKey(coclass_key); + return HRESULT_FROM_WIN32(res); + } + + res = RegOpenKeyExW(categories_key, instance_keyname, 0, + KEY_READ | KEY_WRITE, &instance_key); + + for (; res == ERROR_SUCCESS && list->clsid; list++) + { + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(instance_key, buf); + } + + RegCloseKey(instance_key); + RegCloseKey(categories_key); + + StringFromGUID2(&CLSID_WICImagingCategories, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + + RegCloseKey(coclass_key); + + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + extern HRESULT WINAPI WIC_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI WIC_DllUnregisterServer(void) DECLSPEC_HIDDEN; @@ -1799,6 +1897,8 @@ HRESULT WINAPI DllRegisterServer(void) hr = WIC_DllRegisterServer(); if (SUCCEEDED(hr)) + hr = register_categories(category_list); + if (SUCCEEDED(hr)) hr = register_decoders(decoder_list); if (SUCCEEDED(hr)) hr = register_encoders(encoder_list); @@ -1819,6 +1919,8 @@ HRESULT WINAPI DllUnregisterServer(void) hr = WIC_DllUnregisterServer(); if (SUCCEEDED(hr)) + hr = unregister_categories(category_list); + if (SUCCEEDED(hr)) hr = unregister_decoders(decoder_list); if (SUCCEEDED(hr)) hr = unregister_encoders(encoder_list); diff --git a/include/wincodec.idl b/include/wincodec.idl index 82f419c..ab1e490 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -1001,6 +1001,7 @@ cpp_quote("DEFINE_GUID(GUID_ContainerFormatWmp, 0x57a37caa,0x367a,0x4540,0x91,0x cpp_quote("DEFINE_GUID(GUID_VendorMicrosoft, 0xf0e749ca,0xedef,0x4589,0xa7,0x3a,0xee,0x0e,0x62,0x6a,0x2a,0x2b);") +cpp_quote("DEFINE_GUID(CLSID_WICImagingCategories, 0xfae3d380,0xfea4,0x4623,0x8c,0x75,0xc6,0xb6,0x11,0x10,0xb6,0x81);") cpp_quote("DEFINE_GUID(CATID_WICBitmapDecoders, 0x7ed96837,0x96f0,0x4812,0xb2,0x11,0xf1,0x3c,0x24,0x11,0x7e,0xd3);") cpp_quote("DEFINE_GUID(CATID_WICBitmapEncoders, 0xac757296,0x3522,0x4e11,0x98,0x62,0xc1,0x7b,0xe5,0xa1,0x76,0x7e);") cpp_quote("DEFINE_GUID(CATID_WICFormatConverters, 0x7835eae8,0xbf14,0x49d1,0x93,0xce,0x53,0x3a,0x40,0x7b,0x22,0x48);")

1 0

Dmitry Timoshkov : windowscodecs: Implement ImagingFactory_CreateDecoder.
by Alexandre Julliard 25 Jun '12

25 Jun '12

Module: wine Branch: master Commit: cdc8e59be5c24e133cea0b4d03f7e8aab4168202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc8e59be5c24e133cea0b4d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 22 18:22:36 2012 +0900 windowscodecs: Implement ImagingFactory_CreateDecoder. --- dlls/windowscodecs/imgfactory.c | 78 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/bmpformat.c | 28 ++++++++++++ 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index efcf1b0..9ef8bbb 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -252,9 +252,83 @@ static HRESULT WINAPI ComponentFactory_CreateDecoder(IWICComponentFactory *iface REFGUID guidContainerFormat, const GUID *pguidVendor, IWICBitmapDecoder **ppIDecoder) { - FIXME("(%p,%s,%s,%p): stub\n", iface, debugstr_guid(guidContainerFormat), + IEnumUnknown *enumdecoders; + IUnknown *unkdecoderinfo; + IWICBitmapDecoderInfo *decoderinfo; + IWICBitmapDecoder *decoder = NULL, *preferred_decoder = NULL; + GUID vendor; + HRESULT res; + ULONG num_fetched; + + TRACE("(%p,%s,%s,%p)\n", iface, debugstr_guid(guidContainerFormat), debugstr_guid(pguidVendor), ppIDecoder); - return E_NOTIMPL; + + if (!guidContainerFormat || !ppIDecoder) return E_INVALIDARG; + + res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); + if (FAILED(res)) return res; + + while (!preferred_decoder) + { + res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); + if (res != S_OK) break; + + res = IUnknown_QueryInterface(unkdecoderinfo, &IID_IWICBitmapDecoderInfo, (void **)&decoderinfo); + if (SUCCEEDED(res)) + { + GUID container_guid; + + res = IWICBitmapDecoderInfo_GetContainerFormat(decoderinfo, &container_guid); + if (SUCCEEDED(res) && IsEqualIID(&container_guid, guidContainerFormat)) + { + IWICBitmapDecoder *new_decoder; + + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &new_decoder); + if (SUCCEEDED(res)) + { + if (pguidVendor) + { + res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor); + if (SUCCEEDED(res) && IsEqualIID(&vendor, pguidVendor)) + { + preferred_decoder = new_decoder; + new_decoder = NULL; + } + } + + if (new_decoder && !decoder) + { + decoder = new_decoder; + new_decoder = NULL; + } + + if (new_decoder) IWICBitmapDecoder_Release(new_decoder); + } + } + + IWICBitmapDecoderInfo_Release(decoderinfo); + } + + IUnknown_Release(unkdecoderinfo); + } + + IEnumUnknown_Release(enumdecoders); + + if (preferred_decoder) + { + *ppIDecoder = preferred_decoder; + if (decoder) IWICBitmapDecoder_Release(decoder); + return S_OK; + } + + if (decoder) + { + *ppIDecoder = decoder; + return S_OK; + } + + *ppIDecoder = NULL; + return WINCODEC_ERR_COMPONENTNOTFOUND; } static HRESULT WINAPI ComponentFactory_CreateEncoder(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index f264533..39820b3 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1119,6 +1119,33 @@ static void test_gif_notrailer(void) IWICImagingFactory_Release(factory); } +static void test_create_decoder(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); + + hr = IWICImagingFactory_CreateDecoder(factory, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateDecoder(factory, NULL, NULL, &decoder); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICImagingFactory_CreateDecoder(factory, &GUID_ContainerFormatBmp, NULL, &decoder); + ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + IWICBitmapDecoder_Release(decoder); + + hr = IWICImagingFactory_CreateDecoder(factory, &GUID_ContainerFormatBmp, &GUID_VendorMicrosoft, &decoder); + ok(hr == S_OK, "CreateDecoder error %#x\n", hr); + IWICBitmapDecoder_Release(decoder); + + IWICImagingFactory_Release(factory); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1131,6 +1158,7 @@ START_TEST(bmpformat) test_componentinfo(); test_createfromstream(); test_gif_notrailer(); + test_create_decoder(); CoUninitialize(); }

1 0