Skip to content

W
wine-winehq
Commit 2d08613e authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

ole32: Add more traces to the storage methods.

Signed-off-by: 's avatarDmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: 's avatarVincent Povirk <vincent@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7d6ca631
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 11 deletions
dlls/ole32/storage32.c
View file @ 2d08613e
...@@ -908,6 +908,8 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( ...@@ -908,6 +908,8 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface(
{ {
IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface);
TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), ppvObject);
if (ppvObject==0) if (ppvObject==0)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -918,9 +920,11 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface( ...@@ -918,9 +920,11 @@ static HRESULT WINAPI IEnumSTATSTGImpl_QueryInterface(
{ {
*ppvObject = &This->IEnumSTATSTG_iface; *ppvObject = &This->IEnumSTATSTG_iface;
IEnumSTATSTG_AddRef(&This->IEnumSTATSTG_iface); IEnumSTATSTG_AddRef(&This->IEnumSTATSTG_iface);
TRACE("<-- %p\n", *ppvObject);
return S_OK; return S_OK;
} }
TRACE("<-- E_NOINTERFACE\n");
return E_NOINTERFACE; return E_NOINTERFACE;
} }
...@@ -958,6 +962,8 @@ static HRESULT IEnumSTATSTGImpl_GetNextRef( ...@@ -958,6 +962,8 @@ static HRESULT IEnumSTATSTGImpl_GetNextRef(
HRESULT hr; HRESULT hr;
WCHAR result_name[DIRENTRY_NAME_MAX_LEN]; WCHAR result_name[DIRENTRY_NAME_MAX_LEN];
TRACE("%p,%p\n", This, ref);
hr = StorageBaseImpl_ReadDirEntry(This->parentStorage, hr = StorageBaseImpl_ReadDirEntry(This->parentStorage,
This->parentStorage->storageDirEntry, &entry); This->parentStorage->storageDirEntry, &entry);
searchNode = entry.dirRootEntry; searchNode = entry.dirRootEntry;
...@@ -990,6 +996,7 @@ static HRESULT IEnumSTATSTGImpl_GetNextRef( ...@@ -990,6 +996,7 @@ static HRESULT IEnumSTATSTGImpl_GetNextRef(
memcpy(This->name, result_name, sizeof(result_name)); memcpy(This->name, result_name, sizeof(result_name));
} }
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -1007,11 +1014,16 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( ...@@ -1007,11 +1014,16 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next(
DirRef currentSearchNode; DirRef currentSearchNode;
HRESULT hr=S_OK; HRESULT hr=S_OK;
TRACE("%p,%u,%p,%p\n", iface, celt, rgelt, pceltFetched);
if ( (rgelt==0) || ( (celt!=1) && (pceltFetched==0) ) ) if ( (rgelt==0) || ( (celt!=1) && (pceltFetched==0) ) )
return E_INVALIDARG; return E_INVALIDARG;
if (This->parentStorage->reverted) if (This->parentStorage->reverted)
{
TRACE("<-- STG_E_REVERTED\n");
return STG_E_REVERTED; return STG_E_REVERTED;
}
/* /*
* To avoid the special case, get another pointer to a ULONG value if * To avoid the special case, get another pointer to a ULONG value if
...@@ -1062,6 +1074,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( ...@@ -1062,6 +1074,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next(
if (SUCCEEDED(hr) && *pceltFetched != celt) if (SUCCEEDED(hr) && *pceltFetched != celt)
hr = S_FALSE; hr = S_FALSE;
TRACE("<-- %08x (asked %u, got %u)\n", hr, celt, *pceltFetched);
return hr; return hr;
} }
...@@ -1076,8 +1089,13 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( ...@@ -1076,8 +1089,13 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip(
DirRef currentSearchNode; DirRef currentSearchNode;
HRESULT hr=S_OK; HRESULT hr=S_OK;
TRACE("%p,%u\n", iface, celt);
if (This->parentStorage->reverted) if (This->parentStorage->reverted)
{
TRACE("<-- STG_E_REVERTED\n");
return STG_E_REVERTED; return STG_E_REVERTED;
}
while ( (objectFetched < celt) ) while ( (objectFetched < celt) )
{ {
...@@ -1092,6 +1110,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( ...@@ -1092,6 +1110,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip(
if (SUCCEEDED(hr) && objectFetched != celt) if (SUCCEEDED(hr) && objectFetched != celt)
return S_FALSE; return S_FALSE;
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -1100,8 +1119,13 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( ...@@ -1100,8 +1119,13 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset(
{ {
IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface);
TRACE("%p\n", iface);
if (This->parentStorage->reverted) if (This->parentStorage->reverted)
{
TRACE("<-- STG_E_REVERTED\n");
return STG_E_REVERTED; return STG_E_REVERTED;
}
This->name[0] = 0; This->name[0] = 0;
...@@ -1117,8 +1141,13 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( ...@@ -1117,8 +1141,13 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone(
IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface);
IEnumSTATSTGImpl* newClone; IEnumSTATSTGImpl* newClone;
TRACE("%p,%p\n", iface, ppenum);
if (This->parentStorage->reverted) if (This->parentStorage->reverted)
{
TRACE("<-- STG_E_REVERTED\n");
return STG_E_REVERTED; return STG_E_REVERTED;
}
if (ppenum==0) if (ppenum==0)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -1208,6 +1237,8 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( ...@@ -1208,6 +1237,8 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface(
{ {
StorageBaseImpl *This = impl_from_IStorage(iface); StorageBaseImpl *This = impl_from_IStorage(iface);
TRACE("%p,%s,%p\n", iface, debugstr_guid(riid), ppvObject);
if (!ppvObject) if (!ppvObject)
return E_INVALIDARG; return E_INVALIDARG;
...@@ -1228,10 +1259,13 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( ...@@ -1228,10 +1259,13 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface(
*ppvObject = &This->IDirectWriterLock_iface; *ppvObject = &This->IDirectWriterLock_iface;
} }
else else
{
TRACE("<-- E_NOINTERFACE\n");
return E_NOINTERFACE; return E_NOINTERFACE;
}
IStorage_AddRef(iface); IStorage_AddRef(iface);
TRACE("<-- %p\n", *ppvObject);
return S_OK; return S_OK;
} }
...@@ -1414,6 +1448,7 @@ static HRESULT StorageBaseImpl_CopyChildEntryTo(StorageBaseImpl *This, ...@@ -1414,6 +1448,7 @@ static HRESULT StorageBaseImpl_CopyChildEntryTo(StorageBaseImpl *This,
hr = StorageBaseImpl_CopyChildEntryTo( This, data.rightChild, skip_storage, hr = StorageBaseImpl_CopyChildEntryTo( This, data.rightChild, skip_storage,
skip_stream, snbExclude, pstgDest ); skip_stream, snbExclude, pstgDest );
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -1421,6 +1456,8 @@ static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEnt ...@@ -1421,6 +1456,8 @@ static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEnt
{ {
StgStreamImpl *strm; StgStreamImpl *strm;
TRACE("%p,%d\n", stg, streamEntry);
LIST_FOR_EACH_ENTRY(strm, &stg->strmHead, StgStreamImpl, StrmListEntry) LIST_FOR_EACH_ENTRY(strm, &stg->strmHead, StgStreamImpl, StrmListEntry)
{ {
if (strm->dirEntry == streamEntry) if (strm->dirEntry == streamEntry)
...@@ -1436,6 +1473,8 @@ static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageE ...@@ -1436,6 +1473,8 @@ static BOOL StorageBaseImpl_IsStorageOpen(StorageBaseImpl * stg, DirRef storageE
{ {
StorageInternalImpl *childstg; StorageInternalImpl *childstg;
TRACE("%p,%d\n", stg, storageEntry);
LIST_FOR_EACH_ENTRY(childstg, &stg->storageHead, StorageInternalImpl, ParentListEntry) LIST_FOR_EACH_ENTRY(childstg, &stg->storageHead, StorageInternalImpl, ParentListEntry)
{ {
if (childstg->base.storageDirEntry == storageEntry) if (childstg->base.storageDirEntry == storageEntry)
...@@ -2240,6 +2279,7 @@ static HRESULT StorageBaseImpl_CopyStorageEntryTo(StorageBaseImpl *This, ...@@ -2240,6 +2279,7 @@ static HRESULT StorageBaseImpl_CopyStorageEntryTo(StorageBaseImpl *This,
hr = StorageBaseImpl_CopyChildEntryTo( This, data.dirRootEntry, skip_storage, hr = StorageBaseImpl_CopyChildEntryTo( This, data.dirRootEntry, skip_storage,
skip_stream, snbExclude, pstgDest ); skip_stream, snbExclude, pstgDest );
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -2396,6 +2436,8 @@ static HRESULT deleteStorageContents( ...@@ -2396,6 +2436,8 @@ static HRESULT deleteStorageContents(
HRESULT destroyHr = S_OK; HRESULT destroyHr = S_OK;
StorageInternalImpl *stg, *stg2; StorageInternalImpl *stg, *stg2;
TRACE("%p,%d\n", parentStorage, indexToDelete);
/* Invalidate any open storage objects. */ /* Invalidate any open storage objects. */
LIST_FOR_EACH_ENTRY_SAFE(stg, stg2, &parentStorage->storageHead, StorageInternalImpl, ParentListEntry) LIST_FOR_EACH_ENTRY_SAFE(stg, stg2, &parentStorage->storageHead, StorageInternalImpl, ParentListEntry)
{ {
...@@ -2419,6 +2461,7 @@ static HRESULT deleteStorageContents( ...@@ -2419,6 +2461,7 @@ static HRESULT deleteStorageContents(
if (hr != S_OK) if (hr != S_OK)
{ {
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -2429,6 +2472,7 @@ static HRESULT deleteStorageContents( ...@@ -2429,6 +2472,7 @@ static HRESULT deleteStorageContents(
if (FAILED(hr)) if (FAILED(hr))
{ {
IStorage_Release(childStorage); IStorage_Release(childStorage);
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -2456,6 +2500,7 @@ static HRESULT deleteStorageContents( ...@@ -2456,6 +2500,7 @@ static HRESULT deleteStorageContents(
IStorage_Release(childStorage); IStorage_Release(childStorage);
IEnumSTATSTG_Release(elements); IEnumSTATSTG_Release(elements);
TRACE("%08x\n", hr);
return destroyHr; return destroyHr;
} }
...@@ -2495,6 +2540,7 @@ static HRESULT deleteStreamContents( ...@@ -2495,6 +2540,7 @@ static HRESULT deleteStreamContents(
if (hr!=S_OK) if (hr!=S_OK)
{ {
TRACE("<-- %08x\n", hr);
return(hr); return(hr);
} }
...@@ -2505,6 +2551,7 @@ static HRESULT deleteStreamContents( ...@@ -2505,6 +2551,7 @@ static HRESULT deleteStreamContents(
if(hr != S_OK) if(hr != S_OK)
{ {
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -2512,7 +2559,7 @@ static HRESULT deleteStreamContents( ...@@ -2512,7 +2559,7 @@ static HRESULT deleteStreamContents(
* Release the stream object. * Release the stream object.
*/ */
IStream_Release(pis); IStream_Release(pis);
TRACE("<-- %08x\n", hr);
return S_OK; return S_OK;
} }
...@@ -2558,6 +2605,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( ...@@ -2558,6 +2605,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
if ( entryToDeleteRef == DIRENTRY_NULL ) if ( entryToDeleteRef == DIRENTRY_NULL )
{ {
TRACE("<-- STG_E_FILENOTFOUND\n");
return STG_E_FILENOTFOUND; return STG_E_FILENOTFOUND;
} }
...@@ -2577,7 +2625,10 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( ...@@ -2577,7 +2625,10 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
} }
if (hr!=S_OK) if (hr!=S_OK)
{
TRACE("<-- %08x\n", hr);
return hr; return hr;
}
/* /*
* Remove the entry from its parent storage * Remove the entry from its parent storage
...@@ -2596,6 +2647,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( ...@@ -2596,6 +2647,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement(
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = StorageBaseImpl_Flush(This); hr = StorageBaseImpl_Flush(This);
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -6034,6 +6086,7 @@ end: ...@@ -6034,6 +6086,7 @@ end:
StorageBaseImpl_UnlockTransaction(This->transactedParent, TRUE); StorageBaseImpl_UnlockTransaction(This->transactedParent, TRUE);
} }
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -6140,7 +6193,11 @@ static HRESULT TransactedSnapshotImpl_WriteDirEntry(StorageBaseImpl *base, ...@@ -6140,7 +6193,11 @@ static HRESULT TransactedSnapshotImpl_WriteDirEntry(StorageBaseImpl *base,
TRACE("%x %s l=%x r=%x d=%x\n", index, debugstr_w(data->name), data->leftChild, data->rightChild, data->dirRootEntry); TRACE("%x %s l=%x r=%x d=%x\n", index, debugstr_w(data->name), data->leftChild, data->rightChild, data->dirRootEntry);
hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); hr = TransactedSnapshotImpl_EnsureReadEntry(This, index);
if (FAILED(hr)) return hr; if (FAILED(hr))
{
TRACE("<-- %08x\n", hr);
return hr;
}
memcpy(&This->entries[index].data, data, sizeof(DirEntry)); memcpy(&This->entries[index].data, data, sizeof(DirEntry));
...@@ -6162,7 +6219,7 @@ static HRESULT TransactedSnapshotImpl_WriteDirEntry(StorageBaseImpl *base, ...@@ -6162,7 +6219,7 @@ static HRESULT TransactedSnapshotImpl_WriteDirEntry(StorageBaseImpl *base,
This->entries[index].transactedParentEntry = This->entries[index].newTransactedParentEntry = DIRENTRY_NULL; This->entries[index].transactedParentEntry = This->entries[index].newTransactedParentEntry = DIRENTRY_NULL;
} }
} }
TRACE("<-- S_OK\n");
return S_OK; return S_OK;
} }
...@@ -6173,7 +6230,11 @@ static HRESULT TransactedSnapshotImpl_ReadDirEntry(StorageBaseImpl *base, ...@@ -6173,7 +6230,11 @@ static HRESULT TransactedSnapshotImpl_ReadDirEntry(StorageBaseImpl *base,
HRESULT hr; HRESULT hr;
hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); hr = TransactedSnapshotImpl_EnsureReadEntry(This, index);
if (FAILED(hr)) return hr; if (FAILED(hr))
{
TRACE("<-- %08x\n", hr);
return hr;
}
memcpy(data, &This->entries[index].data, sizeof(DirEntry)); memcpy(data, &This->entries[index].data, sizeof(DirEntry));
...@@ -6235,10 +6296,18 @@ static HRESULT TransactedSnapshotImpl_StreamWriteAt(StorageBaseImpl *base, ...@@ -6235,10 +6296,18 @@ static HRESULT TransactedSnapshotImpl_StreamWriteAt(StorageBaseImpl *base,
HRESULT hr; HRESULT hr;
hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); hr = TransactedSnapshotImpl_EnsureReadEntry(This, index);
if (FAILED(hr)) return hr; if (FAILED(hr))
{
TRACE("<-- %08x\n", hr);
return hr;
}
hr = TransactedSnapshotImpl_MakeStreamDirty(This, index); hr = TransactedSnapshotImpl_MakeStreamDirty(This, index);
if (FAILED(hr)) return hr; if (FAILED(hr))
{
TRACE("<-- %08x\n", hr);
return hr;
}
hr = StorageBaseImpl_StreamWriteAt(This->scratch, hr = StorageBaseImpl_StreamWriteAt(This->scratch,
This->entries[index].stream_entry, offset, size, buffer, bytesWritten); This->entries[index].stream_entry, offset, size, buffer, bytesWritten);
...@@ -6248,6 +6317,7 @@ static HRESULT TransactedSnapshotImpl_StreamWriteAt(StorageBaseImpl *base, ...@@ -6248,6 +6317,7 @@ static HRESULT TransactedSnapshotImpl_StreamWriteAt(StorageBaseImpl *base,
This->entries[index].data.size.QuadPart, This->entries[index].data.size.QuadPart,
offset.QuadPart + size); offset.QuadPart + size);
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -6258,7 +6328,11 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base, ...@@ -6258,7 +6328,11 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base,
HRESULT hr; HRESULT hr;
hr = TransactedSnapshotImpl_EnsureReadEntry(This, index); hr = TransactedSnapshotImpl_EnsureReadEntry(This, index);
if (FAILED(hr)) return hr; if (FAILED(hr))
{
TRACE("<-- %08x\n", hr);
return hr;
}
if (This->entries[index].data.size.QuadPart == newsize.QuadPart) if (This->entries[index].data.size.QuadPart == newsize.QuadPart)
return S_OK; return S_OK;
...@@ -6299,6 +6373,7 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base, ...@@ -6299,6 +6373,7 @@ static HRESULT TransactedSnapshotImpl_StreamSetSize(StorageBaseImpl *base,
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
This->entries[index].data.size = newsize; This->entries[index].data.size = newsize;
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
...@@ -6310,10 +6385,18 @@ static HRESULT TransactedSnapshotImpl_StreamLink(StorageBaseImpl *base, ...@@ -6310,10 +6385,18 @@ static HRESULT TransactedSnapshotImpl_StreamLink(StorageBaseImpl *base,
TransactedDirEntry *dst_entry, *src_entry; TransactedDirEntry *dst_entry, *src_entry;
hr = TransactedSnapshotImpl_EnsureReadEntry(This, src); hr = TransactedSnapshotImpl_EnsureReadEntry(This, src);
if (FAILED(hr)) return hr; if (FAILED(hr))
{
TRACE("<-- %08x\n", hr);
return hr;
}
hr = TransactedSnapshotImpl_EnsureReadEntry(This, dst); hr = TransactedSnapshotImpl_EnsureReadEntry(This, dst);
if (FAILED(hr)) return hr; if (FAILED(hr))
{
TRACE("<-- %08x\n", hr);
return hr;
}
dst_entry = &This->entries[dst]; dst_entry = &This->entries[dst];
src_entry = &This->entries[src]; src_entry = &This->entries[src];
...@@ -6668,7 +6751,7 @@ static HRESULT WINAPI TransactedSharedImpl_Commit( ...@@ -6668,7 +6751,7 @@ static HRESULT WINAPI TransactedSharedImpl_Commit(
This->lastTransactionSig = transactionSig+1; This->lastTransactionSig = transactionSig+1;
} }
} }
TRACE("<-- %08x\n", hr);
return hr; return hr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment