November 2006 - Wine-commits

Andrey Turkin : atl: Implement AtlPixelToHiMetric and AtlHiMetricToPixel.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: abc3769ad2a4b717b404b006d7fc9728d10a635a URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc3769ad2a4b717b404b006d… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Mon Oct 30 18:57:48 2006 +0300 atl: Implement AtlPixelToHiMetric and AtlHiMetricToPixel. --- dlls/atl/Makefile.in | 2 +- dlls/atl/atl.spec | 4 ++-- dlls/atl/atl_main.c | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index e54cf64..fc20950 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = atl.dll IMPORTLIB = libatl.$(IMPLIBEXT) -IMPORTS = ole32 shlwapi user32 advapi32 kernel32 +IMPORTS = ole32 shlwapi user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index f7f46fe..c8f0199 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -19,8 +19,8 @@ 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stub AtlCreateTargetDC -27 stub AtlHiMetricToPixel -28 stub AtlPixelToHiMetric +27 stdcall AtlHiMetricToPixel(ptr ptr) +28 stdcall AtlPixelToHiMetric(ptr ptr) 29 stub AtlDevModeW2A 30 stdcall AtlComPtrAssign(ptr ptr) 31 stub AtlComQIPtrAssign diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 2fdf901..f7a6fc4 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -26,6 +26,7 @@ #define COBJMACROS #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "wingdi.h" #include "winuser.h" #include "wine/debug.h" #include "objbase.h" @@ -421,3 +422,19 @@ ATOM WINAPI AtlModuleRegisterWndClassInf TRACE("returning 0x%04x\n", atom); return atom; } + +void WINAPI AtlHiMetricToPixel(const SIZEL* lpHiMetric, SIZEL* lpPix) +{ + HDC dc = GetDC(NULL); + lpPix->cx = lpHiMetric->cx * GetDeviceCaps( dc, LOGPIXELSX ) / 100; + lpPix->cy = lpHiMetric->cy * GetDeviceCaps( dc, LOGPIXELSY ) / 100; + ReleaseDC( NULL, dc ); +} + +void WINAPI AtlPixelToHiMetric(const SIZEL* lpPix, SIZEL* lpHiMetric) +{ + HDC dc = GetDC(NULL); + lpHiMetric->cx = 100 * lpPix->cx / GetDeviceCaps( dc, LOGPIXELSX ); + lpHiMetric->cy = 100 * lpPix->cy / GetDeviceCaps( dc, LOGPIXELSY ); + ReleaseDC( NULL, dc ); +}

1 0

Jacek Caban : mshtml: Added implementation of QueryStatus(IDM_UNDERLINE).
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 64fe2774289e1df5e74b083e3eb198e7372ec1d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64fe2774289e1df5e74b083e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:34:57 2006 +0100 mshtml: Added implementation of QueryStatus(IDM_UNDERLINE). --- dlls/mshtml/olecmd.c | 7 ++++--- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a373269..68762a9 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -41,6 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_BOLD "cmd_bold" #define NSCMD_ITALIC "cmd_italic" +#define NSCMD_UNDERLINE "cmd_underline" /********************************************************** * IOleCommandTarget implementation @@ -408,7 +409,7 @@ static HRESULT exec_underline(HTMLDocume TRACE("(%p)\n", This); if(This->nscontainer) - do_ns_command(This->nscontainer, "cmd_underline", NULL); + do_ns_command(This->nscontainer, NSCMD_UNDERLINE, NULL); return S_OK; } @@ -674,8 +675,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; case IDM_UNDERLINE: - FIXME("CGID_MSHTML: IDM_UNDERLINE\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_UNDERLINE\n"); + prgCmds[i].cmdf = query_edit_status(This, NSCMD_UNDERLINE); break; case IDM_HORIZONTALLINE: FIXME("CGID_MSHTML: IDM_HORIZONTALLINE\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bf05400..6b28b13 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2041,6 +2041,7 @@ static void test_MSHTML_QueryStatus(IUnk test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); } static void test_OleCommandTarget(IUnknown *unk)

1 0

