Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-01 06:57:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BROWSEUI]

Browse source 
* Remove a call that shouldn't even be working in Windows, and was completely unnecessary. Fixes explorer-new navigation history in ReactOS.
* Added some debug traces.
CORE-8173

svn path=/branches/shell-experiments/; revision=63479
This commit is contained in:
David Quintana 2014-05-27 17:55:41 +00:00
parent be04b066aa
commit 7411374268
1 changed files with 81 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
dll/win32/browseui/travellog.cpp
View file

@ -126,8 +126,9 @@ HRESULT CTravelEntry::GetToolTipText(IUnknown *punk, LPWSTR pwzText) const
HRESULT hResult;
hResult = ILGetDisplayNameEx(NULL, fPIDL, pwzText, ILGDN_NORMAL) ? S_OK : S_FALSE;
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
return S_OK;
}
@ -142,14 +143,16 @@ HRESULT STDMETHODCALLTYPE CTravelEntry::Invoke(IUnknown *punk)
CComPtr<IStream> globalStream;
HRESULT hResult;
TRACE("CTravelEntry::Invoke for IUnknown punk=%p\n", punk);
hResult = punk->QueryInterface(IID_PPV_ARG(IPersistHistory, &persistHistory));
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
hResult = CreateStreamOnHGlobal(fPersistState, FALSE, &globalStream);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
hResult = persistHistory->LoadHistory(globalStream, NULL);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
return S_OK;
}
@ -160,34 +163,43 @@ HRESULT STDMETHODCALLTYPE CTravelEntry::Update(IUnknown *punk, BOOL fIsLocalAnch
CComPtr<IPersistHistory> persistHistory;
CComPtr<IStream> globalStream;
WINDOWDATA windowData;
HGLOBAL globalStorage;
HRESULT hResult;
TRACE("CTravelEntry::Update for IUnknown punk=%p, fIsLocalAnchor=%s\n", punk, fIsLocalAnchor ? "TRUE" : "FALSE");
WCHAR wch[MAX_PATH * 2];
GetToolTipText(punk, wch);
TRACE("Updating entry with display name: %S\n", wch);
ILFree(fPIDL);
fPIDL = NULL;
GlobalFree(fPersistState);
fPersistState = NULL;
hResult = punk->QueryInterface(IID_PPV_ARG(ITravelLogClient, &travelLogClient));
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
hResult = punk->QueryInterface(IID_PPV_ARG(IPersistHistory, &persistHistory));
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
globalStorage = GlobalAlloc(GMEM_FIXED, 0);
hResult = CreateStreamOnHGlobal(globalStorage, FALSE, &globalStream);
if (FAILED(hResult))
hResult = CreateStreamOnHGlobal(NULL, FALSE, &globalStream);
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
hResult = persistHistory->SaveHistory(globalStream);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
hResult = travelLogClient->GetWindowData(globalStream, &windowData);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
fPIDL = windowData.pidl;
// TODO: Properly free the windowData
hResult = GetHGlobalFromStream(globalStream, &fPersistState);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
GetToolTipText(punk, wch);
TRACE("Updated entry display name is now: %S\n", wch);
return S_OK;
}
@ -198,6 +210,9 @@ HRESULT STDMETHODCALLTYPE CTravelEntry::GetPidl(LPITEMIDLIST *ppidl)
*ppidl = ILClone(fPIDL);
if (*ppidl == NULL)
return E_OUTOFMEMORY;
TRACE("CTravelEntry::GetPidl returning ppidl=%p\n", *ppidl);
return S_OK;
}
@ -209,6 +224,7 @@ CTravelLog::CTravelLog()
fMaximumSize = 0;
fCurrentSize = 0;
fEntryCount = 0;
TRACE("CTravelLog created\n");
}
CTravelLog::~CTravelLog()
@ -223,19 +239,25 @@ CTravelLog::~CTravelLog()
anEntry->Release();
anEntry = next;
}
TRACE("CTravelLog destroyed\n");
}
HRESULT CTravelLog::Initialize()
{
FIXME("CTravelLog::Initialize using hardcoded fMaximumSize.\n");
fMaximumSize = 1024 * 1024; // TODO: change to read this from registry
// Software\Microsoft\Windows\CurrentVersion\Explorer\TravelLog
// MaxSize
return S_OK;
}
HRESULT CTravelLog::FindRelativeEntry(int offset, CTravelEntry **foundEntry)
HRESULT CTravelLog::FindRelativeEntry(int _offset, CTravelEntry **foundEntry)
{
CTravelEntry *curEntry;
int offset = _offset;
if (foundEntry == NULL)
return E_INVALIDARG;
*foundEntry = NULL;
curEntry = fCurrentEntry;
@ -257,7 +279,11 @@ HRESULT CTravelLog::FindRelativeEntry(int offset, CTravelEntry **foundEntry)
}
if (curEntry == NULL)
return E_INVALIDARG;
*foundEntry = curEntry;
TRACE("CTravelLog::FindRelativeEntry for offset %d, returning %p\n", offset, *foundEntry);
return S_OK;
}
@ -266,6 +292,10 @@ void CTravelLog::DeleteChain(CTravelEntry *startHere)
CTravelEntry *saveNext;
long itemSize;
TRACE("CTravelLog::DeleteChain deleting chain starting at %p\n", startHere);
long startEntryCount = fEntryCount;
if (startHere->fPreviousEntry != NULL)
{
startHere->fPreviousEntry->fNextEntry = NULL;
@ -285,17 +315,21 @@ void CTravelLog::DeleteChain(CTravelEntry *startHere)
startHere = saveNext;
fEntryCount--;
}
TRACE("CTravelLog::DeleteChain chain of %d items deleted\n", startEntryCount - fEntryCount);
}
void CTravelLog::AppendEntry(CTravelEntry *afterEntry, CTravelEntry *newEntry)
{
if (afterEntry == NULL)
{
TRACE("CTravelLog::AppendEntry appending %p after NULL. Resetting head and tail\n", newEntry);
fListHead = newEntry;
fListTail = newEntry;
}
else
{
TRACE("CTravelLog::AppendEntry appending %p after %p\n", newEntry, afterEntry);
newEntry->fNextEntry = afterEntry->fNextEntry;
afterEntry->fNextEntry = newEntry;
newEntry->fPreviousEntry = afterEntry;
@ -312,6 +346,8 @@ HRESULT STDMETHODCALLTYPE CTravelLog::AddEntry(IUnknown *punk, BOOL fIsLocalAnch
CComObject<CTravelEntry> *newEntry;
long itemSize;
TRACE("CTravelLog::AddEntry for IUnknown punk=%p, fIsLocalAnchor=%s\n", punk, fIsLocalAnchor ? "TRUE" : "FALSE");
if (punk == NULL)
return E_INVALIDARG;
ATLTRY (newEntry = new CComObject<CTravelEntry>);
@ -346,12 +382,14 @@ HRESULT STDMETHODCALLTYPE CTravelLog::Travel(IUnknown *punk, int iOffset)
CTravelEntry *destinationEntry;
HRESULT hResult;
TRACE("CTravelLog::Travel for IUnknown punk=%p at offset=%d\n", punk, iOffset);
hResult = FindRelativeEntry(iOffset, &destinationEntry);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
fCurrentEntry = destinationEntry;
hResult = destinationEntry->Invoke(punk);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
return S_OK;
}
@ -360,11 +398,17 @@ HRESULT STDMETHODCALLTYPE CTravelLog::GetTravelEntry(IUnknown *punk, int iOffset
{
CTravelEntry *destinationEntry;
HRESULT hResult;
hResult = FindRelativeEntry(iOffset, &destinationEntry);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
return destinationEntry->QueryInterface(IID_PPV_ARG(ITravelEntry, ppte));
hResult = destinationEntry->QueryInterface(IID_PPV_ARG(ITravelEntry, ppte));
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
TRACE("CTravelLog::GetTravelEntry for IUnknown punk=%p at offset=%d returning %p\n", punk, iOffset, *ppte);
return hResult;
}
HRESULT STDMETHODCALLTYPE CTravelLog::FindTravelEntry(IUnknown *punk, LPCITEMIDLIST pidl, ITravelEntry **ppte)
@ -373,6 +417,9 @@ HRESULT STDMETHODCALLTYPE CTravelLog::FindTravelEntry(IUnknown *punk, LPCITEMIDL
return E_POINTER;
if (punk == NULL || pidl == NULL)
return E_INVALIDARG;
UNIMPLEMENTED;
return E_NOTIMPL;
}
@ -388,10 +435,10 @@ HRESULT STDMETHODCALLTYPE CTravelLog::GetToolTipText(IUnknown *punk, int iOffset
if (punk == NULL || cchText == 0)
return E_INVALIDARG;
hResult = FindRelativeEntry(iOffset, &destinationEntry);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
hResult = destinationEntry->GetToolTipText(punk, tempString);
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
if (iOffset < 0)
{
@ -402,6 +449,9 @@ HRESULT STDMETHODCALLTYPE CTravelLog::GetToolTipText(IUnknown *punk, int iOffset
wcscpy(templateString, L"Forward to %s");
}
_snwprintf(pwzText, cchText, templateString, tempString);
TRACE("CTravelLog::GetToolTipText for IUnknown punk=%p at offset=%d returning L\"%S\"\n", punk, iOffset, pwzText);
return S_OK;
}
@ -433,6 +483,8 @@ HRESULT STDMETHODCALLTYPE CTravelLog::InsertMenuEntries(IUnknown *punk, HMENU hm
wchar_t itemTextBuffer[MAX_PATH * 2];
HRESULT hResult;
TRACE("CTravelLog::InsertMenuEntries for IUnknown punk=%p, nPos=%d, idFirst=%d, idLast=%d\n", punk);
// TLMENUF_BACK - include back entries
// TLMENUF_INCLUDECURRENT - include current entry, if TLMENUF_CHECKCURRENT then check the entry
// TLMENUF_FORE - include next entries
@ -467,6 +519,7 @@ HRESULT STDMETHODCALLTYPE CTravelLog::InsertMenuEntries(IUnknown *punk, HMENU hm
if (SUCCEEDED(hResult))
{
FixAmpersands(itemTextBuffer);
TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID);
if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo))
{
nPos++;
@ -487,6 +540,7 @@ HRESULT STDMETHODCALLTYPE CTravelLog::InsertMenuEntries(IUnknown *punk, HMENU hm
if (SUCCEEDED(hResult))
{
FixAmpersands(itemTextBuffer);
TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID);
if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo))
{
nPos++;
@ -507,6 +561,7 @@ HRESULT STDMETHODCALLTYPE CTravelLog::InsertMenuEntries(IUnknown *punk, HMENU hm
FixAmpersands(itemTextBuffer);
if ((dwFlags & TLMENUF_CHECKCURRENT) != 0)
menuItemInfo.fState |= MFS_CHECKED;
TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID);
if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo))
{
nPos++;
@ -527,6 +582,7 @@ HRESULT STDMETHODCALLTYPE CTravelLog::InsertMenuEntries(IUnknown *punk, HMENU hm
if (SUCCEEDED(hResult))
{
FixAmpersands(itemTextBuffer);
TRACE("CTravelLog::InsertMenuEntries adding entry L\"%S\"/L\"%S\" with id %d\n", itemTextBuffer, menuItemInfo.dwTypeData, menuItemInfo.wID);
if (InsertMenuItem(hmenu, nPos, TRUE, &menuItemInfo))
{
nPos++;
@ -545,6 +601,7 @@ HRESULT STDMETHODCALLTYPE CTravelLog::Clone(ITravelLog **pptl)
return E_POINTER;
*pptl = NULL;
// duplicate the log
UNIMPLEMENTED;
return E_NOTIMPL;
}
@ -558,6 +615,7 @@ DWORD STDMETHODCALLTYPE CTravelLog::CountEntries(IUnknown *punk)
HRESULT STDMETHODCALLTYPE CTravelLog::Revert()
{
// remove the current entry?
UNIMPLEMENTED;
return E_NOTIMPL;
}
@ -573,13 +631,13 @@ HRESULT CreateTravelLog(REFIID riid, void **ppv)
if (theTravelLog == NULL)
return E_OUTOFMEMORY;
hResult = theTravelLog->QueryInterface(riid, reinterpret_cast<void **>(ppv));
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
{
delete theTravelLog;
return hResult;
}
hResult = theTravelLog->Initialize();
if (FAILED(hResult))
if (FAILED_UNEXPECTEDLY(hResult))
return hResult;
return S_OK;
}