November 2012 - Wine-Commits

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: c27d20902aaf25ea803fbf49853e375b331ef506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27d20902aaf25ea803fbf498… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Nov 12 11:18:56 2012 +0900 po: Update Korean translation. --- po/ko.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0ccb19b..a0bd4b9 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8241,44 +8241,36 @@ msgid "Security Warning" msgstr "보안 경고" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "그래도 계속 진행하겠습니까?" +msgstr "이 소프트웨어를 설치하기를 원합니까?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "위치:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "설치/삭제" +msgstr "설치 안 함" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"설치할 때,ActiveX는 당신의 컴퓨터에 완전한 접근권한을 가질 것입니다. 당신이" +"이 원본을 완전히 신뢰하지 않는다면 설치를 클릭하지 마십시오." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "설치 변환 실패가 추가됨.\n" +msgstr "구성요소 설치가 실패함: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "설치(&I)" +msgstr "설치 (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "설치(&I)" +msgstr "설치" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Detlef Riekenberg : advapi32/tests: Fix a failure on 64bit NT 5.x.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: aaad900d1edaba58d6073e5082530e42958a2201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaad900d1edaba58d6073e508… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 12 05:50:13 2012 +0100 advapi32/tests: Fix a failure on 64bit NT 5.x. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ba0750b..f5fc4e2 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4294,7 +4294,7 @@ static void test_TokenIntegrityLevel(void) res = GetTokenInformation(token, TokenIntegrityLevel, buffer, sizeof(buffer), &size); /* not supported before Vista */ - if (!res && (GetLastError() == ERROR_INVALID_PARAMETER)) + if (!res && ((GetLastError() == ERROR_INVALID_PARAMETER) || GetLastError() == ERROR_INVALID_FUNCTION)) { win_skip("TokenIntegrityLevel not supported\n"); CloseHandle(token);

1 0

Jacek Caban : ieframe: Added IWebBrowser2::Refresh implementation.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 9c3c57040e64bab4a8ddc1b93200f538565d5886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c3c57040e64bab4a8ddc1b93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:20 2012 +0100 ieframe: Added IWebBrowser2::Refresh implementation. --- dlls/ieframe/dochost.c | 26 ++++++++++++++++++++++++++ dlls/ieframe/ie.c | 6 ++++-- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/webbrowser.c | 6 ++++-- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c063851..1b10fb4 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -453,6 +453,32 @@ void deactivate_document(DocHost *This) This->document = NULL; } +HRESULT refresh_document(DocHost *This) +{ + IOleCommandTarget *cmdtrg; + VARIANT vin, vout; + HRESULT hres; + + if(!This->document) { + FIXME("no document\n"); + return E_FAIL; + } + + hres = IUnknown_QueryInterface(This->document, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(FAILED(hres)) + return hres; + + V_VT(&vin) = VT_EMPTY; + V_VT(&vout) = VT_EMPTY; + hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_REFRESH, OLECMDEXECOPT_PROMPTUSER, &vin, &vout); + IOleCommandTarget_Release(cmdtrg); + if(FAILED(hres)) + return hres; + + VariantClear(&vout); + return S_OK; +} + void release_dochost_client(DocHost *This) { if(This->hwnd) { diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 02d0c28..da0e99c 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -182,8 +182,10 @@ static HRESULT WINAPI InternetExplorer_Navigate(IWebBrowser2 *iface, BSTR szUrl, static HRESULT WINAPI InternetExplorer_Refresh(IWebBrowser2 *iface) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return refresh_document(&This->doc_host->doc_host); } static HRESULT WINAPI InternetExplorer_Refresh2(IWebBrowser2 *iface, VARIANT *Level) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8dd3f17..0c13c82 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -265,6 +265,7 @@ void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*) DECLSPEC_HIDDEN; HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; HRESULT go_home(DocHost*) DECLSPEC_HIDDEN; HRESULT go_back(DocHost*) DECLSPEC_HIDDEN; +HRESULT refresh_document(DocHost*) DECLSPEC_HIDDEN; HRESULT get_location_url(DocHost*,BSTR*) DECLSPEC_HIDDEN; HRESULT set_dochost_url(DocHost*,const WCHAR*) DECLSPEC_HIDDEN; void handle_navigation_error(DocHost*,HRESULT,BSTR,IHTMLWindow2*) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 1bd14fa..dda957a 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -292,8 +292,10 @@ static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl, static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + return refresh_document(&This->doc_host); } static HRESULT WINAPI WebBrowser_Refresh2(IWebBrowser2 *iface, VARIANT *Level)

1 0

Jacek Caban : ieframe: Added IWebBrowser2::Refresh tests.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 8b1bd3e5bfe8e3951e19a3063942d1d0cce8cc4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b1bd3e5bfe8e3951e19a3063… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:33 2012 +0100 ieframe: Added IWebBrowser2::Refresh tests. --- dlls/ieframe/tests/webbrowser.c | 43 +++++++++++++++++++++++++++++++------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 213e43d..25cce8a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -126,6 +126,7 @@ DEFINE_EXPECT(Exec_SETTITLE); DEFINE_EXPECT(QueryStatus_SETPROGRESSTEXT); DEFINE_EXPECT(Exec_STOP); DEFINE_EXPECT(Exec_IDM_STOP); +DEFINE_EXPECT(Exec_DocHostCommandHandler_2300); DEFINE_EXPECT(QueryStatus_STOP); DEFINE_EXPECT(QueryStatus_IDM_STOP); DEFINE_EXPECT(DocHost_EnableModeless_TRUE); @@ -160,6 +161,7 @@ static int wb_version; #define DWL_FROM_PUT_HREF 0x02 #define DWL_FROM_GOBACK 0x04 #define DWL_HTTP 0x08 +#define DWL_REFRESH 0x10 static DWORD dwl_flags; @@ -453,6 +455,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 105: /* TODO */ case 138: /* TODO */ case 140: /* TODO (Win7) */ + case 144: /* TODO */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID); @@ -468,6 +471,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case 6041: /* TODO */ break; + case 2300: + CHECK_EXPECT(Exec_DocHostCommandHandler_2300); + return E_NOTIMPL; default: ok(0, "unexpected nCmdID %d of CGID_DocHostCommandHandler\n", nCmdID); } @@ -2697,14 +2703,15 @@ static void test_ExecWB(IWebBrowser2 *webbrowser, BOOL use_custom_target, BOOL h static void test_download(DWORD flags) { + BOOL *b = (flags & DWL_REFRESH) ? &called_Exec_SETDOWNLOADSTATE_0 : &called_Invoke_DOCUMENTCOMPLETE; MSG msg; is_downloading = TRUE; dwl_flags = flags; - test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); + test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & DWL_FROM_GOBACK)) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2727,11 +2734,13 @@ static void test_download(DWORD flags) SET_EXPECT(GetHostInfo); SET_EXPECT(Exec_SETDOWNLOADSTATE_0); SET_EXPECT(Invoke_TITLECHANGE); - SET_EXPECT(Invoke_NAVIGATECOMPLETE2); + if(!(flags & DWL_REFRESH)) + SET_EXPECT(Invoke_NAVIGATECOMPLETE2); if(is_first_load) SET_EXPECT(GetDropTarget); SET_EXPECT(Invoke_PROGRESSCHANGE); - SET_EXPECT(Invoke_DOCUMENTCOMPLETE); + if(!(flags & DWL_REFRESH)) + SET_EXPECT(Invoke_DOCUMENTCOMPLETE); if(flags & DWL_HTTP) SET_EXPECT(Exec_SETTITLE); @@ -2739,12 +2748,12 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(QueryStatus_STOP); - while(!called_Invoke_DOCUMENTCOMPLETE && GetMessage(&msg, NULL, 0, 0)) { + while(!*b && GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } - if((is_http && !(flags & DWL_FROM_GOBACK)) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2773,11 +2782,13 @@ static void test_download(DWORD flags) todo_wine CHECK_CALLED(GetHostInfo); CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); todo_wine CHECK_CALLED(Invoke_TITLECHANGE); - CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); + if(!(flags & DWL_REFRESH)) + CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) todo_wine CHECK_CALLED(GetDropTarget); todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); - CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); + if(!(flags & DWL_REFRESH)) + CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); is_downloading = FALSE; @@ -2795,6 +2806,20 @@ static void test_download(DWORD flags) CLEAR_CALLED(QueryStatus_STOP); } +static void test_Refresh(IWebBrowser2 *webbrowser) +{ + HRESULT hres; + + trace("Refresh...\n"); + + SET_EXPECT(Exec_DocHostCommandHandler_2300); + hres = IWebBrowser2_Refresh(webbrowser); + ok(hres == S_OK, "Refresh failed: %08x\n", hres); + CHECK_CALLED(Exec_DocHostCommandHandler_2300); + + test_download(DWL_REFRESH); +} + static void test_olecmd(IWebBrowser2 *unk, BOOL loaded) { IOleCommandTarget *cmdtrg; @@ -3336,6 +3361,8 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Navigate2(webbrowser, "http://test.winehq.org/tests/hello.html"); test_download(DWL_EXPECT_BEFORE_NAVIGATE|DWL_HTTP); + test_Refresh(webbrowser); + trace("put_href http URL...\n"); test_put_href(webbrowser, "http://www.winehq.org/"); test_download(DWL_FROM_PUT_HREF|DWL_HTTP);

1 0

Jacek Caban : ieframe: Forward more DocHost::Exec calls to embedders.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: d22a8bbd66261b4005495a3d704de1d111778ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22a8bbd66261b4005495a3d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:59:06 2012 +0100 ieframe: Forward more DocHost::Exec calls to embedders. --- dlls/ieframe/dochost.c | 4 ++++ dlls/ieframe/iexplore.c | 3 ++- dlls/ieframe/tests/webbrowser.c | 4 ++-- dlls/ieframe/webbrowser.c | 6 ++++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 0449f24..c063851 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -526,6 +526,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_UPDATECOMMANDS: + case OLECMDID_SETDOWNLOADSTATE: return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); default: FIXME("Unimplemented cmdid %d\n", nCmdID); @@ -605,6 +606,9 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, } } + if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) + return This->container_vtbl->exec(This, pguidCmdGroup, nCmdID, nCmdexecopt, pvaIn, pvaOut); + FIXME("Unimplemented cmdid %d of group %s\n", nCmdID, debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; } diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index c4641bd..0643f16 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -789,8 +789,9 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) static HRESULT DocHostContainer_exec(DocHost* This, const GUID *cmd_group, DWORD cmdid, DWORD execopt, VARIANT *in, VARIANT *out) { - return S_OK; + return E_NOTIMPL; } + static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_addref, IEDocHost_release, diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 57c2be9..213e43d 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2753,7 +2753,7 @@ static void test_download(DWORD flags) } todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); + CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CLEAR_CALLED(DocHost_EnableModeless_FALSE); /* IE 7 */ CLEAR_CALLED(DocHost_EnableModeless_TRUE); /* IE 7 */ todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); @@ -2771,7 +2771,7 @@ static void test_download(DWORD flags) CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */ if(!is_first_load) todo_wine CHECK_CALLED(GetHostInfo); - todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); + CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); todo_wine CHECK_CALLED(Invoke_TITLECHANGE); CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index b82233b..1bd14fa 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1219,11 +1219,13 @@ static HRESULT DocHostContainer_exec(DocHost *doc_host, const GUID *cmd_group, D } if(!cmdtrg) - return S_OK; + return E_NOTIMPL; hres = IOleCommandTarget_Exec(cmdtrg, cmd_group, cmdid, execopt, in, out); IOleCommandTarget_Release(cmdtrg); - if(FAILED(hres)) + if(SUCCEEDED(hres)) + TRACE("Exec returned %08x %s\n", hres, debugstr_variant(out)); + else FIXME("Exec failed\n"); return hres;

