April 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Prune unsupported world matrix transform states.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 43e89cb981644508538b44f37245153b5698456e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e89cb981644508538b44f37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 13 20:46:28 2010 +0200 wined3d: Prune unsupported world matrix transform states. --- dlls/wined3d/state.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f94aac5..bfde5e4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5647,6 +5647,14 @@ static void prune_invalid_states(struct StateEntry *state_table, const struct wi state_table[i].representative = 0; state_table[i].apply = state_undefined; } + + start = STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(gl_info->limits.blends)); + last = STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)); + for (i = start; i <= last; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; + } } static void validate_state_table(struct StateEntry *state_table)

1 0

Detlef Riekenberg : urlmon/tests: Do not depend on user security settings in sec_mgr tests.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: d5e4666e6ab993fc3da8b1214384835d8ad70721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e4666e6ab993fc3da8b1214… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 13 21:30:34 2010 +0200 urlmon/tests: Do not depend on user security settings in sec_mgr tests. --- dlls/urlmon/tests/sec_mgr.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e441698..a83f7ec 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -1,6 +1,6 @@ /* * Copyright 2005-2006 Jacek Caban for CodeWeavers - * Copyright 2009 Detlef Riekenberg + * Copyright 2009-2010 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,15 +41,14 @@ static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; static const WCHAR url3[] = {'f','i','l','e',':','/','/','c',':','\\','I','n','d','e','x','.','h','t','m',0}; static const WCHAR url4[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e', '%','2','e','j','p','g',0}; -static const WCHAR url5[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', - '.','o','r','g',0}; +static const WCHAR url5[] = {'h','t','t','p',':','/','/','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',0}; static const WCHAR url6[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -static const WCHAR url7[] = {'f','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g','/', - 'f','i','l','e','.','t','e','s','t',0}; +static const WCHAR url7[] = {'f','t','p',':','/','/','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t','/','f','i','l','e','.','t','e','s','t',0}; static const WCHAR url8[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; -static const WCHAR url9[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', - '/','s','i','t','e','/','a','b','o','u','t',0}; +static const WCHAR url9[] = {'h','t','t','p',':','/','/','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t', '/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', '.','j','p','g',0}; @@ -58,11 +57,11 @@ static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; -static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q', - '.','o','r','g',3,0,0,0}; +static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',3,0,0,0}; static const BYTE secid6[] = {'a','b','o','u','t',':','b','l','a','n','k',3,0,0,0}; -static const BYTE secid7[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g', - 3,0,0,0}; +static const BYTE secid7[] = {'f','t','p',':','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',3,0,0,0}; static const BYTE secid10[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e','.','j','p','g',3,0,0,0}; static const BYTE secid10_2[] = @@ -641,8 +640,9 @@ static void test_InternetSecurityMarshalling(void) static void test_InternetGetSecurityUrl(void) { - const WCHAR url5_out[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; - const WCHAR url7_out[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g',0}; + const WCHAR url5_out[] = {'h','t','t','p',':','w','w','w','.','z','o','n','e','3', + '.','w','i','n','e','t','e','s','t',0}; + const WCHAR url7_out[] = {'f','t','p',':','z','o','n','e','3','.','w','i','n','e','t','e','s','t',0}; const WCHAR *in[] = {url2, url3, url4, url5, url7, url8, url9, url10}; const WCHAR *out_default[] = {url2, url3, url4, url5_out, url7_out, url8, url5_out, url10};

1 0

Detlef Riekenberg : urlmon/tests: Fix a failure on Win98.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 43e9bb5e92e7c64639142eb991450ecf61326d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e9bb5e92e7c64639142eb99… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 13 23:20:11 2010 +0200 urlmon/tests: Fix a failure on Win98. --- dlls/urlmon/tests/sec_mgr.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index a83f7ec..e758115 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -631,7 +631,9 @@ static void test_InternetSecurityMarshalling(void) ok(hres == S_OK, "CreateStreamOnHGlobal returned: %08x\n", hres); hres = CoMarshalInterface(stream, &IID_IInternetSecurityManager, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); - ok(hres == S_OK, "CoMarshalInterface returned: %08x\n", hres); + /* Not supported in W98 */ + ok(hres == S_OK || broken(hres == REGDB_E_IIDNOTREG), + "CoMarshalInterface returned: %08x\n", hres); IStream_Release(stream); IUnknown_Release(unk);

