December 2009 - Wine-commits

Stefan Leichter : setupapi32/tests: More tests for SetupGetInfFileListW.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 6f8fb2f4e725038d4edc036c2a02ffb55c0672b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8fb2f4e725038d4edc036c2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Dec 8 08:57:44 2009 +0100 setupapi32/tests: More tests for SetupGetInfFileListW. --- dlls/setupapi/tests/install.c | 56 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 4b718fc..9aed163 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -473,9 +473,16 @@ static void test_inffilelist(void) static const char inffile2[] = "test2.inf"; static const WCHAR inffile2W[] = {'t','e','s','t','2','.','i','n','f',0}; static const char invalid_inf[] = "invalid.inf"; + static const WCHAR invalid_infW[] = {'i','n','v','a','l','i','d','.','i','n','f',0}; static const char *inf = "[Version]\n" "Signature=\"$Chicago$\""; + static const char *inf2 = + "[Version]\n" + "Signature=\"$CHICAGO$\""; + static const char *infNT = + "[Version]\n" + "Signature=\"$WINDOWS NT$\""; WCHAR *p, *ptr; char dirA[MAX_PATH]; @@ -587,6 +594,55 @@ static void test_inffilelist(void) ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW), "unexpected filename %s\n",wine_dbgstr_w(p)); + /* upper case value + */ + create_inf_file(inffile2, inf2); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW), + "unexpected filename %s\n",wine_dbgstr_w(p)); + + /* signature Windows NT is also inf style win4 + */ + create_inf_file(inffile2, infNT); + expected = 3 + strlen(inffile) + strlen(inffile2); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, buffer, MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW), + "unexpected filename %s\n",wine_dbgstr_w(p)); + + /* old style + */ + expected = 2 + strlen(invalid_inf); + ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT, buffer, MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,invalid_infW), "unexpected filename %s\n",wine_dbgstr_w(p)); + + /* mixed style + */ + expected = 4 + strlen(inffile) + strlen(inffile2) + strlen(invalid_inf); + ret = pSetupGetInfFileListW(dir, INF_STYLE_OLDNT | INF_STYLE_WIN4, buffer, + MAX_PATH, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + todo_wine + ok(expected == outsize, "expected required buffersize to be %d, got %d\n", + expected, outsize); + for(p = buffer; lstrlenW(p) && (outsize > (p - buffer)); p+=lstrlenW(p) + 1) + ok(!lstrcmpW(p,inffile2W) || !lstrcmpW(p,inffileW) || !lstrcmpW(p,invalid_infW), + "unexpected filename %s\n",wine_dbgstr_w(p)); + DeleteFile(inffile); DeleteFile(inffile2); DeleteFile(invalid_inf);

1 0

Marcus Meissner : winhttp: Check for endCert being NULL (Coverity).
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 298051ab37b4c6725865fb4a56788d3c9e3201b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298051ab37b4c6725865fb4a5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 6 20:58:14 2009 +0100 winhttp: Check for endCert being NULL (Coverity). --- dlls/winhttp/net.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 10176d9..6512db5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -359,6 +359,7 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) CertFreeCertificateContext( context ); } } + if (!endCert) ret = FALSE; if (ret) ret = netconn_verify_cert( endCert, store, server ); CertFreeCertificateContext( endCert );

1 0

Hans Leidekker : setupapi/tests: Fix a memory leak.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 3bf156a8c581b26985f55c4d63e4b7b3badc969e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf156a8c581b26985f55c4d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:43:42 2009 +0100 setupapi/tests: Fix a memory leak. Found by Valgrind. --- dlls/setupapi/tests/stringtable.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/stringtable.c b/dlls/setupapi/tests/stringtable.c index 40e4a54..2b7b77a 100644 --- a/dlls/setupapi/tests/stringtable.c +++ b/dlls/setupapi/tests/stringtable.c @@ -304,6 +304,7 @@ static void test_StringTableLookUpStringEx(void) ok(!memcmp(buffer, &data, 4), "unexpected data\n"); pStringTableDestroy(table); + pStringTableDestroy(table2); } static void test_StringTableStringFromId(void)

