November 2009 - Wine-Commits

Vincent Povirk : ole32: Add and use a destroyDirEntry function for deleting directory entries.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 29c5ba5a778964ee2dedaaf450b46af381a6a85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c5ba5a778964ee2dedaaf45… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 12:25:46 2009 -0600 ole32: Add and use a destroyDirEntry function for deleting directory entries. We need this so we can free any related resources in memory. --- dlls/ole32/storage32.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3af5157..e4b933e 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -183,6 +183,10 @@ static HRESULT createDirEntry( const StgProperty *newData, ULONG *index); +static HRESULT destroyDirEntry( + StorageImpl *storage, + ULONG index); + static void updatePropertyChain( StorageBaseImpl *storage, ULONG newPropertyIndex, @@ -1257,6 +1261,27 @@ static HRESULT createDirEntry( return hr; } +/*************************************************************************** + * + * Internal Method + * + * Mark a directory entry in the file as free. + */ +static HRESULT destroyDirEntry( + StorageImpl *storage, + ULONG index) +{ + HRESULT hr; + BYTE emptyData[PROPSET_BLOCK_SIZE]; + + memset(&emptyData, 0, PROPSET_BLOCK_SIZE); + + hr = StorageImpl_WriteRawDirEntry(storage, index, emptyData); + + return hr; +} + + /**************************************************************************** * * Internal Method @@ -1802,13 +1827,11 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( foundPropertyIndexToDelete); /* - * Invalidate the property by zeroing its name member. + * Invalidate the property */ - propertyToDelete.sizeOfNameString = 0; - - StorageImpl_WriteProperty(This->ancestorStorage, - foundPropertyIndexToDelete, - &propertyToDelete); + if (SUCCEEDED(hr)) + destroyDirEntry(This->ancestorStorage, + foundPropertyIndexToDelete); return hr; }

1 0

Juan Lang : crypt32: Fix a memory leak in a test.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: af3afcf81d9f51c20e61299e25ffa9255e01f83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3afcf81d9f51c20e61299e2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 10:53:35 2009 -0800 crypt32: Fix a memory leak in a test. --- dlls/crypt32/tests/chain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 7f3aa81..3f36afb 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2117,6 +2117,7 @@ static void test_CERT_CHAIN_PARA_cbSize(void) pCertFreeCertificateChain(chain); } + CertFreeCertificateContext(cert); CertCloseStore(store, 0); }

1 0