1 0

Detlef Riekenberg : urlmon/tests: Run the tests again on W95B ( CoInternetParseUrl).
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 083849559679f1f4ab2661fe6ea5bbba6bda9e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=083849559679f1f4ab2661fe6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Apr 13 21:30:54 2010 +0200 urlmon/tests: Run the tests again on W95B (CoInternetParseUrl). --- dlls/urlmon/tests/misc.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2e77c1b..259c5a0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -63,6 +63,8 @@ DEFINE_EXPECT(QI_IInternetProtocolInfo); DEFINE_EXPECT(CreateInstance); DEFINE_EXPECT(unk_Release); +static HRESULT (WINAPI *pCoInternetCompareUrl)(LPCWSTR, LPCWSTR, DWORD); + static void test_CreateFormatEnum(void) { IEnumFORMATETC *fenum = NULL, *fenum2 = NULL; @@ -363,13 +365,18 @@ static void test_CoInternetCompareUrl(void) { HRESULT hres; - hres = CoInternetCompareUrl(url1, url1, 0); + if (!pCoInternetCompareUrl) { + win_skip("CoInternetCompareUrl not found\n"); + return; + } + + hres = pCoInternetCompareUrl(url1, url1, 0); ok(hres == S_OK, "CoInternetParseUrl failed: %08x\n", hres); - hres = CoInternetCompareUrl(url1, url3, 0); + hres = pCoInternetCompareUrl(url1, url3, 0); ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); - hres = CoInternetCompareUrl(url3, url1, 0); + hres = pCoInternetCompareUrl(url3, url1, 0); ok(hres == S_FALSE, "CoInternetParseUrl failed: %08x\n", hres); } @@ -1402,10 +1409,15 @@ static void test_IsValidURL(void) START_TEST(misc) { + HMODULE hurlmon; + OleInitialize(NULL); register_protocols(); + hurlmon = GetModuleHandle("urlmon.dll"); + pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl"); + test_CreateFormatEnum(); test_RegisterFormatEnumerator(); test_CoInternetParseUrl();

1 0

Detlef Riekenberg : urlmon/tests: CoInternetGetSecurityUrl is not present on W95B.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 40cfa7a6f2c0ff9311257e087d3744bcc5a5843f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40cfa7a6f2c0ff9311257e087… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 14 05:41:50 2010 +0200 urlmon/tests: CoInternetGetSecurityUrl is not present on W95B. --- dlls/urlmon/tests/sec_mgr.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e758115..239da6c 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -35,6 +35,8 @@ #include "initguid.h" +static HRESULT (WINAPI *pCoInternetGetSecurityUrl)(LPCWSTR, LPWSTR*, PSUACTION, DWORD); + static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; @@ -654,8 +656,13 @@ static void test_InternetGetSecurityUrl(void) DWORD i; HRESULT hres; + if (!pCoInternetGetSecurityUrl) { + win_skip("CoInternetGetSecurityUrl not found\n"); + return; + } + for(i=0; i<sizeof(in)/sizeof(WCHAR*); i++) { - hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); + hres = pCoInternetGetSecurityUrl(in[i], &sec, PSU_DEFAULT, 0); ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); if(hres == S_OK) { ok(!strcmp_w(sec, out_default[i]), "(%d) Got %s, expected %s\n", @@ -663,7 +670,7 @@ static void test_InternetGetSecurityUrl(void) CoTaskMemFree(sec); } - hres = CoInternetGetSecurityUrl(in[i], &sec, PSU_SECURITY_URL_ONLY, 0); + hres = pCoInternetGetSecurityUrl(in[i], &sec, PSU_SECURITY_URL_ONLY, 0); ok(hres == S_OK, "(%d) CoInternetGetSecurityUrl returned: %08x\n", i, hres); if(hres == S_OK) { ok(!strcmp_w(sec, out_securl[i]), "(%d) Got %s, expected %s\n", @@ -676,8 +683,13 @@ static void test_InternetGetSecurityUrl(void) START_TEST(sec_mgr) { + HMODULE hurlmon; + OleInitialize(NULL); + hurlmon = GetModuleHandle("urlmon.dll"); + pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); + test_InternetGetSecurityUrl(); test_SecurityManager(); test_polices();

1 0

Joel Holdsworth : shell32: Replaced folder.ico with a Tango compliant icon.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 1b54c5f1dc24e6dd0d13ece32877ddbbd141dd18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b54c5f1dc24e6dd0d13ece32… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Tue Apr 13 21:58:56 2010 +0100 shell32: Replaced folder.ico with a Tango compliant icon. --- dlls/shell32/folder.ico | Bin 15086 -> 25214 bytes dlls/shell32/folder.svg | 1054 ++++++----------------------------------------- 2 files changed, 120 insertions(+), 934 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b54c5f1dc24e6dd0d13e…

1 0

Jacek Caban : mshtml: Improved focus handling.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 7cdad62b973eb48c2e11aee0fb50c0de96277cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cdad62b973eb48c2e11aee0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 20:01:21 2010 +0200 mshtml: Improved focus handling. --- dlls/mshtml/editor.c | 1 - dlls/mshtml/mshtml_private.h | 2 -- dlls/mshtml/nsembed.c | 24 ++++++------------------ dlls/mshtml/nsevents.c | 4 ++-- dlls/mshtml/view.c | 7 ++++++- 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 961bb91..14e7ebb 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -508,7 +508,6 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) void handle_edit_load(HTMLDocument *This) { - This->doc_obj->nscontainer->reset_focus = GetFocus(); get_editor_controller(This->doc_obj->nscontainer); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e378f26..4431d9c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -437,8 +437,6 @@ struct NSContainer { nsIURIContentListener *content_listener; HWND hwnd; - - HWND reset_focus; /* hack */ }; typedef struct nsWineURI nsWineURI; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fa8aa41..f3e43c8 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -80,8 +80,6 @@ static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e',' static ATOM nscontainer_class; -#define WM_RESETFOCUS_HACK WM_USER+600 - static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { NSContainer *This; @@ -106,20 +104,13 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP WARN("SetSize failed: %08x\n", nsres); break; - case WM_RESETFOCUS_HACK: - /* - * FIXME - * Gecko grabs focus in edit mode and some apps don't like it. - * We should somehow prevent grabbing focus. - */ - - TRACE("WM_RESETFOCUS_HACK\n"); + case WM_PARENTNOTIFY: + TRACE("WM_PARENTNOTIFY %x\n", (unsigned)wParam); - if(This->reset_focus) { - SetFocus(This->reset_focus); - This->reset_focus = NULL; - if(This->doc) - This->doc->focus = FALSE; + switch(wParam) { + case WM_LBUTTONDOWN: + case WM_RBUTTONDOWN: + nsIWebBrowserFocus_Activate(This->focus); } } @@ -1316,9 +1307,6 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *ifa TRACE("(%p)\n", This); - if(This->reset_focus) - PostMessageW(This->hwnd, WM_RESETFOCUS_HACK, 0, 0); - return nsIBaseWindow_SetFocus(This->window); } diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index c491424..fb2b055 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -129,7 +129,7 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event return NS_ERROR_FAILURE; doc_obj = doc->basedoc.doc_obj; - if(!doc_obj->nscontainer->reset_focus && doc_obj->focus && !is_doc_child_focus(doc_obj)) { + if(doc_obj->focus && !is_doc_child_focus(doc_obj)) { doc_obj->focus = FALSE; notif_focus(doc_obj); } @@ -148,7 +148,7 @@ static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *even return NS_ERROR_FAILURE; doc_obj = doc->basedoc.doc_obj; - if(!doc_obj->nscontainer->reset_focus && !doc_obj->focus) { + if(!doc_obj->focus) { doc_obj->focus = TRUE; notif_focus(doc_obj); } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 2561478..5c096ed 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -92,7 +92,6 @@ static void activate_gecko(NSContainer *This) nsIBaseWindow_SetVisibility(This->window, TRUE); nsIBaseWindow_SetEnabled(This->window, TRUE); - nsIWebBrowserFocus_Activate(This->focus); } void update_doc(HTMLDocument *This, DWORD flags) @@ -216,6 +215,10 @@ static LRESULT WINAPI serverwnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break; case WM_TIMER: return on_timer(This); + case WM_SETFOCUS: + TRACE("(%p) WM_SETFOCUS\n", This); + nsIWebBrowserFocus_Activate(This->nscontainer->focus); + break; case WM_MOUSEACTIVATE: return MA_ACTIVATE; } @@ -664,6 +667,8 @@ static HRESULT WINAPI OleDocumentView_UIActivate(IOleDocumentView *iface, BOOL f This->doc_obj->ui_active = TRUE; }else { + This->doc_obj->focus = FALSE; + nsIWebBrowserFocus_Deactivate(This->doc_obj->nscontainer->focus); if(This->doc_obj->ui_active) { This->doc_obj->ui_active = FALSE; if(This->doc_obj->ip_window)

1 0

Jacek Caban : mshtml: Use DOM designMode to switch to editor mode.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 80f0f35c504feb47e982cac74cb6ec91bb6854c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f0f35c504feb47e982cac74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 20:01:41 2010 +0200 mshtml: Use DOM designMode to switch to editor mode. --- dlls/mshtml/htmlwindow.c | 20 ++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/nsembed.c | 40 ---------------------------------------- dlls/mshtml/olecmd.c | 3 --- 4 files changed, 20 insertions(+), 44 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2aafaa3..5dbea55 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -57,6 +57,26 @@ static void window_set_docnode(HTMLWindow *window, HTMLDocumentNode *doc_node) if(doc_node) htmldoc_addref(&doc_node->basedoc); } + + if(doc_node && window->doc_obj->usermode == EDITMODE) { + nsIDOMNSHTMLDocument *nshtmldoc; + nsAString mode_str; + nsresult nsres; + + static const PRUnichar onW[] = {'o','n',0}; + + nsres = nsIDOMHTMLDocument_QueryInterface(doc_node->nsdoc, &IID_nsIDOMNSHTMLDocument, (void**)&nshtmldoc); + if(NS_SUCCEEDED(nsres)) { + nsAString_Init(&mode_str, onW); + nsres = nsIDOMNSHTMLDocument_SetDesignMode(nshtmldoc, &mode_str); + nsAString_Finish(&mode_str); + nsIDOMNSHTMLDocument_Release(nshtmldoc); + if(NS_FAILED(nsres)) + ERR("SetDesignMode failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSHTMLDocument interface: %08x\n", nsres); + } + } } nsIDOMWindow *get_nsdoc_window(nsIDOMDocument *nsdoc) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4431d9c..3db8d79 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -843,7 +843,6 @@ void update_title(HTMLDocumentObj*); /* editor */ void init_editor(HTMLDocument*); -void set_ns_editmode(NSContainer*); void handle_edit_event(HTMLDocument*,nsIDOMEvent*); HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*); HRESULT editor_exec_cut(HTMLDocument*,DWORD,VARIANT*,VARIANT*); diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index f3e43c8..8a59007 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -767,46 +767,6 @@ void get_editor_controller(NSContainer *This) } } -void set_ns_editmode(NSContainer *This) -{ - nsIEditingSession *editing_session = NULL; - nsIURIContentListener *listener = NULL; - nsIDOMWindow *dom_window = NULL; - nsresult nsres; - - nsres = get_nsinterface((nsISupports*)This->webbrowser, &IID_nsIEditingSession, - (void**)&editing_session); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIEditingSession: %08x\n", nsres); - return; - } - - nsres = nsIWebBrowser_GetContentDOMWindow(This->webbrowser, &dom_window); - if(NS_FAILED(nsres)) { - ERR("Could not get content DOM window: %08x\n", nsres); - nsIEditingSession_Release(editing_session); - return; - } - - nsres = nsIEditingSession_MakeWindowEditable(editing_session, dom_window, - NULL, FALSE, TRUE, TRUE); - nsIEditingSession_Release(editing_session); - nsIDOMWindow_Release(dom_window); - if(NS_FAILED(nsres)) { - ERR("MakeWindowEditable failed: %08x\n", nsres); - return; - } - - /* MakeWindowEditable changes WebBrowser's parent URI content listener. - * It seams to be a bug in Gecko. To workaround it we set our content - * listener again and Gecko's one as its parent. - */ - nsIWebBrowser_GetParentURIContentListener(This->webbrowser, &listener); - nsIURIContentListener_SetParentContentListener(NSURICL(This), listener); - nsIURIContentListener_Release(listener); - nsIWebBrowser_SetParentURIContentListener(This->webbrowser, NSURICL(This)); -} - void close_gecko(void) { TRACE("()\n"); diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b54f064..4d5967a 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -616,9 +616,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, IDocHostUIHandler_HideUI(This->doc_obj->hostui); } - if(This->doc_obj->nscontainer) - set_ns_editmode(This->doc_obj->nscontainer); - if(This->doc_obj->ui_active) { RECT rcBorderWidths;

1 0

Jacek Caban : mshtml: Use NSContainer HWND in handle_blur.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 9539cf7a4e83e0bdd5b24a7381f666a765cc8ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9539cf7a4e83e0bdd5b24a738… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 13 20:01:59 2010 +0200 mshtml: Use NSContainer HWND in handle_blur. --- dlls/mshtml/nsevents.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index fb2b055..3e03149 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -109,11 +109,11 @@ static nsrefcnt NSAPI nsDOMEventListener_Release(nsIDOMEventListener *iface) return release_listener(This); } -static BOOL is_doc_child_focus(HTMLDocumentObj *doc) +static BOOL is_doc_child_focus(NSContainer *nscontainer) { HWND hwnd; - for(hwnd = GetFocus(); hwnd && hwnd != doc->hwnd; hwnd = GetParent(hwnd)); + for(hwnd = GetFocus(); hwnd && hwnd != nscontainer->hwnd; hwnd = GetParent(hwnd)); return hwnd != NULL; } @@ -129,7 +129,7 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event return NS_ERROR_FAILURE; doc_obj = doc->basedoc.doc_obj; - if(doc_obj->focus && !is_doc_child_focus(doc_obj)) { + if(doc_obj->focus && !is_doc_child_focus(doc_obj->nscontainer)) { doc_obj->focus = FALSE; notif_focus(doc_obj); }

1 0

Damjan Jovanovic : wdm.h: Declare IoCallDriver.
by Alexandre Julliard 14 Apr '10

14 Apr '10

Module: wine Branch: master Commit: 189335441e41be7066805965927c38025d0ec7a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189335441e41be70668059659… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Apr 13 20:41:31 2010 +0200 wdm.h: Declare IoCallDriver. --- include/ddk/wdm.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e57be4b..da673a5 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1063,6 +1063,7 @@ void WINAPI ExFreePoolWithTag(PVOID,ULONG); NTSTATUS WINAPI IoAllocateDriverObjectExtension(PDRIVER_OBJECT,PVOID,ULONG,PVOID*); PVOID WINAPI IoAllocateErrorLogEntry(PVOID,UCHAR); PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); +NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE);

1 0