November 2009 - Wine-commits

Vincent Povirk : ole32: Adjust updatePropertyChain signature and name to match removeFromTree.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 274a1d11c192455b691b8c3a58844bc6ad53a088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274a1d11c192455b691b8c3a5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 12:41:09 2009 -0600 ole32: Adjust updatePropertyChain signature and name to match removeFromTree. --- dlls/ole32/storage32.c | 70 +++++++++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e4b933e..1a4ac90 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -187,10 +187,10 @@ static HRESULT destroyDirEntry( StorageImpl *storage, ULONG index); -static void updatePropertyChain( - StorageBaseImpl *storage, - ULONG newPropertyIndex, - StgProperty newProperty); +static HRESULT insertIntoTree( + StorageImpl *This, + ULONG parentStorageIndex, + ULONG newPropertyIndex); static LONG propertyNameCmp( const OLECHAR *newProperty, @@ -768,10 +768,10 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* * Find a spot in the property chain for our newly created property. */ - updatePropertyChain( - This, - renamedPropertyIndex, - renamedProperty); + insertIntoTree( + This->ancestorStorage, + This->rootPropertySetIndex, + renamedPropertyIndex); /* * At this point the renamed property has been inserted in the tree, @@ -948,10 +948,10 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( /* * Find a spot in the property chain for our newly created property. */ - updatePropertyChain( - This, - newPropertyIndex, - newStreamProperty); + insertIntoTree( + This->ancestorStorage, + This->rootPropertySetIndex, + newPropertyIndex); /* * Open the stream to return it. @@ -1131,10 +1131,10 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( /* * Find a spot in the property chain for our newly created property. */ - updatePropertyChain( - This, - newPropertyIndex, - newProperty); + insertIntoTree( + This->ancestorStorage, + This->rootPropertySetIndex, + newPropertyIndex); /* * Open it to get a pointer to return. @@ -1316,18 +1316,26 @@ static LONG propertyNameCmp( * * Properly link this new element in the property chain. */ -static void updatePropertyChain( - StorageBaseImpl *storage, - ULONG newPropertyIndex, - StgProperty newProperty) +static HRESULT insertIntoTree( + StorageImpl *This, + ULONG parentStorageIndex, + ULONG newPropertyIndex) { StgProperty currentProperty; + StgProperty newProperty; + + /* + * Read the inserted property + */ + StorageImpl_ReadProperty(This, + newPropertyIndex, + &newProperty); /* * Read the root property */ - StorageImpl_ReadProperty(storage->ancestorStorage, - storage->rootPropertySetIndex, + StorageImpl_ReadProperty(This, + parentStorageIndex, &currentProperty); if (currentProperty.dirProperty != PROPERTY_NULL) @@ -1347,7 +1355,7 @@ static void updatePropertyChain( /* * Read */ - StorageImpl_ReadProperty(storage->ancestorStorage, + StorageImpl_ReadProperty(This, currentProperty.dirProperty, &currentProperty); @@ -1363,7 +1371,7 @@ static void updatePropertyChain( { if (previous != PROPERTY_NULL) { - StorageImpl_ReadProperty(storage->ancestorStorage, + StorageImpl_ReadProperty(This, previous, &currentProperty); current = previous; @@ -1371,7 +1379,7 @@ static void updatePropertyChain( else { currentProperty.leftChild = newPropertyIndex; - StorageImpl_WriteProperty(storage->ancestorStorage, + StorageImpl_WriteProperty(This, current, &currentProperty); found = 1; @@ -1381,7 +1389,7 @@ static void updatePropertyChain( { if (next != PROPERTY_NULL) { - StorageImpl_ReadProperty(storage->ancestorStorage, + StorageImpl_ReadProperty(This, next, &currentProperty); current = next; @@ -1389,7 +1397,7 @@ static void updatePropertyChain( else { currentProperty.rightChild = newPropertyIndex; - StorageImpl_WriteProperty(storage->ancestorStorage, + StorageImpl_WriteProperty(This, current, &currentProperty); found = 1; @@ -1401,7 +1409,7 @@ static void updatePropertyChain( * Trying to insert an item with the same name in the * subtree structure. */ - assert(FALSE); + return STG_E_FILEALREADYEXISTS; } previous = currentProperty.leftChild; @@ -1414,10 +1422,12 @@ static void updatePropertyChain( * The root storage is empty, link the new property to its dir property */ currentProperty.dirProperty = newPropertyIndex; - StorageImpl_WriteProperty(storage->ancestorStorage, - storage->rootPropertySetIndex, + StorageImpl_WriteProperty(This, + parentStorageIndex, &currentProperty); } + + return S_OK; } /****************************************************************************

1 0

Vincent Povirk : ole32: Simplify RenameElement by using the same entry in the file.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 87ed7d9b8b3c73a42e5583372975805089b6c070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ed7d9b8b3c73a42e5583372… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 2 12:48:02 2009 -0600 ole32: Simplify RenameElement by using the same entry in the file. --- dlls/ole32/storage32.c | 86 +++++------------------------------------------ 1 files changed, 10 insertions(+), 76 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1a4ac90..e5b0717 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -686,10 +686,6 @@ end: * This method will rename the specified element. * * See Windows documentation for more details on IStorage methods. - * - * Implementation notes: The method used to rename consists of creating a clone - * of the deleted StgProperty object setting it with the new name and to - * perform a DestroyElement of the old StgProperty. */ static HRESULT WINAPI StorageBaseImpl_RenameElement( IStorage* iface, @@ -726,81 +722,19 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( if (foundPropertyIndex != PROPERTY_NULL) { - StgProperty renamedProperty; - ULONG renamedPropertyIndex; - - /* - * Setup a new property for the renamed property - */ - renamedProperty.sizeOfNameString = - ( lstrlenW(pwcsNewName)+1 ) * sizeof(WCHAR); - - if (renamedProperty.sizeOfNameString > PROPERTY_NAME_BUFFER_LEN) - return STG_E_INVALIDNAME; - - strcpyW(renamedProperty.name, pwcsNewName); - - renamedProperty.propertyType = currentProperty.propertyType; - renamedProperty.startingBlock = currentProperty.startingBlock; - renamedProperty.size.u.LowPart = currentProperty.size.u.LowPart; - renamedProperty.size.u.HighPart = currentProperty.size.u.HighPart; - - renamedProperty.leftChild = PROPERTY_NULL; - renamedProperty.rightChild = PROPERTY_NULL; - - /* - * Bring the dirProperty link in case it is a storage and in which - * case the renamed storage elements don't require to be reorganized. - */ - renamedProperty.dirProperty = currentProperty.dirProperty; - - /* call CoFileTime to get the current time - renamedProperty.ctime - renamedProperty.mtime - renamedProperty.propertyUniqueID - */ + /* Remove the element from its current position in the tree */ + removeFromTree(This->ancestorStorage, This->rootPropertySetIndex, + foundPropertyIndex); - /* - * Save the new property into a new property spot - */ - createDirEntry(This->ancestorStorage, &renamedProperty, &renamedPropertyIndex); + /* Change the name of the element */ + strcpyW(currentProperty.name, pwcsNewName); - /* - * Find a spot in the property chain for our newly created property. - */ - insertIntoTree( - This->ancestorStorage, - This->rootPropertySetIndex, - renamedPropertyIndex); - - /* - * At this point the renamed property has been inserted in the tree, - * now, before Destroying the old property we must zero its dirProperty - * otherwise the DestroyProperty below will zap it all and we do not want - * this to happen. - * Also, we fake that the old property is a storage so the DestroyProperty - * will not do a SetSize(0) on the stream data. - * - * This means that we need to tweak the StgProperty if it is a stream or a - * non empty storage. - */ - StorageImpl_ReadProperty(This->ancestorStorage, - foundPropertyIndex, - &currentProperty); - - currentProperty.dirProperty = PROPERTY_NULL; - currentProperty.propertyType = PROPTYPE_STORAGE; - StorageImpl_WriteProperty( - This->ancestorStorage, - foundPropertyIndex, - &currentProperty); - - /* - * Invoke Destroy to get rid of the ole property and automatically redo - * the linking of its previous and next members... - */ - IStorage_DestroyElement(iface, pwcsOldName); + StorageImpl_WriteProperty(This->ancestorStorage, foundPropertyIndex, + &currentProperty); + /* Insert the element in a new position in the tree */ + insertIntoTree(This->ancestorStorage, This->rootPropertySetIndex, + foundPropertyIndex); } else {

1 0

Vincent Povirk : ole32: Add tests for IStorage_RenameElement.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: bc3fa10773a42725fd379bc8eaafdba8138090cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3fa10773a42725fd379bc8e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:09:19 2009 -0600 ole32: Add tests for IStorage_RenameElement. --- dlls/ole32/tests/storage32.c | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 480fa17..e4783e8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1044,6 +1044,7 @@ static void test_substorage_share(void) HRESULT r; static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR othername[] = { 'N','E','W','N','A','M','E',0 }; DeleteFileA(filenameA); @@ -1070,6 +1071,11 @@ static void test_substorage_share(void) if (r == S_OK) IStorage_Release(stg3); + /* cannot rename the storage while it's open */ + r = IStorage_RenameElement(stg, stgname, othername); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); + if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stgname); + #if 0 /* This crashes on Wine. */ @@ -1105,6 +1111,11 @@ static void test_substorage_share(void) if (r == S_OK) IStorage_Release(stm2); + /* cannot rename the stream while it's open */ + r = IStorage_RenameElement(stg, stmname, othername); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); + if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stmname); + /* destroying an object while it's open invalidates it */ r = IStorage_DestroyElement(stg, stmname); ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); @@ -2319,6 +2330,75 @@ cleanup: DeleteFileW(file2_name); } +static void test_rename(void) +{ + IStorage *stg, *stg2; + IStream *stm; + HRESULT r; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stgname2[] = { 'S','T','G',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'E','N','T','S',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* create a stream in the substorage */ + r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); + IStream_Release(stm); + + /* rename the stream */ + r = IStorage_RenameElement(stg2, stmname, stmname2); + ok(r==S_OK, "IStorage->RenameElement failed, hr=%08x\n", r); + + /* cannot open stream with old name */ + r = IStorage_OpenStream(stg2, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==STG_E_FILENOTFOUND, "IStorage_OpenStream should fail, hr=%08x\n", r); + if (SUCCEEDED(r)) IStream_Release(stm); + + /* can open stream with new name */ + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==S_OK, "IStorage_OpenStream failed, hr=%08x\n", r); + if (SUCCEEDED(r)) IStream_Release(stm); + + IStorage_Release(stg2); + + /* rename the storage */ + IStorage_RenameElement(stg, stgname, stgname2); + + /* cannot open storage with old name */ + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg2); + ok(r==STG_E_FILENOTFOUND, "IStorage_OpenStream should fail, hr=%08x\n", r); + if (SUCCEEDED(r)) IStorage_Release(stg2); + + /* can open storage with new name */ + r = IStorage_OpenStorage(stg, stgname2, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg2); + ok(r==S_OK, "IStorage_OpenStream should fail, hr=%08x\n", r); + if (SUCCEEDED(r)) + { + /* opened storage still has the stream */ + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(r==S_OK, "IStorage_OpenStream failed, hr=%08x\n", r); + if (SUCCEEDED(r)) IStream_Release(stm); + + IStorage_Release(stg2); + } + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2354,4 +2434,5 @@ START_TEST(storage32) test_copyto_snbexclusions(); test_copyto_iidexclusions_storage(); test_copyto_iidexclusions_stream(); + test_rename(); }

1 0

Juan Lang : crypt32: Stop reading a serialized store if a non-context prop ID appears before a context prop ID .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 0cf2e6fae6276fe6a3ed56d7f07e910752a87aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf2e6fae6276fe6a3ed56d7f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 12:57:54 2009 -0800 crypt32: Stop reading a serialized store if a non-context prop ID appears before a context prop ID. --- dlls/crypt32/serialize.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c index b502110..0c366bf 100644 --- a/dlls/crypt32/serialize.c +++ b/dlls/crypt32/serialize.c @@ -499,8 +499,18 @@ static BOOL CRYPT_ReadSerializedStore(void *handle, CERT_STORE_ADD_NEW, &context); } else - ret = CRYPT_ReadContextProp(contextInterface, - context, &propHdr, buf, read); + { + if (!contextInterface) + { + WARN("prop id %d before a context id\n", + propHdr.propID); + ret = FALSE; + } + else + ret = CRYPT_ReadContextProp( + contextInterface, context, &propHdr, buf, + read); + } } } else

1 0

Juan Lang : crypt32: Correct error when a matching name constraint is found .
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 300d5fe5c4500f9fdd579ebdab7b3a7a8db1d65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=300d5fe5c4500f9fdd579ebda… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 14:40:01 2009 -0800 crypt32: Correct error when a matching name constraint is found. --- dlls/crypt32/chain.c | 3 +-- dlls/crypt32/tests/chain.c | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a6fc9ff..54bff75 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -698,8 +698,7 @@ static void CRYPT_CheckNameConstraints( for (i = 0; i < nameConstraints->cPermittedSubtree; i++) CRYPT_FindMatchingNameEntry( &nameConstraints->rgPermittedSubtree[i].Base, subjectName, - trustErrorStatus, - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + trustErrorStatus, 0, CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT); LocalFree(subjectName); } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 2209e1f..00adab6 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2444,7 +2444,7 @@ static CONST_DATA_BLOB chain19[] = { }; static const CERT_TRUST_STATUS elementStatus19[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus19[] = { @@ -2469,7 +2469,7 @@ static CONST_DATA_BLOB chain21[] = { }; static const CERT_TRUST_STATUS elementStatus21[] = { { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, }; static const SimpleChainStatusCheck simpleStatus21[] = { @@ -2725,11 +2725,17 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, 0 }, 1, simpleStatus18 }, 0 }, + /* Older versions of crypt32 set CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT + * even though the constraint and alt name match. + * They also do not set CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS, since they + * incorrectly find a name constraint error. + */ { { sizeof(chain19) / sizeof(chain19[0]), chain19 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, - CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS + }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus19 }, 0 }, { { sizeof(chain20) / sizeof(chain20[0]), chain20 }, @@ -2741,10 +2747,11 @@ static ChainCheck chainCheck[] = { 1, simpleStatus20 }, TODO_ERROR }, { { sizeof(chain21) / sizeof(chain21[0]), chain21 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, - CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, 0 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_PREFERRED_ISSUER | CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS + }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus21 }, 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 },

1 0

Stefan Leichter : setupapi: Add stub and some tests for SetupGetInfFileListW.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 381221de66bb013a87cf19451009469c5a0091ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=381221de66bb013a87cf19451… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Nov 9 22:44:06 2009 +0100 setupapi: Add stub and some tests for SetupGetInfFileListW. --- dlls/setupapi/install.c | 13 +++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/install.c | 99 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 49b61d9..2064315 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1446,3 +1446,16 @@ BOOL WINAPI SetupInstallServicesFromInfSectionA( HINF Inf, PCSTR SectionName, DW return ret; } + + +/*********************************************************************** + * SetupGetInfFileListW (SETUPAPI.@) + */ +BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, + DWORD insize, PDWORD outsize) +{ + FIXME("(%s %d %p %d %p) stub\n", debugstr_w(dir), style, buffer, insize, outsize); + if(buffer) buffer[0] = 0; + if(outsize) *outsize = 1; + return TRUE; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index fd77b50..2f62b66 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -413,7 +413,7 @@ @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) @ stub SetupGetInfFileListA -@ stub SetupGetInfFileListW +@ stdcall SetupGetInfFileListW(wstr long ptr long ptr) @ stdcall SetupGetInfInformationA(ptr long ptr long ptr) @ stdcall SetupGetInfInformationW(ptr long ptr long ptr) @ stub SetupGetInfSections diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 5361238..7b93d97 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -52,6 +52,7 @@ static char CURR_DIR[MAX_PATH]; static void (WINAPI *pInstallHinfSectionA)(HWND, HINSTANCE, LPCSTR, INT); static void (WINAPI *pInstallHinfSectionW)(HWND, HINSTANCE, LPCWSTR, INT); +static BOOL (WINAPI *pSetupGetInfFileListW)(PCWSTR, DWORD, PWSTR, DWORD, PDWORD); /* * Helpers @@ -466,6 +467,100 @@ cleanup: DeleteFile(inffile); } +static void test_inffilelist(void) +{ + static const char inffile2[] = "test2.inf"; + static const char invalid_inf[] = "invalid.inf"; + static const char *inf = + "[Version]\n" + "Signature=\"$Chicago$\""; + + WCHAR *ptr; + WCHAR dir[MAX_PATH] = { 0 }; + WCHAR buffer[MAX_PATH] = { 0 }; + DWORD expected, outsize; + BOOL ret; + + if(!pSetupGetInfFileListW) + { + win_skip("SetupGetInfFileListW not present\n"); + return; + } + + /* NULL means %windir%\\inf + * get the value as reference + */ + expected = 0; + ret = pSetupGetInfFileListW(NULL, INF_STYLE_WIN4, NULL, 0, &expected); + ok(ret, "expected SetupGetInfFileListW to succeed! Error: %d\n", GetLastError()); + ok(expected > 0, "expected required buffersize to be at least 1\n"); + + /* check if an empty string doesn't behaves like NULL */ + outsize = 0; + SetLastError(0xdeadbeef); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + todo_wine + ok(!ret, "expected SetupGetInfFileListW to fail!\n"); + + /* check a not existing directory + */ + MultiByteToWideChar(CP_ACP, 0, CURR_DIR, -1, dir, MAX_PATH); + ptr = dir + lstrlenW(dir); + MultiByteToWideChar(CP_ACP, 0, "\\not_existent", -1, ptr, MAX_PATH - lstrlenW(dir)); + outsize = 0xffffffff; + SetLastError(0xdeadbeef); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + ok(ret, "expected SetupGetInfFileListW to succeed!\n"); + ok(outsize == 1, "expected required buffersize to be 1, got %d\n", outsize); + todo_wine + ok(ERROR_PATH_NOT_FOUND == GetLastError(), + "expected error ERROR_PATH_NOT_FOUND, got %d\n", GetLastError()); + + create_inf_file(inffile, inf); + create_inf_file(inffile2, inf); + create_inf_file(invalid_inf, "This content does not match the inf file format"); + + /* pass a filename instead of a directory + */ + *ptr = '\\'; + MultiByteToWideChar(CP_ACP, 0, invalid_inf, -1, ptr+1, MAX_PATH - lstrlenW(dir)); + outsize = 0xffffffff; + SetLastError(0xdeadbeef); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + todo_wine + ok(!ret, "expected SetupGetInfFileListW to fail!\n"); + todo_wine + ok(ERROR_DIRECTORY == GetLastError(), + "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); + + /* make the filename look like directory + */ + dir[1 + lstrlenW(dir)] = 0; + dir[lstrlenW(dir)] = '\\'; + SetLastError(0xdeadbeef); + ret = pSetupGetInfFileListW(dir, INF_STYLE_WIN4, NULL, 0, &outsize); + todo_wine + ok(!ret, "expected SetupGetInfFileListW to fail!\n"); + todo_wine + ok(ERROR_DIRECTORY == GetLastError(), + "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); + + /* now check the buffer content of a vaild call + */ + *ptr = 0; + 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); + + + DeleteFile(inffile); + DeleteFile(inffile2); + DeleteFile(invalid_inf); +} + START_TEST(install) { HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); @@ -483,6 +578,8 @@ START_TEST(install) pInstallHinfSectionA = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionA"); pInstallHinfSectionW = (void *)GetProcAddress(hsetupapi, "InstallHinfSectionW"); + pSetupGetInfFileListW = (void *)GetProcAddress(hsetupapi, "SetupGetInfFileListW"); + if (pInstallHinfSectionA) { /* Check if pInstallHinfSectionA sets last error or is a stub (as on WinXP) */ @@ -519,5 +616,7 @@ START_TEST(install) test_profile_items(); } + test_inffilelist(); + SetCurrentDirectory(prev_path); }

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: dc99cee71548f01619eb162cec30f869cf428ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc99cee71548f01619eb162ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 10 19:10:35 2009 +0100 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 02b52f3..7e4e9a1 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -43,6 +43,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Boolisches Objekt erwartet" IDS_JSCRIPT_EXPECTED "JScript Objekt erwartet" IDS_REGEXP_SYNTAX_ERROR "Syntax Fehler in regulärem Ausdruck" + IDS_URI_INVALID_CHAR "Zu verschlüsselnde URI enthält ungültige Zeichen" IDS_INVALID_LENGTH "Array-Größe muss eine endliche, positive Ganzzahl sein" IDS_ARRAY_EXPECTED "Array Objekt erwartet" }

1 0

Juan Lang : crypt32: Update a comment to reflect a fixed vulnerability.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 7eb33b18dac0a5c7f76d4e5bc6453b4b0d1cbd66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb33b18dac0a5c7f76d4e5bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 10:18:36 2009 -0800 crypt32: Update a comment to reflect a fixed vulnerability. --- dlls/crypt32/chain.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c6eaaec..a69b9e4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2363,11 +2363,10 @@ static BOOL match_dns_to_subject_alt_name(PCERT_EXTENSION ext, DWORD size; TRACE_(chain)("%s\n", debugstr_w(server_name)); - /* FIXME: This can be spoofed by the embedded NULL vulnerability. The + /* This could be spoofed by the embedded NULL vulnerability, since the * returned CERT_ALT_NAME_INFO doesn't have a way to indicate the - * encoded length of a name, so a certificate issued to - * winehq.org\0badsite.com will get treated as having been issued to - * winehq.org. + * encoded length of a name. Fortunately CryptDecodeObjectEx fails if + * the encoded form of the name contains a NULL. */ if (CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, ext->Value.pbData, ext->Value.cbData,

1 0

Juan Lang : rsaenh/tests: Fix some test failures.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 1547b474119e10ecdbee533377c67613ace0a009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1547b474119e10ecdbee53337… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 11:00:30 2009 -0800 rsaenh/tests: Fix some test failures. --- dlls/rsaenh/tests/rsaenh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 8632bbb..2f28335 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2060,7 +2060,8 @@ static void test_rsa_round_trip(void) dataLen = strlen(test_string) + 1; result = CryptEncrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen, sizeof(data)); - ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + "CryptEncrypt failed: %08x\n", GetLastError()); /* export the key... */ result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, NULL, &keyLen); @@ -2079,7 +2080,8 @@ static void test_rsa_round_trip(void) * key. */ result = CryptDecrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen); - ok(result, "CryptDecrypt failed: %08x\n", GetLastError()); + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + "CryptDecrypt failed: %08x\n", GetLastError()); if (result) { ok(dataLen == sizeof(test_string), "unexpected size %d\n", dataLen);

1 0

Marcus Meissner : mciavi32: Removed duplicate strlen/NULL check (Coverity).
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: 961e88f756212a3a1da8a1c08da0341ce1453f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961e88f756212a3a1da8a1c08… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Nov 8 10:24:32 2009 +0100 mciavi32: Removed duplicate strlen/NULL check (Coverity). --- dlls/mciavi32/mciavi.c | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 4e5faac..d268ee7 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -250,29 +250,26 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, * contains the hFile value ? */ dwRet = MCIERR_UNRECOGNIZED_COMMAND; - } else if (strlenW(lpOpenParms->lpstrElementName) > 0) { + } else if (lpOpenParms->lpstrElementName && lpOpenParms->lpstrElementName[0]) { /* FIXME : what should be done id wma->hFile is already != 0, or the driver is playin' */ TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(lpOpenParms->lpstrElementName)); - if (lpOpenParms->lpstrElementName && (strlenW(lpOpenParms->lpstrElementName) > 0)) - { - wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); - strcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); - - wma->hFile = mmioOpenW(lpOpenParms->lpstrElementName, NULL, - MMIO_ALLOCBUF | MMIO_DENYWRITE | MMIO_READ); - - if (wma->hFile == 0) { - WARN("can't find file=%s!\n", debugstr_w(lpOpenParms->lpstrElementName)); - dwRet = MCIERR_FILE_NOT_FOUND; - } else { - if (!MCIAVI_GetInfo(wma)) - dwRet = MCIERR_INVALID_FILE; - else if (!MCIAVI_OpenVideo(wma)) - dwRet = MCIERR_CANNOT_LOAD_DRIVER; - else if (!MCIAVI_CreateWindow(wma, dwFlags, lpOpenParms)) - dwRet = MCIERR_CREATEWINDOW; - } + wma->lpFileName = HeapAlloc(GetProcessHeap(), 0, (strlenW(lpOpenParms->lpstrElementName) + 1) * sizeof(WCHAR)); + strcpyW(wma->lpFileName, lpOpenParms->lpstrElementName); + + wma->hFile = mmioOpenW(lpOpenParms->lpstrElementName, NULL, + MMIO_ALLOCBUF | MMIO_DENYWRITE | MMIO_READ); + + if (wma->hFile == 0) { + WARN("can't find file=%s!\n", debugstr_w(lpOpenParms->lpstrElementName)); + dwRet = MCIERR_FILE_NOT_FOUND; + } else { + if (!MCIAVI_GetInfo(wma)) + dwRet = MCIERR_INVALID_FILE; + else if (!MCIAVI_OpenVideo(wma)) + dwRet = MCIERR_CANNOT_LOAD_DRIVER; + else if (!MCIAVI_CreateWindow(wma, dwFlags, lpOpenParms)) + dwRet = MCIERR_CREATEWINDOW; } } else { FIXME("Don't record yet\n");

1 0