1 0

Henri Verbeet : wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name ().
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 0a7b32e3f08d68feddd563afca3c03416cc4cb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7b32e3f08d68feddd563afc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 11 18:52:39 2012 +0100 wined3d: Handle relative addresses in the common code in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 39 ++++++++++++++++----------------------- 1 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1e09c9e..66cee1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1378,7 +1378,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader_version *version = &reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); + struct glsl_src_param rel_param0, rel_param1; + if (reg->idx[0].offset != ~0U && reg->idx[0].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param0); + if (reg->idx[1].offset != ~0U && reg->idx[1].rel_addr) + shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1); *is_color = FALSE; switch (reg->type) @@ -1406,24 +1411,20 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); - - /* Removing a + 0 would be an obvious optimization, but macos doesn't see the NOP - * operation there */ + /* Removing a + 0 would be an obvious optimization, but + * OS X doesn't see the NOP operation there. */ if (idx) { if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s + %u) > %u ? (%s + %u) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s + %u])", - rel_param.param_str, idx, in_count - 1, rel_param.param_str, idx, in_count, - prefix, rel_param.param_str, idx); + rel_param0.param_str, idx, in_count - 1, rel_param0.param_str, idx, in_count, + prefix, rel_param0.param_str, idx); } else { - sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param.param_str, idx); + sprintf(register_name, "%s_in[%s + %u]", prefix, rel_param0.param_str, idx); } } else @@ -1431,12 +1432,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (shader->u.ps.declared_in_count > in_count) { sprintf(register_name, "((%s) > %u ? (%s) > %u ? gl_SecondaryColor : gl_Color : %s_in[%s])", - rel_param.param_str, in_count - 1, rel_param.param_str, in_count, - prefix, rel_param.param_str); + rel_param0.param_str, in_count - 1, rel_param0.param_str, in_count, + prefix, rel_param0.param_str); } else { - sprintf(register_name, "%s_in[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_in[%s]", prefix, rel_param0.param_str); } } } @@ -1462,12 +1463,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); if (reg->idx[0].offset) - sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param.param_str, reg->idx[0].offset); + sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else - sprintf(register_name, "%s_c[%s]", prefix, rel_param.param_str); + sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); } else { @@ -1606,16 +1605,10 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_CONSTBUFFER: if (reg->idx[1].rel_addr) - { - struct glsl_src_param rel_param; - shader_glsl_add_src_param(ins, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param); sprintf(register_name, "%s_cb%u[%s + %u]", - prefix, reg->idx[0].offset, rel_param.param_str, reg->idx[1].offset); - } + prefix, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); else - { sprintf(register_name, "%s_cb%u[%u]", prefix, reg->idx[0].offset, reg->idx[1].offset); - } break; case WINED3DSPR_PRIMID:

1 0

Jacek Caban : mshtml: Don't skip history notification for about: URLs.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 8f1bb21f35d7ffdb58c9891d599ed0611839d587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1bb21f35d7ffdb58c9891d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:57:58 2012 +0100 mshtml: Don't skip history notification for about: URLs. --- dlls/mshtml/persist.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 457f5dc..210fab0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -80,15 +80,6 @@ static void notify_travellog_update(HTMLDocumentObj *doc) if(!doc->is_webbrowser) return; - /* Don't notify if we were in about: page */ - if(doc->basedoc.window->uri) { - DWORD scheme; - - hres = IUri_GetScheme(doc->basedoc.window->uri, &scheme); - if(SUCCEEDED(hres) && scheme == URL_SCHEME_ABOUT) - return; - } - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); if(SUCCEEDED(hres)) { VARIANT vin;

1 0

Michael Stefaniuc : msi: Don't over-allocate memory for a MSISELECTVIEW.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: dad296794365d685082e8fa4eec626e73aea0b80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad296794365d685082e8fa4e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 12 10:28:39 2012 +0100 msi: Don't over-allocate memory for a MSISELECTVIEW. --- dlls/msi/select.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/select.c b/dlls/msi/select.c index ada4eed..e8f3885 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -431,7 +431,7 @@ UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, count = select_count_columns( columns ); - sv = msi_alloc_zero( sizeof *sv + count*sizeof (UINT) ); + sv = msi_alloc_zero( FIELD_OFFSET( MSISELECTVIEW, cols[count] )); if( !sv ) return ERROR_FUNCTION_FAILED;

1 0

Nikolay Sivov : scrrun: Block stream reading calls if it' s not in ForReading mode.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 7a4225c68f6d3029dc6f81afeeeb25bc5f55520b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4225c68f6d3029dc6f81afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 10 13:36:12 2012 -0500 scrrun: Block stream reading calls if it's not in ForReading mode. --- dlls/scrrun/filesystem.c | 32 ++++++++++- dlls/scrrun/tests/filesystem.c | 119 +++++++++++++++++++++++++++++++++------- 2 files changed, 129 insertions(+), 22 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index cd94c43..8fafc7c 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -41,6 +41,13 @@ struct folder { struct textstream { ITextStream ITextStream_iface; LONG ref; + + IOMode mode; +}; + +enum iotype { + IORead, + IOWrite }; static inline struct folder *impl_from_IFolder(IFolder *iface) @@ -53,6 +60,14 @@ static inline struct textstream *impl_from_ITextStream(ITextStream *iface) return CONTAINING_RECORD(iface, struct textstream, ITextStream_iface); } +static int textstream_check_iomode(struct textstream *This, enum iotype type) +{ + if (type == IORead) + return This->mode == ForWriting || This->mode == ForAppending; + else + return 1; +} + static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, void **obj) { struct textstream *This = impl_from_ITextStream(iface); @@ -183,6 +198,10 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); FIXME("(%p)->(%p): stub\n", This, text); + + if (textstream_check_iomode(This, IORead)) + return CTL_E_BADFILEMODE; + return E_NOTIMPL; } @@ -190,6 +209,10 @@ static HRESULT WINAPI textstream_ReadLine(ITextStream *iface, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); FIXME("(%p)->(%p): stub\n", This, text); + + if (textstream_check_iomode(This, IORead)) + return CTL_E_BADFILEMODE; + return E_NOTIMPL; } @@ -197,6 +220,10 @@ static HRESULT WINAPI textstream_ReadAll(ITextStream *iface, BSTR *text) { struct textstream *This = impl_from_ITextStream(iface); FIXME("(%p)->(%p): stub\n", This, text); + + if (textstream_check_iomode(This, IORead)) + return CTL_E_BADFILEMODE; + return E_NOTIMPL; } @@ -265,7 +292,7 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; -static HRESULT create_textstream(ITextStream **ret) +static HRESULT create_textstream(IOMode mode, ITextStream **ret) { struct textstream *stream; @@ -274,6 +301,7 @@ static HRESULT create_textstream(ITextStream **ret) stream->ITextStream_iface.lpVtbl = &textstreamvtbl; stream->ref = 1; + stream->mode = mode; *ret = &stream->ITextStream_iface; return S_OK; @@ -892,7 +920,7 @@ static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, Tristate format, ITextStream **stream) { FIXME("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); - return create_textstream(stream); + return create_textstream(mode, stream); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index d6c596c..e0c8684 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -31,6 +31,8 @@ #include "initguid.h" #include "scrrun.h" +static IFileSystem3 *fs3; + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -41,27 +43,18 @@ static void test_interfaces(void) HRESULT hr; IDispatch *disp; IDispatchEx *dispex; - IFileSystem3 *fs3; IObjectWithSite *site; VARIANT_BOOL b; BSTR path; WCHAR windows_path[MAX_PATH]; WCHAR file_path[MAX_PATH]; - hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IDispatch, (void**)&disp); - if(FAILED(hr)) { - win_skip("Could not create FileSystem object: %08x\n", hr); - return; - } + IFileSystem3_QueryInterface(fs3, &IID_IDispatch, (void**)&disp); GetSystemDirectoryW(windows_path, MAX_PATH); lstrcpyW(file_path, windows_path); lstrcatW(file_path, file_kernel32W); - hr = IDispatch_QueryInterface(disp, &IID_IFileSystem3, (void**)&fs3); - ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); - hr = IDispatch_QueryInterface(disp, &IID_IObjectWithSite, (void**)&site); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); @@ -119,25 +112,16 @@ static void test_interfaces(void) ok(b == VARIANT_FALSE, "Folder exists\n"); SysFreeString(path); - IFileSystem3_Release(fs3); IDispatch_Release(disp); } static void test_createfolder(void) { - IFileSystem3 *fs3; HRESULT hr; WCHAR pathW[MAX_PATH]; BSTR path; IFolder *folder; - hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IFileSystem3, (void**)&fs3); - if(FAILED(hr)) { - win_skip("Could not create FileSystem object: %08x\n", hr); - return; - } - /* create existing directory */ GetCurrentDirectoryW(sizeof(pathW)/sizeof(WCHAR), pathW); path = SysAllocString(pathW); @@ -146,16 +130,111 @@ static void test_createfolder(void) ok(hr == CTL_E_FILEALREADYEXISTS, "got 0x%08x\n", hr); ok(folder == NULL, "got %p\n", folder); SysFreeString(path); +} - IFileSystem3_Release(fs3); +static void test_textstream(void) +{ + static WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; + ITextStream *stream; + VARIANT_BOOL b; + HANDLE file; + HRESULT hr; + BSTR name, data; + + file = CreateFileW(testfileW, GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + CloseHandle(file); + + name = SysAllocString(testfileW); + b = VARIANT_FALSE; + hr = IFileSystem3_FileExists(fs3, name, &b); + ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); + ok(b == VARIANT_TRUE, "got %x\n", b); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); +todo_wine { + ok(hr == S_FALSE || broken(hr == S_OK), "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got 0x%x\n", b); +} + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); +} + b = 10; + hr = ITextStream_get_AtEndOfLine(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE || broken(b == 10), "got 0x%x\n", b); +} + hr = ITextStream_Read(stream, 1, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadLine(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadAll(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(name); + + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); +} + b = 10; + hr = ITextStream_get_AtEndOfLine(stream, &b); +todo_wine { + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE || broken(b == 10), "got 0x%x\n", b); +} + hr = ITextStream_Read(stream, 1, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadLine(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + hr = ITextStream_ReadAll(stream, &data); + ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + + ITextStream_Release(stream); + + DeleteFileW(testfileW); } START_TEST(filesystem) { + HRESULT hr; + CoInitialize(NULL); + hr = CoCreateInstance(&CLSID_FileSystemObject, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IFileSystem3, (void**)&fs3); + if(FAILED(hr)) { + win_skip("Could not create FileSystem object: %08x\n", hr); + return; + } + test_interfaces(); test_createfolder(); + test_textstream(); + + IFileSystem3_Release(fs3); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Properly report history update for location. replace call.
by Alexandre Julliard Nov. 12, 2012

Nov. 12, 2012

Module: wine Branch: master Commit: 7ac09e721c544ffdc7176c646986c4d18a38b56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ac09e721c544ffdc7176c646… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 12:57:48 2012 +0100 mshtml: Properly report history update for location.replace call. --- dlls/mshtml/binding.h | 4 ++++ dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/htmlframebase.c | 3 ++- dlls/mshtml/htmllocation.c | 6 ++++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 3 --- dlls/mshtml/navigate.c | 10 ++++++---- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 6 +++--- 10 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 1eee469..7934c90 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -114,6 +114,7 @@ void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT navigate_new_window(HTMLOuterWindow*,IUri*,const WCHAR*,IHTMLWindow2**) DECLSPEC_HIDDEN; +HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*,DWORD) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(HTMLInnerWindow*,IStream*) DECLSPEC_HIDDEN; @@ -123,4 +124,7 @@ HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDE IUri *get_uri_nofrag(IUri*) DECLSPEC_HIDDEN; +void set_current_mon(HTMLOuterWindow*,IMoniker*,DWORD) DECLSPEC_HIDDEN; +void set_current_uri(HTMLOuterWindow*,IUri*) DECLSPEC_HIDDEN; + HRESULT bind_mon_to_wstr(HTMLInnerWindow*,IMoniker*,WCHAR**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index b0ec97e..a7b87a8 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -121,7 +121,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) if(*href) { if(!window) window = This->element.node.doc->basedoc.window; - hres = navigate_url(window, href, window->uri); + hres = navigate_url(window, href, window->uri, BINDING_NAVIGATED); }else { TRACE("empty href\n"); hres = S_OK; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0a41522..5fc9560 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -37,6 +37,7 @@ #include "mshtml_private.h" #include "htmlevent.h" #include "pluginhost.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -609,7 +610,7 @@ static HRESULT WINAPI HTMLDocument_put_URL(IHTMLDocument2 *iface, BSTR v) return E_FAIL; } - return navigate_url(This->window, v, This->window->uri); + return navigate_url(This->window, v, This->window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index a11adca..e05e219 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -27,6 +27,7 @@ #include "ole2.h" #include "mshtml_private.h" +#include "binding.h" #include "wine/debug.h" @@ -136,7 +137,7 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) return E_FAIL; } - return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri); + return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 3a978b5..9e4d6d2 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -170,7 +171,7 @@ static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) return E_FAIL; } - return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->uri); + return navigate_url(This->window->base.outer_window, v, This->window->base.outer_window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) @@ -570,7 +571,8 @@ static HRESULT WINAPI HTMLLocation_replace(IHTMLLocation *iface, BSTR bstr) return E_FAIL; } - return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->uri); + return navigate_url(This->window->base.outer_window, bstr, This->window->base.outer_window->uri, + BINDING_NAVIGATED|BINDING_REPLACE); } static HRESULT WINAPI HTMLLocation_assign(IHTMLLocation *iface, BSTR bstr) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1696ed5..0318002 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -206,7 +206,7 @@ static void release_outer_window(HTMLOuterWindow *This) } remove_target_tasks(This->task_magic); - set_current_mon(This, NULL); + set_current_mon(This, NULL, 0); if(This->base.inner_window) detach_inner_window(This->base.inner_window); release_children(This); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f24354d..74f1b39 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -781,7 +781,6 @@ void init_node_cc(void); HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -HRESULT navigate_url(HTMLOuterWindow*,const WCHAR*,IUri*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; void call_property_onchanged(ConnectionPoint*,DISPID) DECLSPEC_HIDDEN; @@ -810,8 +809,6 @@ nsIWritableVariant *create_nsvariant(void) DECLSPEC_HIDDEN; nsresult create_nsfile(const PRUnichar*,nsIFile**) DECLSPEC_HIDDEN; HRESULT create_pending_window(HTMLOuterWindow*,nsChannelBSC*) DECLSPEC_HIDDEN; -void set_current_mon(HTMLOuterWindow*,IMoniker*) DECLSPEC_HIDDEN; -void set_current_uri(HTMLOuterWindow*,IUri*) DECLSPEC_HIDDEN; HRESULT start_binding(HTMLInnerWindow*,BSCallback*,IBindCtx*) DECLSPEC_HIDDEN; HRESULT async_start_doc_binding(HTMLOuterWindow*,HTMLInnerWindow*) DECLSPEC_HIDDEN; void abort_window_bindings(HTMLInnerWindow*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 33ebbca..9532a82 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1777,7 +1777,7 @@ static void start_doc_binding_proc(task_t *_task) { start_doc_binding_task_t *task = (start_doc_binding_task_t*)_task; - set_current_mon(task->window, task->pending_window->bscallback->bsc.mon); + set_current_mon(task->window, task->pending_window->bscallback->bsc.mon, BINDING_NAVIGATED); start_binding(task->pending_window, &task->pending_window->bscallback->bsc, NULL); } @@ -1948,6 +1948,7 @@ typedef struct { task_t header; HTMLOuterWindow *window; nsChannelBSC *bscallback; + DWORD flags; IMoniker *mon; IUri *uri; } navigate_task_t; @@ -1959,7 +1960,7 @@ static void navigate_proc(task_t *_task) hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { - set_current_mon(task->window, task->bscallback->bsc.mon); + set_current_mon(task->window, task->bscallback->bsc.mon, task->flags); set_current_uri(task->window, task->uri); start_binding(task->window->pending_window, &task->bscallback->bsc, NULL); } @@ -2124,6 +2125,7 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC task->window = window; task->bscallback = bsc; + task->flags = flags; task->mon = mon; IUri_AddRef(uri); @@ -2317,7 +2319,7 @@ HRESULT load_uri(HTMLOuterWindow *window, IUri *uri, DWORD flags) return hres; } -HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_uri) +HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_uri, DWORD flags) { BSTR display_uri; IUri *uri; @@ -2359,7 +2361,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u } } - hres = navigate_uri(window, uri, display_uri, BINDING_NAVIGATED); + hres = navigate_uri(window, uri, display_uri, flags); IUri_Release(uri); SysFreeString(display_uri); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 5ce6648..90543df 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -992,7 +992,7 @@ static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc } if(is_doc_channel) - set_current_mon(window, mon); + set_current_mon(window, mon, BINDING_NAVIGATED); hres = create_channelbsc(mon, NULL, NULL, 0, is_doc_channel, &bscallback); IMoniker_Release(mon); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 649c906..457f5dc 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -132,14 +132,14 @@ void set_current_uri(HTMLOuterWindow *window, IUri *uri) IUri_GetDisplayUri(uri, &window->url); } -void set_current_mon(HTMLOuterWindow *This, IMoniker *mon) +void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) { IUriContainer *uri_container; IUri *uri = NULL; HRESULT hres; if(This->mon) { - if(This->doc_obj) + if(This->doc_obj && !(flags & BINDING_REPLACE)) notify_travellog_update(This->doc_obj); IMoniker_Release(This->mon); This->mon = NULL; @@ -323,7 +323,7 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) update_doc(This, UPDATE_TITLE|UPDATE_UI); }else { update_doc(This, UPDATE_TITLE); - set_current_mon(This->window, mon); + set_current_mon(This->window, mon, flags); } if(This->doc_obj->client) {

1 0