Jacek Caban : mshtml: Added implementation of QueryStatus(IDM_ITALIC).
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 5e0d749c2fb154b1e72db5bbe062b3f8cafe8e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0d749c2fb154b1e72db5bbe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:34:44 2006 +0100 mshtml: Added implementation of QueryStatus(IDM_ITALIC). --- dlls/mshtml/olecmd.c | 7 ++++--- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 6c619c7..a373269 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -40,6 +40,7 @@ #include "mshtml_private.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_BOLD "cmd_bold" +#define NSCMD_ITALIC "cmd_italic" /********************************************************** * IOleCommandTarget implementation @@ -397,7 +398,7 @@ static HRESULT exec_italic(HTMLDocument TRACE("(%p)\n", This); if(This->nscontainer) - do_ns_command(This->nscontainer, "cmd_italic", NULL); + do_ns_command(This->nscontainer, NSCMD_ITALIC, NULL); return S_OK; } @@ -657,8 +658,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; case IDM_ITALIC: - FIXME("CGID_MSHTML: IDM_ITALIC\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_ITALIC\n"); + prgCmds[i].cmdf = query_edit_status(This, NSCMD_ITALIC); break; case IDM_JUSTIFYCENTER: FIXME("CGID_MSHTML: IDM_JUSTIFYCENTER\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index db56d24..bf05400 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2040,6 +2040,7 @@ static void test_MSHTML_QueryStatus(IUnk else unk = _unk; test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); } static void test_OleCommandTarget(IUnknown *unk)

1 0

