August 2005 - Wine-Devel - list.winehq.org

Re: MSHMTL: Added QueryStatus implementation

by Jacek Caban

Hello. Saulius Krasuckas wrote: >* On Tue, 2 Aug 2005, Jacek Caban wrote: > > >>--- dlls/mshtml/tests/htmldoc.c 26 Jul 2005 10:31:23 -0000 1.5 >>+++ dlls/mshtml/tests/htmldoc.c 1 Aug 2005 22:33:37 -0000 >>@@ -806,12 +806,76 @@ static void test_Persist() >> } >> } >> >>+static OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { >>+ 0, >>+ OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ >>+ OLECMDF_SUPPORTED, /* OLECMDID_NEW */ >>+ OLECMDF_SUPPORTED, /* OLECMDID_SAVE */ >> >> > ... > > >>+ OLECMD cmd[2] = { >>+ {OLECMDID_OPEN, 0xf0f0}, >>+ {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} >>+ }; >>+ >>+ hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 0, NULL, NULL); >>+ ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); >>+ >>+ hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmd, NULL); >>+ ok(hres == OLECMDERR_E_NOTSUPPORTED, >>+ "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); >> >> > >Jacek, OLECMDID_OPEN (equally as OLECMDID_NEW) isn't supported here on >winME, AFAICT. Moreover, calls to IOleCommandTarget_QueryStatus throws an >exception of Accesss Violation here. I tested this with OLECMDID_SAVE and >it works OK. > >And we have a typo next, right? > > Right, good catch. > > >>+ ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); >>+ ok(cmd[0].cmdf == OLECMDF_SUPPORTED, >>+ "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); >> >> > >Hence, there goes my try: > >Log message: > Saulius Krasuckas <saulius.krasuckas(a)ieee.org> > Fix typo in a two checks. WinME fixes: > - OLECMDID_OPEN and OLECMDID_NEW aren't supported. > - Ignore unsupported OLECMDs as they throws exceptions. > > > > I'm not sure if it is a correct fix. Although it avoids crashes, much less functionality of QueryStatus is tested. Before your patch all possible commands were tested. But that's not why the patch may be not correct: it seems to be a case similar to crashes on xp while HTMLDocument is not active in place. In this case it is not active in place because UIActivate fails. Looking at the test results, UIActivate is a problem on every win 9x and causes most tests to fail. So first UIActivate should be fixed and then, if this problem remains, we'll be sure that your fix is correct. Presently if you want to make this test not to crash, you may disable IOleCommand tests if UIActivate fails. I'll take a look at these tests, but first I'll have to get win 98 installed. My guess is that it requires to be loaded before a call to UIActivate, so the attached patch might help (even if so, a few other tests will fail, but currently the most interesting is UIActivate), but I haven't tested it yet. Anyway a similar test will go to the CVS soon. Thanks, Jacek Index: dlls/mshtml/tests/htmldoc.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/tests/htmldoc.c,v retrieving revision 1.7 diff -u -p -r1.7 htmldoc.c --- dlls/mshtml/tests/htmldoc.c 3 Aug 2005 21:26:40 -0000 1.7 +++ dlls/mshtml/tests/htmldoc.c 14 Aug 2005 13:25:08 -0000 @@ -43,6 +43,9 @@ ok(called_ ## func, "expected " #func "\n"); \ expect_ ## func = called_ ## func = FALSE +static const WCHAR WINEHQ_URL[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.', + 'o','r','g','/',0}; + static IUnknown *htmldoc_unk = NULL; static IOleDocumentView *view = NULL; static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; @@ -776,6 +779,7 @@ static void test_Persist() { IPersistMoniker *persist_mon; IPersistFile *persist_file; + IMoniker *mon; GUID guid; HRESULT hres; @@ -801,6 +805,16 @@ static void test_Persist() hres = IPersistMoniker_GetClassID(persist_mon, &guid); ok(hres == S_OK, "GetClassID failed: %08lx\n", hres); ok(IsEqualGUID(&CLSID_HTMLDocument, &guid), "guid != CLSID_HTMLDocument\n"); + + hres = CreateURLMoniker(NULL, WINEHQ_URL, &mon); + ok(hres == S_OK, "CreateURLMoniker failed: %08lx\n", hres); + + if(SUCCEEDED(hres)) { + hres = IPersistMoniker_Load(persist_mon, FALSE, mon, NULL, 0x12); + ok(hres == S_OK, "Load failed: %08lx\n", hres); + + IMoniker_Release(mon); + } IPersistMoniker_Release(persist_mon); }

