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

Jacek Caban : mshtml: Activate nsWebBrowser after creating document window.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 946acd062dcab27c2f41e0e513d6ca00ddc1323f URL: http://source.winehq.org/git/wine.git/?a=commit;h=946acd062dcab27c2f41e0e51… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:32:22 2007 +0200 mshtml: Activate nsWebBrowser after creating document window. --- dlls/mshtml/view.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index cbd8c89..14648c7 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -84,16 +84,16 @@ static void paint_document(HTMLDocument *This) EndPaint(This->hwnd, &ps); } -static void activate_gecko(HTMLDocument *This) +static void activate_gecko(NSContainer *This) { - TRACE("(%p) %p\n", This, This->nscontainer->window); + TRACE("(%p) %p\n", This, This->window); - SetParent(This->nscontainer->hwnd, This->hwnd); - ShowWindow(This->nscontainer->hwnd, SW_SHOW); + SetParent(This->hwnd, This->doc->hwnd); + ShowWindow(This->hwnd, SW_SHOW); - nsIBaseWindow_SetVisibility(This->nscontainer->window, TRUE); - nsIBaseWindow_SetEnabled(This->nscontainer->window, TRUE); - nsIWebBrowserFocus_Activate(This->nscontainer->focus); + nsIBaseWindow_SetVisibility(This->window, TRUE); + nsIBaseWindow_SetEnabled(This->window, TRUE); + nsIWebBrowserFocus_Activate(This->focus); } void update_doc(HTMLDocument *This, DWORD flags) @@ -180,8 +180,6 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM switch(msg) { case WM_CREATE: This->hwnd = hwnd; - if(This->nscontainer) - activate_gecko(This); break; case WM_PAINT: paint_document(This); @@ -242,7 +240,8 @@ static HRESULT activate_window(HTMLDocument *This) return FAILED(hres) ? hres : E_FAIL; } - hres = IOleInPlaceSite_GetWindowContext(This->ipsite, &pIPFrame, &pIPWnd, &posrect, &cliprect, &frameinfo); + hres = IOleInPlaceSite_GetWindowContext(This->ipsite, &pIPFrame, &pIPWnd, + &posrect, &cliprect, &frameinfo); if(FAILED(hres)) { WARN("GetWindowContext failed: %08x\n", hres); return hres; @@ -289,6 +288,9 @@ static HRESULT activate_window(HTMLDocument *This) SetTimer(This->hwnd, TIMER_ID, 100, NULL); } + if(This->nscontainer) + activate_gecko(This->nscontainer); + This->in_place_active = TRUE; hres = IOleInPlaceSite_QueryInterface(This->ipsite, &IID_IOleInPlaceSiteEx, (void**)&ipsiteex); if(SUCCEEDED(hres)) {

1 0

