wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

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

Juan Lang : crypt32: Trace cert version.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: bdbee82c428915d4e54526a5c384dbccc261bf35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbee82c428915d4e54526a5c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 6 18:00:05 2009 -0800 crypt32: Trace cert version. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index a69b9e4..a6fc9ff 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1112,7 +1112,7 @@ static void dump_element(PCCERT_CONTEXT cert) LPWSTR name = NULL; DWORD len, i; - TRACE_(chain)("%p\n", cert); + TRACE_(chain)("%p: version %d\n", cert, cert->pCertInfo->dwVersion); len = CertGetNameStringW(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, NULL, 0); name = CryptMemAlloc(len * sizeof(WCHAR));

1 0

Juan Lang : rsaenh/tests: Fix a couple typos.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 314033b992242a3dc781d8b717e377e61126c436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=314033b992242a3dc781d8b71… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 11:53:59 2009 -0800 rsaenh/tests: Fix a couple typos. --- dlls/rsaenh/tests/rsaenh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 2f28335..4a69483 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -176,7 +176,7 @@ static int init_aes_environment(void) result = CryptAcquireContext(&hProv, szContainer, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT); if (!result && GetLastError() == NTE_PROV_TYPE_NOT_DEF) { - win_skip("RSA_ASE provider not supported\n"); + win_skip("RSA_AES provider not supported\n"); return 0; } ok(!result && GetLastError()==NTE_BAD_FLAGS, "%d, %08x\n", result, GetLastError()); @@ -2307,7 +2307,7 @@ static void test_null_provider(void) ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); if (!result) return; result = CryptImportKey(prov, signBlob, sizeof(signBlob), 0, 0, &key); - ok(result, "CryptGenKey failed: %08x\n", GetLastError()); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); CryptDestroyKey(key); /* doesn't allow access to the key exchange key.. */ result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key);

1 0

Juan Lang : crypt32: Fix test failures across Windows versions.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 0695b0dc73e004a78744541d72e817a6d94d88dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0695b0dc73e004a78744541d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 11:47:59 2009 -0800 crypt32: Fix test failures across Windows versions. --- dlls/crypt32/tests/encode.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 934aceb..9c2d739 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1391,11 +1391,35 @@ static void test_decodeNameValue(DWORD dwEncoding) embeddedNullNameValue.value.dwValueType, GetLastError()); if (ret) { - CERT_NAME_VALUE value = { CERT_RDN_ENCODED_BLOB, + CERT_NAME_VALUE rdnEncodedValue = { CERT_RDN_ENCODED_BLOB, { sizeof(ia5EmbeddedNull), ia5EmbeddedNull } }; - - todo_wine - compareNameValues(&value, (const CERT_NAME_VALUE *)buf); + CERT_NAME_VALUE embeddedNullValue = { CERT_RDN_IA5_STRING, + { sizeof(embedded_null) - 1, (BYTE *)embedded_null } }; + const CERT_NAME_VALUE *got = (const CERT_NAME_VALUE *)buf, + *expected = NULL; + + /* Some Windows versions decode name values with embedded NULLs, + * others leave them encoded, even with the same version of crypt32. + * Accept either. + */ + ok(got->dwValueType == CERT_RDN_ENCODED_BLOB || + got->dwValueType == CERT_RDN_IA5_STRING, + "Expected CERT_RDN_ENCODED_BLOB or CERT_RDN_IA5_STRING, got %d\n", + got->dwValueType); + if (got->dwValueType == CERT_RDN_ENCODED_BLOB) + expected = &rdnEncodedValue; + else if (got->dwValueType == CERT_RDN_IA5_STRING) + expected = &embeddedNullValue; + if (expected) + { + ok(got->Value.cbData == expected->Value.cbData, + "String type %d: unexpected data size, got %d, expected %d\n", + got->dwValueType, got->Value.cbData, expected->Value.cbData); + if (got->Value.cbData && got->Value.pbData) + ok(!memcmp(got->Value.pbData, expected->Value.pbData, + min(got->Value.cbData, expected->Value.cbData)), + "String type %d: unexpected value\n", expected->dwValueType); + } LocalFree(buf); } }

1 0

Juan Lang : crypt32: Fix some test failures on older crypt32 versions.
by Alexandre Julliard 11 Nov '09

11 Nov '09

Module: wine Branch: master Commit: 49c1a34721a1ccd453b1c5b856ef5612f764f7c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c1a34721a1ccd453b1c5b85… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Nov 10 11:16:47 2009 -0800 crypt32: Fix some test failures on older crypt32 versions. --- dlls/crypt32/tests/encode.c | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index a46022b..934aceb 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7523,7 +7523,13 @@ static void test_encodeCertPolicyMappings(DWORD dwEncoding) memset(&info, 0, sizeof(info)); ret = pCryptEncodeObjectEx(dwEncoding, mappingOids[i], &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy mappings support\n"); + return; + } if (ret) { ok(size == sizeof(emptySequence), "unexpected size %d\n", size); @@ -7582,7 +7588,13 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy mappings support\n"); + return; + } if (ret) { ok(info->cPolicyMapping == 0, @@ -7649,7 +7661,13 @@ static void test_encodeCertPolicyConstraints(DWORD dwEncoding) */ ret = pCryptEncodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy constraints support\n"); + return; + } if (ret) { ok(size == sizeof(emptySequence), "unexpected size %d\n", size); @@ -7716,7 +7734,13 @@ static void test_decodeCertPolicyConstraints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_POLICY_CONSTRAINTS, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_FILE_NOT_FOUND), + "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + win_skip("no policy mappings support\n"); + return; + } if (ret) { ok(!info->fRequireExplicitPolicy,

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

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

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

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

Sunil Mohan Adapa : oleaut32: Update comment about a newly seen value in SLTG TypeLib.
by Alexandre Julliard 10 Nov '09

10 Nov '09

Module: wine Branch: master Commit: ffb2cfc29e5cb51ed6747a872a6c99ffa1e1a352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb2cfc29e5cb51ed6747a872… Author: Sunil Mohan Adapa <sunilmohan(a)fsf.org.in> Date: Tue Nov 10 10:30:24 2009 +0530 oleaut32: Update comment about a newly seen value in SLTG TypeLib. --- dlls/oleaut32/typelib.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 1fe8ecf..b1c85ed 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -413,7 +413,7 @@ typedef struct { /*0e*/ DWORD res0e; /* 0xffffffff */ /*12*/ WORD major_version; /* major version number */ /*14*/ WORD minor_version; /* minor version number */ -/*16*/ DWORD res16; /* 0xfffe0000 */ +/*16*/ DWORD res16; /* 0xfffe0000 or 0xfffc0000 (on dual interfaces?) */ /*1a*/ BYTE typeflags1;/* 0x02 | top 5 bits hold l5sbs of TYPEFLAGS */ /*1b*/ BYTE typeflags2;/* TYPEFLAGS >> 5 */ /*1c*/ BYTE typeflags3;/* 0x02*/

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2009