Aug. 14, 2005

Re: PATCH: GlobalAddAtomA check for invalid ptr

by Marcus Meissner

On Thu, Aug 11, 2005 at 02:52:52PM +0200, Alexandre Julliard wrote: > Marcus Meissner <marcus(a)jet.franken.de> writes: > > > So ... now we can: > > > > - fix this program by contacting the developers etc... which is difficult. > > - fix WINE by adding a check. > > > > I can only fix WINE. > > Yes, but please don't use the IsBad* functions, use a proper exception > handler. Next try, is this what you imagined. I now do a strlen() in GlobalAddAtomA(), however the compiler might optimize it away in the future (gcc 4.1 doesn't). Ciao, Marcus Changelog: Catch invalid strings in GlobalAddAtomA() using an exception handler. Index: dlls/kernel/atom.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/atom.c,v retrieving revision 1.8 diff -u -r1.8 atom.c --- dlls/kernel/atom.c 10 May 2005 15:15:50 -0000 1.8 +++ dlls/kernel/atom.c 14 Aug 2005 10:24:46 -0000 @@ -38,6 +38,8 @@ #include "winbase.h" #include "winerror.h" +#include "wine/exception.h" +#include "excpt.h" #include "wine/server.h" #include "wine/unicode.h" #include "kernel_private.h" @@ -48,6 +50,14 @@ #define MAX_ATOM_LEN 255 +/* filter for page-fault exceptions */ +static WINE_EXCEPTION_FILTER(page_fault) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_SEARCH; +} + static struct atom_table* get_local_table(DWORD entries) { static struct atom_table* local_table; @@ -183,6 +193,20 @@ */ ATOM WINAPI GlobalAddAtomA( LPCSTR str /* [in] String to add */ ) { + if (HIWORD(str)) { + __TRY { + char *s = (char*)str; + while (*s) s++; + /* FIXME: Should make sure the compiler does + * not throw away the above. + */ + } + __EXCEPT(page_fault) { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + __ENDTRY + } return ATOM_AddAtomA( str, NULL ); }

Aug. 14, 2005

Re: MSHMTL: Added QueryStatus implementation

by Saulius Krasuckas