Jacek Caban : mshtml: Added nsIEmbeddingSiteWindow:[Get|Set] Visibility implementation.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 9f8b92c33714369912a48ff2738712269e09b05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8b92c33714369912a48ff27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:31:43 2007 +0200 mshtml: Added nsIEmbeddingSiteWindow:[Get|Set]Visibility implementation. --- dlls/mshtml/nsembed.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 0d46b9b..6b4e918 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1216,16 +1216,21 @@ static nsresult NSAPI nsEmbeddingSiteWindow_GetVisibility(nsIEmbeddingSiteWindow PRBool *aVisibility) { NSContainer *This = NSEMBWNDS_THIS(iface); - WARN("(%p)->(%p)\n", This, aVisibility); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%p)\n", This, aVisibility); + + *aVisibility = This->doc && This->doc->hwnd && IsWindowVisible(This->doc->hwnd); + return NS_OK; } static nsresult NSAPI nsEmbeddingSiteWindow_SetVisibility(nsIEmbeddingSiteWindow *iface, PRBool aVisibility) { NSContainer *This = NSEMBWNDS_THIS(iface); - WARN("(%p)->(%x)\n", This, aVisibility); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)->(%x)\n", This, aVisibility); + + return NS_OK; } static nsresult NSAPI nsEmbeddingSiteWindow_GetTitle(nsIEmbeddingSiteWindow *iface,

1 0

Jacek Caban : mshtml: Added nsIEmbeddingSiteWindow::SetFocus implementation .
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 7430f1ad849c9dbb70f994c83b5eeecea2574550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7430f1ad849c9dbb70f994c83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:30:23 2007 +0200 mshtml: Added nsIEmbeddingSiteWindow::SetFocus implementation. --- dlls/mshtml/nsembed.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 19da19d..0d46b9b 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1206,8 +1206,10 @@ static nsresult NSAPI nsEmbeddingSiteWindow_GetDimensions(nsIEmbeddingSiteWindow static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *iface) { NSContainer *This = NSEMBWNDS_THIS(iface); - WARN("(%p)\n", This); - return NS_ERROR_NOT_IMPLEMENTED; + + TRACE("(%p)\n", This); + + return nsIBaseWindow_SetFocus(This->window); } static nsresult NSAPI nsEmbeddingSiteWindow_GetVisibility(nsIEmbeddingSiteWindow *iface,

1 0

Jacek Caban : mshtml: Get rid of no longer used nsIDOMEventListener interface in NSContainer.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 3d3048db307bd5cb560ee42b039c1d5f2dddf936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3048db307bd5cb560ee42b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:29:44 2007 +0200 mshtml: Get rid of no longer used nsIDOMEventListener interface in NSContainer. --- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 91 ------------------------------------------ 2 files changed, 0 insertions(+), 92 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f20f673..1ee8148 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -140,7 +140,6 @@ struct NSContainer { const nsIInterfaceRequestorVtbl *lpInterfaceRequestorVtbl; const nsIWeakReferenceVtbl *lpWeakReferenceVtbl; const nsISupportsWeakReferenceVtbl *lpSupportsWeakReferenceVtbl; - const nsIDOMEventListenerVtbl *lpDOMEventListenerVtbl; nsEventListener keypress_listener; nsEventListener load_listener; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ebb4d07..19da19d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -689,36 +689,6 @@ void set_ns_editmode(NSContainer *This) nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); } -static void handle_load_event(NSContainer *This, nsIDOMEvent *event) -{ - task_t *task; - - TRACE("(%p)\n", This); - - if(!This->doc) - return; - - if(This->editor_controller) { - nsIController_Release(This->editor_controller); - This->editor_controller = NULL; - } - - if(This->doc->usermode == EDITMODE) - This->editor_controller = get_editor_controller(This); - - task = mshtml_alloc(sizeof(task_t)); - - task->doc = This->doc; - task->task_id = TASK_PARSECOMPLETE; - task->next = NULL; - - /* - * This should be done in the worker thread that parses HTML, - * but we don't have such thread (Gecko parses HTML for us). - */ - push_task(task); -} - void close_gecko(void) { TRACE("()\n"); @@ -766,9 +736,6 @@ static nsresult NSAPI nsWebBrowserChrome_QueryInterface(nsIWebBrowserChrome *ifa }else if(IsEqualGUID(&IID_nsITooltipListener, riid)) { TRACE("(%p)->(IID_nsITooltipListener %p)\n", This, result); *result = NSTOOLTIP(This); - }else if(IsEqualGUID(&IID_nsIDOMEventListener, riid)) { - TRACE("(%p)->(IID_nsIDOMEventListener %p)\n", This, result); - *result = NSEVENTLIST(This); }else if(IsEqualGUID(&IID_nsIInterfaceRequestor, riid)) { TRACE("(%p)->(IID_nsIInterfaceRequestor %p)\n", This, result); *result = NSIFACEREQ(This); @@ -1350,63 +1317,6 @@ static const nsITooltipListenerVtbl nsTooltipListenerVtbl = { nsTooltipListener_OnHideTooltip }; -#define NSEVENTLIST_THIS(iface) DEFINE_THIS(NSContainer, DOMEventListener, iface) - -static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *iface, - nsIIDRef riid, nsQIResult result) -{ - NSContainer *This = NSEVENTLIST_THIS(iface); - return nsIWebBrowserChrome_QueryInterface(NSWBCHROME(This), riid, result); -} - -static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener *iface) -{ - NSContainer *This = NSEVENTLIST_THIS(iface); - return nsIWebBrowserChrome_AddRef(NSWBCHROME(This)); -} - -static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) -{ - NSContainer *This = NSEVENTLIST_THIS(iface); - return nsIWebBrowserChrome_Release(NSWBCHROME(This)); -} - -static nsresult NSAPI nsDOMEventListener_HandleEvent(nsIDOMEventListener *iface, nsIDOMEvent *event) -{ - NSContainer *This = NSEVENTLIST_THIS(iface); - nsAString type_str; - const PRUnichar *type; - - static const PRUnichar loadW[] = {'l','o','a','d',0}; - - nsAString_Init(&type_str, NULL); - nsIDOMEvent_GetType(event, &type_str); - nsAString_GetData(&type_str, &type, NULL); - - TRACE("(%p)->(%p) %s\n", This, event, debugstr_w(type)); - - if(!strcmpW(loadW, type)) { - handle_load_event(This, event); - }else if(This->doc) { - update_doc(This->doc, UPDATE_UI); - if(This->doc->usermode == EDITMODE) - handle_edit_event(This->doc, event); - } - - nsAString_Finish(&type_str); - - return NS_OK; -} - -#undef NSEVENTLIST_THIS - -static const nsIDOMEventListenerVtbl nsDOMEventListenerVtbl = { - nsDOMEventListener_QueryInterface, - nsDOMEventListener_AddRef, - nsDOMEventListener_Release, - nsDOMEventListener_HandleEvent -}; - #define NSIFACEREQ_THIS(iface) DEFINE_THIS(NSContainer, InterfaceRequestor, iface) static nsresult NSAPI nsInterfaceRequestor_QueryInterface(nsIInterfaceRequestor *iface, @@ -1550,7 +1460,6 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ret->lpInterfaceRequestorVtbl = &nsInterfaceRequestorVtbl; ret->lpWeakReferenceVtbl = &nsWeakReferenceVtbl; ret->lpSupportsWeakReferenceVtbl = &nsSupportsWeakReferenceVtbl; - ret->lpDOMEventListenerVtbl = &nsDOMEventListenerVtbl; ret->doc = doc; ret->ref = 1;

1 0

Jacek Caban : mshtml: Move load event listener to separated object.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 7dd4f5e2baa6ffb9dd9737cb8111256c5ba5156d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd4f5e2baa6ffb9dd9737cb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:28:54 2007 +0200 mshtml: Move load event listener to separated object. --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/nsembed.c | 26 +------------------------- dlls/mshtml/nsevents.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 644f6b0..f20f673 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -143,6 +143,7 @@ struct NSContainer { const nsIDOMEventListenerVtbl *lpDOMEventListenerVtbl; nsEventListener keypress_listener; + nsEventListener load_listener; nsIWebBrowser *webbrowser; nsIWebNavigation *navigation; @@ -357,6 +358,7 @@ void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); nsICommandParams *create_nscommand_params(void); void nsnode_to_nsstring(nsIDOMNode*,nsAString*); +nsIController *get_editor_controller(NSContainer*); void init_nsevents(NSContainer*); BSCallback *create_bscallback(IMoniker*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 862e084..ebb4d07 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -589,7 +589,7 @@ void nsnode_to_nsstring(nsIDOMNode *nsdoc, nsAString *str) nsIContentSerializer_Release(serializer); } -static nsIController *get_editor_controller(NSContainer *This) +nsIController *get_editor_controller(NSContainer *This) { nsIController *ret = NULL; nsIEditingSession *editing_session = NULL; @@ -1532,7 +1532,6 @@ static const nsISupportsWeakReferenceVtbl nsSupportsWeakReferenceVtbl = { NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) { - nsIDOMWindow *dom_window; nsIWebBrowserSetup *wbsetup; nsIScrollable *scrollable; NSContainer *ret; @@ -1621,29 +1620,6 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) if(NS_FAILED(nsres)) ERR("SetParentURIContentListener failed: %08x\n", nsres); - nsres = nsIWebBrowser_GetContentDOMWindow(ret->webbrowser, &dom_window); - if(NS_SUCCEEDED(nsres)) { - nsIDOMEventTarget *target; - nsres = nsIDOMWindow_QueryInterface(dom_window, &IID_nsIDOMEventTarget, (void**)&target); - nsIDOMWindow_Release(dom_window); - if(NS_SUCCEEDED(nsres)) { - nsAString load_str; - static const PRUnichar wsz_load[] = {'l','o','a','d',0}; - - nsAString_Init(&load_str, wsz_load); - nsres = nsIDOMEventTarget_AddEventListener(target, &load_str, NSEVENTLIST(ret), TRUE); - nsAString_Finish(&load_str); - if(NS_FAILED(nsres)) - ERR("AddEventTarget failed: %08x\n", nsres); - - nsIDOMEventTarget_Release(target); - }else { - ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); - } - }else { - ERR("GetContentDOMWindow failed: %08x\n", nsres); - } - init_nsevents(ret); nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIScrollable, (void**)&scrollable); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 887a169..2a04111 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -86,6 +86,39 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, return NS_OK; } +static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) +{ + NSContainer *This = NSEVENTLIST_THIS(iface)->This; + task_t *task; + + TRACE("(%p)\n", This); + + if(!This->doc) + return NS_OK; + + if(This->editor_controller) { + nsIController_Release(This->editor_controller); + This->editor_controller = NULL; + } + + if(This->doc->usermode == EDITMODE) + This->editor_controller = get_editor_controller(This); + + task = mshtml_alloc(sizeof(task_t)); + + task->doc = This->doc; + task->task_id = TASK_PARSECOMPLETE; + task->next = NULL; + + /* + * This should be done in the worker thread that parses HTML, + * but we don't have such thread (Gecko parses HTML for us). + */ + push_task(task); + + return NS_OK; +} + #undef NSEVENTLIST_THIS #define EVENTLISTENER_VTBL(handler) \ @@ -97,6 +130,7 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, }; static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); +static const nsIDOMEventListenerVtbl load_vtbl = EVENTLISTENER_VTBL(handle_load); static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, nsIDOMEventListener *listener, BOOL capture) @@ -126,8 +160,10 @@ void init_nsevents(NSContainer *This) nsresult nsres; static const PRUnichar wsz_keypress[] = {'k','e','y','p','r','e','s','s',0}; + static const PRUnichar wsz_load[] = {'l','o','a','d',0}; init_listener(&This->keypress_listener, This, &keypress_vtbl); + init_listener(&This->load_listener, This, &load_vtbl); nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); if(NS_FAILED(nsres)) { @@ -143,6 +179,7 @@ void init_nsevents(NSContainer *This) } init_event(target, wsz_keypress, NSEVENTLIST(&This->keypress_listener), FALSE); + init_event(target, wsz_load, NSEVENTLIST(&This->load_listener), TRUE); nsIDOMEventTarget_Release(target); }