Jacek Caban : mshtml: Added more QueryStatus tests.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: da3f18745e4d1b764137c2704acb845d7c1068b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3f18745e4d1b764137c2704… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:34:33 2006 +0100 mshtml: Added more QueryStatus tests. --- dlls/mshtml/tests/htmldoc.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index d2d9d92..db56d24 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -115,6 +115,7 @@ static BOOL expect_LockContainer_fLock; static BOOL expect_SetActiveObject_active; static BOOL set_clientsite = FALSE, container_locked = FALSE; static BOOL readystate_set_loading = FALSE; +static BOOL editmode = FALSE; static enum load_state_t { LD_DOLOAD, LD_LOADING, @@ -127,6 +128,7 @@ static LPCOLESTR expect_status_text = NU static HRESULT QueryInterface(REFIID riid, void **ppv); static void test_readyState(IUnknown*); +static void test_MSHTML_QueryStatus(IUnknown*,DWORD); static HRESULT WINAPI HlinkFrame_QueryInterface(IHlinkFrame *iface, REFIID riid, void **ppv) { @@ -249,6 +251,10 @@ static HRESULT WINAPI PropertyNotifySink switch(dispID) { case DISPID_READYSTATE: CHECK_EXPECT2(OnChanged_READYSTATE); + test_MSHTML_QueryStatus(NULL, OLECMDF_SUPPORTED + | (editmode && (load_state == LD_INTERACTIVE || load_state == LD_COMPLETE) + ? OLECMDF_ENABLED : 0)); + if(readystate_set_loading) { readystate_set_loading = FALSE; load_state = LD_LOADING; @@ -2006,6 +2012,36 @@ static const OLECMDF expect_cmds[OLECMDI OLECMDF_SUPPORTED /* OLECMDID_GETPRINTTEMPLATE */ }; +static void test_QueryStatus(IUnknown *unk, REFIID cgid, ULONG cmdid, DWORD cmdf) +{ + IOleCommandTarget *cmdtrg; + OLECMD olecmd = {cmdid, 0}; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IOleCommandTarget_QueryStatus(cmdtrg, cgid, 1, &olecmd, NULL); + ok(hres == S_OK, "QueryStatus failed: %08x\n", hres); + + IOleCommandTarget_Release(cmdtrg); + + ok(olecmd.cmdID == cmdid, "cmdID changed\n"); + ok(olecmd.cmdf == cmdf, "cmdf=%08x, expected %08x\n", olecmd.cmdf, cmdf); +} + +static void test_MSHTML_QueryStatus(IUnknown *unk, DWORD cmdf) +{ + static IUnknown *_unk; + + if(unk) _unk = unk; + else unk = _unk; + + test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); +} + static void test_OleCommandTarget(IUnknown *unk) { IOleCommandTarget *cmdtrg; @@ -2147,6 +2183,8 @@ static void test_exec_editmode(IUnknown CHECK_CALLED(OnChanged_READYSTATE); IOleCommandTarget_Release(cmdtrg); + + editmode = TRUE; } static HWND create_container_window(void) @@ -2577,6 +2615,7 @@ static void init_test(enum load_state_t set_clientsite = FALSE; call_UIActivate = FALSE; load_state = ls; + editmode = FALSE; } static void test_HTMLDocument(enum load_state_t ls) @@ -2594,6 +2633,7 @@ static void test_HTMLDocument(enum load_ return; test_QueryInterface(unk); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_ConnectionPointContainer(unk); test_Persist(unk); if(load_state == LD_NO) @@ -2608,6 +2648,7 @@ static void test_HTMLDocument(enum load_ if(load_state == LD_LOADING) test_download(FALSE); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_OleCommandTarget_fail(unk); test_OleCommandTarget(unk); test_OnAmbientPropertyChange(unk); @@ -2677,6 +2718,7 @@ static void test_HTMLDocument_hlink(void test_download(FALSE); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_exec_onunload(unk); test_Window(unk, TRUE); test_InPlaceDeactivate(unk, TRUE); @@ -2712,11 +2754,14 @@ static void test_editing_mode(void) test_ConnectionPointContainer(unk); test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); test_DoVerb(oleobj); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); IOleObject_Release(oleobj); test_exec_editmode(unk); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_download(TRUE); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED|OLECMDF_ENABLED); test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE);

1 0

Jacek Caban : mshtml: Added implementation of QueryStatus(IDM_BOLD).
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 227be057c222756de196d879790d05e92f29b47d URL: http://source.winehq.org/git/wine.git/?a=commit;h=227be057c222756de196d8797… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:34:17 2006 +0100 mshtml: Added implementation of QueryStatus(IDM_BOLD). --- dlls/mshtml/olecmd.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 908ed90..6c619c7 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -39,6 +39,8 @@ #include "mshtml_private.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +#define NSCMD_BOLD "cmd_bold" + /********************************************************** * IOleCommandTarget implementation */ @@ -245,7 +247,7 @@ static void do_ns_command(NSContainer *T nsIInterfaceRequestor *iface_req; nsresult nsres; - FIXME("(%p)\n", This); + TRACE("(%p)\n", This); nsres = nsIWebBrowser_QueryInterface(This->webbrowser, &IID_nsIInterfaceRequestor, (void**)&iface_req); @@ -298,6 +300,27 @@ static nsresult get_ns_command_state(NSC return nsres; } +static DWORD query_edit_status(HTMLDocument *This, const char *nscmd) +{ + nsICommandParams *nsparam; + PRBool b = FALSE; + + if(!This->nscontainer) { + FIXME("dummy not implemented\n"); + return OLECMDF_SUPPORTED; + } + + if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + return OLECMDF_SUPPORTED; + + nsparam = create_nscommand_params(); + get_ns_command_state(This->nscontainer, nscmd, nsparam); + + nsICommandParams_GetBooleanValue(nsparam, "state_enabled", &b); + + return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); +} + static HRESULT exec_fontname(HTMLDocument *This, VARIANT *in, VARIANT *out) { TRACE("(%p)->(%p %p)\n", This, in, out); @@ -364,7 +387,7 @@ static HRESULT exec_bold(HTMLDocument *T TRACE("(%p)\n", This); if(This->nscontainer) - do_ns_command(This->nscontainer, "cmd_bold", NULL); + do_ns_command(This->nscontainer, NSCMD_BOLD, NULL); return S_OK; } @@ -626,8 +649,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; case IDM_BOLD: - FIXME("CGID_MSHTML: IDM_BOLD\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_BOLD\n"); + prgCmds[i].cmdf = query_edit_status(This, NSCMD_BOLD); break; case IDM_FORECOLOR: FIXME("CGID_MSHTML: IDM_FORECOLOR\n");

1 0

Jacek Caban : mshtml: Added more edit mode tests.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: f003d3c56921412085e323b244e2a26b96ebef3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f003d3c56921412085e323b24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:34:12 2006 +0100 mshtml: Added more edit mode tests. --- dlls/mshtml/tests/htmldoc.c | 100 +++++++++++++++++++++++++++--------------- 1 files changed, 64 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index cd3162d..d2d9d92 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1804,24 +1804,33 @@ static void test_Load(IPersistMoniker *p (IUnknown*)&ClientSite); SET_EXPECT(GetDisplayName); - SET_EXPECT(GetHostInfo); - SET_EXPECT(Invoke_AMBIENT_USERMODE); - SET_EXPECT(Invoke_AMBIENT_SILENT); - SET_EXPECT(Invoke_AMBIENT_DLCONTROL); - SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); - SET_EXPECT(Invoke_AMBIENT_USERAGENT); - SET_EXPECT(Invoke_AMBIENT_PALETTE); - SET_EXPECT(GetOptionKeyPath); - SET_EXPECT(GetOverrideKeyPath); - SET_EXPECT(GetWindow); - SET_EXPECT(QueryStatus_SETPROGRESSTEXT); - SET_EXPECT(Exec_SETPROGRESSMAX); - SET_EXPECT(Exec_SETPROGRESSPOS); - SET_EXPECT(Exec_ShellDocView_37); + if(!set_clientsite) { + SET_EXPECT(Invoke_AMBIENT_USERMODE); + SET_EXPECT(GetHostInfo); + SET_EXPECT(Invoke_AMBIENT_DLCONTROL); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Invoke_AMBIENT_USERAGENT); + SET_EXPECT(Invoke_AMBIENT_PALETTE); + SET_EXPECT(GetOptionKeyPath); + SET_EXPECT(GetOverrideKeyPath); + SET_EXPECT(GetWindow); + SET_EXPECT(QueryStatus_SETPROGRESSTEXT); + SET_EXPECT(Exec_SETPROGRESSMAX); + SET_EXPECT(Exec_SETPROGRESSPOS); + SET_EXPECT(Exec_ShellDocView_37); + } + if(!container_locked) { + SET_EXPECT(GetContainer); + SET_EXPECT(LockContainer); + } SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(BindToStorage); - SET_EXPECT(GetContainer); - SET_EXPECT(LockContainer); + if(set_clientsite) { + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(Exec_ShellDocView_37); + } expect_LockContainer_fLock = TRUE; readystate_set_loading = TRUE; @@ -1829,24 +1838,34 @@ static void test_Load(IPersistMoniker *p ok(hres == S_OK, "Load failed: %08x\n", hres); CHECK_CALLED(GetDisplayName); - CHECK_CALLED(GetHostInfo); - CHECK_CALLED(Invoke_AMBIENT_USERMODE); - CHECK_CALLED(Invoke_AMBIENT_SILENT); - CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); - CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); - CHECK_CALLED(Invoke_AMBIENT_USERAGENT); - CHECK_CALLED(Invoke_AMBIENT_PALETTE); - CHECK_CALLED(GetOptionKeyPath); - CHECK_CALLED(GetOverrideKeyPath); - CHECK_CALLED(GetWindow); - CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); - CHECK_CALLED(Exec_SETPROGRESSMAX); - CHECK_CALLED(Exec_SETPROGRESSPOS); - CHECK_CALLED(Exec_ShellDocView_37); + if(!set_clientsite) { + CHECK_CALLED(Invoke_AMBIENT_USERMODE); + CHECK_CALLED(GetHostInfo); + CHECK_CALLED(Invoke_AMBIENT_DLCONTROL); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Invoke_AMBIENT_USERAGENT); + CHECK_CALLED(Invoke_AMBIENT_PALETTE); + CHECK_CALLED(GetOptionKeyPath); + CHECK_CALLED(GetOverrideKeyPath); + CHECK_CALLED(GetWindow); + CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); + CHECK_CALLED(Exec_SETPROGRESSMAX); + CHECK_CALLED(Exec_SETPROGRESSPOS); + CHECK_CALLED(Exec_ShellDocView_37); + } + if(!container_locked) { + CHECK_CALLED(GetContainer); + CHECK_CALLED(LockContainer); + container_locked = TRUE; + } CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(BindToStorage); - CHECK_CALLED(GetContainer); - CHECK_CALLED(LockContainer); + if(set_clientsite) { + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Exec_ShellDocView_37); + } set_clientsite = container_locked = TRUE; @@ -1855,7 +1874,7 @@ static void test_Load(IPersistMoniker *p test_readyState((IUnknown*)persist); } -static void test_download(void) +static void test_download(BOOL verb_done) { HWND hwnd; MSG msg; @@ -1865,6 +1884,10 @@ static void test_download(void) test_readyState(NULL); + if(verb_done) { + SET_EXPECT(Exec_SETPROGRESSMAX); + SET_EXPECT(GetHostInfo); + } SET_EXPECT(SetStatusText); SET_EXPECT(Exec_SETDOWNLOADSTATE_1); SET_EXPECT(GetDropTarget); @@ -1882,6 +1905,10 @@ static void test_download(void) DispatchMessage(&msg); } + if(verb_done) { + CHECK_CALLED(Exec_SETPROGRESSMAX); + CHECK_CALLED(GetHostInfo); + } CHECK_CALLED(SetStatusText); CHECK_CALLED(Exec_SETDOWNLOADSTATE_1); CHECK_CALLED(GetDropTarget); @@ -1987,7 +2014,7 @@ static void test_OleCommandTarget(IUnkno HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IOleCommandTarget, (void**)&cmdtrg); - ok(hres == S_OK, "QueryInterface(IIDIOleM=CommandTarget failed: %08x\n", hres); + ok(hres == S_OK, "QueryInterface(IID_IOleCommandTarget failed: %08x\n", hres); if(FAILED(hres)) return; @@ -2579,7 +2606,7 @@ static void test_HTMLDocument(enum load_ } if(load_state == LD_LOADING) - test_download(); + test_download(FALSE); test_OleCommandTarget_fail(unk); test_OleCommandTarget(unk); @@ -2648,7 +2675,7 @@ static void test_HTMLDocument_hlink(void test_Persist(unk); test_Navigate(unk); - test_download(); + test_download(FALSE); test_exec_onunload(unk); test_Window(unk, TRUE); @@ -2689,6 +2716,7 @@ static void test_editing_mode(void) IOleObject_Release(oleobj); test_exec_editmode(unk); + test_download(TRUE); test_UIDeactivate(); test_InPlaceDeactivate(unk, TRUE);

1 0

Jacek Caban : mshtml: Load about:blank in exec_editmode.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: cf075bdf00830dd0eda259bda5ea4a8ca746382d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf075bdf00830dd0eda259bda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:34:06 2006 +0100 mshtml: Load about:blank in exec_editmode. --- dlls/mshtml/olecmd.c | 50 +++++++++----------------------------------------- 1 files changed, 9 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 7e6e0cf..908ed90 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -448,8 +448,11 @@ static void setup_ns_editing(NSContainer static HRESULT exec_editmode(HTMLDocument *This) { + IMoniker *mon; HRESULT hres; + static const WCHAR wszAboutBlank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + TRACE("(%p)\n", This); This->usermode = EDITMODE; @@ -457,20 +460,6 @@ static HRESULT exec_editmode(HTMLDocumen if(This->frame) IOleInPlaceFrame_SetStatusText(This->frame, NULL); - if(This->client) { - IOleCommandTarget *cmdtrg = NULL; - - hres = IOleClientSite_QueryInterface(This->client, &IID_IOleCommandTarget, - (void**)&cmdtrg); - if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_I4; - V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); - } - } - if(This->hostui) { DOCHOSTUIINFO hostinfo; @@ -484,37 +473,16 @@ static HRESULT exec_editmode(HTMLDocumen debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); } - if(This->client) { - VARIANT silent, offline; - - hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &silent); - if(SUCCEEDED(hres)) { - if(V_VT(&silent) != VT_BOOL) - WARN("V_VT(silent) = %d\n", V_VT(&silent)); - else if(V_BOOL(&silent)) - FIXME("silent == true\n"); - } - - hres = get_client_disp_property(This->client, - DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); - if(SUCCEEDED(hres)) { - if(V_VT(&silent) != VT_BOOL) - WARN("V_VT(offline) = %d\n", V_VT(&silent)); - else if(V_BOOL(&silent)) - FIXME("offline == true\n"); - } - } - if(This->nscontainer) setup_ns_editing(This->nscontainer); - /* - * FIXME: We should load about:protocol here. - */ - This->readystate = READYSTATE_LOADING; - call_property_onchanged(This->cp_propnotif, DISPID_READYSTATE); + hres = CreateURLMoniker(NULL, wszAboutBlank, &mon); + if(FAILED(hres)) { + FIXME("CreateURLMoniker failed: %08x\n", hres); + return hres; + } - return S_OK; + return IPersistMoniker_Load(PERSISTMON(This), TRUE, mon, NULL, 0); } static HRESULT exec_baselinefont3(HTMLDocument *This)