* On Sun, 14 Aug 2005, Saulius Krasuckas wrote: > * On Tue, 2 Aug 2005, Jacek Caban wrote: > > > > + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 0, NULL, NULL); > > + ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); > > + > > + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmd, NULL); > > + ok(hres == OLECMDERR_E_NOTSUPPORTED, > > + "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); > > Jacek, OLECMDID_OPEN (equally as OLECMDID_NEW) isn't supported here on > winME, AFAICT. Moreover, calls to IOleCommandTarget_QueryStatus throws an > exception of Accesss Violation here. Oh. I mean the last call to IOleCommandTarget_QueryStatus, where both cmd elements are used. The first call works OK.

Aug. 14, 2005

Re: MSHMTL: Added QueryStatus implementation

by Saulius Krasuckas

* On Tue, 2 Aug 2005, Jacek Caban wrote: > > --- dlls/mshtml/tests/htmldoc.c 26 Jul 2005 10:31:23 -0000 1.5 > +++ dlls/mshtml/tests/htmldoc.c 1 Aug 2005 22:33:37 -0000 > @@ -806,12 +806,76 @@ static void test_Persist() > } > } > > +static OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { > + 0, > + OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ > + OLECMDF_SUPPORTED, /* OLECMDID_NEW */ > + OLECMDF_SUPPORTED, /* OLECMDID_SAVE */ ... > + OLECMD cmd[2] = { > + {OLECMDID_OPEN, 0xf0f0}, > + {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} > + }; > + > + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 0, NULL, NULL); > + ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); > + > + hres = IOleCommandTarget_QueryStatus(cmdtrg, NULL, 2, cmd, NULL); > + ok(hres == OLECMDERR_E_NOTSUPPORTED, > + "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); Jacek, OLECMDID_OPEN (equally as OLECMDID_NEW) isn't supported here on winME, AFAICT. Moreover, calls to IOleCommandTarget_QueryStatus throws an exception of Accesss Violation here. I tested this with OLECMDID_SAVE and it works OK. And we have a typo next, right? > + ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); > + ok(cmd[0].cmdf == OLECMDF_SUPPORTED, > + "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); Hence, there goes my try: Log message: Saulius Krasuckas <saulius.krasuckas(a)ieee.org> Fix typo in a two checks. WinME fixes: - OLECMDID_OPEN and OLECMDID_NEW aren't supported. - Ignore unsupported OLECMDs as they throws exceptions. Index: dlls/mshtml/tests/htmldoc.c =================================================================== RCS file: /home/wine/wine/dlls/mshtml/tests/htmldoc.c,v retrieving revision 1.7 diff -p -u -r1.7 htmldoc.c --- dlls/mshtml/tests/htmldoc.c 3 Aug 2005 21:26:40 -0000 1.7 +++ dlls/mshtml/tests/htmldoc.c 13 Aug 2005 16:09:15 -0000 @@ -808,8 +808,8 @@ static void test_Persist() static const OLECMDF expect_cmds[OLECMDID_GETPRINTTEMPLATE+1] = { 0, - OLECMDF_SUPPORTED, /* OLECMDID_OPEN */ - OLECMDF_SUPPORTED, /* OLECMDID_NEW */ + 0, /* OLECMDID_OPEN */ + 0, /* OLECMDID_NEW */ OLECMDF_SUPPORTED, /* OLECMDID_SAVE */ OLECMDF_SUPPORTED|OLECMDF_ENABLED, /* OLECMDID_SAVEAS */ OLECMDF_SUPPORTED, /* OLECMDID_SAVECOPYAS */ @@ -842,7 +842,7 @@ static const OLECMDF expect_cmds[OLECMDI OLECMDF_SUPPORTED, /* OLECMDID_SHOWPAGESETUP */ OLECMDF_SUPPORTED, /* OLECMDID_SHOWPRINT */ 0,0, - OLECMDF_SUPPORTED, /* OLECMDID_CLOSE */ + OLECMDF_SUPPORTED, /* OLECMDID_DONTDOWNLOADCSS */ 0,0,0, OLECMDF_SUPPORTED, /* OLECMDID_SETPRINTTEMPLATE */ OLECMDF_SUPPORTED /* OLECMDID_GETPRINTTEMPLATE */ @@ -854,7 +854,10 @@ static void test_OleCommandTarget(IOleCo int i; HRESULT hres; + ZeroMemory(cmds, sizeof(cmds)); + for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + if(!expect_cmds[i+1]) continue; cmds[i].cmdID = i+1; cmds[i].cmdf = 0xf0f0; } @@ -863,6 +866,7 @@ static void test_OleCommandTarget(IOleCo ok(hres == S_OK, "QueryStatus failed: %08lx\n", hres); for(i=0; i<OLECMDID_GETPRINTTEMPLATE; i++) { + if(!expect_cmds[i+1]) continue; ok(cmds[i].cmdID == i+1, "cmds[%d].cmdID canged to %lx\n", i, cmds[i].cmdID); ok(cmds[i].cmdf == expect_cmds[i+1], "cmds[%d].cmdf=%lx, expected %x\n", i+1, cmds[i].cmdf, expect_cmds[i+1]); @@ -961,7 +965,7 @@ static void test_HTMLDocument(void) int i; OLECMD cmd[2] = { - {OLECMDID_OPEN, 0xf0f0}, + {OLECMDID_SAVE, 0xf0f0}, {OLECMDID_GETPRINTTEMPLATE+1, 0xf0f0} }; @@ -973,9 +977,9 @@ static void test_HTMLDocument(void) "QueryStatus failed: %08lx, expected OLECMDERR_E_NOTSUPPORTED\n", hres); ok(cmd[1].cmdID == OLECMDID_GETPRINTTEMPLATE+1, "cmd[0].cmdID=%ld, expected OLECMDID_GETPRINTTEMPLATE+1\n", cmd[0].cmdID); - ok(cmd[1].cmdf == 0, "cmd[0].cmdf=%lx, expected 0\n", cmd[0].cmdf); + ok(cmd[1].cmdf == 0, "cmd[1].cmdf=%lx, expected 0\n", cmd[1].cmdf); ok(cmd[0].cmdf == OLECMDF_SUPPORTED, - "cmd[1].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[1].cmdf); + "cmd[0].cmdf=%lx, expected OLECMDF_SUPPORTED\n", cmd[0].cmdf); hres = IOleCommandTarget_QueryStatus(cmdtrg, &IID_IHTMLDocument2, 2, cmd, NULL); ok(hres == OLECMDERR_E_UNKNOWNGROUP,

Aug. 14, 2005