1 0

Evan Stade : gdiplus: Tidy up graphics constructor.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 6490dadb2396b8b495e681b6bbfd2a22acac355b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6490dadb2396b8b495e681b6b… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jun 22 19:27:02 2007 -0700 gdiplus: Tidy up graphics constructor. --- dlls/gdiplus/graphics.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index beba700..5ac16f7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -116,8 +116,9 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) if(graphics == NULL) return InvalidParameter; - *graphics = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(GpGraphics)); + *graphics = GdipAlloc(sizeof(GpGraphics)); + if(!*graphics) return OutOfMemory; + (*graphics)->hdc = hdc; (*graphics)->hwnd = NULL;

1 0

Jacek Caban : mshtml: Move keypress event listener to separated object.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 8b3086a512a9e0db26bbd23151ce69ff2e9fce3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3086a512a9e0db26bbd2315… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 22 23:28:09 2007 +0200 mshtml: Move keypress event listener to separated object. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/mshtml_private.h | 8 ++ dlls/mshtml/nsembed.c | 11 +-- dlls/mshtml/nsevents.c | 148 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 6cbeaf7..eeb6e0d 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ main.c \ navigate.c \ nsembed.c \ + nsevents.c \ nsio.c \ nsservice.c \ olecmd.c \ diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b20354c..644f6b0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -126,6 +126,11 @@ struct HTMLDocument { HTMLDOMNode *nodes; }; +typedef struct { + const nsIDOMEventListenerVtbl *lpDOMEventListenerVtbl; + NSContainer *This; +} nsEventListener; + struct NSContainer { const nsIWebBrowserChromeVtbl *lpWebBrowserChromeVtbl; const nsIContextMenuListenerVtbl *lpContextMenuListenerVtbl; @@ -137,6 +142,8 @@ struct NSContainer { const nsISupportsWeakReferenceVtbl *lpSupportsWeakReferenceVtbl; const nsIDOMEventListenerVtbl *lpDOMEventListenerVtbl; + nsEventListener keypress_listener; + nsIWebBrowser *webbrowser; nsIWebNavigation *navigation; nsIBaseWindow *window; @@ -350,6 +357,7 @@ void nsAString_Finish(nsAString*); nsIInputStream *create_nsstream(const char*,PRInt32); nsICommandParams *create_nscommand_params(void); void nsnode_to_nsstring(nsIDOMNode*,nsAString*); +void init_nsevents(NSContainer*); BSCallback *create_bscallback(IMoniker*); HRESULT start_binding(BSCallback*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 40225d5..862e084 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1627,16 +1627,9 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) nsres = nsIDOMWindow_QueryInterface(dom_window, &IID_nsIDOMEventTarget, (void**)&target); nsIDOMWindow_Release(dom_window); if(NS_SUCCEEDED(nsres)) { - nsAString keypress_str, load_str; - static const PRUnichar wsz_keypress[] = {'k','e','y','p','r','e','s','s',0}; + nsAString load_str; static const PRUnichar wsz_load[] = {'l','o','a','d',0}; - nsAString_Init(&keypress_str, wsz_keypress); - nsres = nsIDOMEventTarget_AddEventListener(target, &keypress_str, NSEVENTLIST(ret), FALSE); - nsAString_Finish(&keypress_str); - if(NS_FAILED(nsres)) - ERR("AddEventTarget failed: %08x\n", nsres); - nsAString_Init(&load_str, wsz_load); nsres = nsIDOMEventTarget_AddEventListener(target, &load_str, NSEVENTLIST(ret), TRUE); nsAString_Finish(&load_str); @@ -1651,6 +1644,8 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ERR("GetContentDOMWindow failed: %08x\n", nsres); } + init_nsevents(ret); + nsres = nsIWebBrowser_QueryInterface(ret->webbrowser, &IID_nsIScrollable, (void**)&scrollable); if(NS_SUCCEEDED(nsres)) { nsres = nsIScrollable_SetDefaultScrollbarPreferences(scrollable, diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c new file mode 100644 index 0000000..887a169 --- /dev/null +++ b/dlls/mshtml/nsevents.c @@ -0,0 +1,148 @@ +/* + * Copyright 2007 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" +#include "wine/unicode.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +#define NSEVENTLIST_THIS(iface) DEFINE_THIS(nsEventListener, DOMEventListener, iface) + +static nsresult NSAPI nsDOMEventListener_QueryInterface(nsIDOMEventListener *iface, + nsIIDRef riid, nsQIResult result) +{ + nsEventListener *This = NSEVENTLIST_THIS(iface); + + *result = NULL; + + if(IsEqualGUID(&IID_nsISupports, riid)) { + TRACE("(%p)->(IID_nsISupports, %p)\n", This, result); + *result = NSEVENTLIST(This); + }else if(IsEqualGUID(&IID_nsIDOMEventListener, riid)) { + TRACE("(%p)->(IID_nsIDOMEventListener %p)\n", This, result); + *result = NSEVENTLIST(This); + } + + if(*result) { + nsIWebBrowserChrome_AddRef(NSEVENTLIST(This)); + return NS_OK; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); + return NS_NOINTERFACE; +} + +static nsrefcnt NSAPI nsDOMEventListener_AddRef(nsIDOMEventListener *iface) +{ + NSContainer *This = NSEVENTLIST_THIS(iface)->This; + return nsIWebBrowserChrome_AddRef(NSWBCHROME(This)); +} + +static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) +{ + NSContainer *This = NSEVENTLIST_THIS(iface)->This; + return nsIWebBrowserChrome_Release(NSWBCHROME(This)); +} + +static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, + nsIDOMEvent *event) +{ + NSContainer *This = NSEVENTLIST_THIS(iface)->This; + + TRACE("(%p)->(%p)\n", This, event); + + update_doc(This->doc, UPDATE_UI); + if(This->doc->usermode == EDITMODE) + handle_edit_event(This->doc, event); + + return NS_OK; +} + +#undef NSEVENTLIST_THIS + +#define EVENTLISTENER_VTBL(handler) \ + { \ + nsDOMEventListener_QueryInterface, \ + nsDOMEventListener_AddRef, \ + nsDOMEventListener_Release, \ + handler, \ + }; + +static const nsIDOMEventListenerVtbl keypress_vtbl = EVENTLISTENER_VTBL(handle_keypress); + +static void init_event(nsIDOMEventTarget *target, const PRUnichar *type, + nsIDOMEventListener *listener, BOOL capture) +{ + nsAString type_str; + nsresult nsres; + + nsAString_Init(&type_str, type); + nsres = nsIDOMEventTarget_AddEventListener(target, &type_str, listener, capture); + nsAString_Finish(&type_str); + if(NS_FAILED(nsres)) + ERR("AddEventTarget failed: %08x\n", nsres); + +} + +static void init_listener(nsEventListener *This, NSContainer *container, + const nsIDOMEventListenerVtbl *vtbl) +{ + This->lpDOMEventListenerVtbl = vtbl; + This->This = container; +} + +void init_nsevents(NSContainer *This) +{ + nsIDOMWindow *dom_window; + nsIDOMEventTarget *target; + nsresult nsres; + + static const PRUnichar wsz_keypress[] = {'k','e','y','p','r','e','s','s',0}; + + init_listener(&This->keypress_listener, This, &keypress_vtbl); + + nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); + if(NS_FAILED(nsres)) { + ERR("GetContentDOMWindow failed: %08x\n", nsres); + return; + } + + nsres = nsIDOMWindow_QueryInterface(dom_window, &IID_nsIDOMEventTarget, (void**)&target); + nsIDOMWindow_Release(dom_window); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMEventTarget interface: %08x\n", nsres); + return; + } + + init_event(target, wsz_keypress, NSEVENTLIST(&This->keypress_listener), FALSE); + + nsIDOMEventTarget_Release(target); +}

1 0

Evan Stade : gdiplus: Fix broken graphics path constructor.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 6baacf61a857a7f9c471005cb12553f8d37a558e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6baacf61a857a7f9c471005cb… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jun 22 19:20:44 2007 -0700 gdiplus: Fix broken graphics path constructor. --- dlls/gdiplus/graphicspath.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 13a14cf..cce60c6 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -38,14 +38,13 @@ GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path) if(!path) return InvalidParameter; - *path = GdipAlloc(sizeof(GpSolidFill)); + *path = GdipAlloc(sizeof(GpPath)); if(!*path) return OutOfMemory; - hdc = GetDC(0); - (*path)->fill = fill; (*path)->newfigure = TRUE; + hdc = GetDC(0); ret = GdipCreateFromHDC(hdc, &((*path)->graphics)); if(ret != Ok){

1 0

Evan Stade : gdiplus: Fix erroneous pen error checking.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 02efd4bbf1afdc9cba8c7e824d85bb7f7b6a7319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02efd4bbf1afdc9cba8c7e824… Author: Evan Stade <estade(a)gmail.com> Date: Fri Jun 22 19:24:50 2007 -0700 gdiplus: Fix erroneous pen error checking. --- dlls/gdiplus/pen.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index d0355db..9ee72d9 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -33,8 +33,11 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, LOGBRUSH lb; GpPen *gp_pen; + if(!pen) + return InvalidParameter; + gp_pen = GdipAlloc(sizeof(GpPen)); - if(!pen) return OutOfMemory; + if(!gp_pen) return OutOfMemory; gp_pen->style = GP_DEFAULT_PENSTYLE; gp_pen->color = ARGB2COLORREF(color); @@ -51,12 +54,10 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, FLOAT width, GpUnit unit, 0, NULL); } else { FIXME("UnitWorld, UnitPixel only supported units\n"); + GdipFree(gp_pen); return NotImplemented; } - if(!gp_pen) - return GenericError; - *pen = gp_pen; return Ok;

1 0

Misha Koshelev : wine.inf: Fix path to rundll32.exe in inffile/shell/ install/command subkey.
by Alexandre Julliard 25 Jun '07

25 Jun '07

Module: wine Branch: master Commit: 1a2e16de0fa014d6db2d65abe3a08c97c7788821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2e16de0fa014d6db2d65abe… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri Jun 22 17:38:35 2007 -0500 wine.inf: Fix path to rundll32.exe in inffile/shell/install/command subkey. --- tools/wine.inf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 01bf848..78ced6d 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -119,7 +119,7 @@ HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" HKCR,htmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,inffile\shell\install\command,,2,"%10%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" +HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,lnkfile,,2,"Shortcut"

1 0