December 2009 - Wine-Commits

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

Dec. 8, 2009

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

Stefan Leichter : setupapi32/tests: More tests for SetupGetInfFileListW.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

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

James Hawkins : msi: Add a NULL terminator to file->dest after reallocation .
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: d90aca35c4d3e0d4d5cebaeae3a8628fb9d62767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90aca35c4d3e0d4d5cebaeae… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:55:32 2009 -0800 msi: Add a NULL terminator to file->dest after reallocation. --- dlls/msi/action.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0755f42..ef30dda 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5288,6 +5288,11 @@ static BOOL move_files_wildcard(LPWSTR source, LPWSTR dest, int options) goto done; } + /* file->dest may be shorter after the reallocation, so add a NULL + * terminator. This is needed for the call to strrchrW, as there will no + * longer be a NULL terminator within the bounds of the allocation in this case. + */ + file->dest[size - 1] = '\0'; lstrcpyW(strrchrW(file->dest, '\\') + 1, file->destname); while (!list_empty(&files.entry))

1 0

James Hawkins : msi: Free the column info data when updating the table column info.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: b13803ea40ec15d39540694d45b431ce31b46463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13803ea40ec15d39540694d4… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:55:21 2009 -0800 msi: Free the column info data when updating the table column info. --- dlls/msi/table.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a0317da..d2b9a00 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1042,17 +1042,22 @@ static UINT get_tablecolumns( MSIDATABASE *db, static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) { MSITABLE *table; + LPWSTR tablename; UINT size, offset, old_count; UINT n; - table = find_cached_table( db, name ); + /* We may free name in msi_free_colinfo. */ + tablename = strdupW( name ); + + table = find_cached_table( db, tablename ); old_count = table->col_count; + msi_free_colinfo( table->colinfo, table->col_count ); msi_free( table->colinfo ); table->colinfo = NULL; - table_get_column_info( db, name, &table->colinfo, &table->col_count ); + table_get_column_info( db, tablename, &table->colinfo, &table->col_count ); if (!table->col_count) - return; + goto done; size = msi_table_get_row_size( db, table->colinfo, table->col_count ); offset = table->colinfo[table->col_count - 1].offset; @@ -1063,6 +1068,9 @@ static void msi_update_table_columns( MSIDATABASE *db, LPCWSTR name ) if (old_count < table->col_count) memset( &table->data[n][offset], 0, size - offset ); } + +done: + msi_free(tablename); } /* try to find the table name in the _Tables table */

1 0

Hans Leidekker : setupapi/tests: Fix a memory leak.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

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

Huw Davies : ntdll: Only free the string if the test succeeded.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

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

Marcus Meissner : winhttp: Check for endCert being NULL (Coverity).
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

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

James Hawkins : msi: Make sure to free the extra row data when deleting a row.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: c20902314b2d673a6f85fbcbd9b24a3ad264afbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20902314b2d673a6f85fbcbd… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Dec 7 19:54:37 2009 -0800 msi: Make sure to free the extra row data when deleting a row. --- dlls/msi/table.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index fa32a04..a0317da 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1754,15 +1754,14 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) tv->columns[i].hash_table = NULL; } - if ( row == num_rows - 1 ) - return ERROR_SUCCESS; - for (i = row + 1; i < num_rows; i++) { memcpy(tv->table->data[i - 1], tv->table->data[i], tv->row_size); tv->table->data_persistent[i - 1] = tv->table->data_persistent[i]; } + msi_free(tv->table->data[num_rows - 1]); + return ERROR_SUCCESS; }

1 0

Vincent Povirk : ole32: Add DestroyDirEntry to the storage vtable.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

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

Juan Lang : inetmib1: Return SNMP_ERRORSTATUS_NOSUCHNAME for an interface' s physical address if it has none.
by Alexandre Julliard Dec. 8, 2009

Dec. 8, 2009

Module: wine Branch: master Commit: 91d62162da316f7a25781ea1a88460aa237a116b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d62162da316f7a25781ea1a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Dec 7 13:18:02 2009 -0800 inetmib1: Return SNMP_ERRORSTATUS_NOSUCHNAME for an interface's physical address if it has none. --- dlls/inetmib1/main.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 204c0e2..2a5f97a 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -553,13 +553,30 @@ static INT setOidWithItemAndInteger(AsnObjectIdentifier *dst, return ret; } +static DWORD copyIfRowPhysAddr(AsnAny *value, void *src) +{ + PMIB_IFROW row = (PMIB_IFROW)((BYTE *)src - + FIELD_OFFSET(MIB_IFROW, dwPhysAddrLen)); + DWORD ret; + + if (row->dwPhysAddrLen) + { + setStringValue(value, ASN_OCTETSTRING, row->dwPhysAddrLen, + row->bPhysAddr); + ret = SNMP_ERRORSTATUS_NOERROR; + } + else + ret = SNMP_ERRORSTATUS_NOSUCHNAME; + return ret; +} + static struct structToAsnValue mib2IfEntryMap[] = { { FIELD_OFFSET(MIB_IFROW, dwIndex), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwDescrLen), copyLengthPrecededString }, { FIELD_OFFSET(MIB_IFROW, dwType), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwMtu), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwSpeed), copyInt }, - { FIELD_OFFSET(MIB_IFROW, dwPhysAddrLen), copyLengthPrecededString }, + { FIELD_OFFSET(MIB_IFROW, dwPhysAddrLen), copyIfRowPhysAddr }, { FIELD_OFFSET(MIB_IFROW, dwAdminStatus), copyInt }, { FIELD_OFFSET(MIB_IFROW, dwOperStatus), copyOperStatus }, { FIELD_OFFSET(MIB_IFROW, dwLastChange), copyInt },

1 0