Vincent Povirk : ole32: Rename StorageImpl_SetElementTimes to StorageBaseImpl_SetElementTimes.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 17236668c918d06d8474a0f28f202c3fcb62c1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17236668c918d06d8474a0f28… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:54:36 2009 -0500 ole32: Rename StorageImpl_SetElementTimes to StorageBaseImpl_SetElementTimes. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 313bad7..c7aca84 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2105,7 +2105,7 @@ static HRESULT removeFromTree( /****************************************************************************** * SetElementTimes (IStorage) */ -static HRESULT WINAPI StorageImpl_SetElementTimes( +static HRESULT WINAPI StorageBaseImpl_SetElementTimes( IStorage* iface, const OLECHAR *pwcsName,/* [string][in] */ const FILETIME *pctime, /* [in] */ @@ -2148,7 +2148,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_EnumElements, StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, - StorageImpl_SetElementTimes, + StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, StorageImpl_SetStateBits, StorageImpl_Stat @@ -3956,7 +3956,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_EnumElements, StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, - StorageImpl_SetElementTimes, + StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, StorageImpl_SetStateBits, StorageBaseImpl_Stat

1 0

Vincent Povirk : ole32: Rename StorageImpl_DestroyElement to StorageBaseImpl_DestroyElement.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: fd2f35a8727476853511ca9a0e8fd70ae4307b43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2f35a8727476853511ca9a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:53:30 2009 -0500 ole32: Rename StorageImpl_DestroyElement to StorageBaseImpl_DestroyElement. --- dlls/ole32/storage32.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d022ae4..313bad7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -160,12 +160,12 @@ typedef struct * Forward declaration of internal functions used by the method DestroyElement */ static HRESULT deleteStorageProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG foundPropertyIndexToDelete, StgProperty propertyToDelete); static HRESULT deleteStreamProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG foundPropertyIndexToDelete, StgProperty propertyToDelete); @@ -1745,11 +1745,11 @@ static HRESULT WINAPI StorageImpl_Revert( * enumeration strategy that would give all the leaves of a storage * first. (postfix order) */ -static HRESULT WINAPI StorageImpl_DestroyElement( +static HRESULT WINAPI StorageBaseImpl_DestroyElement( IStorage* iface, const OLECHAR *pwcsName)/* [string][in] */ { - StorageImpl* const This=(StorageImpl*)iface; + StorageBaseImpl* const This=(StorageBaseImpl*)iface; HRESULT hr = S_OK; StgProperty propertyToDelete; @@ -1761,12 +1761,12 @@ static HRESULT WINAPI StorageImpl_DestroyElement( if (pwcsName==NULL) return STG_E_INVALIDPOINTER; - if ( STGM_ACCESS_MODE( This->base.openFlags ) == STGM_READ ) + if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) return STG_E_ACCESSDENIED; foundPropertyIndexToDelete = findElement( - This->base.ancestorStorage, - This->base.rootPropertySetIndex, + This->ancestorStorage, + This->rootPropertySetIndex, pwcsName, &propertyToDelete); @@ -1797,8 +1797,8 @@ static HRESULT WINAPI StorageImpl_DestroyElement( * Adjust the property chain */ hr = removeFromTree( - This->base.ancestorStorage, - This->base.rootPropertySetIndex, + This->ancestorStorage, + This->rootPropertySetIndex, foundPropertyIndexToDelete); /* @@ -1806,7 +1806,7 @@ static HRESULT WINAPI StorageImpl_DestroyElement( */ propertyToDelete.sizeOfNameString = 0; - StorageImpl_WriteProperty(This->base.ancestorStorage, + StorageImpl_WriteProperty(This->ancestorStorage, foundPropertyIndexToDelete, &propertyToDelete); @@ -1876,7 +1876,7 @@ static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) * */ static HRESULT deleteStorageProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG indexOfPropertyToDelete, StgProperty propertyToDelete) { @@ -1916,7 +1916,7 @@ static HRESULT deleteStorageProperty( hr = IEnumSTATSTG_Next(elements, 1, &currentElement, NULL); if (hr==S_OK) { - destroyHr = StorageImpl_DestroyElement(childStorage, currentElement.pwcsName); + destroyHr = IStorage_DestroyElement(childStorage, currentElement.pwcsName); CoTaskMemFree(currentElement.pwcsName); } @@ -1943,7 +1943,7 @@ static HRESULT deleteStorageProperty( * */ static HRESULT deleteStreamProperty( - StorageImpl *parentStorage, + StorageBaseImpl *parentStorage, ULONG indexOfPropertyToDelete, StgProperty propertyToDelete) { @@ -2146,7 +2146,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageImpl_Commit, StorageImpl_Revert, StorageBaseImpl_EnumElements, - StorageImpl_DestroyElement, + StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, StorageImpl_SetElementTimes, StorageBaseImpl_SetClass, @@ -3954,7 +3954,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageInternalImpl_Commit, StorageInternalImpl_Revert, StorageBaseImpl_EnumElements, - StorageImpl_DestroyElement, + StorageBaseImpl_DestroyElement, StorageBaseImpl_RenameElement, StorageImpl_SetElementTimes, StorageBaseImpl_SetClass,

1 0

Vincent Povirk : ole32: Rename StorageImpl_MoveElementTo to StorageBaseImpl_MoveElementTo.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: c4aed16590c60cbb33d2de38674a2a53ff9d95be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4aed16590c60cbb33d2de386… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:49:30 2009 -0500 ole32: Rename StorageImpl_MoveElementTo to StorageBaseImpl_MoveElementTo. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1a4a315..d022ae4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1691,7 +1691,7 @@ static HRESULT WINAPI StorageBaseImpl_CopyTo( /************************************************************************* * MoveElementTo (IStorage) */ -static HRESULT WINAPI StorageImpl_MoveElementTo( +static HRESULT WINAPI StorageBaseImpl_MoveElementTo( IStorage* iface, const OLECHAR *pwcsName, /* [string][in] */ IStorage *pstgDest, /* [unique][in] */ @@ -2142,7 +2142,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_CreateStorage, StorageBaseImpl_OpenStorage, StorageBaseImpl_CopyTo, - StorageImpl_MoveElementTo, + StorageBaseImpl_MoveElementTo, StorageImpl_Commit, StorageImpl_Revert, StorageBaseImpl_EnumElements, @@ -3950,7 +3950,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_CreateStorage, StorageBaseImpl_OpenStorage, StorageBaseImpl_CopyTo, - StorageImpl_MoveElementTo, + StorageBaseImpl_MoveElementTo, StorageInternalImpl_Commit, StorageInternalImpl_Revert, StorageBaseImpl_EnumElements,

1 0

Juan Lang : crypt32: Fix a memory leak reading trusted root certs.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 7a73fd97ad2117180261d4796d48b8ef0df0f818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a73fd97ad2117180261d4796… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 2 10:54:34 2009 -0800 crypt32: Fix a memory leak reading trusted root certs. --- dlls/crypt32/rootstore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index a4a75ab..a55b281 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -719,6 +719,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); check_and_store_certs(from, store); } + CertCloseStore(from, 0); } static HCERTSTORE create_root_store(void)

1 0

Vincent Povirk : ole32: Remove uses of This->base. ancestorStorage in removeFromTree.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: bdc4755d7de7cb0d1b17d6727eddc7d751761b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc4755d7de7cb0d1b17d6727… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 15:03:19 2009 -0500 ole32: Remove uses of This->base.ancestorStorage in removeFromTree. --- dlls/ole32/storage32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 68ca23a..3af5157 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2036,7 +2036,7 @@ static HRESULT removeFromTree( setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); res = StorageImpl_WriteProperty( - This->base.ancestorStorage, + This, parentPropertyId, &parentProperty); if(!res) @@ -2057,7 +2057,7 @@ static HRESULT removeFromTree( do { res = StorageImpl_ReadProperty( - This->base.ancestorStorage, + This, newRightChildParent, &newRightChildParentProperty); if (!res) @@ -2072,7 +2072,7 @@ static HRESULT removeFromTree( newRightChildParentProperty.rightChild = propertyToDelete.rightChild; res = StorageImpl_WriteProperty( - This->base.ancestorStorage, + This, newRightChildParent, &newRightChildParentProperty); if (!res) @@ -2089,7 +2089,7 @@ static HRESULT removeFromTree( setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); res = StorageImpl_WriteProperty( - This->base.ancestorStorage, + This, parentPropertyId, &parentProperty); if(!res)

1 0

Vincent Povirk : ole32: Rename StorageImpl_SetStateBits to StorageBaseImpl_SetStateBits.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 7973904d56b8e9704462da339f5fb794d5a8e419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7973904d56b8e9704462da339… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 28 14:56:19 2009 -0500 ole32: Rename StorageImpl_SetStateBits to StorageBaseImpl_SetStateBits. --- dlls/ole32/storage32.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index c7aca84..66cbf92 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2119,13 +2119,13 @@ static HRESULT WINAPI StorageBaseImpl_SetElementTimes( /****************************************************************************** * SetStateBits (IStorage) */ -static HRESULT WINAPI StorageImpl_SetStateBits( +static HRESULT WINAPI StorageBaseImpl_SetStateBits( IStorage* iface, DWORD grfStateBits,/* [in] */ DWORD grfMask) /* [in] */ { - StorageImpl* const This = (StorageImpl*)iface; - This->base.stateBits = (This->base.stateBits & ~grfMask) | (grfStateBits & grfMask); + StorageBaseImpl* const This = (StorageBaseImpl*)iface; + This->stateBits = (This->stateBits & ~grfMask) | (grfStateBits & grfMask); return S_OK; } @@ -2150,7 +2150,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_RenameElement, StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, - StorageImpl_SetStateBits, + StorageBaseImpl_SetStateBits, StorageImpl_Stat }; @@ -3958,7 +3958,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_RenameElement, StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, - StorageImpl_SetStateBits, + StorageBaseImpl_SetStateBits, StorageBaseImpl_Stat };

1 0

Paul Vriens : ddraw/tests: Fix a test failure on systems with no DirectDraw7.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 8a1f0eed8ee146b20901c1a7085bfcda0266aac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a1f0eed8ee146b20901c1a70… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 2 12:03:32 2009 +0100 ddraw/tests: Fix a test failure on systems with no DirectDraw7. --- dlls/ddraw/tests/ddrawmodes.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index d8026ef..e44c6bc 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -654,6 +654,11 @@ static void testddraw7(void) DWORD *pend; hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + if (hr==E_NOINTERFACE) + { + win_skip("DirectDraw7 is not supported\n"); + return; + } ok(hr==DD_OK, "IDirectDraw7_QueryInterface returned %08x\n", hr); if (hr==DD_OK)

1 0

Paul Vriens : advapi32/tests: Add some ReadEventLogA tests.
by Alexandre Julliard Nov. 3, 2009

Nov. 3, 2009

Module: wine Branch: master Commit: 531363f6e68c30227c6fcb1e18f39998df05a621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=531363f6e68c30227c6fcb1e1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Nov 1 16:02:40 2009 +0100 advapi32/tests: Add some ReadEventLogA tests. --- dlls/advapi32/tests/eventlog.c | 149 ++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 24 +++++++ 2 files changed, 173 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index 9794f30..f6377a6 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -256,6 +256,154 @@ static void test_backup(void) DeleteFileA(backup); } +static void test_read(void) +{ + HANDLE handle; + BOOL ret; + DWORD count, toread, read, needed; + void *buf; + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, 0, 0, NULL, 0, NULL, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + read = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, 0, 0, NULL, 0, &read, NULL); + ok(!ret, "Expected failure\n"); + ok(read == 0xdeadbeef, "Expected 'read' parameter to remain unchanged\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, 0, 0, NULL, 0, NULL, &needed); + ok(!ret, "Expected failure\n"); + ok(needed == 0xdeadbeef, "Expected 'needed' parameter to remain unchanged\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* 'read' and 'needed' are only filled when the needed buffer size is passed back or when the call succeeds */ + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, 0, 0, NULL, 0, &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, NULL, 0, NULL, NULL); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, NULL, 0, &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + buf = NULL; + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); + SetLastError(0xdeadbeef); + ret = ReadEventLogA(NULL, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + + handle = OpenEventLogA(NULL, "Application"); + + /* Show that we need the proper dwFlags with a (for the rest) proper call */ + buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, 0, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, EVENTLOG_SEEK_READ, 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, EVENTLOG_SEEK_READ | EVENTLOG_FORWARDS_READ | EVENTLOG_BACKWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, EVENTLOG_SEEK_READ | EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + HeapFree(GetProcessHeap(), 0, buf); + + /* First check if there are any records (in practice only on Wine: FIXME) */ + count = 0; + GetNumberOfEventLogRecords(handle, &count); + if (!count) + { + skip("No records in the 'Application' log\n"); + CloseEventLog(handle); + return; + } + + /* Get the buffer size for the first record */ + buf = HeapAlloc(GetProcessHeap(), 0, sizeof(EVENTLOGRECORD)); + read = needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, + 0, buf, sizeof(EVENTLOGRECORD), &read, &needed); + ok(!ret, "Expected failure\n"); + ok(read == 0, "Expected no bytes read\n"); + ok(needed > sizeof(EVENTLOGRECORD), "Expected the needed buffersize to be bigger than sizeof(EVENTLOGRECORD)\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* Read the first record */ + toread = needed; + buf = HeapReAlloc(GetProcessHeap(), 0, buf, toread); + read = needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadEventLogA(handle, EVENTLOG_SEQUENTIAL_READ | EVENTLOG_FORWARDS_READ, 0, buf, toread, &read, &needed); + ok(ret, "Expected succes\n"); + ok(read == toread || + broken(read < toread), /* NT4 wants a buffer size way bigger than just 1 record */ + "Expected the requested size to be read\n"); + ok(needed == 0, "Expected no extra bytes to be read\n"); + HeapFree(GetProcessHeap(), 0, buf); + + CloseEventLog(handle); +} + START_TEST(eventlog) { SetLastError(0xdeadbeef); @@ -274,4 +422,5 @@ START_TEST(eventlog) test_count(); test_oldest(); test_backup(); + test_read(); } diff --git a/include/winnt.h b/include/winnt.h index fd267c3..032e9c1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4972,6 +4972,30 @@ typedef struct _TAPE_GET_MEDIA_PARAMETERS { #define EVENTLOG_AUDIT_SUCCESS 0x0008 #define EVENTLOG_AUDIT_FAILURE 0x0010 +#define EVENTLOG_SEQUENTIAL_READ 0x0001 +#define EVENTLOG_SEEK_READ 0x0002 +#define EVENTLOG_FORWARDS_READ 0x0004 +#define EVENTLOG_BACKWARDS_READ 0x0008 + +typedef struct _EVENTLOGRECORD { + DWORD Length; + DWORD Reserved; + DWORD RecordNumber; + DWORD TimeGenerated; + DWORD TimeWritten; + DWORD EventID; + WORD EventType; + WORD NumStrings; + WORD EventCategory; + WORD ReservedFlags; + DWORD ClosingRecordNumber; + DWORD StringOffset; + DWORD UserSidLength; + DWORD UserSidOffset; + DWORD DataLength; + DWORD DataOffset; +} EVENTLOGRECORD, *PEVENTLOGRECORD; + #define SERVICE_BOOT_START 0x00000000 #define SERVICE_SYSTEM_START 0x00000001 #define SERVICE_AUTO_START 0x00000002

1 0