wine-commits October 2008

wine-commits@winehq.org

3 participants
1216 discussions

Jacek Caban : mshtml: Added get_onmouseover implementations.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 364b12609c4c0d4cfc70383f4ebc3c8e7bd4537d URL: http://source.winehq.org/git/wine.git/?a=commit;h=364b12609c4c0d4cfc70383f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:46:32 2008 -0500 mshtml: Added get_onmouseover implementations. --- dlls/mshtml/htmldoc.c | 6 ++++-- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/htmlevent.c | 13 +++++++++++++ dlls/mshtml/htmlevent.h | 11 +++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b9cafe5..00bc68c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1081,8 +1081,10 @@ static HRESULT WINAPI HTMLDocument_put_onmouseover(IHTMLDocument2 *iface, VARIAN static HRESULT WINAPI HTMLDocument_get_onmouseover(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_MOUSEOVER, p); } static HRESULT WINAPI HTMLDocument_put_onreadystatechange(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1052e6c..b53521a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -510,8 +510,10 @@ static HRESULT WINAPI HTMLElement_put_onmouseover(IHTMLElement *iface, VARIANT v static HRESULT WINAPI HTMLElement_get_onmouseover(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_MOUSEOVER, p); } static HRESULT WINAPI HTMLElement_put_onmousemove(IHTMLElement *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 05c5296..4c8e2a2 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -471,6 +471,19 @@ HRESULT set_event_handler(event_target_t **event_target, HTMLDocument *doc, even return E_NOTIMPL; } +HRESULT get_event_handler(event_target_t **event_target, eventid_t eid, VARIANT *var) +{ + if(*event_target && (*event_target)->event_table[eid]) { + V_VT(var) = VT_DISPATCH; + V_DISPATCH(var) = (*event_target)->event_table[eid]; + IDispatch_AddRef(V_DISPATCH(var)); + }else { + V_VT(var) = VT_NULL; + } + + return S_OK; +} + void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) { const PRUnichar *attr_value; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f4a99c3..b5b581b 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -30,13 +30,24 @@ void check_event_attr(HTMLDocument*,nsIDOMElement*); void release_event_target(event_target_t*); void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); +HRESULT get_event_handler(event_target_t**,eventid_t,VARIANT*); static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { return set_event_handler(&node->event_target, node->doc, eid, var); } +static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) +{ + return get_event_handler(&node->event_target, eid, var); +} + static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) { return set_event_handler(&doc->event_target, doc, eid, var); } + +static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) +{ + return get_event_handler(&doc->event_target, eid, var); +}

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_onmouseover implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 3cae9a77784fc0b01358bd9f16271621b8f75338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cae9a77784fc0b01358bd9f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:46:20 2008 -0500 mshtml: Added IHTMLDocument2::put_onmouseover implementation. --- dlls/mshtml/htmldoc.c | 10 ++++++++-- dlls/mshtml/htmlevent.c | 32 +++++++++++++++++--------------- dlls/mshtml/htmlevent.h | 12 +++++++++++- dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b757a80..b9cafe5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -197,6 +198,9 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface) if(This->window) IHTMLWindow2_Release(HTMLWINDOW2(This->window)); + if(This->event_target) + release_event_target(This->event_target); + heap_free(This->mime); detach_selection(This); detach_ranges(This); @@ -1068,8 +1072,10 @@ static HRESULT WINAPI HTMLDocument_get_onmouseout(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onmouseover(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = HTMLDOC_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return set_doc_event(This, EVENTID_MOUSEOVER, &v); } static HRESULT WINAPI HTMLDocument_get_onmouseover(IHTMLDocument2 *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2b05eb7..05c5296 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -430,37 +430,39 @@ void fire_event(HTMLDocument *doc, eventid_t eid, nsIDOMNode *target) } } -static HRESULT set_node_event_disp(HTMLDOMNode *node, eventid_t eid, IDispatch *disp) +static HRESULT set_event_handler_disp(event_target_t **event_target, HTMLDocument *doc, eventid_t eid, IDispatch *disp) { - if(!node->event_target) - node->event_target = heap_alloc_zero(sizeof(event_target_t)); - else if(node->event_target->event_table[eid]) - IDispatch_Release(node->event_target->event_table[eid]); + if(!*event_target) + *event_target = heap_alloc_zero(sizeof(event_target_t)); + else if((*event_target)->event_table[eid]) + IDispatch_Release((*event_target)->event_table[eid]); + (*event_target)->event_table[eid] = disp; + if(!disp) + return S_OK; IDispatch_AddRef(disp); - node->event_target->event_table[eid] = disp; if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { - if(!node->doc->nscontainer->event_vector) { - node->doc->nscontainer->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); - if(!node->doc->nscontainer->event_vector) + if(!doc->nscontainer->event_vector) { + doc->nscontainer->event_vector = heap_alloc_zero(EVENTID_LAST*sizeof(BOOL)); + if(!doc->nscontainer->event_vector) return E_OUTOFMEMORY; } - if(!node->doc->nscontainer->event_vector[eid]) { - node->doc->nscontainer->event_vector[eid] = TRUE; - add_nsevent_listener(node->doc->nscontainer, event_info[eid].name); + if(!doc->nscontainer->event_vector[eid]) { + doc->nscontainer->event_vector[eid] = TRUE; + add_nsevent_listener(doc->nscontainer, event_info[eid].name); } } return S_OK; } -HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) +HRESULT set_event_handler(event_target_t **event_target, HTMLDocument *doc, eventid_t eid, VARIANT *var) { switch(V_VT(var)) { case VT_DISPATCH: - return set_node_event_disp(node, eid, V_DISPATCH(var)); + return set_event_handler_disp(event_target, doc, eid, V_DISPATCH(var)); default: FIXME("not supported vt=%d\n", V_VT(var)); @@ -494,7 +496,7 @@ void check_event_attr(HTMLDocument *doc, nsIDOMElement *nselem) disp = script_parse_event(doc, attr_value); if(disp) { node = get_node(doc, (nsIDOMNode*)nselem, TRUE); - set_node_event_disp(node, i, disp); + set_event_handler_disp(&node->event_target, node->doc, i, disp); IDispatch_Release(disp); } } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 7b01dd7..f4a99c3 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -29,4 +29,14 @@ eventid_t str_to_eid(LPCWSTR); void check_event_attr(HTMLDocument*,nsIDOMElement*); void release_event_target(event_target_t*); void fire_event(HTMLDocument*,eventid_t,nsIDOMNode*); -HRESULT set_node_event(HTMLDOMNode*,eventid_t,VARIANT*); +HRESULT set_event_handler(event_target_t**,HTMLDocument*,eventid_t,VARIANT*); + +static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) +{ + return set_event_handler(&node->event_target, node->doc, eid, var); +} + +static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) +{ + return set_event_handler(&doc->event_target, doc, eid, var); +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a58cfef..09a5d60 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -276,6 +276,7 @@ struct HTMLDocument { DWORD update; + event_target_t *event_target; ConnectionPointContainer cp_container; ConnectionPoint cp_htmldocevents; ConnectionPoint cp_htmldocevents2;

1 0

Jacek Caban : mshtml: Added IHTMLElement::put_onmouseover implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 4a2db7cc9b2c86a193acf6186a2bf59429a80c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2db7cc9b2c86a193acf6186… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 15:46:08 2008 -0500 mshtml: Added IHTMLElement::put_onmouseover implementation. --- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/htmlevent.c | 12 ++++++++---- dlls/mshtml/htmlevent.h | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 60fd574..1052e6c 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -501,8 +501,10 @@ static HRESULT WINAPI HTMLElement_get_onmouseout(IHTMLElement *iface, VARIANT *p static HRESULT WINAPI HTMLElement_put_onmouseover(IHTMLElement *iface, VARIANT v) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->node, EVENTID_MOUSEOVER, &v); } static HRESULT WINAPI HTMLElement_get_onmouseover(IHTMLElement *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d72b936..2b05eb7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -48,6 +48,9 @@ static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; +static const WCHAR mouseoverW[] = {'m','o','u','s','e','o','v','e','r',0}; +static const WCHAR onmouseoverW[] = {'o','n','m','o','u','s','e','o','v','e','r',0}; + typedef struct { LPCWSTR name; LPCWSTR attr_name; @@ -57,10 +60,11 @@ typedef struct { #define EVENT_DEFAULTLISTENER 0x0001 static const event_info_t event_info[] = { - {changeW, onchangeW, EVENT_DEFAULTLISTENER}, - {clickW, onclickW, EVENT_DEFAULTLISTENER}, - {keyupW, onkeyupW, EVENT_DEFAULTLISTENER}, - {loadW, onloadW, 0} + {changeW, onchangeW, EVENT_DEFAULTLISTENER}, + {clickW, onclickW, EVENT_DEFAULTLISTENER}, + {keyupW, onkeyupW, EVENT_DEFAULTLISTENER}, + {loadW, onloadW, 0}, + {mouseoverW, onmouseoverW, EVENT_DEFAULTLISTENER} }; eventid_t str_to_eid(LPCWSTR str) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index adc7692..7b01dd7 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -21,6 +21,7 @@ typedef enum { EVENTID_CLICK, EVENTID_KEYUP, EVENTID_LOAD, + EVENTID_MOUSEOVER, EVENTID_LAST } eventid_t;

1 0

Alexandre Julliard : configure: Moved the crosstest checks so that they are done for all platforms.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 9fb81984f5a65afd4a1bcbef391eb36d6febafe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb81984f5a65afd4a1bcbef3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 11 21:19:53 2008 +0200 configure: Moved the crosstest checks so that they are done for all platforms. --- configure | 56 +++++++++++++++++++++++++++++--------------------------- configure.ac | 24 +++++++++++++----------- 2 files changed, 42 insertions(+), 38 deletions(-) diff --git a/configure b/configure index 1debef2..4f1443b 100755 --- a/configure +++ b/configure @@ -733,9 +733,9 @@ LDEXECFLAGS DISKARBITRATIONLIB COREAUDIO CARBONLIB -CROSSTEST CROSSCC CROSSWINDRES +CROSSTEST NASLIBS XML2LIBS XML2INCL @@ -9389,12 +9389,28 @@ echo "${ECHO_T}$ac_cv_c_dll_hpux" >&6; } fi fi fi + ;; +esac - CROSSTEST="" +enable_winequartz_drv=${enable_winequartz_drv:-no} - if test "$cross_compiling" = "no" - then - for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc +if test "$LIBEXT" = "a"; then + { { echo "$as_me:$LINENO: error: could not find a way to build shared libraries. +It is currently not possible to build Wine without shared library +(.so) support to allow transparent switch between .so and .dll files. +If you are using Linux, you will need a newer binutils. +" >&5 +echo "$as_me: error: could not find a way to build shared libraries. +It is currently not possible to build Wine without shared library +(.so) support to allow transparent switch between .so and .dll files. +If you are using Linux, you will need a newer binutils. +" >&2;} + { (exit 1); exit 1; }; } +fi + +if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" +then + for ac_prog in i586-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc mingw32-gcc mingw-gcc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9437,7 +9453,7 @@ fi done test -n "$CROSSCC" || CROSSCC="false" - for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool + for ac_prog in i586-mingw32msvc-dlltool i386-mingw32msvc-dlltool i686-mingw32-dlltool i586-mingw32-dlltool i486-mingw32-dlltool i386-mingw32-dlltool mingw32-dlltool mingw-dlltool do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9480,7 +9496,7 @@ fi done test -n "$DLLTOOL" || DLLTOOL="false" - for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres + for ac_prog in i586-mingw32msvc-windres i386-mingw32msvc-windres i686-mingw32-windres i586-mingw32-windres i486-mingw32-windres i386-mingw32-windres mingw32-windres mingw-windres do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9523,7 +9539,7 @@ fi done test -n "$CROSSWINDRES" || CROSSWINDRES="false" - for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar + for ac_prog in i586-mingw32msvc-ar i386-mingw32msvc-ar i686-mingw32-ar i586-mingw32-ar i486-mingw32-ar i386-mingw32-ar mingw32-ar mingw-ar do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -9566,25 +9582,11 @@ fi done test -n "$MINGWAR" || MINGWAR="false" - if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi - fi - ;; -esac - -enable_winequartz_drv=${enable_winequartz_drv:-no} + if test "$CROSSCC" != "false" + then + CROSSTEST="\$(CROSSTEST)" -if test "$LIBEXT" = "a"; then - { { echo "$as_me:$LINENO: error: could not find a way to build shared libraries. -It is currently not possible to build Wine without shared library -(.so) support to allow transparent switch between .so and .dll files. -If you are using Linux, you will need a newer binutils. -" >&5 -echo "$as_me: error: could not find a way to build shared libraries. -It is currently not possible to build Wine without shared library -(.so) support to allow transparent switch between .so and .dll files. -If you are using Linux, you will need a newer binutils. -" >&2;} - { (exit 1); exit 1; }; } + fi fi @@ -27164,9 +27166,9 @@ LDEXECFLAGS!$LDEXECFLAGS$ac_delim DISKARBITRATIONLIB!$DISKARBITRATIONLIB$ac_delim COREAUDIO!$COREAUDIO$ac_delim CARBONLIB!$CARBONLIB$ac_delim -CROSSTEST!$CROSSTEST$ac_delim CROSSCC!$CROSSCC$ac_delim CROSSWINDRES!$CROSSWINDRES$ac_delim +CROSSTEST!$CROSSTEST$ac_delim NASLIBS!$NASLIBS$ac_delim XML2LIBS!$XML2LIBS$ac_delim XML2INCL!$XML2INCL$ac_delim diff --git a/configure.ac b/configure.ac index dac47c6..5a942ce 100644 --- a/configure.ac +++ b/configure.ac @@ -588,17 +588,6 @@ case $host_os in fi fi fi - - dnl Check for cross compiler to build test programs - AC_SUBST(CROSSTEST,"") - if test "$cross_compiling" = "no" - then - WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) - WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false) - WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false) - WINE_CHECK_MINGW_PROG(MINGWAR,ar,false) - if test "$CROSSCC" != "false"; then CROSSTEST="\$(CROSSTEST)"; fi - fi ;; esac @@ -613,6 +602,19 @@ If you are using Linux, you will need a newer binutils.] ) fi +dnl Check for cross compiler to build test programs +if test "$cross_compiling" = "no" -a "$LIBEXT" != "dll" +then + WINE_CHECK_MINGW_PROG(CROSSCC,gcc,false) + WINE_CHECK_MINGW_PROG(DLLTOOL,dlltool,false) + WINE_CHECK_MINGW_PROG(CROSSWINDRES,windres,false) + WINE_CHECK_MINGW_PROG(MINGWAR,ar,false) + if test "$CROSSCC" != "false" + then + AC_SUBST(CROSSTEST,"\$(CROSSTEST)") + fi +fi + dnl **** Check for X11 **** if test "$have_x" = "yes"

1 0

Alexandre Julliard : comcat: Moved all the implementation to ole32 where it belongs.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 19966f8c0e7e7d990f4bfa8f0e7302051f88219a URL: http://source.winehq.org/git/wine.git/?a=commit;h=19966f8c0e7e7d990f4bfa8f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 11 13:30:08 2008 +0200 comcat: Moved all the implementation to ole32 where it belongs. --- dlls/comcat/Makefile.in | 5 +- dlls/comcat/comcat.spec | 2 +- dlls/comcat/comcat_main.c | 33 +- dlls/comcat/comcat_private.h | 58 --- dlls/comcat/factory.c | 120 ----- dlls/comcat/register.c | 348 ------------- dlls/ole32/Makefile.in | 1 + dlls/{comcat/information.c => ole32/comcat.c} | 677 ++++++++++++++++++++----- dlls/ole32/moniker.h | 1 + dlls/ole32/oleproxy.c | 3 + dlls/ole32/regsvr.c | 2 +- 11 files changed, 563 insertions(+), 687 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19966f8c0e7e7d990f4bf…

1 0

Alexandre Julliard : comcat: Get rid of the redundant IUnknown vtable for the manager implementation.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: 67fe27d036b9b268a21da79108f8305350419574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fe27d036b9b268a21da7910… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 11 13:14:44 2008 +0200 comcat: Get rid of the redundant IUnknown vtable for the manager implementation. --- dlls/comcat/Makefile.in | 1 - dlls/comcat/comcat_private.h | 7 +-- dlls/comcat/information.c | 32 ++++------- dlls/comcat/manager.c | 116 ------------------------------------------ dlls/comcat/register.c | 44 ++++++++++------ 5 files changed, 40 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67fe27d036b9b268a21da…

1 0

Alexandre Julliard : comcat: Simplify the class factory implementation and make it more similar to the other ones in ole32 .
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: f8ff1bd6fb24c5bb9c6f96c9af5b55af701b1c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ff1bd6fb24c5bb9c6f96c9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 11 13:11:49 2008 +0200 comcat: Simplify the class factory implementation and make it more similar to the other ones in ole32. --- dlls/comcat/comcat_main.c | 2 +- dlls/comcat/comcat_private.h | 12 +--------- dlls/comcat/factory.c | 47 ++++++++++------------------------------- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/dlls/comcat/comcat_main.c b/dlls/comcat/comcat_main.c index 5af9935..b1f6da7 100644 --- a/dlls/comcat/comcat_main.c +++ b/dlls/comcat/comcat_main.c @@ -38,7 +38,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { *ppv = NULL; if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) { - return IClassFactory_QueryInterface((LPCLASSFACTORY)&COMCAT_ClassFactory, iid, ppv); + return ComCatCF_Create(iid, ppv); } FIXME("\n\tCLSID:\t%s,\n\tIID:\t%s\n",debugstr_guid(rclsid),debugstr_guid(iid)); return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/comcat/comcat_private.h b/dlls/comcat/comcat_private.h index 4002dfd..96a3b09 100644 --- a/dlls/comcat/comcat_private.h +++ b/dlls/comcat/comcat_private.h @@ -39,17 +39,7 @@ */ extern LONG dll_ref; -/********************************************************************** - * ClassFactory declaration for comcat.dll - */ -typedef struct -{ - /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; - LONG ref; -} ClassFactoryImpl; - -extern ClassFactoryImpl COMCAT_ClassFactory; +extern HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv); /********************************************************************** * StdComponentCategoriesMgr declaration for comcat.dll diff --git a/dlls/comcat/factory.c b/dlls/comcat/factory.c index 22be165..c70a02b 100644 --- a/dlls/comcat/factory.c +++ b/dlls/comcat/factory.c @@ -24,7 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface); /********************************************************************** * COMCAT_IClassFactory_QueryInterface (also IUnknown) @@ -42,7 +41,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( IsEqualGUID(riid, &IID_IClassFactory)) { *ppvObj = (LPVOID)iface; - COMCAT_IClassFactory_AddRef(iface); + IUnknown_AddRef(iface); return S_OK; } @@ -54,16 +53,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_QueryInterface( */ static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface) { - ClassFactoryImpl *This = (ClassFactoryImpl *)iface; - ULONG ref; - - TRACE("\n"); - - ref = InterlockedIncrement(&This->ref); - if (ref == 1) { - InterlockedIncrement(&dll_ref); - } - return ref; + return 2; /* non-heap based object */ } /********************************************************************** @@ -71,16 +61,7 @@ static ULONG WINAPI COMCAT_IClassFactory_AddRef(LPCLASSFACTORY iface) */ static ULONG WINAPI COMCAT_IClassFactory_Release(LPCLASSFACTORY iface) { - ClassFactoryImpl *This = (ClassFactoryImpl *)iface; - ULONG ref; - - TRACE("\n"); - - ref = InterlockedDecrement(&This->ref); - if (ref == 0) { - InterlockedDecrement(&dll_ref); - } - return ref; + return 1; /* non-heap based object */ } /********************************************************************** @@ -115,20 +96,14 @@ static HRESULT WINAPI COMCAT_IClassFactory_LockServer( LPCLASSFACTORY iface, BOOL fLock) { - TRACE("\n"); - - if (fLock != FALSE) { - IClassFactory_AddRef(iface); - } else { - IClassFactory_Release(iface); - } + FIXME("(%d), stub!\n",fLock); return S_OK; } /********************************************************************** - * IClassFactory_Vtbl + * static ClassFactory instance */ -static const IClassFactoryVtbl IClassFactory_Vtbl = +static const IClassFactoryVtbl ComCatCFVtbl = { COMCAT_IClassFactory_QueryInterface, COMCAT_IClassFactory_AddRef, @@ -137,7 +112,9 @@ static const IClassFactoryVtbl IClassFactory_Vtbl = COMCAT_IClassFactory_LockServer }; -/********************************************************************** - * static ClassFactory instance - */ -ClassFactoryImpl COMCAT_ClassFactory = { &IClassFactory_Vtbl, 0 }; +static const IClassFactoryVtbl *ComCatCF = &ComCatCFVtbl; + +HRESULT ComCatCF_Create(REFIID riid, LPVOID *ppv) +{ + return IClassFactory_QueryInterface((IClassFactory *)&ComCatCF, riid, ppv); +}

1 0

Alexandre Julliard : comcat: Moved dll registration to ole32.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: d4f107f54b3fa7abcfff8976ff47d270de87d4ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f107f54b3fa7abcfff8976f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 11 13:08:22 2008 +0200 comcat: Moved dll registration to ole32. --- dlls/comcat/Makefile.in | 3 +- dlls/comcat/comcat_main.c | 16 ++- dlls/comcat/regsvr.c | 418 --------------------------------------------- dlls/ole32/regsvr.c | 15 ++ tools/wine.inf.in | 1 - 5 files changed, 31 insertions(+), 422 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4f107f54b3fa7abcfff8…

1 0

Alexandre Julliard : comcat: Get rid of NULL checks on the This pointer.
by Alexandre Julliard 13 Oct '08

13 Oct '08

Module: wine Branch: master Commit: e5299ac7ba333e795ec9d9d46ca272fc8063fa58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5299ac7ba333e795ec9d9d46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 11 11:57:39 2008 +0200 comcat: Get rid of NULL checks on the This pointer. --- dlls/comcat/factory.c | 10 +------ dlls/comcat/information.c | 53 ++++++++++++--------------------------------- dlls/comcat/manager.c | 6 +---- dlls/comcat/register.c | 10 ++------ 4 files changed, 20 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5299ac7ba333e795ec9d…

1 0

Alexandre Julliard : Wine release 1.1.6
by Alexandre Julliard 10 Oct '08

10 Oct '08

Module: website Branch: master Commit: c68f98c7db44a46e6ee7b05c3dc7a7f5bc794922 URL: http://source.winehq.org/git/website.git/?a=commit;h=c68f98c7db44a46e6ee7b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 10 17:05:41 2008 +0200 Wine release 1.1.6 --- news/en/2008101001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2008101001.xml b/news/en/2008101001.xml new file mode 100644 index 0000000..d736486 --- /dev/null +++ b/news/en/2008101001.xml @@ -0,0 +1,17 @@ +<news> +<date>October 10, 2008</date> +<title>Wine 1.1.6 Released</title> +<body> + The Wine development release 1.1.6 is now available. + <a href="?announce=1.1.6">What's new</a> in this release: +<ul> + <li>Beginnings of schannel implementation using GnuTLS.</li> + <li>Many fixes from various code analysis tools.</li> + <li>Support for X11 desktop work area.</li> + <li>Fixes for Richedit tables.</li> + <li>More complete JavaScript support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.6.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>. +</body></news>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2008