MSHMTL: Added QueryStatus implementation

Saulius Krasuckas saulius2 at ar.fi.lt
Sun Aug 14 11:37:19 CDT 2005


* On Sun, 14 Aug 2005, Saulius Krasuckas wrote:
> * On Sun, 14 Aug 2005, Jacek Caban wrote:
> > 
> > Presently if you want to make this test not to crash, you may disable 
> > IOleCommand tests if UIActivate fails.

Is something like this OK?  I have "borrowed" boolean variable 
expect_SetActiveObject_active.

| --- dlls/mshtml/tests/htmldoc.c 2005-08-14 19:33:22.000000000 +0300
| +++ /mnt/vcd2/wine/dlls/mshtml/tests/htmldoc.c  2005-08-14 19:22:26.000000000 +0300
| @@ -510,8 +510,8 @@ static HRESULT WINAPI DocumentSite_Activ
|              SET_EXPECT(OnUIActivate);
|              SET_EXPECT(SetActiveObject);
|              SET_EXPECT(ShowUI);
| -            expect_SetActiveObject_active = TRUE;
|              hres = IOleDocumentView_UIActivate(view, TRUE);
| +            expect_SetActiveObject_active = (hres == S_OK);
|              ok(hres == S_OK, "UIActivate failed: %08lx\n", hres);
|              CHECK_CALLED(CanInPlaceActivate);
|              CHECK_CALLED(GetWindowContext);
| @@ -957,7 +957,7 @@ static void test_HTMLDocument(void)
|          CHECK_CALLED(ActivateMe);
|      }
|  
| -    if(cmdtrg) {
| +    if(cmdtrg && expect_SetActiveObject_active) {
|          int i;
|      
|          OLECMD cmd[2] = {
| @@ -1020,7 +1020,7 @@ static void test_HTMLDocument(void)
|          CHECK_CALLED(OnUIDeactivate);
|      }
|  
| -    if(cmdtrg)
| +    if(cmdtrg && expect_SetActiveObject_active)
|          test_OleCommandTarget(cmdtrg);
|  
|      if(activeobject) {
| @@ -1129,7 +1129,7 @@ static void test_HTMLDocument(void)
|          ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd);
|      }
|  
| -    if(cmdtrg)
| +    if(cmdtrg && expect_SetActiveObject_active)
|          test_OleCommandTarget(cmdtrg);
|  
|      if(view) {


> OLECMDID_OPEN seems to be supported at least on winME.  I am curious, why?

I mean OLECMDID_OPEN is *not supported* on winME.  As isn't OLECMDID_NEW. 
Sorry for typo-inversions.




More information about the wine-devel mailing list