1 0

Jacek Caban : mshtml: Added beginning of set_progress task implementation.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: d6108c6c247121781c8950047039db544dfc683d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6108c6c247121781c8950047… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:34:01 2006 +0100 mshtml: Added beginning of set_progress task implementation. --- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/persist.c | 10 ++++++++++ dlls/mshtml/task.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b3ad479..b352c5f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -353,7 +353,8 @@ typedef struct task_t { enum { TASK_SETDOWNLOADSTATE, - TASK_PARSECOMPLETE + TASK_PARSECOMPLETE, + TASK_SETPROGRESS } task_id; struct task_t *next; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 7b35e96..39c3a7e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -243,6 +243,16 @@ static HRESULT WINAPI PersistMoniker_Loa bscallback = create_bscallback(pimkName); + if(This->frame) { + task = mshtml_alloc(sizeof(task_t)); + + task->doc = This; + task->task_id = TASK_SETPROGRESS; + task->next = NULL; + + push_task(task); + } + task = mshtml_alloc(sizeof(task_t)); task->doc = This; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 6b5d093..84108d1 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -179,6 +179,44 @@ static void set_parsecomplete(HTMLDocume } } +static void set_progress(HTMLDocument *doc) +{ + IOleCommandTarget *olecmd = NULL; + HRESULT hres; + + TRACE("(%p)\n", doc); + + if(doc->client) + IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + + if(olecmd) { + VARIANT progress_max, progress; + + V_VT(&progress_max) = VT_I4; + V_I4(&progress_max) = 0; /* FIXME */ + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSMAX, OLECMDEXECOPT_DONTPROMPTUSER, + &progress_max, NULL); + + V_VT(&progress) = VT_I4; + V_I4(&progress) = 0; /* FIXME */ + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, OLECMDEXECOPT_DONTPROMPTUSER, + &progress, NULL); + } + + if(doc->usermode == EDITMODE && doc->hostui) { + DOCHOSTUIINFO hostinfo; + + memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); + hostinfo.cbSize = sizeof(DOCHOSTUIINFO); + hres = IDocHostUIHandler_GetHostInfo(doc->hostui, &hostinfo); + if(SUCCEEDED(hres)) + /* FIXME: use hostinfo */ + TRACE("hostinfo = {%u %08x %08x %s %s}\n", + hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, + debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); + } +} + static void process_task(task_t *task) { switch(task->task_id) { @@ -186,6 +224,8 @@ static void process_task(task_t *task) return set_downloading(task->doc); case TASK_PARSECOMPLETE: return set_parsecomplete(task->doc); + case TASK_SETPROGRESS: + return set_progress(task->doc); default: ERR("Wrong task_id %d\n", task->task_id); }

1 0

Jacek Caban : mshtml: Call SetStatusText in set_parsecomplete.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: 0cd636c3555bca9c28580d96e4ad25db0ac9d2b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd636c3555bca9c28580d96e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:33:55 2006 +0100 mshtml: Call SetStatusText in set_parsecomplete. --- dlls/mshtml/task.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 25b9501..6b5d093 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -97,7 +97,7 @@ static void set_downloading(HTMLDocument TRACE("(%p)\n", doc); - if(doc->frame) + if(doc->frame) IOleInPlaceFrame_SetStatusText(doc->frame, NULL /* FIXME */); if(!doc->client) @@ -160,6 +160,11 @@ static void set_parsecomplete(HTMLDocume doc->readystate = READYSTATE_COMPLETE; call_property_onchanged(doc->cp_propnotif, DISPID_READYSTATE); + if(doc->frame) { + static const WCHAR wszDone[] = {'D','o','n','e',0}; + IOleInPlaceFrame_SetStatusText(doc->frame, wszDone); + } + if(olecmd) { VARIANT title; WCHAR empty[] = {0};

1 0

Jacek Caban : mshtml: Get DISPID_AMBIENT_SILENT and DISPID_AMBIENT_OFFLINECONNECTED property in IPersistMoniker ::Load.
by Alexandre Julliard 02 Nov '06

02 Nov '06

Module: wine Branch: master Commit: f09890eade58d93b62212a0f1c1047452e0746a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09890eade58d93b62212a0f1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 2 17:30:27 2006 +0100 mshtml: Get DISPID_AMBIENT_SILENT and DISPID_AMBIENT_OFFLINECONNECTED property in IPersistMoniker::Load. --- dlls/mshtml/persist.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a52f015..7b35e96 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -30,6 +30,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" #include "shlguid.h" +#include "idispids.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -219,6 +220,27 @@ static HRESULT WINAPI PersistMoniker_Loa } } + if(This->client) { + VARIANT silent, offline; + + hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &silent); + if(SUCCEEDED(hres)) { + if(V_VT(&silent) != VT_BOOL) + WARN("V_VT(silent) = %d\n", V_VT(&silent)); + else if(V_BOOL(&silent)) + FIXME("silent == true\n"); + } + + hres = get_client_disp_property(This->client, + DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &offline); + if(SUCCEEDED(hres)) { + if(V_VT(&silent) != VT_BOOL) + WARN("V_VT(offline) = %d\n", V_VT(&silent)); + else if(V_BOOL(&silent)) + FIXME("offline == true\n"); + } + } + bscallback = create_bscallback(pimkName); task = mshtml_alloc(sizeof(task_t));

1 0