March 2010 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Forward setting document.location to window object.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 42a80aeac063b6f7c8e7858caf2088c9117813f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a80aeac063b6f7c8e7858ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:45:45 2010 +0100 mshtml: Forward setting document.location to window object. --- dlls/mshtml/htmldoc.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2e2144c..5c9bb6b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1599,6 +1599,11 @@ static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID { HTMLDocument *This = DISPEX_THIS(iface); + if(This->window && id == DISPID_IHTMLDOCUMENT2_LOCATION && (wFlags & DISPATCH_PROPERTYPUT)) + return IDispatchEx_InvokeEx(DISPATCHEX(This->window), DISPID_IHTMLWINDOW2_LOCATION, lcid, wFlags, + pdp, pvarRes, pei, pspCaller); + + return IDispatchEx_InvokeEx(This->dispex, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); }

1 0

Jacek Caban : mshtml: Use user agent string in IOmNavigator::get_appVersion .
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 115efbed698d5be26fbbcaf265fd6d480aa9dd7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=115efbed698d5be26fbbcaf26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:46:18 2010 +0100 mshtml: Use user agent string in IOmNavigator::get_appVersion. --- dlls/mshtml/omnavigator.c | 23 ++++++++++++++++------- dlls/mshtml/tests/dom.c | 10 ++++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index dc0fb4a..d127eef 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -160,19 +160,28 @@ static HRESULT WINAPI OmNavigator_get_appVersion(IOmNavigator *iface, BSTR *p) { OmNavigator *This = OMNAVIGATOR_THIS(iface); - /* FIXME: Should we return something smarter? */ - static const WCHAR app_verW[] = - {'4','.','0',' ','(','c','o','m','p','a','t','i','b','l','e',';', - ' ','M','S','I','E',' ','7','.','0',';', - ' ','W','i','n','d','o','w','s',' ','N','T',' ','5','.','1',';', - ' ','M','o','z','i','l','l','a','/','4','.','0',')',0}; + char user_agent[512]; + DWORD size; + HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - *p = SysAllocString(app_verW); + size = sizeof(user_agent); + hres = ObtainUserAgentString(0, user_agent, &size); + if(FAILED(hres)) + return hres; + + if(strncmp(user_agent, "Mozilla/", 8)) { + FIXME("Unsupported user agent\n"); + return E_FAIL; + } + + size = MultiByteToWideChar(CP_ACP, 0, user_agent+8, -1, NULL, 0); + *p = SysAllocStringLen(NULL, size-1); if(!*p) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, user_agent+8, -1, *p, size); return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 25bf764..264f9fb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3173,6 +3173,16 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!strcmp_wa(bstr, buf), "userAgent returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), buf); SysFreeString(bstr); + if(!strncmp(buf, "Mozilla/", 8)) { + bstr = NULL; + hres = IOmNavigator_get_appVersion(navigator, &bstr); + ok(hres == S_OK, "get_appVersion failed: %08x\n", hres); + ok(!strcmp_wa(bstr, buf+8), "appVersion returned %s, expected \"%s\"\n", wine_dbgstr_w(bstr), buf+8); + SysFreeString(bstr); + }else { + skip("nonstandard user agent\n"); + } + ref = IOmNavigator_Release(navigator); ok(!ref, "navigator should be destroyed here\n"); }

1 0

