November 2006 - Wine-Commits

Alexandre Julliard : kernel32/tests: Fixed the pipe test for MacOS.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 91bb29ca4d84b80551fce257dee5392a96108619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bb29ca4d84b80551fce257d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 15:40:36 2006 +0100 kernel32/tests: Fixed the pipe test for MacOS. --- dlls/kernel32/tests/pipe.c | 53 ++++++++++++++++++++++++++++--------------- 1 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index c956e75..9701939 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -129,22 +129,25 @@ static void test_CreateNamedPipe(int pip ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - /* should return all 23 bytes */ + if (readden != sizeof(obuf)) /* Linux only returns the first message */ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); - } + else + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); } else - ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + { + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ + ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + } if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 3a check\n"); - if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - pbuf += sizeof(obuf); - ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 3b check\n"); - } + if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { + pbuf += sizeof(obuf); + ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 3b check\n"); } ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf) + sizeof(obuf2), "read 3 got %d bytes\n", readden); @@ -161,22 +164,26 @@ static void test_CreateNamedPipe(int pip ok(written == sizeof(obuf2), "write file len 4b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { + if (readden != sizeof(obuf)) /* Linux only returns the first message */ /* should return all 23 bytes */ ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); - } + else + todo_wine ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); } else - ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + { + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both messages */ + ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + } if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "pipe content 4a check\n"); - if (pipemode == PIPE_TYPE_BYTE) { - todo_wine { - pbuf += sizeof(obuf); - ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 4b check\n"); - } + if (pipemode == PIPE_TYPE_BYTE && readden >= sizeof(obuf)+sizeof(obuf2)) { + pbuf += sizeof(obuf); + ok(memcmp(obuf2, pbuf, sizeof(obuf2)) == 0, "pipe content 4b check\n"); } ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); if (pipemode == PIPE_TYPE_BYTE) { @@ -212,9 +219,14 @@ static void test_CreateNamedPipe(int pip ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); - ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ + ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + else + todo_wine ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); @@ -243,7 +255,10 @@ static void test_CreateNamedPipe(int pip ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile6b\n"); ok(written == sizeof(obuf2), "write file len 6b\n"); ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek6\n"); - ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + if (readden != sizeof(obuf) + sizeof(obuf2)) /* MacOS returns both writes */ + ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); + else + todo_wine ok(readden == sizeof(obuf), "peek6 got %d bytes\n", readden); if (avail != sizeof(obuf)) /* older Linux kernels only return the first write here */ ok(avail == sizeof(obuf) + sizeof(obuf2), "peek6b got %d bytes available\n", avail); pbuf = ibuf;

1 0

Eric Pouech : mscms: GetColorDirectory: fixed incorrect A -> W conversions.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 4b88fd842a58998d234ab7daa3ad77d5cbe23654 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b88fd842a58998d234ab7daa… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:46:59 2006 +0100 mscms: GetColorDirectory: fixed incorrect A -> W conversions. --- dlls/mscms/profile.c | 27 ++++++++++++++------------- dlls/mscms/tests/profile.c | 10 ++-------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 0b1b437..0ada3e8 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -91,14 +91,13 @@ BOOL WINAPI GetColorDirectoryA( PCSTR ma if (bufferW) { - ret = GetColorDirectoryW( NULL, bufferW, &sizeW ); - *size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); - - if (ret) + if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW ))) { - len = WideCharToMultiByte( CP_ACP, 0, bufferW, *size, buffer, *size, NULL, NULL ); + *size = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, *size, NULL, NULL ); if (!len) ret = FALSE; } + else *size = sizeW / sizeof(WCHAR); HeapFree( GetProcessHeap(), 0, bufferW ); } @@ -132,13 +131,14 @@ BOOL WINAPI GetColorDirectoryW( PCWSTR m len = lstrlenW( colordir ) * sizeof(WCHAR); - if (len <= *size && buffer) + if (buffer && len <= *size) { lstrcpyW( buffer, colordir ); *size = len; return TRUE; } + SetLastError( ERROR_MORE_DATA ); *size = len; return FALSE; } @@ -389,14 +389,13 @@ BOOL WINAPI GetStandardColorSpaceProfile if (profileW) { - ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW ); - *size = WideCharToMultiByte( CP_ACP, 0, profileW, -1, NULL, 0, NULL, NULL ); - - if (ret) + if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW ))) { - len = WideCharToMultiByte( CP_ACP, 0, profileW, *size, profile, *size, NULL, NULL ); + *size = WideCharToMultiByte( CP_ACP, 0, profileW, -1, NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( CP_ACP, 0, profileW, -1, profile, *size, NULL, NULL ); if (!len) ret = FALSE; } + else *size = sizeW / sizeof(WCHAR); HeapFree( GetProcessHeap(), 0, profileW ); } @@ -451,20 +450,22 @@ BOOL WINAPI GetStandardColorSpaceProfile switch (id) { - case 0x52474220: /* 'RGB ' */ + case SPACE_RGB: /* 'RGB ' */ lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); if (*size < len || !profile) { *size = len; - return TRUE; + SetLastError( ERROR_MORE_DATA ); + return FALSE; } lstrcpyW( profile, rgbprofile ); break; default: + SetLastError( ERROR_FILE_NOT_FOUND ); return FALSE; } return TRUE; diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index fda6723..3cf1073 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -597,7 +597,6 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* 4th param, */ @@ -612,17 +611,14 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* dereferenced 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &zero); - todo_wine ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); } else { SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, NULL, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* dereferenced 4th param. */ ret = pGetStandardColorSpaceProfileA(NULL, SPACE_RGB, newprofile, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); } @@ -642,7 +638,7 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &sizeP); - if (!ret) todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); else ok( !lstrcmpiA( newprofile, emptyA ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Functional checks */ @@ -689,7 +685,6 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &sizeP); - todo_wine ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* 3th param, */ @@ -702,7 +697,6 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* dereferenced 4th param. */ ret = pGetStandardColorSpaceProfileW(NULL, SPACE_RGB, newprofile, &zero); - todo_wine ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ @@ -721,7 +715,7 @@ static void test_GetStandardColorSpacePr SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); - if (!ret) todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); else ok( !lstrcmpiW( newprofile, emptyW ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Functional checks */

1 0

Jacek Caban : mshtml: Code clean up.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: c64326e62c6f14233ca29a0ee8ee83596387e389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c64326e62c6f14233ca29a0ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:49:53 2006 +0100 mshtml: Code clean up. --- dlls/mshtml/olecmd.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index ecb92e8..d663e48 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -44,8 +44,10 @@ #define NSCMD_ITALIC "cmd_italic" #define NSCMD_UNDERLINE "cmd_underline" #define NSCMD_FONTCOLOR "cmd_fontColor" #define NSCMD_ALIGN "cmd_align" +#define NSCMD_FONTFACE "cmd_fontFace" #define NSSTATE_ATTRIBUTE "state_attribute" +#define NSSTATE_ALL "state_all" /********************************************************** * IOleCommandTarget implementation @@ -318,7 +320,7 @@ static DWORD query_edit_status(HTMLDocum nsparam = create_nscommand_params(); get_ns_command_state(This->nscontainer, nscmd, nsparam); - nsICommandParams_GetBooleanValue(nsparam, "state_all", &b); + nsICommandParams_GetBooleanValue(nsparam, NSSTATE_ALL, &b); } return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); @@ -359,10 +361,10 @@ static HRESULT exec_fontname(HTMLDocumen len = WideCharToMultiByte(CP_ACP, 0, V_BSTR(in), -1, NULL, 0, NULL, NULL); stra = mshtml_alloc(len); WideCharToMultiByte(CP_ACP, 0, V_BSTR(in), -1, stra, -1, NULL, NULL); - nsICommandParams_SetCStringValue(nsparam, "state_attribute", stra); + nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, stra); mshtml_free(stra); - do_ns_command(This->nscontainer, "cmd_fontFace", nsparam); + do_ns_command(This->nscontainer, NSCMD_FONTFACE, nsparam); nsICommandParams_Release(nsparam); } @@ -381,11 +383,11 @@ static HRESULT exec_fontname(HTMLDocumen nsparam = create_nscommand_params(); - nsres = get_ns_command_state(This->nscontainer, "cmd_fontFace", nsparam); + nsres = get_ns_command_state(This->nscontainer, NSCMD_FONTFACE, nsparam); if(NS_FAILED(nsres)) return S_OK; - nsICommandParams_GetCStringValue(nsparam, "state_attribute", &stra); + nsICommandParams_GetCStringValue(nsparam, NSSTATE_ATTRIBUTE, &stra); nsICommandParams_Release(nsparam); len = MultiByteToWideChar(CP_ACP, 0, stra, -1, NULL, 0);

1 0

Jacek Caban : mshtml: Added QueryStatus(IDM_JUSTIFY*) implementation.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 4769950d66ddf076ab423701749269195cec5403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4769950d66ddf076ab4237017… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:50:51 2006 +0100 mshtml: Added QueryStatus(IDM_JUSTIFY*) implementation. --- dlls/mshtml/olecmd.c | 44 ++++++++++++++++++++++++++++++++++-------- dlls/mshtml/tests/htmldoc.c | 3 ++ 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index d663e48..1e8d048 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -49,6 +49,10 @@ #define NSCMD_FONTFACE "cmd_fontFace" #define NSSTATE_ATTRIBUTE "state_attribute" #define NSSTATE_ALL "state_all" +#define NSALIGN_CENTER "center" +#define NSALIGN_LEFT "left" +#define NSALIGN_RIGHT "right" + /********************************************************** * IOleCommandTarget implementation */ @@ -321,11 +325,33 @@ static DWORD query_edit_status(HTMLDocum get_ns_command_state(This->nscontainer, nscmd, nsparam); nsICommandParams_GetBooleanValue(nsparam, NSSTATE_ALL, &b); + + nsICommandParams_Release(nsparam); } return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); } +static DWORD query_align_status(HTMLDocument *This, const char *align_str) +{ + nsICommandParams *nsparam; + char *align = NULL; + + if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) + return OLECMDF_SUPPORTED; + + if(This->nscontainer) { + nsparam = create_nscommand_params(); + get_ns_command_state(This->nscontainer, NSCMD_ALIGN, nsparam); + + nsICommandParams_GetCStringValue(nsparam, NSSTATE_ATTRIBUTE, &align); + + nsICommandParams_Release(nsparam); + } + + return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (align && !strcmp(align_str, align) ? OLECMDF_LATCHED : 0); +} + static void set_ns_align(HTMLDocument *This, const char *align_str) { nsICommandParams *nsparam; @@ -460,21 +486,21 @@ static HRESULT exec_italic(HTMLDocument static HRESULT exec_justifycenter(HTMLDocument *This) { TRACE("(%p)\n", This); - set_ns_align(This, "center"); + set_ns_align(This, NSALIGN_CENTER); return S_OK; } static HRESULT exec_justifyleft(HTMLDocument *This) { TRACE("(%p)\n", This); - set_ns_align(This, "left"); + set_ns_align(This, NSALIGN_LEFT); return S_OK; } static HRESULT exec_justifyright(HTMLDocument *This) { TRACE("(%p)\n", This); - set_ns_align(This, "right"); + set_ns_align(This, NSALIGN_RIGHT); return S_OK; } @@ -737,16 +763,16 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = query_edit_status(This, NSCMD_ITALIC); break; case IDM_JUSTIFYCENTER: - FIXME("CGID_MSHTML: IDM_JUSTIFYCENTER\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_JUSTIFYCENTER\n"); + prgCmds[i].cmdf = query_align_status(This, NSALIGN_CENTER); break; case IDM_JUSTIFYLEFT: - FIXME("CGID_MSHTML: IDM_JUSTIFYLEFT\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_JUSTIFYLEFT\n"); + prgCmds[i].cmdf = query_align_status(This, NSALIGN_LEFT); break; case IDM_JUSTIFYRIGHT: - FIXME("CGID_MSHTML: IDM_JUSTIFYRIGHT\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_JUSTIFYRIGHT\n"); + prgCmds[i].cmdf = query_align_status(This, NSALIGN_RIGHT); break; case IDM_UNDERLINE: TRACE("CGID_MSHTML: IDM_UNDERLINE\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2ae2dbb..a42e296 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2043,6 +2043,9 @@ static void test_MSHTML_QueryStatus(IUnk test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FORECOLOR, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYCENTER, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYLEFT, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_JUSTIFYRIGHT, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); }

1 0

Jacek Caban : mshtml: Added Exec(IDM_JUSTIFYLEFT) and Exec(IDM_JUSTIFYRIGHT ) implementataion.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 95cc9db8286a2a384bd5a65d38df601b0f88e959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95cc9db8286a2a384bd5a65d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:49:00 2006 +0100 mshtml: Added Exec(IDM_JUSTIFYLEFT) and Exec(IDM_JUSTIFYRIGHT) implementataion. --- dlls/mshtml/olecmd.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index d8a2154..ecb92e8 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -462,6 +462,20 @@ static HRESULT exec_justifycenter(HTMLDo return S_OK; } +static HRESULT exec_justifyleft(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + set_ns_align(This, "left"); + return S_OK; +} + +static HRESULT exec_justifyright(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + set_ns_align(This, "right"); + return S_OK; +} + static HRESULT exec_underline(HTMLDocument *This) { TRACE("(%p)\n", This); @@ -821,6 +835,14 @@ static HRESULT WINAPI OleCommandTarget_E if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_justifycenter(This); + case IDM_JUSTIFYLEFT: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_justifyleft(This); + case IDM_JUSTIFYRIGHT: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_justifyright(This); case IDM_UNDERLINE: if(pvaIn || pvaOut) FIXME("unsupported arguments\n");

1 0

Jacek Caban : mshtml: Added Exec(IDM_JUSTIFYCENTER) implementation.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 8968c399e6e4bd393d11c2b0e2b75a63ab5a8693 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8968c399e6e4bd393d11c2b0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:48:07 2006 +0100 mshtml: Added Exec(IDM_JUSTIFYCENTER) implementation. --- dlls/mshtml/olecmd.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 28f7189..d8a2154 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -43,6 +43,7 @@ #define NSCMD_BOLD "cmd_bold" #define NSCMD_ITALIC "cmd_italic" #define NSCMD_UNDERLINE "cmd_underline" #define NSCMD_FONTCOLOR "cmd_fontColor" +#define NSCMD_ALIGN "cmd_align" #define NSSTATE_ATTRIBUTE "state_attribute" @@ -323,6 +324,21 @@ static DWORD query_edit_status(HTMLDocum return OLECMDF_SUPPORTED | OLECMDF_ENABLED | (b ? OLECMDF_LATCHED : 0); } +static void set_ns_align(HTMLDocument *This, const char *align_str) +{ + nsICommandParams *nsparam; + + if(!This->nscontainer) + return; + + nsparam = create_nscommand_params(); + nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, align_str); + + do_ns_command(This->nscontainer, NSCMD_ALIGN, nsparam); + + nsICommandParams_Release(nsparam); +} + static HRESULT exec_fontname(HTMLDocument *This, VARIANT *in, VARIANT *out) { TRACE("(%p)->(%p %p)\n", This, in, out); @@ -439,6 +455,13 @@ static HRESULT exec_italic(HTMLDocument return S_OK; } +static HRESULT exec_justifycenter(HTMLDocument *This) +{ + TRACE("(%p)\n", This); + set_ns_align(This, "center"); + return S_OK; +} + static HRESULT exec_underline(HTMLDocument *This) { TRACE("(%p)\n", This); @@ -794,6 +817,10 @@ static HRESULT WINAPI OleCommandTarget_E if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_italic(This); + case IDM_JUSTIFYCENTER: + if(pvaIn || pvaOut) + FIXME("unsupported arguments\n"); + return exec_justifycenter(This); case IDM_UNDERLINE: if(pvaIn || pvaOut) FIXME("unsupported arguments\n");

1 0

Jacek Caban : mshtml: Added IDM_FORECOLOR implementation.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 40d31d869b4ddb667e2604ba7452c1b274f8680e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d31d869b4ddb667e2604ba7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:47:10 2006 +0100 mshtml: Added IDM_FORECOLOR implementation. --- dlls/mshtml/olecmd.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index b63af0f..28f7189 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -42,6 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define NSCMD_BOLD "cmd_bold" #define NSCMD_ITALIC "cmd_italic" #define NSCMD_UNDERLINE "cmd_underline" +#define NSCMD_FONTCOLOR "cmd_fontColor" + +#define NSSTATE_ATTRIBUTE "state_attribute" /********************************************************** * IOleCommandTarget implementation @@ -381,6 +384,35 @@ static HRESULT exec_fontname(HTMLDocumen return S_OK; } +static HRESULT exec_forecolor(HTMLDocument *This, VARIANT *in, VARIANT *out) +{ + TRACE("(%p)->(%p %p)\n", This, in, out); + + if(in) { + if(V_VT(in) == VT_I4) { + nsICommandParams *nsparam = create_nscommand_params(); + char color_str[10]; + + sprintf(color_str, "#%02x%02x%02x", + V_I4(in)&0xff, (V_I4(in)>>8)&0xff, (V_I4(in)>>16)&0xff); + + nsICommandParams_SetCStringValue(nsparam, NSSTATE_ATTRIBUTE, color_str); + do_ns_command(This->nscontainer, NSCMD_FONTCOLOR, nsparam); + + nsICommandParams_Release(nsparam); + }else { + FIXME("unsupported in vt=%d\n", V_VT(in)); + } + } + + if(out) { + FIXME("unsupported out\n"); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT exec_fontsize(HTMLDocument *This, VARIANT *in, VARIANT *out) { FIXME("(%p)->(%p %p)\n", This, in, out); @@ -658,8 +690,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = query_edit_status(This, NSCMD_BOLD); break; case IDM_FORECOLOR: - FIXME("CGID_MSHTML: IDM_FORECOLOR\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_FORECOLOR\n"); + prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_ITALIC: TRACE("CGID_MSHTML: IDM_ITALIC\n"); @@ -756,6 +788,8 @@ static HRESULT WINAPI OleCommandTarget_E if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); return exec_bold(This); + case IDM_FORECOLOR: + return exec_forecolor(This, pvaIn, pvaOut); case IDM_ITALIC: if(pvaIn || pvaOut) FIXME("unsupported arguments\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 68e2a11..2ae2dbb 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2042,6 +2042,7 @@ static void test_MSHTML_QueryStatus(IUnk test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_FORECOLOR, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf); }

1 0

Jacek Caban : mshtml: Added Exec(IDM_FONTSIZE) stub.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: f0871b5814d51bced5149797ec0ffbdee7635f84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0871b5814d51bced5149797e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:46:11 2006 +0100 mshtml: Added Exec(IDM_FONTSIZE) stub. --- dlls/mshtml/olecmd.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 41d7688..b63af0f 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -381,6 +381,12 @@ static HRESULT exec_fontname(HTMLDocumen return S_OK; } +static HRESULT exec_fontsize(HTMLDocument *This, VARIANT *in, VARIANT *out) +{ + FIXME("(%p)->(%p %p)\n", This, in, out); + return E_NOTIMPL; +} + static HRESULT exec_bold(HTMLDocument *This) { TRACE("(%p)\n", This); @@ -744,6 +750,8 @@ static HRESULT WINAPI OleCommandTarget_E switch(nCmdID) { case IDM_FONTNAME: return exec_fontname(This, pvaIn, pvaOut); + case IDM_FONTSIZE: + return exec_fontsize(This, pvaIn, pvaOut); case IDM_BOLD: if(pvaIn || pvaOut) FIXME("unsupported arguments\n");

1 0

Jacek Caban : mshtml: Added QueryStatus(IDM_FONTSIZE) implementation.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: fd5da1a7b993ce915d93bbac81538e81f50fa37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5da1a7b993ce915d93bbac8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:45:05 2006 +0100 mshtml: Added QueryStatus(IDM_FONTSIZE) implementation. --- dlls/mshtml/olecmd.c | 4 ++-- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 01c98bb..41d7688 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -640,8 +640,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_FONTSIZE: - FIXME("CGID_MSHTML: IDM_FONTSIZE\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_FONTSIZE\n"); + prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_PASTE: FIXME("CGID_MSHTML: IDM_PASTE\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index c643456..68e2a11 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_FONTNAME, cmdf); + test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTSIZE, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf);

1 0

Jacek Caban : mshtml: Added QueryStatus(IDM_FONTNAME) implementation.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: cab25424d2bde00dc14a18ff731a55adb7abfede URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab25424d2bde00dc14a18ff7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 9 10:44:15 2006 +0100 mshtml: Added QueryStatus(IDM_FONTNAME) implementation. --- dlls/mshtml/olecmd.c | 6 +++--- dlls/mshtml/tests/htmldoc.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index dfeb81d..01c98bb 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -310,7 +310,7 @@ static DWORD query_edit_status(HTMLDocum if(This->usermode != EDITMODE || This->readystate < READYSTATE_INTERACTIVE) return OLECMDF_SUPPORTED; - if(This->nscontainer) { + if(This->nscontainer && nscmd) { nsparam = create_nscommand_params(); get_ns_command_state(This->nscontainer, nscmd, nsparam); @@ -636,8 +636,8 @@ static HRESULT WINAPI OleCommandTarget_Q prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; break; case IDM_FONTNAME: - FIXME("CGID_MSHTML: IDM_FONTNAME\n"); - prgCmds[i].cmdf = OLECMDF_SUPPORTED|OLECMDF_ENABLED; + TRACE("CGID_MSHTML: IDM_FONTNAME\n"); + prgCmds[i].cmdf = query_edit_status(This, NULL); break; case IDM_FONTSIZE: FIXME("CGID_MSHTML: IDM_FONTSIZE\n"); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6b28b13..c643456 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2039,6 +2039,7 @@ static void test_MSHTML_QueryStatus(IUnk if(unk) _unk = unk; else unk = _unk; + test_QueryStatus(unk, &CGID_MSHTML, IDM_FONTNAME, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_BOLD, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_ITALIC, cmdf); test_QueryStatus(unk, &CGID_MSHTML, IDM_UNDERLINE, cmdf);

1 0