1 0

Hans Leidekker : ntdll/tests: Fix a memory leak.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: fe8f5c22325986a2225610a283319626d107f4e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8f5c22325986a2225610a28… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:44:04 2009 +0100 ntdll/tests: Fix a memory leak. Found by Valgrind. --- dlls/ntdll/tests/file.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dff5d9f..7e8f101 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -43,7 +43,7 @@ static BOOL (WINAPI * pGetVolumePathNameW)(LPCWSTR, LPWSTR, DWORD); static UINT (WINAPI *pGetSystemWow64DirectoryW)( LPWSTR, UINT ); -static NTSTATUS (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); +static VOID (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG, ULONG * ); @@ -337,6 +337,7 @@ static void open_file_test(void) } CloseHandle( dir ); + pRtlFreeUnicodeString( &nameW ); } static void delete_file_test(void)

1 0

Hans Leidekker : wininet/tests: Mark behavior of IE5 as broken for some ftp tests.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: bf58fdd197f516a598ee7f098282c058d2d3e908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf58fdd197f516a598ee7f098… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 8 11:44:29 2009 +0100 wininet/tests: Mark behavior of IE5 as broken for some ftp tests. --- dlls/wininet/tests/ftp.c | 39 +++++++++++++++++++++++---------------- 1 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 37c71da..d152601 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -438,7 +438,7 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) bRet = FtpCreateDirectoryA(hFtp, "new_directory_deadbeef"); error = GetLastError(); ok ( bRet == FALSE, "Expected FtpCreateDirectoryA to fail\n"); - ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); trace_extended_error(error); @@ -446,22 +446,24 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) bRet = FtpDeleteFileA(hFtp, "non_existent_file_deadbeef"); error = GetLastError(); ok ( bRet == FALSE, "Expected FtpDeleteFileA to fail\n"); - ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS, + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); trace_extended_error(error); SetLastError(0xdeadbeef); bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); - ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + error = GetLastError(); + ok ( bRet == FALSE || broken(bRet == TRUE), "Expected FtpGetFileA to fail\n"); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_SUCCESS), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); DeleteFileA("should_be_non_existing_deadbeef"); /* Just in case */ SetLastError(0xdeadbeef); hOpenFile2 = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); - ok ( bRet == FALSE, "Expected FtpOpenFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + error = GetLastError(); + ok ( bRet == FALSE || broken(bRet == TRUE), "Expected FtpOpenFileA to fail\n"); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_SUCCESS), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); InternetCloseHandle(hOpenFile2); /* Just in case */ /* Create a temporary local file */ @@ -471,22 +473,25 @@ static void test_openfile(HINTERNET hFtp, HINTERNET hConnect) CloseHandle(hFile); SetLastError(0xdeadbeef); bRet = FtpPutFileA(hFtp, "now_existing_local", "non_existing_remote", FTP_TRANSFER_TYPE_UNKNOWN, 0); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpPutFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); DeleteFileA("now_existing_local"); SetLastError(0xdeadbeef); bRet = FtpRemoveDirectoryA(hFtp, "should_be_non_existing_deadbeef_dir"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpRemoveDirectoryA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); SetLastError(0xdeadbeef); bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", "new"); + error = GetLastError(); ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n"); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError()); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error); } InternetCloseHandle(hOpenFile); @@ -748,6 +753,7 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) HINTERNET hSearch; HINTERNET hSearch2; HINTERNET hOpenFile; + DWORD error; /* NULL as the search file ought to return the first file in the directory */ SetLastError(0xdeadbeef); @@ -793,9 +799,10 @@ static void test_find_first_file(HINTERNET hFtp, HINTERNET hConnect) /* This should fail as the OpenFile handle wasn't closed */ SetLastError(0xdeadbeef); hSearch = FtpFindFirstFileA(hFtp, "welcome.msg", &findData, 0, 0); + error = GetLastError(); ok ( hSearch == NULL, "Expected FtpFindFirstFileA to fail\n" ); - ok ( GetLastError() == ERROR_FTP_TRANSFER_IN_PROGRESS, - "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", GetLastError() ); + ok ( error == ERROR_FTP_TRANSFER_IN_PROGRESS || broken(error == ERROR_INTERNET_EXTENDED_ERROR), + "Expected ERROR_FTP_TRANSFER_IN_PROGRESS, got %d\n", error ); InternetCloseHandle(hSearch); /* Just in case */ InternetCloseHandle(hOpenFile);

