November 2006 - Wine-commits

Paul Vriens : rsaenh: Move type-check before len-check (Coverity).
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 9fa27f3be3f45a211aec7cb0d56a8d3ddf1eb65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa27f3be3f45a211aec7cb0d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Nov 12 17:55:09 2006 +0100 rsaenh: Move type-check before len-check (Coverity). --- dlls/rsaenh/rsa.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsa.c b/dlls/rsaenh/rsa.c index 4d6cd03..00a65e5 100644 --- a/dlls/rsaenh/rsa.c +++ b/dlls/rsaenh/rsa.c @@ -62,12 +62,6 @@ int rand_prime(mp_int *N, long len) { int type; - /* allow sizes between 2 and 256 bytes for a prime size */ - if (len < 16 || len > 8192) { - printf("Invalid prime size!\n"); - return CRYPT_INVALID_PRIME_SIZE; - } - /* get type */ if (len < 0) { type = LTM_PRIME_BBS; @@ -78,6 +72,12 @@ int rand_prime(mp_int *N, long len) /* Original LibTomCrypt: type = 0; */ } + /* allow sizes between 2 and 256 bytes for a prime size */ + if (len < 16 || len > 8192) { + printf("Invalid prime size!\n"); + return CRYPT_INVALID_PRIME_SIZE; + } + /* New prime generation makes the code even more cryptoish-insane. Do you know what this means!!! -- Gir: Yeah, oh wait, er, no. */

1 0

Paul Vriens : msi: Fix typo's (Coverity).
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: ded9943b5b829ad1a4481a5ebc831a5a3934bd87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded9943b5b829ad1a4481a5eb… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Nov 12 12:01:26 2006 +0100 msi: Fix typo's (Coverity). --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 47acd58..456d4e0 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1643,7 +1643,7 @@ static void ACTION_UpdateFeatureInstallS if (res == comp->Installed) continue; - if (res != INSTALLSTATE_DEFAULT || res != INSTALLSTATE_LOCAL || + if (res != INSTALLSTATE_DEFAULT && res != INSTALLSTATE_LOCAL && res != INSTALLSTATE_SOURCE) { res = INSTALLSTATE_INCOMPLETE;

1 0

Stefan Dösinger : wined3d: Fix a comment.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 7311e9fc8e50531af8b0ca6edc0b1f77a4aabfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7311e9fc8e50531af8b0ca6ed… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Nov 12 12:08:42 2006 +0100 wined3d: Fix a comment. --- dlls/wined3d/vertexbuffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index aeccdab..820309f 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -184,7 +184,7 @@ inline BOOL WINAPI IWineD3DVertexBufferI * -> New semantics that have to be converted appear * -> The position of semantics that have to be converted changes * -> The stride of the vertex changed AND there is stuff that needs conversion - * -> (If a vertex buffer is bound and in use assume that nothing that needs conversion is there) + * -> (If a vertex shader is bound and in use assume that nothing that needs conversion is there) * * Return values: * TRUE: Reload is needed

1 0

Alexandre Julliard : server: Fix list corruption caused by previous change.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: d6f8284c2f9aa8042f13fe47c59bd419b34e4245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f8284c2f9aa8042f13fe47c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 12:53:09 2006 +0100 server: Fix list corruption caused by previous change. --- server/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/process.c b/server/process.c index b66e492..217710a 100644 --- a/server/process.c +++ b/server/process.c @@ -517,7 +517,7 @@ static void terminate_process( struct pr { struct list *ptr; - if (skip) /* move it to the end of the list */ + if (skip && skip->process == process) /* move it to the end of the list */ { assert( skip->state != TERMINATED ); list_remove( &skip->proc_entry );

1 0

Jacek Caban : mshtml: Added border implementation.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 396b0ad126eb239507e7b6cfbd8de621e70ce587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=396b0ad126eb239507e7b6cfb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 12 17:09:38 2006 +0100 mshtml: Added border implementation. --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/oleobj.c | 9 +++++- dlls/mshtml/view.c | 60 ++++++++++++++++++++++++++--------------- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f47a799..998ee49 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -91,6 +91,8 @@ struct HTMLDocument { HWND hwnd; HWND tooltips_hwnd; + DOCHOSTUIINFO hostinfo; + USERMODE usermode; READYSTATE readystate; BOOL in_place_active; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 9ed62f7..343facc 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -84,6 +84,8 @@ static HRESULT WINAPI OleObject_SetClien This->hostui = NULL; } + memset(&This->hostinfo, 0, sizeof(DOCHOSTUIINFO)); + if(!pClientSite) return S_OK; @@ -96,11 +98,12 @@ static HRESULT WINAPI OleObject_SetClien memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); hostinfo.cbSize = sizeof(DOCHOSTUIINFO); hres = IDocHostUIHandler_GetHostInfo(pDocHostUIHandler, &hostinfo); - if(SUCCEEDED(hres)) - /* FIXME: use hostinfo */ + if(SUCCEEDED(hres)) { TRACE("hostinfo = {%u %08x %08x %s %s}\n", hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); + memcpy(&This->hostinfo, &hostinfo, sizeof(DOCHOSTUIINFO)); + } if(!This->has_key_path) { hres = IDocHostUIHandler_GetOptionKeyPath(pDocHostUIHandler, &key_path, 0); @@ -693,4 +696,6 @@ void HTMLDocument_OleObj_Init(HTMLDocume This->has_key_path = FALSE; This->container_locked = FALSE; + + memset(&This->hostinfo, 0, sizeof(DOCHOSTUIINFO)); } diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 632d6bd..e0db0b8 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -49,29 +49,37 @@ typedef struct { WNDPROC proc; } tooltip_data; -static void paint_disabled(HWND hwnd) { - HDC hdc; +static void paint_document(HTMLDocument *This) +{ PAINTSTRUCT ps; - HBRUSH brush; RECT rect; - HFONT font; - WCHAR wszHTMLDisabled[100]; + HDC hdc; + + GetClientRect(This->hwnd, &rect); + + hdc = BeginPaint(This->hwnd, &ps); + + if(!(This->hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) + DrawEdge(hdc, &rect, EDGE_SUNKEN, BF_RECT|BF_ADJUST); + + if(!This->nscontainer) { + WCHAR wszHTMLDisabled[100]; + HFONT font; - LoadStringW(hInst, IDS_HTMLDISABLED, wszHTMLDisabled, sizeof(wszHTMLDisabled)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_HTMLDISABLED, wszHTMLDisabled, sizeof(wszHTMLDisabled)/sizeof(WCHAR)); - font = CreateFontA(25,0,0,0,400,0,0,0,ANSI_CHARSET,0,0,DEFAULT_QUALITY,DEFAULT_PITCH,NULL); - brush = CreateSolidBrush(RGB(255,255,255)); - GetClientRect(hwnd, &rect); + font = CreateFontA(25,0,0,0,400,0,0,0,ANSI_CHARSET,0,0,DEFAULT_QUALITY,DEFAULT_PITCH,NULL); - hdc = BeginPaint(hwnd, &ps); - SelectObject(hdc, font); - SelectObject(hdc, brush); - Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom); - DrawTextW(hdc, wszHTMLDisabled,-1, &rect, DT_CENTER | DT_SINGLELINE | DT_VCENTER); - EndPaint(hwnd, &ps); + SelectObject(hdc, font); + SelectObject(hdc, GetSysColorBrush(COLOR_WINDOW)); - DeleteObject(font); - DeleteObject(brush); + Rectangle(hdc, rect.left, rect.top, rect.right, rect.bottom); + DrawTextW(hdc, wszHTMLDisabled,-1, &rect, DT_CENTER | DT_SINGLELINE | DT_VCENTER); + + DeleteObject(font); + } + + EndPaint(This->hwnd, &ps); } static void activate_gecko(HTMLDocument *This) @@ -106,14 +114,22 @@ static LRESULT WINAPI serverwnd_proc(HWN activate_gecko(This); break; case WM_PAINT: - if(!This->nscontainer) - paint_disabled(hwnd); + paint_document(This); break; case WM_SIZE: TRACE("(%p)->(WM_SIZE)\n", This); - if(This->nscontainer) - SetWindowPos(This->nscontainer->hwnd, NULL, 0, 0, LOWORD(lParam), HIWORD(lParam), - SWP_NOZORDER | SWP_NOACTIVATE); + if(This->nscontainer) { + INT ew=0, eh=0; + + if(!(This->hostinfo.dwFlags & (DOCHOSTUIFLAG_NO3DOUTERBORDER|DOCHOSTUIFLAG_NO3DBORDER))) { + ew = GetSystemMetrics(SM_CXEDGE); + eh = GetSystemMetrics(SM_CYEDGE); + } + + SetWindowPos(This->nscontainer->hwnd, NULL, ew, eh, + LOWORD(lParam) - 2*ew, HIWORD(lParam) - 2*eh, + SWP_NOZORDER | SWP_NOACTIVATE); + } } return DefWindowProcW(hwnd, msg, wParam, lParam);

1 0

Jacek Caban : mshtml: Added IDM_ORDERLIST implementation.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 2a782684300b59955cd39f1eb5e06565b55b92cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a782684300b59955cd39f1eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 11 15:32:49 2006 +0100 mshtml: Added IDM_ORDERLIST implementation. --- dlls/mshtml/olecmd.c | 19 +++++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 91ab10b..8714a6e 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -49,6 +49,7 @@ #define NSCMD_INDENT "cmd_indent" #define NSCMD_OUTDENT "cmd_outdent" #define NSCMD_INSERTHR "cmd_insertHR" #define NSCMD_UL "cmd_ul" +#define NSCMD_OL "cmd_ol" #define NSSTATE_ATTRIBUTE "state_attribute" #define NSSTATE_ALL "state_all" @@ -630,6 +631,16 @@ static HRESULT exec_horizontalline(HTMLD return S_OK; } +static HRESULT exec_orderlist(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_OL, NULL); + + return S_OK; +} + static HRESULT exec_unorderlist(HTMLDocument *This) { TRACE("(%p)\n", This); @@ -827,8 +838,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_ORDERLIST: - FIXME("CGID_MSHTML: IDM_ORDERLIST\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_ORDERLIST\n"); + prgCmds[i].cmdf = query_edit_status(This, NSCMD_OL); break; case IDM_UNORDERLIST: TRACE("CGID_MSHTML: IDM_HORIZONTALLINE\n"); @@ -933,6 +944,10 @@ static HRESULT WINAPI OleCommandTarget_E if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_horizontalline(This); + case IDM_ORDERLIST: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_orderlist(This); case IDM_UNORDERLIST: if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 26c938b..21bec06 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2049,6 +2049,7 @@ static void test_MSHTML_QueryStatus(IUnk test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_HORIZONTALLINE, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_ORDERLIST, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNORDERLIST, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_INDENT, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_OUTDENT, cmdf);

1 0

Jacek Caban : mshtml: Added IDM_UNORDERLIST implementation.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 8d76b3deedf7d6da0b8dd0eef68a9dd48705e6c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d76b3deedf7d6da0b8dd0eef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 11 15:31:55 2006 +0100 mshtml: Added IDM_UNORDERLIST implementation. --- dlls/mshtml/olecmd.c | 19 +++++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 57d0ddb..91ab10b 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -48,6 +48,7 @@ #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" #define NSCMD_OUTDENT "cmd_outdent" #define NSCMD_INSERTHR "cmd_insertHR" +#define NSCMD_UL "cmd_ul" #define NSSTATE_ATTRIBUTE "state_attribute" #define NSSTATE_ALL "state_all" @@ -629,6 +630,16 @@ static HRESULT exec_horizontalline(HTMLD return S_OK; } +static HRESULT exec_unorderlist(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_UL, NULL); + + return S_OK; +} + static HRESULT exec_indent(HTMLDocument *This) { TRACE("(%p)\n", This); @@ -820,8 +831,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; case IDM_UNORDERLIST: - FIXME("CGID_MSHTML: IDM_UNORDERLIST\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_HORIZONTALLINE\n"); + prgCmds[i].cmdf = query_edit_status(This, NSCMD_UL); break; case IDM_INDENT: TRACE("CGID_MSHTML: IDM_INDENT\n"); @@ -922,6 +933,10 @@ static HRESULT WINAPI OleCommandTarget_E if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_horizontalline(This); + case IDM_UNORDERLIST: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_unorderlist(This); case IDM_INDENT: if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index e1cf2a9..26c938b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2049,6 +2049,7 @@ static void test_MSHTML_QueryStatus(IUnk test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_HORIZONTALLINE, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_UNORDERLIST, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_INDENT, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_OUTDENT, cmdf); }

1 0

Jacek Caban : mshtml: Added IDM_HORIZONTALLINE implementation.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 80db14763d5d865e356bc234c9643c56a6e8176d URL: http://source.winehq.org/git/wine.git/?a=commit;h=80db14763d5d865e356bc234c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 11 15:31:00 2006 +0100 mshtml: Added IDM_HORIZONTALLINE implementation. --- dlls/mshtml/olecmd.c | 19 +++++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 97e5af7..57d0ddb 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -47,6 +47,7 @@ #define NSCMD_ALIGN "cmd_align" #define NSCMD_FONTFACE "cmd_fontFace" #define NSCMD_INDENT "cmd_indent" #define NSCMD_OUTDENT "cmd_outdent" +#define NSCMD_INSERTHR "cmd_insertHR" #define NSSTATE_ATTRIBUTE "state_attribute" #define NSSTATE_ALL "state_all" @@ -618,6 +619,16 @@ static HRESULT exec_baselinefont3(HTMLDo return S_OK; } +static HRESULT exec_horizontalline(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_INSERTHR, NULL); + + return S_OK; +} + static HRESULT exec_indent(HTMLDocument *This) { TRACE("(%p)\n", This); @@ -801,8 +812,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = query_edit_status(This, NSCMD_UNDERLINE); break; case IDM_HORIZONTALLINE: - FIXME("CGID_MSHTML: IDM_HORIZONTALLINE\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_HORIZONTALLINE\n"); + prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_ORDERLIST: FIXME("CGID_MSHTML: IDM_ORDERLIST\n"); @@ -907,6 +918,10 @@ static HRESULT WINAPI OleCommandTarget_E return exec_editmode(This); case IDM_BASELINEFONT3: return exec_baselinefont3(This); + case IDM_HORIZONTALLINE: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_horizontalline(This); case IDM_INDENT: if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bbe1d29..e1cf2a9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2048,6 +2048,7 @@ static void test_MSHTML_QueryStatus(IUnk test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_HORIZONTALLINE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_INDENT, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_OUTDENT, cmdf); }

1 0

Jacek Caban : mshtml: Added IDM_INDENT and IDM_OUTDENT implementation.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 6f4146a30b150f836651f29d0b0d88a1a64e082a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4146a30b150f836651f29d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Nov 11 15:30:08 2006 +0100 mshtml: Added IDM_INDENT and IDM_OUTDENT implementation. --- dlls/mshtml/olecmd.c | 38 ++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/htmldoc.c | 2 ++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 1e8d048..97e5af7 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -45,6 +45,8 @@ #define NSCMD_UNDERLINE "cmd_underline" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_ALIGN "cmd_align" #define NSCMD_FONTFACE "cmd_fontFace" +#define NSCMD_INDENT "cmd_indent" +#define NSCMD_OUTDENT "cmd_outdent" #define NSSTATE_ATTRIBUTE "state_attribute" #define NSSTATE_ALL "state_all" @@ -616,6 +618,26 @@ static HRESULT exec_baselinefont3(HTMLDo return S_OK; } +static HRESULT exec_indent(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_INDENT, NULL); + + return S_OK; +} + +static HRESULT exec_outdent(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + + if(This->nscontainer) + do_ns_command(This->nscontainer, NSCMD_OUTDENT, NULL); + + return S_OK; +} + static const struct { OLECMDF cmdf; HRESULT (*func)(HTMLDocument*,DWORD,VARIANT*,VARIANT*); @@ -791,12 +813,12 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; case IDM_INDENT: - FIXME("CGID_MSHTML: IDM_INDENT\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_INDENT\n"); + prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_OUTDENT: - FIXME("CGID_MSHTML: IDM_OUTDENT\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_OUTDENT\n"); + prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_BLOCKDIRLTR: FIXME("CGID_MSHTML: IDM_BLOCKDIRLTR\n"); @@ -885,6 +907,14 @@ static HRESULT WINAPI OleCommandTarget_E return exec_editmode(This); case IDM_BASELINEFONT3: return exec_baselinefont3(This); + case IDM_INDENT: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_indent(This); + case IDM_OUTDENT: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_outdent(This); default: FIXME("unsupported nCmdID %d of CGID_MSHTML group\n", nCmdID); return OLECMDERR_E_NOTSUPPORTED; diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a42e296..bbe1d29 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2048,6 +2048,8 @@ static void test_MSHTML_QueryStatus(IUnk test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_INDENT, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_OUTDENT, cmdf); } static void test_OleCommandTarget(IUnknown *unk)

1 0

Jacek Caban : mshtml: Remove menus that are in shdoclc.dll.
by Alexandre Julliard 13 Nov '06

13 Nov '06

Module: wine Branch: master Commit: 7a1a6cbb9d7edb8b95b3dafccbd22172977ee5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1a6cbb9d7edb8b95b3dafcc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 23:55:03 2006 +0100 mshtml: Remove menus that are in shdoclc.dll. --- dlls/mshtml/Bg.rc | 218 ---------------------------------------------------- dlls/mshtml/De.rc | 218 ---------------------------------------------------- dlls/mshtml/En.rc | 218 ---------------------------------------------------- dlls/mshtml/Es.rc | 218 ---------------------------------------------------- dlls/mshtml/Fi.rc | 218 ---------------------------------------------------- dlls/mshtml/Fr.rc | 218 ---------------------------------------------------- dlls/mshtml/Hu.rc | 219 ----------------------------------------------------- dlls/mshtml/Ko.rc | 219 ----------------------------------------------------- dlls/mshtml/Nl.rc | 218 ---------------------------------------------------- dlls/mshtml/No.rc | 218 ---------------------------------------------------- dlls/mshtml/Sv.rc | 218 ---------------------------------------------------- dlls/mshtml/Tr.rc | 218 ---------------------------------------------------- 12 files changed, 0 insertions(+), 2618 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a1a6cbb9d7edb8b95b3d…

1 0