Nikolay Sivov : shell32/shellview: Improve error handling on some helpers, fix possible leak.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 571159d5ff416603b7e4cc381bd5eeaf3ade0351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=571159d5ff416603b7e4cc381… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:47:59 2010 +0300 shell32/shellview: Improve error handling on some helpers, fix possible leak. --- dlls/shell32/shlview.c | 138 ++++++++++++++++++++++++------------------------ 1 files changed, 69 insertions(+), 69 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 80c4c3a..ae133a0 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -634,96 +634,96 @@ static INT CALLBACK fill_list( LPVOID ptr, LPVOID arg ) return TRUE; } -static HRESULT ShellView_FillList(IShellViewImpl * This) +static HRESULT ShellView_FillList(IShellViewImpl *This) { - LPENUMIDLIST pEnumIDList; - LPITEMIDLIST pidl; - DWORD dwFetched; - HRESULT hRes; - HDPA hdpa; - - TRACE("%p\n",This); - - /* get the itemlist from the shfolder*/ - hRes = IShellFolder_EnumObjects(This->pSFParent,This->hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS, &pEnumIDList); - if (hRes != S_OK) - { - if (hRes==S_FALSE) - return(NOERROR); - return(hRes); - } + LPENUMIDLIST pEnumIDList; + LPITEMIDLIST pidl; + DWORD fetched; + HRESULT hr; + HDPA hdpa; - /* create a pointer array */ - hdpa = DPA_Create(16); - if (!hdpa) - { - return(E_OUTOFMEMORY); - } + TRACE("(%p)\n", This); - /* copy the items into the array*/ - while((S_OK == IEnumIDList_Next(pEnumIDList,1, &pidl, &dwFetched)) && dwFetched) - { - if (DPA_InsertPtr(hdpa, 0x7fff, pidl) == -1) - { - SHFree(pidl); - } - } + /* get the itemlist from the shfolder*/ + hr = IShellFolder_EnumObjects(This->pSFParent, This->hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS, &pEnumIDList); + if (hr != S_OK) return hr; - /* sort the array */ - DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent); + /* create a pointer array */ + hdpa = DPA_Create(16); + if (!hdpa) + { + IEnumIDList_Release(pEnumIDList); + return E_OUTOFMEMORY; + } - /*turn the listview's redrawing off*/ - SendMessageA(This->hWndList, WM_SETREDRAW, FALSE, 0); + /* copy the items into the array*/ + while((S_OK == IEnumIDList_Next(pEnumIDList, 1, &pidl, &fetched)) && fetched) + { + if (DPA_InsertPtr(hdpa, DPA_GetPtrCount(hdpa), pidl) == -1) + { + SHFree(pidl); + } + } - DPA_DestroyCallback( hdpa, fill_list, This ); + /* sort the array */ + DPA_Sort(hdpa, ShellView_CompareItems, (LPARAM)This->pSFParent); - /*turn the listview's redrawing back on and force it to draw*/ - SendMessageA(This->hWndList, WM_SETREDRAW, TRUE, 0); + SendMessageW(This->hWndList, WM_SETREDRAW, FALSE, 0); + DPA_DestroyCallback(hdpa, fill_list, This); + SendMessageW(This->hWndList, WM_SETREDRAW, TRUE, 0); - IEnumIDList_Release(pEnumIDList); /* destroy the list*/ + IEnumIDList_Release(pEnumIDList); - return S_OK; + return S_OK; } /********************************************************** * ShellView_OnCreate() */ -static LRESULT ShellView_OnCreate(IShellViewImpl * This) +static LRESULT ShellView_OnCreate(IShellViewImpl *This) { - IDropTarget* pdt; - SHChangeNotifyEntry ntreg; - IPersistFolder2 * ppf2 = NULL; + IShellView2 *iface = (IShellView2*)This; + IPersistFolder2 *ppf2; + IDropTarget* pdt; + HRESULT hr; - TRACE("%p\n",This); + TRACE("(%p)\n", This); - if(ShellView_CreateList(This)) - { - if(ShellView_InitList(This)) - { + if (ShellView_CreateList(This)) + { + if (ShellView_InitList(This)) + { ShellView_FillList(This); - } - } + } + } - if (SUCCEEDED(IUnknown_QueryInterface((IUnknown*)&This->lpVtbl, &IID_IDropTarget, (LPVOID*)&pdt))) - { - RegisterDragDrop(This->hWnd, pdt); - IDropTarget_Release(pdt); - } + hr = IShellView2_QueryInterface(iface, &IID_IDropTarget, (LPVOID*)&pdt); + if (hr == S_OK) + { + RegisterDragDrop(This->hWnd, pdt); + IDropTarget_Release(pdt); + } - /* register for receiving notifications */ - IShellFolder_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&ppf2); - if (ppf2) - { - IPersistFolder2_GetCurFolder(ppf2, (LPITEMIDLIST*)&ntreg.pidl); - ntreg.fRecursive = TRUE; - This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNF_IDLIST, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); - SHFree((LPITEMIDLIST)ntreg.pidl); - IPersistFolder2_Release(ppf2); - } + /* register for receiving notifications */ + hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&ppf2); + if (hr == S_OK) + { + SHChangeNotifyEntry ntreg; - This->hAccel = LoadAcceleratorsA(shell32_hInstance, "shv_accel"); + hr = IPersistFolder2_GetCurFolder(ppf2, (LPITEMIDLIST*)&ntreg.pidl); + if (hr == S_OK) + { + ntreg.fRecursive = TRUE; + This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNF_IDLIST, SHCNE_ALLEVENTS, + SHV_CHANGE_NOTIFY, 1, &ntreg); + SHFree((LPITEMIDLIST)ntreg.pidl); + } + IPersistFolder2_Release(ppf2); + } - return S_OK; + This->hAccel = LoadAcceleratorsA(shell32_hInstance, "shv_accel"); + + return S_OK; } /********************************************************** @@ -1875,7 +1875,7 @@ static HRESULT WINAPI IShellView_fnRefresh(IShellView2 * iface) { IShellViewImpl *This = (IShellViewImpl *)iface; - TRACE("(%p)\n",This); + TRACE("(%p)\n", This); SendMessageW(This->hWndList, LVM_DELETEALLITEMS, 0, 0); ShellView_FillList(This);

1 0

Nikolay Sivov : shell32/shellview: Use W-calls for menu handling, same for SendMessage to ListView window.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 5308dfb396312baf5b10c8cda59725adc56c532d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5308dfb396312baf5b10c8cda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:48:34 2010 +0300 shell32/shellview: Use W-calls for menu handling, same for SendMessage to ListView window. --- dlls/shell32/shlview.c | 215 ++++++++++++++++++++++++----------------------- 1 files changed, 110 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5308dfb396312baf5b10c…

1 0

Nikolay Sivov : shell32: Initial test file for IShellView/IFolderView, implemented IFolderView::GetSpacing.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 537e3821d562705ac7e583d8426678a15ae7bd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=537e3821d562705ac7e583d84… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:53:00 2010 +0300 shell32: Initial test file for IShellView/IFolderView, implemented IFolderView::GetSpacing. --- dlls/shell32/shlview.c | 27 ++- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/msg.h | 294 +++++++++++++++++++++++++++ dlls/shell32/tests/shlview.c | 433 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 749 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537e3821d562705ac7e58…

1 0

Nikolay Sivov : shell32/shellview: Remove unneeded memset, release browser reference on failure.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4261aaffd7861821192c6dcbb44882e63dc0e7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4261aaffd7861821192c6dcbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:53:38 2010 +0300 shell32/shellview: Remove unneeded memset, release browser reference on failure. --- dlls/shell32/shlview.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2b1ac1f..c2fb973 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2068,7 +2068,7 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2C /* Get our parent window */ IShellBrowser_AddRef(This->pShellBrowser); - IShellBrowser_GetWindow(This->pShellBrowser, &(This->hWndParent)); + IShellBrowser_GetWindow(This->pShellBrowser, &This->hWndParent); /* Try to get the ICommDlgBrowserInterface, adds a reference !!! */ This->pCommDlgBrowser = NULL; @@ -2079,7 +2079,6 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2C /* If our window class has not been registered, then do so */ if (!GetClassInfoW(shell32_hInstance, SV_CLASS_NAME, &wc)) { - ZeroMemory(&wc, sizeof(wc)); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = ShellView_WndProc; wc.cbClsExtra = 0; @@ -2102,7 +2101,11 @@ static HRESULT WINAPI IShellView2_fnCreateViewWindow2(IShellView2* iface, LPSV2C CheckToolbar(This); - if (!wnd) return E_FAIL; + if (!wnd) + { + IShellBrowser_Release(This->pShellBrowser); + return E_FAIL; + } SetWindowPos(wnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); UpdateWindow(wnd);

1 0

Nikolay Sivov : shell32/shellview: Implemented IFolderView:: GetSelectionMarkedItem() with basic test.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 90b9c2fd3953b04043ebe09fd89eeec925219d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b9c2fd3953b04043ebe09fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:54:03 2010 +0300 shell32/shellview: Implemented IFolderView::GetSelectionMarkedItem() with basic test. --- dlls/shell32/shlview.c | 10 +++++++--- dlls/shell32/tests/shlview.c | 23 ++++++++++++++++++++++- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index c2fb973..8778dbd 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2739,9 +2739,13 @@ static HRESULT WINAPI IFView_Items(IFolderView *iface, UINT flags, REFIID riid, static HRESULT WINAPI IFView_GetSelectionMarkedItem(IFolderView *iface, int *item) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%p), stub\n", This, item); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + + TRACE("(%p)->(%p)\n", This, item); + + *item = SendMessageW(This->hWndList, LVM_GETSELECTIONMARK, 0, 0); + + return S_OK; } static HRESULT WINAPI IFView_GetFocusedItem(IFolderView *iface, int *item) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index a14c691..fd65e49 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -298,6 +298,11 @@ static const struct message folderview_getspacing_seq[] = { { 0 } }; +static const struct message folderview_getselectionmarked_seq[] = { + { LVM_GETSELECTIONMARK, sent }, + { 0 } +}; + static void test_IShellView_CreateViewWindow(void) { IShellFolder *desktop; @@ -344,7 +349,7 @@ static void test_IFolderView(void) IFolderView *fv; HWND hwnd_view, hwnd_list; HRESULT hr; - DWORD ret; + INT ret; POINT pt; RECT r; @@ -371,6 +376,9 @@ if (0) { /* crashes on Vista and Win2k8 - List not created yet case */ hr = IFolderView_GetSpacing(fv, &pt); + + /* crashes on XP */ + hr = IFolderView_GetSelectionMarkedItem(fv, NULL); } browser = IShellBrowserImpl_Construct(); @@ -414,6 +422,19 @@ if (0) ok(pt.x == LOWORD(ret) && pt.y == HIWORD(ret), "got (%d, %d)\n", LOWORD(ret), HIWORD(ret)); } + /* IFolderView::GetSelectionMarkedItem */ +if (0) +{ + /* crashes on XP */ + hr = IFolderView_GetSelectionMarkedItem(fv, NULL); +} + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hr = IFolderView_GetSelectionMarkedItem(fv, &ret); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getselectionmarked_seq, + "IFolderView::GetSelectionMarkedItem", FALSE); + IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view);

1 0

Nikolay Sivov : shell32/shellview: Implemented IFolderView::GetFocusedItem.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 8c92ba009d2aec43df3d483abf30f3c09d850f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c92ba009d2aec43df3d483ab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 6 23:55:32 2010 +0300 shell32/shellview: Implemented IFolderView::GetFocusedItem. --- dlls/shell32/shlview.c | 10 +++++++--- dlls/shell32/tests/shlview.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 8778dbd..f718c2b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -2750,9 +2750,13 @@ static HRESULT WINAPI IFView_GetSelectionMarkedItem(IFolderView *iface, int *ite static HRESULT WINAPI IFView_GetFocusedItem(IFolderView *iface, int *item) { - IShellViewImpl *This = impl_from_IFolderView(iface); - FIXME("(%p)->(%p), stub\n", This, item); - return E_NOTIMPL; + IShellViewImpl *This = impl_from_IFolderView(iface); + + TRACE("(%p)->(%p)\n", This, item); + + *item = SendMessageW(This->hWndList, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + + return S_OK; } static HRESULT WINAPI IFView_GetItemPosition(IFolderView *iface, PCUITEMID_CHILD pidl, POINT *ppt) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index fd65e49..2cd4c4b 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -303,6 +303,11 @@ static const struct message folderview_getselectionmarked_seq[] = { { 0 } }; +static const struct message folderview_getfocused_seq[] = { + { LVM_GETNEXTITEM, sent|wparam|lparam, -1, LVNI_FOCUSED }, + { 0 } +}; + static void test_IShellView_CreateViewWindow(void) { IShellFolder *desktop; @@ -379,6 +384,7 @@ if (0) /* crashes on XP */ hr = IFolderView_GetSelectionMarkedItem(fv, NULL); + hr = IFolderView_GetFocusedItem(fv, NULL); } browser = IShellBrowserImpl_Construct(); @@ -435,6 +441,13 @@ if (0) ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getselectionmarked_seq, "IFolderView::GetSelectionMarkedItem", FALSE); + /* IFolderView::GetFocusedItem */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hr = IFolderView_GetFocusedItem(fv, &ret); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getfocused_seq, + "IFolderView::GetFocusedItem", FALSE); + IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view);

1 0

Jacek Caban : shdocvw: Store object passed in DOCHOST_DOCCANNAVIGATE command.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: fab9304721a05b1b8b0369c554f1209218cf695d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab9304721a05b1b8b0369c55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:43:24 2010 +0100 shdocvw: Store object passed in DOCHOST_DOCCANNAVIGATE command. --- dlls/shdocvw/dochost.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/shdocvw/shdocvw.h | 1 + 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index e8982e4..6eb8199 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -21,9 +21,14 @@ #include "hlink.h" #include "exdispid.h" #include "mshtml.h" +#include "initguid.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); + +#define DOCHOST_DOCCANNAVIGATE 0 + static ATOM doc_view_atom = 0; void push_dochost_task(DocHost *This, task_header_t *task, task_proc_t proc, BOOL send) @@ -314,6 +319,11 @@ void deactivate_document(DocHost *This) IHlinkTarget *hlink = NULL; HRESULT hres; + if(This->doc_navigate) { + IUnknown_Release(This->doc_navigate); + This->doc_navigate = NULL; + } + if(This->is_prop_notif) advise_prop_notif(This, FALSE); @@ -425,8 +435,34 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, VARIANT *pvaOut) { DocHost *This = OLECMD_THIS(iface); - FIXME("(%p)->(%s %d %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, - nCmdexecopt, pvaIn, pvaOut); + + TRACE("(%p)->(%s %d %d %p %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, + nCmdexecopt, debugstr_variant(pvaIn), debugstr_variant(pvaOut)); + + if(!pguidCmdGroup) { + FIXME("Unimplemented cmdid %d\n", nCmdID); + return E_NOTIMPL; + } + + if(IsEqualGUID(pguidCmdGroup, &CGID_DocHostCmdPriv)) { + switch(nCmdID) { + case DOCHOST_DOCCANNAVIGATE: + if(!pvaIn || V_VT(pvaIn) != VT_UNKNOWN) + return E_INVALIDARG; + + if(This->doc_navigate) + IUnknown_Release(This->doc_navigate); + IUnknown_AddRef(V_UNKNOWN(pvaIn)); + This->doc_navigate = V_UNKNOWN(pvaIn); + return S_OK; + + default: + FIXME("unsupported command %d of CGID_DocHostCmdPriv\n", nCmdID); + return E_NOTIMPL; + } + } + + FIXME("Unimplemented group %s\n", debugstr_guid(pguidCmdGroup)); return E_NOTIMPL; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index c734f04..1641222 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -92,6 +92,7 @@ struct DocHost { IUnknown *document; IOleDocumentView *view; + IUnknown *doc_navigate; HWND hwnd; HWND frame_hwnd;

1 0

Jacek Caban : shdocvw: Separate document state from control state.
by Alexandre Julliard 15 Mar '10

15 Mar '10

Module: wine Branch: master Commit: 4ecf80fd0b65ef1c894ff66f7aa8dfacb7f95346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ecf80fd0b65ef1c894ff66f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 13 16:43:48 2010 +0100 shdocvw: Separate document state from control state. --- dlls/shdocvw/dochost.c | 17 ++++++++++++----- dlls/shdocvw/navigate.c | 2 +- dlls/shdocvw/shdocvw.h | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 6eb8199..8756527 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -159,16 +159,23 @@ static void advise_prop_notif(DocHost *This, BOOL set) This->is_prop_notif = set; } +void set_doc_state(DocHost *This, READYSTATE doc_state) +{ + This->doc_state = doc_state; + if(doc_state > This->ready_state) + This->ready_state = doc_state; +} + static void update_ready_state(DocHost *This, READYSTATE ready_state) { - if(ready_state > READYSTATE_LOADING && This->ready_state <= READYSTATE_LOADING) { + if(ready_state > READYSTATE_LOADING && This->doc_state <= READYSTATE_LOADING) notif_complete(This, DISPID_NAVIGATECOMPLETE2); - This->ready_state = ready_state; - } - if(ready_state == READYSTATE_COMPLETE && This->ready_state < READYSTATE_COMPLETE) { - This->ready_state = READYSTATE_COMPLETE; + if(ready_state == READYSTATE_COMPLETE && This->doc_state < READYSTATE_COMPLETE) { + set_doc_state(This, READYSTATE_COMPLETE); notif_complete(This, DISPID_DOCUMENTCOMPLETE); + }else { + set_doc_state(This, ready_state); } } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index ec23fcc..456cd83 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -549,7 +549,7 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo VARIANT_BOOL cancel = VARIANT_FALSE; HRESULT hres; - This->ready_state = READYSTATE_LOADING; + set_doc_state(This, READYSTATE_LOADING); on_before_navigate2(This, bsc->url, bsc->post_data, bsc->post_data_len, bsc->headers, &cancel); if(cancel) { diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 1641222..1184298 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -104,6 +104,7 @@ struct DocHost { VARIANT_BOOL busy; READYSTATE ready_state; + READYSTATE doc_state; DWORD prop_notif_cookie; BOOL is_prop_notif; @@ -223,6 +224,7 @@ HRESULT dochost_object_available(DocHost*,IUnknown*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(DocHost*,LPCWSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); HRESULT go_home(DocHost*); +void set_doc_state(DocHost*,READYSTATE); #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,BOOL);

1 0