1 0

Huw Davies : ntdll: Only free the string if the test succeeded.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: af0bb4a141855c4384003782bb64a6cbbe29753b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0bb4a141855c4384003782b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 8 10:34:40 2009 +0000 ntdll: Only free the string if the test succeeded. --- dlls/ntdll/tests/rtlstr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 80e9efa..d9ba0c9 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -468,7 +468,7 @@ static void test_RtlDuplicateUnicodeString(void) ok(memcmp(dest_str.Buffer, res_str.Buffer, dupl_ustr[test_num].res_buf_size) == 0, "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has destination \"%s\" expected \"%s\"\n", test_num, dupl_ustr[test_num].add_nul, dest_ansi_str.Buffer, dupl_ustr[test_num].res_buf); - pRtlFreeUnicodeString(&dest_str); + if(result == STATUS_SUCCESS) pRtlFreeUnicodeString(&dest_str); } else { ok(dest_str.Buffer == NULL && dupl_ustr[test_num].res_buf == NULL, "(test %d): RtlDuplicateUnicodeString(%d, source, dest) has destination %p expected %p\n",

1 0

Paul Vriens : adapi32/tests: Fix test failures when the computername is fully qualified on W2K3 and earlier .
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 72c54e5d3b5bb8c1a66eee9291597fd49750993f URL: http://source.winehq.org/git/wine.git/?a=commit;h=72c54e5d3b5bb8c1a66eee929… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Dec 8 09:28:49 2009 +0100 adapi32/tests: Fix test failures when the computername is fully qualified on W2K3 and earlier. --- dlls/advapi32/tests/eventlog.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index a781c06..c0f516a 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -712,7 +712,7 @@ static void test_readwrite(void) BOOL ret, sidavailable; BOOL on_vista = FALSE; /* Used to indicate Vista, W2K8 or Win7 */ int i; - char *localcomputer; + char *localcomputer = NULL; DWORD size; if (pCreateWellKnownSid) @@ -730,24 +730,6 @@ static void test_readwrite(void) user = NULL; } - if (pGetComputerNameExA) - { - size = 0; - SetLastError(0xdeadbeef); - pGetComputerNameExA(ComputerNameDnsFullyQualified, NULL, &size); - /* Cope with W2K (needed size is not set) */ - if (size == 0 && GetLastError() == ERROR_MORE_DATA) - size = 1024; - localcomputer = HeapAlloc(GetProcessHeap(), 0, size); - pGetComputerNameExA(ComputerNameDnsFullyQualified, localcomputer, &size); - } - else - { - size = MAX_COMPUTERNAME_LENGTH + 1; - localcomputer = HeapAlloc(GetProcessHeap(), 0, size); - GetComputerNameA(localcomputer, &size); - } - /* Write an event with an incorrect event type. This will fail on Windows 7 * but succeed on all others, hence it's not part of the struct. */ @@ -878,6 +860,22 @@ static void test_readwrite(void) if (on_vista) skip("There is no DWORD alignment enforced for UserSid on Vista, W2K8 or Win7\n"); + if (on_vista && pGetComputerNameExA) + { + /* New Vista+ behavior */ + size = 0; + SetLastError(0xdeadbeef); + pGetComputerNameExA(ComputerNameDnsFullyQualified, NULL, &size); + localcomputer = HeapAlloc(GetProcessHeap(), 0, size); + pGetComputerNameExA(ComputerNameDnsFullyQualified, localcomputer, &size); + } + else + { + size = MAX_COMPUTERNAME_LENGTH + 1; + localcomputer = HeapAlloc(GetProcessHeap(), 0, size); + GetComputerNameA(localcomputer, &size); + } + /* Read all events from our created eventlog, one by one */ handle = OpenEventLogA(NULL, eventlogname); i = 0;

1 0

Vincent Povirk : ole32: Take a StorageBaseImpl in insertIntoTree.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: 0425ed1d38dc999cfa02dc2e9990f5329d57c4fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=0425ed1d38dc999cfa02dc2e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 09:40:17 2009 -0600 ole32: Take a StorageBaseImpl in insertIntoTree. --- dlls/ole32/storage32.c | 58 ++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2015eaf..5a7f6d9 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -189,7 +189,7 @@ static HRESULT destroyDirEntry( DirRef index); static HRESULT insertIntoTree( - StorageImpl *This, + StorageBaseImpl *This, DirRef parentStorageIndex, DirRef newEntryIndex); @@ -779,7 +779,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( &currentEntry); /* Insert the element in a new position in the tree */ - insertIntoTree(This->ancestorStorage, This->storageDirEntry, + insertIntoTree(This, This->storageDirEntry, currentEntryRef); } else @@ -920,7 +920,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( * Insert the new entry in the parent storage's tree. */ insertIntoTree( - This->ancestorStorage, + This, This->storageDirEntry, newStreamEntryRef); @@ -1108,7 +1108,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( * Insert the new directory entry into the parent storage's tree */ insertIntoTree( - This->ancestorStorage, + This, This->storageDirEntry, newEntryRef); @@ -1294,7 +1294,7 @@ static LONG entryNameCmp( * Add a directory entry to a storage */ static HRESULT insertIntoTree( - StorageImpl *This, + StorageBaseImpl *This, DirRef parentStorageIndex, DirRef newEntryIndex) { @@ -1304,16 +1304,16 @@ static HRESULT insertIntoTree( /* * Read the inserted entry */ - StorageImpl_ReadDirEntry(This, - newEntryIndex, - &newEntry); + StorageBaseImpl_ReadDirEntry(This, + newEntryIndex, + &newEntry); /* * Read the storage entry */ - StorageImpl_ReadDirEntry(This, - parentStorageIndex, - &currentEntry); + StorageBaseImpl_ReadDirEntry(This, + parentStorageIndex, + &currentEntry); if (currentEntry.dirRootEntry != DIRENTRY_NULL) { @@ -1332,9 +1332,9 @@ static HRESULT insertIntoTree( /* * Read */ - StorageImpl_ReadDirEntry(This, - currentEntry.dirRootEntry, - &currentEntry); + StorageBaseImpl_ReadDirEntry(This, + currentEntry.dirRootEntry, + &currentEntry); previous = currentEntry.leftChild; next = currentEntry.rightChild; @@ -1348,17 +1348,17 @@ static HRESULT insertIntoTree( { if (previous != DIRENTRY_NULL) { - StorageImpl_ReadDirEntry(This, - previous, - &currentEntry); + StorageBaseImpl_ReadDirEntry(This, + previous, + &currentEntry); current = previous; } else { currentEntry.leftChild = newEntryIndex; - StorageImpl_WriteDirEntry(This, - current, - &currentEntry); + StorageBaseImpl_WriteDirEntry(This, + current, + &currentEntry); found = 1; } } @@ -1366,17 +1366,17 @@ static HRESULT insertIntoTree( { if (next != DIRENTRY_NULL) { - StorageImpl_ReadDirEntry(This, - next, - &currentEntry); + StorageBaseImpl_ReadDirEntry(This, + next, + &currentEntry); current = next; } else { currentEntry.rightChild = newEntryIndex; - StorageImpl_WriteDirEntry(This, - current, - &currentEntry); + StorageBaseImpl_WriteDirEntry(This, + current, + &currentEntry); found = 1; } } @@ -1399,9 +1399,9 @@ static HRESULT insertIntoTree( * The storage is empty, make the new entry the root of its element tree */ currentEntry.dirRootEntry = newEntryIndex; - StorageImpl_WriteDirEntry(This, - parentStorageIndex, - &currentEntry); + StorageBaseImpl_WriteDirEntry(This, + parentStorageIndex, + &currentEntry); } return S_OK;

1 0

Vincent Povirk : ole32: Take a StorageBaseImpl in removeFromTree.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: f43e013f734459c55459e78e9868aa9137c81f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43e013f734459c55459e78e9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 09:43:17 2009 -0600 ole32: Take a StorageBaseImpl in removeFromTree. --- dlls/ole32/storage32.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 5a7f6d9..309c2dd 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -176,7 +176,7 @@ static HRESULT deleteStreamContents( DirEntry entryDataToDelete); static HRESULT removeFromTree( - StorageImpl *This, + StorageBaseImpl *This, DirRef parentStorageIndex, DirRef deletedIndex); @@ -204,7 +204,7 @@ static DirRef findElement( DirEntry *data); static HRESULT findTreeParent( - StorageImpl *storage, + StorageBaseImpl *storage, DirRef storageEntry, const OLECHAR *childName, DirEntry *parentData, @@ -769,7 +769,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( } /* Remove the element from its current position in the tree */ - removeFromTree(This->ancestorStorage, This->storageDirEntry, + removeFromTree(This, This->storageDirEntry, currentEntryRef); /* Change the name of the element */ @@ -1454,7 +1454,7 @@ static DirRef findElement(StorageImpl *storage, DirRef storageEntry, * If there is no such element, find a place where it could be inserted and * return STG_E_FILENOTFOUND. */ -static HRESULT findTreeParent(StorageImpl *storage, DirRef storageEntry, +static HRESULT findTreeParent(StorageBaseImpl *storage, DirRef storageEntry, const OLECHAR *childName, DirEntry *parentData, DirRef *parentEntry, ULONG *relation) { @@ -1462,7 +1462,7 @@ static HRESULT findTreeParent(StorageImpl *storage, DirRef storageEntry, DirEntry childData; /* Read the storage entry to find the root of the tree. */ - StorageImpl_ReadDirEntry(storage, storageEntry, parentData); + StorageBaseImpl_ReadDirEntry(storage, storageEntry, parentData); *parentEntry = storageEntry; *relation = DIRENTRY_RELATION_DIR; @@ -1473,7 +1473,7 @@ static HRESULT findTreeParent(StorageImpl *storage, DirRef storageEntry, { LONG cmp; - StorageImpl_ReadDirEntry(storage, childEntry, &childData); + StorageBaseImpl_ReadDirEntry(storage, childEntry, &childData); cmp = entryNameCmp(childName, childData.name); @@ -1812,7 +1812,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( * Remove the entry from its parent storage */ hr = removeFromTree( - This->ancestorStorage, + This, This->storageDirEntry, entryToDeleteRef); @@ -2053,7 +2053,7 @@ static void setEntryLink(DirEntry *entry, ULONG relation, DirRef new_target) * freeing any resources attached to it. */ static HRESULT removeFromTree( - StorageImpl *This, + StorageBaseImpl *This, DirRef parentStorageIndex, DirRef deletedIndex) { @@ -2063,7 +2063,7 @@ static HRESULT removeFromTree( DirRef parentEntryRef; ULONG typeOfRelation; - hr = StorageImpl_ReadDirEntry(This, deletedIndex, &entryToDelete); + hr = StorageBaseImpl_ReadDirEntry(This, deletedIndex, &entryToDelete); if (hr != S_OK) return hr; @@ -2084,7 +2084,7 @@ static HRESULT removeFromTree( */ setEntryLink(&parentEntry, typeOfRelation, entryToDelete.leftChild); - hr = StorageImpl_WriteDirEntry( + hr = StorageBaseImpl_WriteDirEntry( This, parentEntryRef, &parentEntry); @@ -2105,7 +2105,7 @@ static HRESULT removeFromTree( do { - hr = StorageImpl_ReadDirEntry( + hr = StorageBaseImpl_ReadDirEntry( This, newRightChildParent, &newRightChildParentEntry); @@ -2120,7 +2120,7 @@ static HRESULT removeFromTree( newRightChildParentEntry.rightChild = entryToDelete.rightChild; - hr = StorageImpl_WriteDirEntry( + hr = StorageBaseImpl_WriteDirEntry( This, newRightChildParent, &newRightChildParentEntry); @@ -2137,7 +2137,7 @@ static HRESULT removeFromTree( */ setEntryLink(&parentEntry, typeOfRelation, entryToDelete.rightChild); - hr = StorageImpl_WriteDirEntry( + hr = StorageBaseImpl_WriteDirEntry( This, parentEntryRef, &parentEntry);

1 0

Vincent Povirk : ole32: Add DestroyDirEntry to the storage vtable.
by Alexandre Julliard 08 Dec '09

08 Dec '09

Module: wine Branch: master Commit: ee39a21d2b3f5e1a8d0f5519c316804ce16d9f45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee39a21d2b3f5e1a8d0f5519c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 09:50:15 2009 -0600 ole32: Add DestroyDirEntry to the storage vtable. --- dlls/ole32/storage32.c | 23 ++++++++++++++--------- dlls/ole32/storage32.h | 7 +++++++ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 309c2dd..53c2c87 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -184,10 +184,6 @@ static HRESULT removeFromTree( * Declaration of the functions used to manipulate DirEntry */ -static HRESULT destroyDirEntry( - StorageImpl *storage, - DirRef index); - static HRESULT insertIntoTree( StorageBaseImpl *This, DirRef parentStorageIndex, @@ -1244,12 +1240,13 @@ static HRESULT StorageImpl_CreateDirEntry( * * Mark a directory entry in the file as free. */ -static HRESULT destroyDirEntry( - StorageImpl *storage, +static HRESULT StorageImpl_DestroyDirEntry( + StorageBaseImpl *base, DirRef index) { HRESULT hr; BYTE emptyData[RAW_DIRENTRY_SIZE]; + StorageImpl *storage = (StorageImpl*)base; memset(&emptyData, 0, RAW_DIRENTRY_SIZE); @@ -1820,8 +1817,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( * Invalidate the entry */ if (SUCCEEDED(hr)) - destroyDirEntry(This->ancestorStorage, - entryToDeleteRef); + StorageBaseImpl_DestroyDirEntry(This, entryToDeleteRef); return hr; } @@ -2227,6 +2223,7 @@ static const StorageBaseImplVtbl StorageImpl_BaseVtbl = StorageImpl_CreateDirEntry, StorageImpl_BaseWriteDirEntry, StorageImpl_BaseReadDirEntry, + StorageImpl_DestroyDirEntry }; static HRESULT StorageImpl_Construct( @@ -3667,6 +3664,13 @@ static HRESULT StorageInternalImpl_ReadDirEntry(StorageBaseImpl *base, index, data); } +static HRESULT StorageInternalImpl_DestroyDirEntry(StorageBaseImpl *base, + DirRef index) +{ + return StorageBaseImpl_DestroyDirEntry(&base->ancestorStorage->base, + index); +} + /****************************************************************************** ** ** Storage32InternalImpl_Commit @@ -4112,7 +4116,8 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = StorageInternalImpl_Destroy, StorageInternalImpl_CreateDirEntry, StorageInternalImpl_WriteDirEntry, - StorageInternalImpl_ReadDirEntry + StorageInternalImpl_ReadDirEntry, + StorageInternalImpl_DestroyDirEntry }; /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fdac6a5..12cff71 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -251,6 +251,7 @@ struct StorageBaseImplVtbl { HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); HRESULT (*ReadDirEntry)(StorageBaseImpl*,DirRef,DirEntry*); + HRESULT (*DestroyDirEntry)(StorageBaseImpl*,DirRef); }; static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) @@ -276,6 +277,12 @@ static inline HRESULT StorageBaseImpl_ReadDirEntry(StorageBaseImpl *This, return This->baseVtbl->ReadDirEntry(This, index, data); } +static inline HRESULT StorageBaseImpl_DestroyDirEntry(StorageBaseImpl *This, + DirRef index) +{ + return This->baseVtbl->DestroyDirEntry(This, index); +} + /**************************************************************************** * StorageBaseImpl stream list handlers */

1 0