Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 56625: [RSAENH_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 12:34:31 2012 New Revision: 56625 URL: http://svn.reactos.org/svn/reactos?rev=56625&view=rev Log: [RSAENH_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/rsaenh/rsaenh.c Modified: trunk/rostests/winetests/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rsaenh/rsaenh.c… ============================================================================== --- trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rsaenh/rsaenh.c [iso-8859-1] Sat May 19 12:34:31 2012 @@ -662,6 +662,8 @@ sizeof(signed_ssl3_shamd5_hash)); printBytes("got", pbSigValue, len); } + result = CryptDestroyKey(hKeyExchangeKey); + ok(result, "CryptDestroyKey failed 0x%08x\n", GetLastError()); result = CryptDestroyHash(hHash); ok(result, "CryptDestroyHash failed 0x%08x\n", GetLastError()); result = CryptReleaseContext(prov, 0); @@ -945,10 +947,12 @@ for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; - /* AES provider doesn't support salt */ + /* Does AES provider support salt? */ result = CryptGetKeyParam(hKey, KP_SALT, NULL, &dwLen, 0); - ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == ERROR_NO_TOKEN /* Win7 */), - "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); + ok((!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, + "expected NTE_BAD_KEY, got %08x\n", GetLastError()); + if (result) + ok(!dwLen, "unexpected salt length %d\n", dwLen); dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); @@ -1246,6 +1250,7 @@ dwKeyLen = 1025; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); + ok(!result, "CryptSetKeyParam failed: %08x\n", GetLastError()); dwLen = sizeof(dwKeyLen); CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); @@ -1511,7 +1516,9 @@ 0x40, 0x64, 0x28, 0xe8, 0x8a, 0xe7, 0xa4, 0xd4, 0x1c, 0xfd, 0xde, 0x71 }; - + BLOBHEADER *blobHeader = (BLOBHEADER *)abPlainPrivateKey; + RSAPUBKEY *rsaPubKey = (RSAPUBKEY *)(blobHeader+1); + dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); if (!result) { @@ -1556,6 +1563,21 @@ CryptDestroyKey(hSessionKey); CryptDestroyKey(hKeyExchangeKey); + + /* Test importing a private key with a buffer that's smaller than the + * actual buffer. The private exponent can be omitted, its length is + * inferred from the passed-in length parameter. + */ + dwLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + rsaPubKey->bitlen / 8 + 5 * rsaPubKey->bitlen / 16; + for (; dwLen < sizeof(abPlainPrivateKey); dwLen++) + { + result = CryptImportKey(hProv, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + ok(result, "CryptImportKey failed at size %d: %d (%08x)\n", dwLen, + GetLastError(), GetLastError()); + if (result) + CryptDestroyKey(hKeyExchangeKey); + } } static void test_verify_signature(void) { @@ -1766,16 +1788,15 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; + /* It seems that CPVerifySignature doesn't care about the OID at all. */ + result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; - /* Next test fails on WinXP SP2. It seems that CPVerifySignature doesn't care about - * the OID at all. */ - /*result = CryptVerifySignature(hHash, abSignatureMD2NoOID, 128, hPubSignKey, NULL, 0); - ok(!result && GetLastError()==NTE_BAD_SIGNATURE, "%08lx\n", GetLastError()); - if (result) return;*/ - CryptDestroyHash(hHash); result = CryptCreateHash(hProv, CALG_MD4, 0, 0, &hHash); @@ -1790,6 +1811,10 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD4NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1808,6 +1833,10 @@ ok(result, "%08x\n", GetLastError()); if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + result = CryptVerifySignature(hHash, abSignatureMD5NoOID, 128, hPubSignKey, NULL, CRYPT_NOHASHOID); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -1823,6 +1852,10 @@ if (!result) return; result = CryptVerifySignature(hHash, abSignatureSHA, 128, hPubSignKey, NULL, 0); + ok(result, "%08x\n", GetLastError()); + if (!result) return; + + result = CryptVerifySignature(hHash, abSignatureSHANoOID, 128, hPubSignKey, NULL, 0); ok(result, "%08x\n", GetLastError()); if (!result) return; @@ -2151,6 +2184,115 @@ CryptDestroyKey(hPrivKey); } + +static void test_import_hmac(void) +{ + /* Test cases from RFC 2202, section 3 */ + static const struct rfc2202_test_case { + const char *key; + DWORD key_len; + const char *data; + const DWORD data_len; + const char *digest; + } cases[] = { + { "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b" + "\x0b\x0b\x0b\x0b", 20, + "Hi There", 8, + "\xb6\x17\x31\x86\x55\x05\x72\x64\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e" + "\xf1\x46\xbe\x00" }, + { "Jefe", 4, + "what do ya want for nothing?", 28, + "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74\x16\xd5\xf1\x84\xdf\x9c" + "\x25\x9a\x7c\x79" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa", 20, + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd" + "\xdd\xdd", 50, + "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3\x9a\xf4\x8a\xa1\x7b\x4f" + "\x63\xf1\x75\xd3" }, + { "\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10" + "\x11\x12\x13\x14\x15\x16\x17\x18\x19", 25, + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd" + "\xcd\xcd", 50, + "\x4c\x90\x07\xF4\x02\x62\x50\xc6\xbc\x84\x14\xf9\xbf\x50\xc8\x6c" + "\x2d\x72\x35\xda" }, + { "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c" + "\x0c\x0c\x0c\x0c", 20, + "Test With Truncation", 20, + "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2\x7b\xe1\xd5\x8b\xb9\x32" + "\x4a\x9a\x5a\x04" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", + 80, + "Test Using Larger Than Block-Size Key - Hash Key First", 54, + "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70\x56\x37\xce\x8a\x3b\x55" + "\xed\x40\x21\x12" }, + { "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa" + "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa", + 80, + "Test Using Larger Than Block-Size Key and Larger " + "Than One Block-Size Data", 73, + "\xe8\xe9\x9D\x0f\x45\x23\x7d\x78\x6d\x6b\xba\xa7\x96\x5c\x78\x08" + "\xbb\xff\x1a\x91" } + }; + DWORD i; + + for (i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) + { + const struct rfc2202_test_case *test_case = &cases[i]; + DWORD size = sizeof(BLOBHEADER) + sizeof(DWORD) + test_case->key_len; + BYTE *blob = HeapAlloc(GetProcessHeap(), 0, size); + + if (blob) + { + BLOBHEADER *header = (BLOBHEADER *)blob; + DWORD *key_len = (DWORD *)(header + 1); + BYTE *key_bytes = (BYTE *)(key_len + 1); + BOOL result; + HCRYPTKEY key; + + header->bType = PLAINTEXTKEYBLOB; + header->bVersion = CUR_BLOB_VERSION; + header->reserved = 0; + header->aiKeyAlg = CALG_RC2; + *key_len = test_case->key_len; + memcpy(key_bytes, test_case->key, *key_len); + result = CryptImportKey(hProv, blob, size, 0, CRYPT_IPSEC_HMAC_KEY, &key); + ok(result || broken(GetLastError() == NTE_BAD_FLAGS /* Win2k */), "CryptImportKey failed on test case %d: %08x\n", i, GetLastError()); + if (result) + { + HCRYPTHASH hash; + HMAC_INFO hmac_info = { CALG_SHA1, 0 }; + BYTE digest[20]; + DWORD digest_size; + + result = CryptCreateHash(hProv, CALG_HMAC, key, 0, &hash); + ok(result, "CryptCreateHash failed on test case %d: %08x\n", i, GetLastError()); + result = CryptSetHashParam(hash, HP_HMAC_INFO, (BYTE *)&hmac_info, 0); + ok(result, "CryptSetHashParam failed on test case %d: %08x\n", i, GetLastError()); + result = CryptHashData(hash, (const BYTE *)test_case->data, test_case->data_len, 0); + ok(result, "CryptHashData failed on test case %d: %08x\n", i, GetLastError()); + digest_size = sizeof(digest); + result = CryptGetHashParam(hash, HP_HASHVAL, digest, &digest_size, 0); + ok(result, "CryptGetHashParam failed on test case %d: %08x\n", i, GetLastError()); + ok(!memcmp(digest, test_case->digest, sizeof(digest)), "Unexpected value on test case %d\n", i); + CryptDestroyHash(hash); + CryptDestroyKey(key); + } + HeapFree(GetProcessHeap(), 0, blob); + } + } +} static void test_schannel_provider(void) { @@ -2227,7 +2369,16 @@ result = CryptImportKey(hProv, abTLS1Master, dwLen, hRSAKey, 0, &hMasterSecret); ok (result, "%08x\n", GetLastError()); if (!result) return; - + + /* Deriving a hash from the master secret. This is due to the CryptoAPI architecture. + * (Keys can only be derived from hashes, not from other keys.) + * The hash can't be created yet because the key doesn't have the client + * random or server random set. + */ + result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + /* Setting the TLS1 client and server random parameters, as well as the * MAC and encryption algorithm parameters. */ data_blob.cbData = 33; @@ -2241,7 +2392,20 @@ result = CryptSetKeyParam(hMasterSecret, KP_SERVER_RANDOM, (BYTE*)&data_blob, 0); ok (result, "%08x\n", GetLastError()); if (!result) return; - + + result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); + ok (result, "%08x\n", GetLastError()); + if (!result) return; + + /* Deriving the server write encryption key from the master hash can't + * succeed before the encryption key algorithm is set. + */ + result = CryptDeriveKey(hProv, CALG_SCHANNEL_ENC_KEY, hMasterHash, CRYPT_SERVER, &hServerWriteKey); + ok (!result && GetLastError() == NTE_BAD_FLAGS, + "expected NTE_BAD_FLAGS, got %08x\n", GetLastError()); + + CryptDestroyHash(hMasterHash); + saSChannelAlg.dwUse = SCHANNEL_ENC_KEY; saSChannelAlg.Algid = CALG_DES; saSChannelAlg.cBits = 64; @@ -2260,8 +2424,6 @@ ok (result, "%08x\n", GetLastError()); if (!result) return; - /* Deriving a hash from the master secret. This is due to the CryptoAPI architecture. - * (Keys can only be derived from hashes, not from other keys.) */ result = CryptCreateHash(hProv, CALG_SCHANNEL_MASTER_HASH, hMasterSecret, 0, &hMasterHash); ok (result, "%08x\n", GetLastError()); if (!result) return; @@ -2362,7 +2524,8 @@ dataLen = strlen(test_string) + 1; result = CryptEncrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen, sizeof(data)); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptEncrypt failed: %08x\n", GetLastError()); /* export the key... */ result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, NULL, @@ -2371,6 +2534,7 @@ exportedKey = HeapAlloc(GetProcessHeap(), 0, keyLen); result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, exportedKey, &keyLen); + ok(result, "CryptExportKey failed: %08x\n", GetLastError()); /* destroy the key... */ CryptDestroyKey(keyExchangeKey); CryptDestroyKey(signKey); @@ -2382,7 +2546,8 @@ * key. */ result = CryptDecrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptDecrypt failed: %08x\n", GetLastError()); if (result) { @@ -2809,22 +2974,23 @@ { result = CryptAcquireContext(&prov1, szContainer, szProvider, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); } dwLen = (DWORD)sizeof(abPlainPrivateKey); result = CryptImportKey(prov1, abPlainPrivateKey, dwLen, 0, 0, &hKeyExchangeKey); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); dwLen = (DWORD)sizeof(abSessionKey); result = CryptImportKey(prov1, abSessionKey, dwLen, hKeyExchangeKey, 0, &hSessionKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptImportKey failed: %08x\n", GetLastError()); /* Once the key has been imported, subsequently acquiring a context with * the same name will allow retrieving the key. */ result = CryptAcquireContext(&prov2, szContainer, szProvider, PROV_RSA_FULL, 0); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); result = CryptGetUserKey(prov2, AT_KEYEXCHANGE, &hKey); - ok(result, "%08x\n", GetLastError()); + ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); CryptReleaseContext(prov2, 0); @@ -2854,6 +3020,7 @@ test_verify_signature(); test_rsa_encrypt(); test_import_export(); + test_import_hmac(); test_enum_container(); clean_up_base_environment(); test_key_permissions();

1 0

[akhaldi] 56624: [RSAENH] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 12:34:30 2012 New Revision: 56624 URL: http://svn.reactos.org/svn/reactos?rev=56624&view=rev Log: [RSAENH] * Sync to Wine 1.5.4. Added: trunk/reactos/dll/win32/rsaenh/rsaenh.rgs (with props) trunk/reactos/dll/win32/rsaenh/rsrc.rc (with props) Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt trunk/reactos/dll/win32/rsaenh/handle.c trunk/reactos/dll/win32/rsaenh/handle.h trunk/reactos/dll/win32/rsaenh/implglue.c trunk/reactos/dll/win32/rsaenh/implglue.h trunk/reactos/dll/win32/rsaenh/mpi.c trunk/reactos/dll/win32/rsaenh/rsaenh.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Sat May 19 12:34:30 2012 @@ -16,14 +16,13 @@ rsa.c rsaenh.c sha2.c + rsrc.rc version.rc ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) add_library(rsaenh SHARED ${SOURCE}) - set_module_type(rsaenh win32dll) target_link_libraries(rsaenh wine) add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) add_pch(rsaenh tomcrypt.h) - add_cd_file(TARGET rsaenh DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/rsaenh/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/handle.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -41,7 +41,7 @@ * Initializes the HANDLETABLE structure pointed to by lpTable * * PARAMS - * lpTable [I] Pointer to the HANDLETABLE structure, which is to be initalized. + * lpTable [I] Pointer to the HANDLETABLE structure, which is to be initialized. * * NOTES * You have to call destroy_handle_table when you don't need the table Modified: trunk/reactos/dll/win32/rsaenh/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/handle.h?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/handle.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/handle.h [iso-8859-1] Sat May 19 12:34:30 2012 @@ -56,15 +56,15 @@ CRITICAL_SECTION mutex; }; -void init_handle_table (struct handle_table *lpTable); -void destroy_handle_table(struct handle_table *lpTable); -int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); -int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy); -int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject); -int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType); +void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN; +void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN; +int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; +int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; +int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; +int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, - OBJECTHDR **ppObject); + OBJECTHDR **ppObject) DECLSPEC_HIDDEN; #ifdef __cplusplus } Modified: trunk/reactos/dll/win32/rsaenh/implglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/implglue.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/implglue.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -482,7 +482,7 @@ } BOOL import_private_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp) + DWORD dwDataLen, DWORD dwPubExp) { BYTE *pbTemp, *pbBigNum; @@ -496,7 +496,7 @@ pbTemp = HeapAlloc(GetProcessHeap(), 0, 2*dwKeyLen+5*((dwKeyLen+1)>>1)); if (!pbTemp) return FALSE; - memcpy(pbTemp, pbSrc, 2*dwKeyLen+5*((dwKeyLen+1)>>1)); + memcpy(pbTemp, pbSrc, min(dwDataLen, 2*dwKeyLen+5*((dwKeyLen+1)>>1))); pbBigNum = pbTemp; pKeyContext->rsa.type = PK_PRIVATE; @@ -518,6 +518,10 @@ reverse_bytes(pbBigNum, (dwKeyLen+1)>>1); mp_read_unsigned_bin(&pKeyContext->rsa.qP, pbBigNum, (dwKeyLen+1)>>1); pbBigNum += (dwKeyLen+1)>>1; + /* The size of the private exponent d is inferred from the remaining + * data length. + */ + dwKeyLen = min(dwKeyLen, dwDataLen - (pbBigNum - pbTemp)); reverse_bytes(pbBigNum, dwKeyLen); mp_read_unsigned_bin(&pKeyContext->rsa.d, pbBigNum, dwKeyLen); mp_set_int(&pKeyContext->rsa.e, dwPubExp); Modified: trunk/reactos/dll/win32/rsaenh/implglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/implglue.… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/implglue.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/implglue.h [iso-8859-1] Sat May 19 12:34:30 2012 @@ -72,34 +72,34 @@ rsa_key rsa; } KEY_CONTEXT; -BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext); +BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) DECLSPEC_HIDDEN; BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, CONST BYTE *pbData, - DWORD dwDataLen); -BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue); + DWORD dwDataLen) DECLSPEC_HIDDEN; +BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHashValue) DECLSPEC_HIDDEN; BOOL duplicate_hash_impl(ALG_ID aiAlgid, CONST HASH_CONTEXT *pSrcHashContext, - HASH_CONTEXT *pDestHashContext); + HASH_CONTEXT *pDestHashContext) DECLSPEC_HIDDEN; -BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen); -BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext); +BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) DECLSPEC_HIDDEN; +BOOL free_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext) DECLSPEC_HIDDEN; BOOL setup_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue); + DWORD dwEffectiveKeyLen, DWORD dwSaltLen, BYTE *abKeyValue) DECLSPEC_HIDDEN; BOOL duplicate_key_impl(ALG_ID aiAlgid, CONST KEY_CONTEXT *pSrcKeyContext, - KEY_CONTEXT *pDestKeyContext); + KEY_CONTEXT *pDestKeyContext) DECLSPEC_HIDDEN; /* dwKeySpec is optional for symmetric key algorithms */ BOOL encrypt_block_impl(ALG_ID aiAlgid, DWORD dwKeySpec, KEY_CONTEXT *pKeyContext, CONST BYTE *pbIn, BYTE *pbOut, - DWORD enc); -BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen); + DWORD enc) DECLSPEC_HIDDEN; +BOOL encrypt_stream_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, BYTE *pbInOut, DWORD dwLen) DECLSPEC_HIDDEN; BOOL export_public_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp); + DWORD *pdwPubExp) DECLSPEC_HIDDEN; BOOL import_public_key_impl(CONST BYTE *pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp); + DWORD dwPubExp) DECLSPEC_HIDDEN; BOOL export_private_key_impl(BYTE *pbDest, const KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD *pdwPubExp); + DWORD *pdwPubExp) DECLSPEC_HIDDEN; BOOL import_private_key_impl(CONST BYTE* pbSrc, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen, - DWORD dwPubExp); + DWORD dwDataLen, DWORD dwPubExp) DECLSPEC_HIDDEN; -BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen); +BOOL gen_rand_impl(BYTE *pbBuffer, DWORD dwLen) DECLSPEC_HIDDEN; #endif /* __WINE_IMPLGLUE_H */ Modified: trunk/reactos/dll/win32/rsaenh/mpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/mpi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/mpi.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -1412,7 +1412,7 @@ bottom = a->dp + a->used - 1 - b; /* much like mp_rshd this is implemented using a sliding window - * except the window goes the otherway around. Copying from + * except the window goes the other way around. Copying from * the bottom to the top. see bn_mp_rshd.c for more info. */ for (x = a->used - 1; x >= b; x--) { @@ -3663,7 +3663,7 @@ } /* pre-calculate the value required for Barrett reduction - * For a given modulus "b" it calulates the value required in "a" + * For a given modulus "b" it calculates the value required in "a" */ int mp_reduce_setup (mp_int * a, const mp_int * b) { Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.c?… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.c [iso-8859-1] Sat May 19 12:34:30 2012 @@ -37,8 +37,11 @@ #include "handle.h" #include "implglue.h" #include "objbase.h" +#include "rpcproxy.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); + +static HINSTANCE instance; /****************************************************************************** * CRYPTHASH - hash objects @@ -71,7 +74,7 @@ * CRYPTKEY - key objects */ #define RSAENH_MAGIC_KEY 0x73620457u -#define RSAENH_MAX_KEY_SIZE 48 +#define RSAENH_MAX_KEY_SIZE 64 #define RSAENH_MAX_BLOCK_SIZE 24 #define RSAENH_KEYSTATE_IDLE 0 #define RSAENH_KEYSTATE_ENCRYPTING 1 @@ -102,6 +105,7 @@ BYTE abInitVector[RSAENH_MAX_BLOCK_SIZE]; BYTE abChainVector[RSAENH_MAX_BLOCK_SIZE]; RSAENH_SCHANNEL_INFO siSChannelInfo; + CRYPT_DATA_BLOB blobHmacKey; } CRYPTKEY; /****************************************************************************** @@ -135,6 +139,7 @@ #define RSAENH_HMAC_DEF_IPAD_CHAR 0x36 #define RSAENH_HMAC_DEF_OPAD_CHAR 0x5c #define RSAENH_HMAC_DEF_PAD_LEN 64 +#define RSAENH_HMAC_BLOCK_LEN 64 #define RSAENH_DES_EFFECTIVE_KEYLEN 56 #define RSAENH_DES_STORAGE_KEYLEN 64 #define RSAENH_3DES112_EFFECTIVE_KEYLEN 112 @@ -358,6 +363,7 @@ switch (fdwReason) { case DLL_PROCESS_ATTACH: + instance = hInstance; DisableThreadLibraryCalls(hInstance); init_handle_table(&handle_table); break; @@ -728,6 +734,7 @@ free_key_impl(pCryptKey->aiAlgid, &pCryptKey->context); free_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); free_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); + free_data_blob(&pCryptKey->blobHmacKey); HeapFree(GetProcessHeap(), 0, pCryptKey); } @@ -755,7 +762,7 @@ * * PARAMS * hProv [I] Handle to the provider to which the created key will belong. - * aiAlgid [I] The new key shall use the crypto algorithm idenfied by aiAlgid. + * aiAlgid [I] The new key shall use the crypto algorithm identified by aiAlgid. * dwFlags [I] Upper 16 bits give the key length. * Lower 16 bits: CRYPT_EXPORTABLE, CRYPT_CREATE_SALT, * CRYPT_NO_SALT @@ -821,7 +828,13 @@ return (HCRYPTKEY)INVALID_HANDLE_VALUE; } break; - + + case CALG_HMAC: + /* Avoid the key length check for HMAC keys, which have unlimited + * length. + */ + break; + default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || @@ -853,8 +866,11 @@ pCryptKey->dwSaltLen = 0; memset(pCryptKey->abKeyValue, 0, sizeof(pCryptKey->abKeyValue)); memset(pCryptKey->abInitVector, 0, sizeof(pCryptKey->abInitVector)); + memset(&pCryptKey->siSChannelInfo.saEncAlg, 0, sizeof(pCryptKey->siSChannelInfo.saEncAlg)); + memset(&pCryptKey->siSChannelInfo.saMACAlg, 0, sizeof(pCryptKey->siSChannelInfo.saMACAlg)); init_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); init_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); + init_data_blob(&pCryptKey->blobHmacKey); switch(aiAlgid) { @@ -886,6 +902,11 @@ case CALG_RSA_KEYX: case CALG_RSA_SIGN: pCryptKey->dwBlockLen = dwKeyLen >> 3; + pCryptKey->dwMode = 0; + break; + + case CALG_HMAC: + pCryptKey->dwBlockLen = 0; pCryptKey->dwMode = 0; break; } @@ -1783,7 +1804,7 @@ /****************************************************************************** * CPCreateHash (RSAENH.@) * - * CPCreateHash creates and initalizes a new hash object. + * CPCreateHash creates and initializes a new hash object. * * PARAMS * hProv [I] Handle to the key container to which the new hash will belong. @@ -1836,6 +1857,13 @@ (pCryptKey->aiAlgid != CALG_TLS1_MASTER)) { SetLastError(NTE_BAD_KEY); + return FALSE; + } + if (Algid == CALG_SCHANNEL_MASTER_HASH && + ((!pCryptKey->siSChannelInfo.blobClientRandom.cbData) || + (!pCryptKey->siSChannelInfo.blobServerRandom.cbData))) + { + SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -1904,7 +1932,7 @@ /****************************************************************************** * CPDestroyHash (RSAENH.@) * - * Releases the handle to a hash object. The object is destroyed if it's reference + * Releases the handle to a hash object. The object is destroyed if its reference * count reaches zero. * * PARAMS @@ -1937,7 +1965,7 @@ /****************************************************************************** * CPDestroyKey (RSAENH.@) * - * Releases the handle to a key object. The object is destroyed if it's reference + * Releases the handle to a key object. The object is destroyed if its reference * count reaches zero. * * PARAMS @@ -1970,7 +1998,7 @@ /****************************************************************************** * CPDuplicateHash (RSAENH.@) * - * Clones a hash object including it's current state. + * Clones a hash object including its current state. * * PARAMS * hUID [I] Handle to the key container the hash belongs to. @@ -2026,7 +2054,7 @@ /****************************************************************************** * CPDuplicateKey (RSAENH.@) * - * Clones a key object including it's current state. + * Clones a key object including its current state. * * PARAMS * hUID [I] Handle to the key container the hash belongs to. @@ -2518,7 +2546,7 @@ pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; *pKeyLen = pCryptKey->dwKeyLen; - memcpy(pbKey, &pCryptKey->abKeyValue, pCryptKey->dwKeyLen); + memcpy(pbKey, pCryptKey->abKeyValue, pCryptKey->dwKeyLen); } *pdwDataLen = dwDataLen; return TRUE; @@ -2690,6 +2718,12 @@ CONST RSAPUBKEY *pRSAPubKey = (CONST RSAPUBKEY*)(pBlobHeader+1); BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2697,11 +2731,27 @@ return FALSE; } - if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY)) || - (pRSAPubKey->magic != RSAENH_MAGIC_RSA2) || - (dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + - (2 * pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)))) - { + if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY))) + { + ERR("datalen %d not long enough for a BLOBHEADER + RSAPUBKEY\n", + dwDataLen); + SetLastError(NTE_BAD_DATA); + return FALSE; + } + if (pRSAPubKey->magic != RSAENH_MAGIC_RSA2) + { + ERR("unexpected magic %08x\n", pRSAPubKey->magic); + SetLastError(NTE_BAD_DATA); + return FALSE; + } + if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)))) + { + DWORD expectedLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + (pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)); + + ERR("blob too short for pub key: expect %d, got %d\n", + expectedLen, dwDataLen); SetLastError(NTE_BAD_DATA); return FALSE; } @@ -2710,7 +2760,7 @@ if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) return FALSE; setup_key(pCryptKey); ret = import_private_key_impl((CONST BYTE*)(pRSAPubKey+1), &pCryptKey->context, - pRSAPubKey->bitlen/8, pRSAPubKey->pubexp); + pRSAPubKey->bitlen/8, dwDataLen, pRSAPubKey->pubexp); if (ret) { if (dwFlags & CRYPT_EXPORTABLE) pCryptKey->dwPermissions |= CRYPT_EXPORT; @@ -2766,6 +2816,12 @@ ALG_ID algID; BOOL ret; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER, (OBJECTHDR**)&pKeyContainer)) { @@ -2840,6 +2896,12 @@ BYTE *pbDecrypted; DWORD dwKeyLen; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } if (!lookup_handle(&handle_table, hPubKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pPubKey) || pPubKey->aiAlgid != CALG_RSA_KEYX) { @@ -2915,13 +2977,47 @@ return FALSE; } - *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, *pKeyLen<<19, &pCryptKey); - if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) - return FALSE; - memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); - setup_key(pCryptKey); - if (dwFlags & CRYPT_EXPORTABLE) - pCryptKey->dwPermissions |= CRYPT_EXPORT; + if (dwFlags & CRYPT_IPSEC_HMAC_KEY) + { + *phKey = new_key(hProv, CALG_HMAC, 0, &pCryptKey); + if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return FALSE; + if (*pKeyLen <= RSAENH_MIN(sizeof(pCryptKey->abKeyValue), RSAENH_HMAC_BLOCK_LEN)) + { + memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); + pCryptKey->dwKeyLen = *pKeyLen; + } + else + { + CRYPT_DATA_BLOB blobHmacKey = { *pKeyLen, (BYTE *)pbKeyStream }; + + /* In order to initialize an HMAC key, the key material is hashed, + * and the output of the hash function is used as the key material. + * Unfortunately, the way the Crypto API is designed, we don't know + * the hash algorithm yet, so we have to copy the entire key + * material. + */ + if (!copy_data_blob(&pCryptKey->blobHmacKey, &blobHmacKey)) + { + release_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY); + *phKey = (HCRYPTKEY)INVALID_HANDLE_VALUE; + return FALSE; + } + } + setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; + } + else + { + *phKey = new_key(hProv, pBlobHeader->aiKeyAlg, *pKeyLen<<19, &pCryptKey); + if (*phKey == (HCRYPTKEY)INVALID_HANDLE_VALUE) + return FALSE; + memcpy(pCryptKey->abKeyValue, pbKeyStream, *pKeyLen); + setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; + } return TRUE; } @@ -3022,12 +3118,6 @@ TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); - if (dwFlags & CRYPT_IPSEC_HMAC_KEY) - { - FIXME("unimplemented for CRYPT_IPSEC_HMAC_KEY\n"); - SetLastError(NTE_BAD_FLAGS); - return FALSE; - } return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); } @@ -3851,6 +3941,12 @@ { /* See RFC 2246, chapter 6.3 Key calculation */ case CALG_SCHANNEL_ENC_KEY: + if (!pMasterKey->siSChannelInfo.saEncAlg.Algid || + !pMasterKey->siSChannelInfo.saEncAlg.cBits) + { + SetLastError(NTE_BAD_FLAGS); + return FALSE; + } *phKey = new_key(hProv, pMasterKey->siSChannelInfo.saEncAlg.Algid, MAKELONG(LOWORD(dwFlags),pMasterKey->siSChannelInfo.saEncAlg.cBits), &pCryptKey); @@ -4150,6 +4246,29 @@ return FALSE; } + if (pCryptKey->aiAlgid == CALG_HMAC && !pCryptKey->dwKeyLen) { + HCRYPTHASH hKeyHash; + DWORD keyLen; + + if (!RSAENH_CPCreateHash(hProv, ((PHMAC_INFO)pbData)->HashAlgid, 0, 0, + &hKeyHash)) + return FALSE; + if (!RSAENH_CPHashData(hProv, hKeyHash, pCryptKey->blobHmacKey.pbData, + pCryptKey->blobHmacKey.cbData, 0)) + { + RSAENH_CPDestroyHash(hProv, hKeyHash); + return FALSE; + } + keyLen = sizeof(pCryptKey->abKeyValue); + if (!RSAENH_CPGetHashParam(hProv, hKeyHash, HP_HASHVAL, pCryptKey->abKeyValue, + &keyLen, 0)) + { + RSAENH_CPDestroyHash(hProv, hKeyHash); + return FALSE; + } + pCryptKey->dwKeyLen = keyLen; + RSAENH_CPDestroyHash(hProv, hKeyHash); + } for (i=0; i<RSAENH_MIN(pCryptKey->dwKeyLen,pCryptHash->pHMACInfo->cbInnerString); i++) { pCryptHash->pHMACInfo->pbInnerString[i] ^= pCryptKey->abKeyValue[i]; } @@ -4369,204 +4488,39 @@ goto cleanup; } - if (!build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags)) { + if (build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags) && + !memcmp(pbDecrypted, pbConstructed, dwSigLen)) { + res = TRUE; goto cleanup; } - if (memcmp(pbDecrypted, pbConstructed, dwSigLen)) { - SetLastError(NTE_BAD_SIGNATURE); + if (!(dwFlags & CRYPT_NOHASHOID) && + build_hash_signature(pbConstructed, dwSigLen, aiAlgid, abHashValue, dwHashLen, dwFlags|CRYPT_NOHASHOID) && + !memcmp(pbDecrypted, pbConstructed, dwSigLen)) { + res = TRUE; goto cleanup; } - - res = TRUE; + + SetLastError(NTE_BAD_SIGNATURE); + cleanup: HeapFree(GetProcessHeap(), 0, pbConstructed); HeapFree(GetProcessHeap(), 0, pbDecrypted); return res; } -static const WCHAR szProviderKeys[6][116] = { - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ','B','a','s', - 'e',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d', - ' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ','S','t','r','o','n','g', - ' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r', - 'o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'R','S','A',' ','S','C','h','a','n','n','e','l',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }, - { 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'C','r','y','p','t','o','g','r','a','p','h','y','\\','D','e','f','a','u','l','t','s','\\', - 'P','r','o','v','i','d','e','r','\\','M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r', - ' ','(','P','r','o','t','o','t','y','p','e',')',0 } -}; -static const WCHAR szDefaultKeys[3][65] = { - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','0','1',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','1','2',0 }, - { 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','C','r','y','p','t','o','g','r', - 'a','p','h','y','\\','D','e','f','a','u','l','t','s','\\','P','r','o','v', - 'i','d','e','r',' ','T','y','p','e','s','\\','T','y','p','e',' ','0','2','4',0 } -}; - - /****************************************************************************** * DllRegisterServer (RSAENH.@) - * - * Dll self registration. - * - * PARAMS - * - * RETURNS - * Success: S_OK. - * Failure: != S_OK - * - * NOTES - * Registers the following keys: - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider\ - * Microsoft Base Cryptographic Provider v1.0 - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider\ - * Microsoft Enhanced Cryptographic Provider - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider\ - * Microsoft Strong Cryptographpic Provider - * - HKLM\Software\Microsoft\Cryptography\Defaults\Provider Types\Type 001 */ HRESULT WINAPI DllRegisterServer(void) { - HKEY key; - DWORD dp; - long apiRet; - int i; - - for (i=0; i<6; i++) { - apiRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szProviderKeys[i], 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, &dp); - - if (apiRet == ERROR_SUCCESS) - { - if (dp == REG_CREATED_NEW_KEY) - { - static const WCHAR szImagePath[] = { 'I','m','a','g','e',' ','P','a','t','h',0 }; - static const WCHAR szRSABase[] = { 'r','s','a','e','n','h','.','d','l','l',0 }; - static const WCHAR szType[] = { 'T','y','p','e',0 }; - static const WCHAR szSignature[] = { 'S','i','g','n','a','t','u','r','e',0 }; - DWORD type, sign; - - switch(i) - { - case 3: - type=PROV_RSA_SCHANNEL; - break; - case 4: - case 5: - type=PROV_RSA_AES; - break; - default: - type=PROV_RSA_FULL; - break; - } - sign = 0xdeadbeef; - RegSetValueExW(key, szImagePath, 0, REG_SZ, (const BYTE *)szRSABase, - (lstrlenW(szRSABase) + 1) * sizeof(WCHAR)); - RegSetValueExW(key, szType, 0, REG_DWORD, (LPBYTE)&type, sizeof(type)); - RegSetValueExW(key, szSignature, 0, REG_BINARY, (LPBYTE)&sign, sizeof(sign)); - } - RegCloseKey(key); - } - } - - for (i=0; i<3; i++) { - apiRet = RegCreateKeyExW(HKEY_LOCAL_MACHINE, szDefaultKeys[i], 0, NULL, - REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &key, &dp); - if (apiRet == ERROR_SUCCESS) - { - if (dp == REG_CREATED_NEW_KEY) - { - static const WCHAR szName[] = { 'N','a','m','e',0 }; - static const WCHAR szRSAName[3][54] = { - { 'M','i','c','r','o','s','o','f','t',' ', - 'E','n','h','a','n','c','e','d',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', - 'P','r','o','v','i','d','e','r',' ','v','1','.','0',0 }, - { 'M','i','c','r','o','s','o','f','t',' ','R','S','A',' ', - 'S','C','h','a','n','n','e','l',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', - 'P','r','o','v','i','d','e','r',0 }, - { 'M','i','c','r','o','s','o','f','t',' ','E','n','h','a','n','c','e','d',' ', - 'R','S','A',' ','a','n','d',' ','A','E','S',' ', - 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ', - 'P','r','o','v','i','d','e','r',0 } }; - static const WCHAR szTypeName[] = { 'T','y','p','e','N','a','m','e',0 }; - static const WCHAR szRSATypeName[3][38] = { - { 'R','S','A',' ','F','u','l','l',' ', - '(','S','i','g','n','a','t','u','r','e',' ','a','n','d',' ', - 'K','e','y',' ','E','x','c','h','a','n','g','e',')',0 }, - { 'R','S','A',' ','S','C','h','a','n','n','e','l',0 }, - { 'R','S','A',' ','F','u','l','l',' ','a','n','d',' ','A','E','S',0 } }; - - RegSetValueExW(key, szName, 0, REG_SZ, - (const BYTE *)szRSAName[i], lstrlenW(szRSAName[i])*sizeof(WCHAR)+sizeof(WCHAR)); - RegSetValueExW(key, szTypeName, 0, REG_SZ, - (const BYTE *)szRSATypeName[i], lstrlenW(szRSATypeName[i])*sizeof(WCHAR)+sizeof(WCHAR)); - } - } - RegCloseKey(key); - } - - return HRESULT_FROM_WIN32(apiRet); + return __wine_register_resources( instance ); } /****************************************************************************** * DllUnregisterServer (RSAENH.@) - * - * Dll self unregistration. - * - * PARAMS - * - * RETURNS - * Success: S_OK - * - * NOTES - * For the relevant keys see DllRegisterServer. */ HRESULT WINAPI DllUnregisterServer(void) { - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[0]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[1]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[2]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[3]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[4]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szProviderKeys[5]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[0]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[1]); - RegDeleteKeyW(HKEY_LOCAL_MACHINE, szDefaultKeys[2]); - return S_OK; -} + return __wine_unregister_resources( instance ); +} Added: trunk/reactos/dll/win32/rsaenh/rsaenh.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.rg… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.rgs (added) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.rgs [iso-8859-1] Sat May 19 12:34:30 2012 @@ -1,0 +1,72 @@ +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Cryptography + { + NoRemove Defaults + { + NoRemove Provider + { + ForceRemove 'Microsoft Base Cryptographic Provider v1.0' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 1 + } + ForceRemove 'Microsoft Enhanced Cryptographic Provider v1.0' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 1 + } + ForceRemove 'Microsoft Enhanced RSA and AES Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 24 + } + ForceRemove 'Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 24 + } + ForceRemove 'Microsoft RSA SChannel Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 12 + } + ForceRemove 'Microsoft Strong Cryptographic Provider' + { + val 'Image Path' = s '%MODULE%' + val 'Signature' = b deadbeef + val 'Type' = d 1 + } + } + NoRemove 'Provider Types' + { + ForceRemove 'Type 001' + { + val 'Name' = s 'Microsoft Enhanced Cryptographic Provider v1.0' + val 'TypeName' = s 'RSA Full (Signature and Key Exchange)' + } + ForceRemove 'Type 012' + { + val 'Name' = s 'Microsoft RSA SChannel Cryptographic Provider' + val 'TypeName' = s 'RSA SChannel' + } + ForceRemove 'Type 024' + { + val 'Name' = s 'Microsoft Enhanced RSA and AES Cryptographic Provider' + val 'TypeName' = s 'RSA Full and AES' + } + } + } + } + } + } +} Propchange: trunk/reactos/dll/win32/rsaenh/rsaenh.rgs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/rsaenh/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsrc.rc (added) +++ trunk/reactos/dll/win32/rsaenh/rsrc.rc [iso-8859-1] Sat May 19 12:34:30 2012 @@ -1,0 +1,31 @@ +/* + * Resources for rsaenh + * + * Copyright (c) 2007 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: rsaenh.rgs */ +1 WINE_REGISTRY rsaenh.rgs + +#define WINE_FILEDESCRIPTION_STR "Wine rsaenh" +#define WINE_FILENAME_STR "rsaenh.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/rsaenh/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 12:34:30 2012 @@ -143,7 +143,7 @@ reactos/dll/win32/riched32 # Synced to Wine-1.3.37 reactos/dll/win32/rpcrt4 # Synced to Wine-1.3.26 reactos/dll/win32/rsabase # Autosync -reactos/dll/win32/rsaenh # Autosync +reactos/dll/win32/rsaenh # Synced to Wine-1.5.4 reactos/dll/win32/sccbase # Synced to Wine-1.3.37 reactos/dll/win32/schannel # Synced to Wine-1.3.37 reactos/dll/win32/secur32 # Forked

1 0

[akhaldi] 56623: [PSTOREC] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 12:06:22 2012 New Revision: 56623 URL: http://svn.reactos.org/svn/reactos?rev=56623&view=rev Log: [PSTOREC] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sat May 19 12:06:22 2012 @@ -298,9 +298,8 @@ const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pProomptInfo, DWORD dwFlags ) { - FIXME("%p %08x %s %s %p %08x %p %08x\n", This, Key, - debugstr_guid(pItemType), debugstr_guid(pItemSubtype), - debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); + FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), + debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pProomptInfo, dwFlags); return E_NOTIMPL; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 12:06:22 2012 @@ -135,7 +135,7 @@ reactos/dll/win32/pidgen # Synced to Wine-1.3.37 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to Wine-1.3.37 -reactos/dll/win32/pstorec # Synced to Wine-1.3.37 +reactos/dll/win32/pstorec # Synced to Wine-1.5.4 reactos/dll/win32/query # Synced to Wine-1.3.37 reactos/dll/win32/rasapi32 # Synced to Wine-1.3.37 reactos/dll/win32/resutils # Synced to Wine-1.3.37

1 0

[akhaldi] 56622: [MSCMS_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 11:45:41 2012 New Revision: 56622 URL: http://svn.reactos.org/svn/reactos?rev=56622&view=rev Log: [MSCMS_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/mscms/profile.c Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… ============================================================================== --- trunk/rostests/winetests/mscms/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/profile.c [iso-8859-1] Sat May 19 11:45:41 2012 @@ -131,12 +131,6 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x2d, 0xd3, 0x00, 0x00, 0x20, 0x20, 0x50, 0x48 }; -static LPSTR standardprofile; -static LPWSTR standardprofileW; - -static LPSTR testprofile; -static LPWSTR testprofileW; - #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') static void MSCMS_basenameA( LPCSTR path, LPSTR name ) @@ -227,7 +221,7 @@ ok( ret && size > 0, "GetColorDirectoryW() failed (%d)\n", GetLastError() ); } -static void test_GetColorProfileElement(void) +static void test_GetColorProfileElement( char *standardprofile ) { if (standardprofile) { @@ -277,7 +271,7 @@ } } -static void test_GetColorProfileElementTag(void) +static void test_GetColorProfileElementTag( char *standardprofile ) { if (standardprofile) { @@ -318,7 +312,7 @@ } } -static void test_GetColorProfileFromHandle(void) +static void test_GetColorProfileFromHandle( char *testprofile ) { if (testprofile) { @@ -376,7 +370,7 @@ } } -static void test_GetColorProfileHeader(void) +static void test_GetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -417,7 +411,7 @@ } } -static void test_GetCountColorProfileElements(void) +static void test_GetCountColorProfileElements( char *standardprofile ) { if (standardprofile) { @@ -453,7 +447,7 @@ } } -static void test_GetStandardColorSpaceProfileA(void) +static void test_GetStandardColorSpaceProfileA( char *standardprofile ) { BOOL ret; DWORD size; @@ -538,7 +532,7 @@ ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); } -static void test_GetStandardColorSpaceProfileW(void) +static void test_GetStandardColorSpaceProfileW( WCHAR *standardprofileW ) { BOOL ret; DWORD size; @@ -644,7 +638,7 @@ ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); } -static void test_EnumColorProfilesA(void) +static void test_EnumColorProfilesA( char *standardprofile ) { BOOL ret; DWORD total, size, number; @@ -698,7 +692,7 @@ HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_EnumColorProfilesW(void) +static void test_EnumColorProfilesW( WCHAR *standardprofileW ) { BOOL ret; DWORD total, size, number; @@ -751,7 +745,7 @@ HeapFree( GetProcessHeap(), 0, buffer ); } -static void test_InstallColorProfileA(void) +static void test_InstallColorProfileA( char *standardprofile, char *testprofile ) { BOOL ret; @@ -808,7 +802,7 @@ } } -static void test_InstallColorProfileW(void) +static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofileW ) { BOOL ret; @@ -865,7 +859,7 @@ } } -static void test_IsColorProfileTagPresent(void) +static void test_IsColorProfileTagPresent( char *standardprofile ) { if (standardprofile) { @@ -905,7 +899,7 @@ } } -static void test_OpenColorProfileA(void) +static void test_OpenColorProfileA( char *standardprofile ) { PROFILE profile; HPROFILE handle; @@ -965,7 +959,7 @@ } } -static void test_OpenColorProfileW(void) +static void test_OpenColorProfileW( WCHAR *standardprofileW ) { PROFILE profile; HPROFILE handle; @@ -1015,7 +1009,7 @@ } } -static void test_SetColorProfileElement(void) +static void test_SetColorProfileElement( char *testprofile ) { if (testprofile) { @@ -1077,7 +1071,7 @@ } } -static void test_SetColorProfileHeader(void) +static void test_SetColorProfileHeader( char *testprofile ) { if (testprofile) { @@ -1148,7 +1142,7 @@ } } -static void test_UninstallColorProfileA(void) +static void test_UninstallColorProfileA( char *testprofile ) { BOOL ret; @@ -1196,7 +1190,7 @@ } } -static void test_UninstallColorProfileW(void) +static void test_UninstallColorProfileW( WCHAR *testprofileW ) { BOOL ret; @@ -1248,7 +1242,7 @@ } } -static void test_AssociateColorProfileWithDeviceA(void) +static void test_AssociateColorProfileWithDeviceA( char *testprofile ) { BOOL ret; char profile[MAX_PATH], basename[MAX_PATH]; @@ -1331,10 +1325,10 @@ { UINT len; HANDLE handle; - char path[MAX_PATH], file[MAX_PATH]; - char profilefile1[MAX_PATH], profilefile2[MAX_PATH]; - WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH]; - WCHAR fileW[MAX_PATH]; + char path[MAX_PATH], file[MAX_PATH], profilefile1[MAX_PATH], profilefile2[MAX_PATH]; + WCHAR profilefile1W[MAX_PATH], profilefile2W[MAX_PATH], fileW[MAX_PATH]; + char *standardprofile = NULL, *testprofile = NULL; + WCHAR *standardprofileW = NULL, *testprofileW = NULL; UINT ret; hmscms = LoadLibraryA( "mscms.dll" ); @@ -1395,10 +1389,8 @@ if (CopyFileA( standardprofile, file, FALSE )) { testprofile = (LPSTR)&file; - len = MultiByteToWideChar( CP_ACP, 0, testprofile, -1, NULL, 0 ); MultiByteToWideChar( CP_ACP, 0, testprofile, -1, fileW, len ); - testprofileW = (LPWSTR)&fileW; } } @@ -1407,40 +1399,37 @@ test_GetColorDirectoryA(); test_GetColorDirectoryW(); - test_GetColorProfileElement(); - test_GetColorProfileElementTag(); - - test_GetColorProfileFromHandle(); - test_GetColorProfileHeader(); - - test_GetCountColorProfileElements(); - - test_GetStandardColorSpaceProfileA(); - test_GetStandardColorSpaceProfileW(); - - test_EnumColorProfilesA(); - test_EnumColorProfilesW(); - - test_InstallColorProfileA(); - test_InstallColorProfileW(); - - test_IsColorProfileTagPresent(); - - test_OpenColorProfileA(); - test_OpenColorProfileW(); - - test_SetColorProfileElement(); - test_SetColorProfileHeader(); - - test_UninstallColorProfileA(); - test_UninstallColorProfileW(); - - test_AssociateColorProfileWithDeviceA(); - - /* Clean up */ - if (testprofile) - DeleteFileA( testprofile ); - + test_GetColorProfileElement( standardprofile ); + test_GetColorProfileElementTag( standardprofile ); + + test_GetColorProfileFromHandle( testprofile ); + test_GetColorProfileHeader( testprofile ); + + test_GetCountColorProfileElements( standardprofile ); + + test_GetStandardColorSpaceProfileA( standardprofile ); + test_GetStandardColorSpaceProfileW( standardprofileW ); + + test_EnumColorProfilesA( standardprofile ); + test_EnumColorProfilesW( standardprofileW ); + + test_InstallColorProfileA( standardprofile, testprofile ); + test_InstallColorProfileW( standardprofileW, testprofileW ); + + test_IsColorProfileTagPresent( standardprofile ); + + test_OpenColorProfileA( standardprofile ); + test_OpenColorProfileW( standardprofileW ); + + test_SetColorProfileElement( testprofile ); + test_SetColorProfileHeader( testprofile ); + + test_UninstallColorProfileA( testprofile ); + test_UninstallColorProfileW( testprofileW ); + + test_AssociateColorProfileWithDeviceA( testprofile ); + + if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 ); FreeLibrary( hmscms ); }

1 0

[akhaldi] 56621: [MSCMS] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 11:45:34 2012 New Revision: 56621 URL: http://svn.reactos.org/svn/reactos?rev=56621&view=rev Log: [MSCMS] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/mscms/CMakeLists.txt trunk/reactos/dll/win32/mscms/profile.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mscms/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/CMakeLists.txt [iso-8859-1] Sat May 19 11:45:34 2012 @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(mscms.dll mscms.spec) Modified: trunk/reactos/dll/win32/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/profile.c?… ============================================================================== --- trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mscms/profile.c [iso-8859-1] Sat May 19 11:45:34 2012 @@ -253,13 +253,12 @@ { ret = GetColorDirectoryW( NULL, NULL, &sizeW ); *size = sizeW / sizeof(WCHAR); - return FALSE; + return ret; } sizeW = *size * sizeof(WCHAR); bufferW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (bufferW) { if ((ret = GetColorDirectoryW( NULL, bufferW, &sizeW ))) @@ -594,11 +593,10 @@ { ret = GetStandardColorSpaceProfileW( NULL, id, NULL, &sizeW ); *size = sizeW / sizeof(WCHAR); - return FALSE; + return ret; } profileW = HeapAlloc( GetProcessHeap(), 0, sizeW ); - if (profileW) { if ((ret = GetStandardColorSpaceProfileW( NULL, id, profileW, &sizeW ))) @@ -1475,7 +1473,6 @@ handle = CreateFileW( profile->pProfileData, flags, sharing, NULL, creation, 0, NULL ); else { - DWORD size; WCHAR *path; if (!GetColorDirectoryW( NULL, NULL, &size ) && GetLastError() == ERROR_MORE_DATA) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 11:45:34 2012 @@ -94,7 +94,7 @@ reactos/dll/win32/msacm32 # Autosync reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37 reactos/dll/win32/mscat32 # Synced to Wine-1.3.37 -reactos/dll/win32/mscms # Synced to Wine-1.3.37 +reactos/dll/win32/mscms # Synced to Wine-1.5.4 reactos/dll/win32/mscoree # Synced to Wine-1.3.37 reactos/dll/win32/msctf # Synced to Wine-1.3.37 reactos/dll/win32/msftedit # Synced to Wine-1.3.37

1 0

[akhaldi] 56620: [MCIWAVE] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 11:34:35 2012 New Revision: 56620 URL: http://svn.reactos.org/svn/reactos?rev=56620&view=rev Log: [MCIWAVE] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/mciwave/mciwave.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciwave/mciwave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/mciwave.… ============================================================================== --- trunk/reactos/dll/win32/mciwave/mciwave.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/mciwave.c [iso-8859-1] Sat May 19 11:34:35 2012 @@ -225,7 +225,7 @@ /************************************************************************** * WAVE_ConvertByteToTimeFormat [internal] */ -static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val, LPDWORD lpRet) +static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val) { DWORD ret = 0; @@ -243,7 +243,6 @@ WARN("Bad time format %u!\n", wmw->dwMciTimeFormat); } TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wmw->dwMciTimeFormat, ret); - *lpRet = 0; return ret; } @@ -257,6 +256,9 @@ switch (wmw->dwMciTimeFormat) { case MCI_FORMAT_MILLISECONDS: ret = MulDiv(val,wmw->lpWaveFormat->nAvgBytesPerSec,1000); + if (ret > wmw->ckWaveData.cksize && + val == WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize)) + ret = wmw->ckWaveData.cksize; break; case MCI_FORMAT_BYTES: ret = val; @@ -868,6 +870,10 @@ whidx = 0; wmw->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!wmw->hEvent) { + dwRet = MCIERR_OUT_OF_MEMORY; + goto cleanUp; + } wmw->dwEventCount = 1L; /* for first buffer */ TRACE("Playing (normalized) from byte=%u for %u bytes\n", wmw->dwPosition, left); @@ -919,6 +925,7 @@ wmw->hWave = 0; } CloseHandle(wmw->hEvent); + wmw->hEvent = NULL; wmw->dwStatus = MCI_MODE_STOP; @@ -1484,7 +1491,7 @@ return MCIERR_UNSUPPORTED_FUNCTION; } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ - lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize, &ret); + lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize); TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: @@ -1509,8 +1516,7 @@ } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, - (dwFlags & MCI_STATUS_START) ? 0 : wmw->dwPosition, - &ret); + (dwFlags & MCI_STATUS_START) ? 0 : wmw->dwPosition); TRACE("MCI_STATUS_POSITION %s => %lu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 11:34:35 2012 @@ -87,7 +87,7 @@ reactos/dll/win32/mcicda # Synced to Wine-1.3.37 reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4 reactos/dll/win32/mciseq # Synced to Wine-1.3.37 -reactos/dll/win32/mciwave # Synced to Wine-1.3.37 +reactos/dll/win32/mciwave # Synced to Wine-1.5.4 reactos/dll/win32/mlang # Synced to Wine-1.3.37 reactos/dll/win32/mpr # Autosync reactos/dll/win32/mprapi # Synced to Wine-1.3.37

1 0

[akhaldi] 56619: [MCOQTZ32] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 11:26:15 2012 New Revision: 56619 URL: http://svn.reactos.org/svn/reactos?rev=56619&view=rev Log: [MCOQTZ32] * Sync to Wine 1.5.4. Added: trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc (with props) Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Sat May 19 11:26:15 2012 @@ -6,13 +6,12 @@ list(APPEND SOURCE mciqtz.c + mciavi_res.rc version.rc ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def) add_library(mciqtz32 SHARED ${SOURCE}) - set_module_type(mciqtz32 win32dll) - target_link_libraries(mciqtz32 wine strmiids) add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciavi_… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc (added) +++ trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc [iso-8859-1] Sat May 19 11:26:15 2012 @@ -1,0 +1,579 @@ +/* MciAvi resources + * + * Copyright (c) 2000, Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "mmddk.h" +#include "digitalv.h" + +#ifdef MCI_INTEGER64 +#define MCI_DWORD_PTR MCI_INTEGER64 +#else +#define MCI_DWORD_PTR MCI_INTEGER +#endif + +MCIAVI RCDATA +BEGIN +L"play\0", MCI_PLAY, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"from\0", 0x00000004L, MCI_INTEGER, +L"to\0", 0x00000008L, MCI_INTEGER, +L"repeat\0", 0x00010000L, MCI_FLAG, +L"reverse\0", 0x00020000L, MCI_FLAG, +L"window\0", 0x01000000L, MCI_FLAG, +L"fullscreen by 2\0", 0x04000000L, MCI_FLAG, +L"fullscreen\0", 0x02000000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"capability\0", MCI_GETDEVCAPS, 0, MCI_COMMAND_HEAD, +L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000100L, MCI_CONSTANT, +L"can record\0", 0x00000001L, MCI_INTEGER, +L"has audio\0", 0x00000002L, MCI_INTEGER, +L"has video\0", 0x00000003L, MCI_INTEGER, +L"uses files\0", 0x00000005L, MCI_INTEGER, +L"compound device\0", 0x00000006L, MCI_INTEGER, +L"device type\0", 0x00000004L, MCI_INTEGER, +L"can eject\0", 0x00000007L, MCI_INTEGER, +L"can play\0", 0x00000008L, MCI_INTEGER, +L"can save\0", 0x00000009L, MCI_INTEGER, +L"can lock\0", 0x00004000L, MCI_INTEGER, +L"can reverse\0", 0x00004004L, MCI_INTEGER, +L"can stretch input\0", 0x00004008L, MCI_INTEGER, +L"can stretch\0", 0x00004001L, MCI_INTEGER, +L"can test\0", 0x00004009L, MCI_INTEGER, +L"has still\0", 0x00004005L, MCI_INTEGER, +L"can freeze\0", 0x00004002L, MCI_INTEGER, +L"uses palettes\0", 0x00004006L, MCI_INTEGER, +L"windows\0", 0x00004003L, MCI_INTEGER, +L"maximum play rate\0", 0x0000400aL, MCI_INTEGER, +L"minimum play rate\0", 0x0000400bL, MCI_INTEGER, +L"can colorkey\0", 0x00004100L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"capture\0", MCI_CAPTURE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"as\0", 0x00010000L, MCI_STRING, +L"at\0", 0x00020000L, MCI_RECT, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"close\0", MCI_CLOSE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"configure\0", MCI_CONFIGURE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"copy\0", MCI_COPY, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"from\0", 0x00000004L, MCI_INTEGER, +L"to\0", 0x00000008L, MCI_INTEGER, +L"at\0", 0x00010000L, MCI_RECT, +L"audio stream\0", 0x00020000L, MCI_INTEGER, +L"video stream\0", 0x00040000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"cue\0", MCI_CUE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"input\0", 0x00010000L, MCI_FLAG, +L"output\0", 0x00020000L, MCI_FLAG, +L"to\0", 0x00000008L, MCI_INTEGER, +L"noshow\0", 0x00040000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"cut\0", MCI_CUT, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"from\0", 0x00000004L, MCI_INTEGER, +L"to\0", 0x00000008L, MCI_INTEGER, +L"at\0", 0x00010000L, MCI_RECT, +L"audio stream\0", 0x00020000L, MCI_INTEGER, +L"video stream\0", 0x00040000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"delete\0", MCI_DELETE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"from\0", 0x00000004L, MCI_INTEGER, +L"to\0", 0x00000008L, MCI_INTEGER, +L"at\0", 0x00010000L, MCI_RECT, +L"audio stream\0", 0x00020000L, MCI_INTEGER, +L"video stream\0", 0x00040000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"freeze\0", MCI_FREEZE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"at\0", 0x00010000L, MCI_RECT, +L"outside\0", 0x00020000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"info\0", MCI_INFO, 0, MCI_COMMAND_HEAD, +L"\0", MCI_STRING, 0, MCI_RETURN, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"file\0", 0x00000200L, MCI_FLAG, +L"product\0", 0x00000100L, MCI_FLAG, +L"window text\0", 0x00010000L, MCI_FLAG, +L"usage\0", 0x00004000L, MCI_FLAG, +L"version\0", 0x00000400L, MCI_FLAG, +L"\0", 0x00020000L, MCI_CONSTANT, +L"audio algorithm\0", 0x00004004L, MCI_INTEGER, +L"audio quality\0", 0x00004001L, MCI_INTEGER, +L"still algorithm\0", 0x00004005L, MCI_INTEGER, +L"still quality\0", 0x00004002L, MCI_INTEGER, +L"video algorithm\0", 0x00004006L, MCI_INTEGER, +L"video quality\0", 0x00004003L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"list\0", MCI_LIST, 0, MCI_COMMAND_HEAD, +L"\0", MCI_STRING, 0, MCI_RETURN, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"count\0", 0x00020000L, MCI_FLAG, +L"number\0", 0x00040000L, MCI_INTEGER, +L"\0", 0x00010000L, MCI_CONSTANT, +L"audio algorithm\0", 0x00004000L, MCI_INTEGER, +L"audio quality\0", 0x00004001L, MCI_INTEGER, +L"audio stream\0", 0x00004002L, MCI_INTEGER, +L"still algorithm\0", 0x00004003L, MCI_INTEGER, +L"still quality\0", 0x00004004L, MCI_INTEGER, +L"video algorithm\0", 0x00004005L, MCI_INTEGER, +L"video quality\0", 0x00004006L, MCI_INTEGER, +L"video source\0", 0x00004008L, MCI_INTEGER, +L"video stream\0", 0x00004007L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"algorithm\0", 0x00080000L, MCI_STRING, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"load\0", MCI_LOAD, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000100L, MCI_STRING, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"monitor\0", MCI_MONITOR, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00020000L, MCI_CONSTANT, +L"input\0", 0x00004000L, MCI_INTEGER, +L"file\0", 0x00004001L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"method\0", 0x00010000L, MCI_CONSTANT, +L"pre\0", 0x0000a000L, MCI_INTEGER, +L"post\0", 0x0000a001L, MCI_INTEGER, +L"direct\0", 0x0000a002L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"open\0", MCI_OPEN, 0, MCI_COMMAND_HEAD, +L"\0", MCI_INTEGER, 0, MCI_RETURN, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"type\0", 0x00002000L, MCI_STRING, +L"element\0", 0x00000200L, MCI_STRING, +L"alias\0", 0x00000400L, MCI_STRING, +L"shareable\0", 0x00000100L, MCI_FLAG, +L"style\0", 0x00010000L, MCI_CONSTANT, +L"overlapped\0", 0x00cf0000L, MCI_INTEGER, +L"popup\0", 0x80880000L, MCI_INTEGER, +L"child\0", 0x40000000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"parent\0", 0x00020000L, MCI_HWND, +L"nostatic\0", 0x00040000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"paste\0", MCI_PASTE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"to\0", 0x00000008L, MCI_INTEGER, +L"at\0", 0x00010000L, MCI_RECT, +L"insert\0", 0x00080000L, MCI_FLAG, +L"overwrite\0", 0x00100000L, MCI_FLAG, +L"audio stream\0", 0x00020000L, MCI_INTEGER, +L"video stream\0", 0x00040000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"pause\0", MCI_PAUSE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"put\0", MCI_PUT, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"at\0", 0x00010000L, MCI_RECT, +L"source\0", 0x00020000L, MCI_FLAG, +L"destination\0", 0x00040000L, MCI_FLAG, +L"frame\0", 0x00080000L, MCI_FLAG, +L"video\0", 0x00100000L, MCI_FLAG, +L"window\0", 0x00200000L, MCI_FLAG, +L"client\0", 0x00400000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"quality\0", MCI_QUALITY, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00010000L, MCI_CONSTANT, +L"audio\0", 0x00004000L, MCI_INTEGER, +L"still\0", 0x00004001L, MCI_INTEGER, +L"video\0", 0x00004002L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"name\0", 0x00020000L, MCI_STRING, +L"algorithm\0", 0x00040000L, MCI_STRING, +L"dialog\0", 0x00080000L, MCI_FLAG, +L"handle\0", 0x00100000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"realize\0", MCI_REALIZE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"normal\0", 0x00010000L, MCI_FLAG, +L"background\0", 0x00020000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"record\0", MCI_RECORD, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"from\0", 0x00000004L, MCI_INTEGER, +L"to\0", 0x00000008L, MCI_INTEGER, +L"insert\0", 0x00000100L, MCI_FLAG, +L"overwrite\0", 0x00000200L, MCI_FLAG, +L"at\0", 0x00010000L, MCI_RECT, +L"hold\0", 0x00020000L, MCI_FLAG, +L"audio stream\0", 0x00040000L, MCI_INTEGER, +L"video stream\0", 0x00080000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"reserve\0", MCI_RESERVE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"in\0", 0x00010000L, MCI_STRING, +L"size\0", 0x00020000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"restore\0", MCI_RESTORE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"from\0", 0x00010000L, MCI_STRING, +L"at\0", 0x00020000L, MCI_RECT, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"resume\0", MCI_RESUME, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"save\0", MCI_SAVE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000100L, MCI_STRING, +L"at\0", 0x00010000L, MCI_RECT, +L"abort\0", 0x00020000L, MCI_FLAG, +L"keepreserve\0", 0x00040000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"seek\0", MCI_SEEK, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"to start\0", 0x00000100L, MCI_FLAG, +L"to end\0", 0x00000200L, MCI_FLAG, +L"to\0", 0x00000008L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"set\0", MCI_SET, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"time format\0", 0x00000400L, MCI_CONSTANT, +L"frames\0", 0x00000003L, MCI_INTEGER, +L"milliseconds\0", 0x00000000L, MCI_INTEGER, +L"ms\0", 0x00000000L, MCI_INTEGER, +L"bytes\0", 0x00000008L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"door open\0", 0x00000100L, MCI_FLAG, +L"door closed\0", 0x00000200L, MCI_FLAG, +L"audio\0", 0x00000800L, MCI_CONSTANT, +L"all\0", 0x00000000L, MCI_INTEGER, +L"left\0", 0x00000001L, MCI_INTEGER, +L"right\0", 0x00000002L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"video\0", 0x00001000L, MCI_FLAG, +L"seek exactly\0", 0x00010000L, MCI_FLAG, +L"file format\0", 0x00080000L, MCI_CONSTANT, +L"avss\0", 0x00004000L, MCI_INTEGER, +L"avi\0", 0x00004001L, MCI_INTEGER, +L"dib\0", 0x00004002L, MCI_INTEGER, +L"rdib\0", 0x00004003L, MCI_INTEGER, +L"jpeg\0", 0x00004004L, MCI_INTEGER, +L"rjpeg\0", 0x00004005L, MCI_INTEGER, +L"jfif\0", 0x00004006L, MCI_INTEGER, +L"mpeg\0", 0x00004007L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"still\0", 0x00040000L, MCI_FLAG, +L"on\0", 0x00002000L, MCI_FLAG, +L"off\0", 0x00004000L, MCI_FLAG, +L"speed\0", 0x00020000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"setaudio\0", MCI_SETAUDIO, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00800000L, MCI_CONSTANT, +L"bass\0", 0x00004001L, MCI_INTEGER, +L"treble\0", 0x00004000L, MCI_INTEGER, +L"volume\0", 0x00004002L, MCI_INTEGER, +L"stream\0", 0x00004003L, MCI_INTEGER, +L"source\0", 0x00004004L, MCI_INTEGER, +L"samplespersec\0", 0x00004005L, MCI_INTEGER, +L"bytespersec\0", 0x00004006L, MCI_INTEGER, +L"alignment\0", 0x00004007L, MCI_INTEGER, +L"bitspersample\0", 0x00004008L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"to\0", 0x01000000L, MCI_CONSTANT, +L"left\0", 0x00000001L, MCI_INTEGER, +L"right\0", 0x00000002L, MCI_INTEGER, +L"average\0", 0x00004000L, MCI_INTEGER, +L"stereo\0", 0x00000000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"over\0", 0x00010000L, MCI_INTEGER, +L"algorithm\0", 0x00040000L, MCI_STRING, +L"quality\0", 0x00080000L, MCI_STRING, +L"record\0", 0x00100000L, MCI_FLAG, +L"left\0", 0x00200000L, MCI_FLAG, +L"clocktime\0", 0x00020000L, MCI_FLAG, +L"right\0", 0x00400000L, MCI_FLAG, +L"on\0", 0x00002000L, MCI_FLAG, +L"off\0", 0x00004000L, MCI_FLAG, +L"input\0", 0x02000000L, MCI_FLAG, +L"output\0", 0x04000000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"setvideo\0", MCI_SETVIDEO, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00100000L, MCI_CONSTANT, +L"frame rate\0", 0x00004008L, MCI_INTEGER, +L"brightness\0", 0x00004000L, MCI_INTEGER, +L"color\0", 0x00004001L, MCI_INTEGER, +L"contrast\0", 0x00004002L, MCI_INTEGER, +L"tint\0", 0x00004003L, MCI_INTEGER, +L"sharpness\0", 0x00004004L, MCI_INTEGER, +L"gamma\0", 0x00004005L, MCI_INTEGER, +L"palette handle\0", 0x00004007L, MCI_INTEGER, +L"stream\0", 0x00004006L, MCI_INTEGER, +L"source\0", 0x00004009L, MCI_INTEGER, +L"key index\0", 0x0000400aL, MCI_INTEGER, +L"key color\0", 0x0000400bL, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"to\0", 0x01000000L, MCI_CONSTANT, +L"ntsc\0", 0x00004000L, MCI_INTEGER, +L"rgb\0", 0x00004001L, MCI_INTEGER, +L"svideo\0", 0x00004002L, MCI_INTEGER, +L"pal\0", 0x00004003L, MCI_INTEGER, +L"secam\0", 0x00004004L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"quality\0", 0x00010000L, MCI_STRING, +L"algorithm\0", 0x00020000L, MCI_STRING, +L"number\0", 0x00080000L, MCI_INTEGER, +L"over\0", 0x00200000L, MCI_INTEGER, +L"record\0", 0x00400000L, MCI_FLAG, +L"still\0", 0x00800000L, MCI_FLAG, +L"clocktime\0", 0x00040000L, MCI_FLAG, +L"on\0", 0x00002000L, MCI_FLAG, +L"off\0", 0x00004000L, MCI_FLAG, +L"input\0", 0x02000000L, MCI_FLAG, +L"output\0", 0x04000000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"signal\0", MCI_SIGNAL, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"at\0", 0x00010000L, MCI_INTEGER, +L"every\0", 0x00020000L, MCI_INTEGER, +L"uservalue\0", 0x00040000L, MCI_INTEGER, +L"cancel\0", 0x00080000L, MCI_FLAG, +L"return position\0", 0x00100000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"status\0", MCI_STATUS, 0, MCI_COMMAND_HEAD, +L"\0", MCI_DWORD_PTR, 0, MCI_RETURN, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000100L, MCI_CONSTANT, +L"frames skipped\0", 0x00008001L, MCI_INTEGER, +L"play speed\0", 0x00008002L, MCI_INTEGER, +L"audio breaks\0", 0x00008003L, MCI_INTEGER, +L"alignment\0", 0x00004029L, MCI_INTEGER, +L"audio input\0", 0x00004000L, MCI_INTEGER, +L"audio record\0", 0x0000401aL, MCI_INTEGER, +L"audio source\0", 0x00004009L, MCI_INTEGER, +L"audio stream\0", 0x0000402dL, MCI_INTEGER, +L"bass\0", 0x0000400fL, MCI_INTEGER, +L"bitsperpel\0", 0x0000402bL, MCI_INTEGER, +L"bitspersample\0", 0x0000402aL, MCI_INTEGER, +L"brightness\0", 0x00004005L, MCI_INTEGER, +L"bytespersec\0", 0x00004028L, MCI_INTEGER, +L"color\0", 0x00004006L, MCI_INTEGER, +L"contrast\0", 0x00004007L, MCI_INTEGER, +L"current track\0", 0x00000008L, MCI_INTEGER, +L"file format\0", 0x00004008L, MCI_INTEGER, +L"still file format\0", 0x0000401dL, MCI_INTEGER, +L"file mode\0", 0x0000401fL, MCI_INTEGER, +L"file completion\0", 0x00004020L, MCI_INTEGER, +L"forward\0", 0x0000402cL, MCI_INTEGER, +L"gamma\0", 0x0000400aL, MCI_INTEGER, +L"length\0", 0x00000001L, MCI_INTEGER, +L"media present\0", 0x00000005L, MCI_INTEGER, +L"mode\0", 0x00000004L, MCI_INTEGER, +L"monitor method\0", 0x0000400cL, MCI_INTEGER, +L"monitor\0", 0x0000400bL, MCI_INTEGER, +L"number of tracks\0", 0x00000003L, MCI_INTEGER, +L"palette handle\0", 0x00004004L, MCI_INTEGER, +L"pause mode\0", 0x00004026L, MCI_INTEGER, +L"position\0", 0x00000002L, MCI_INTEGER, +L"ready\0", 0x00000007L, MCI_INTEGER, +L"frame rate\0", 0x0000400eL, MCI_INTEGER, +L"reserved size\0", 0x00004010L, MCI_INTEGER, +L"samplespersec\0", 0x00004027L, MCI_INTEGER, +L"seek exactly\0", 0x00004011L, MCI_INTEGER, +L"sharpness\0", 0x00004012L, MCI_INTEGER, +L"smpte\0", 0x00004013L, MCI_INTEGER, +L"speed\0", 0x00004003L, MCI_INTEGER, +L"time format\0", 0x00000006L, MCI_INTEGER, +L"tint\0", 0x00004015L, MCI_INTEGER, +L"treble\0", 0x00004016L, MCI_INTEGER, +L"unsaved\0", 0x00004017L, MCI_INTEGER, +L"video key color\0", 0x00004025L, MCI_INTEGER, +L"video key index\0", 0x00004024L, MCI_INTEGER, +L"video source\0", 0x0000401bL, MCI_INTEGER, +L"video source number\0", 0x0000401eL, MCI_INTEGER, +L"video record\0", 0x0000401cL, MCI_INTEGER, +L"video stream\0", 0x0000402eL, MCI_INTEGER, +L"volume\0", 0x00004019L, MCI_INTEGER, +L"window handle\0", 0x00004001L, MCI_INTEGER, +L"window visible\0", 0x00004021L, MCI_INTEGER, +L"window minimized\0", 0x00004022L, MCI_INTEGER, +L"window maximized\0", 0x00004023L, MCI_INTEGER, +L"video streams\0", 0x00004100L, MCI_INTEGER, +L"video bitrate\0", 0x00004101L, MCI_INTEGER, +L"video maxbitrate\0", 0x00004102L, MCI_INTEGER, +L"audio streams\0", 0x00004103L, MCI_INTEGER, +L"audio bitrate\0", 0x00004104L, MCI_INTEGER, +L"video brush\0", 0x00004105L, MCI_INTEGER, +L"audio\0", 0x00004014L, MCI_INTEGER, +L"video\0", 0x00004018L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"track\0", 0x00000010L, MCI_INTEGER, +L"start\0", 0x00000200L, MCI_FLAG, +L"left\0", 0x00080000L, MCI_FLAG, +L"right\0", 0x00100000L, MCI_FLAG, +L"nominal\0", 0x00020000L, MCI_FLAG, +L"record\0", 0x01000000L, MCI_FLAG, +L"input\0", 0x00400000L, MCI_FLAG, +L"output\0", 0x00800000L, MCI_FLAG, +L"disk space\0", 0x00200000L, MCI_STRING, +L"reference\0", 0x00040000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"step\0", MCI_STEP, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"reverse\0", 0x00010000L, MCI_FLAG, +L"by\0", 0x00020000L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"stop\0", MCI_STOP, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"hold\0", 0x00010000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"undo\0", MCI_UNDO, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"unfreeze\0", MCI_UNFREEZE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"at\0", 0x00010000L, MCI_RECT, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"update\0", MCI_UPDATE, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"at\0", 0x00010000L, MCI_RECT, +L"hdc\0", 0x00020000L, MCI_HDC, +L"paint\0", 0x00040000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"where\0", MCI_WHERE, 0, MCI_COMMAND_HEAD, +L"\0", MCI_RECT, 0, MCI_RETURN, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"source\0", 0x00020000L, MCI_FLAG, +L"destination\0", 0x00040000L, MCI_FLAG, +L"frame\0", 0x00080000L, MCI_FLAG, +L"video\0", 0x00100000L, MCI_FLAG, +L"window\0", 0x00200000L, MCI_FLAG, +L"max\0", 0x00400000L, MCI_FLAG, +L"min\0", 0x00800000L, MCI_FLAG, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"window\0", MCI_WINDOW, 0, MCI_COMMAND_HEAD, +L"notify\0", 0x00000001L, MCI_FLAG, +L"wait\0", 0x00000002L, MCI_FLAG, +L"test\0", 0x00000020L, MCI_FLAG, +L"handle\0", 0x00010000L, MCI_CONSTANT, +L"default\0", 0x00000000L, MCI_HWND, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"state\0", 0x00040000L, MCI_CONSTANT, +L"hide\0", 0x00000000L, MCI_INTEGER, +L"minimize\0", 0x00000006L, MCI_INTEGER, +L"restore\0", 0x00000009L, MCI_INTEGER, +L"show maximized\0", 0x00000003L, MCI_INTEGER, +L"show min noactive\0", 0x00000007L, MCI_INTEGER, +L"show minimized\0", 0x00000002L, MCI_INTEGER, +L"show na\0", 0x00000008L, MCI_INTEGER, +L"show noactivate\0", 0x00000004L, MCI_INTEGER, +L"show normal\0", 0x00000001L, MCI_INTEGER, +L"show\0", 0x00000005L, MCI_INTEGER, +L"no action\0", 0x00000008L, MCI_INTEGER, +L"minimized\0", 0x00000002L, MCI_INTEGER, +L"\0", 0x00000000L, MCI_END_CONSTANT, +L"text\0", 0x00080000L, MCI_STRING, +L"\0", 0x00000000L, MCI_END_COMMAND, +L"\0", 0x00000000L, MCI_END_COMMAND_LIST +END + +STRINGTABLE +BEGIN + +MCI_ON_S, "on" +MCI_OFF_S, "off" +END Propchange: trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Sat May 19 11:26:15 2012 @@ -37,7 +37,7 @@ * MCI QTZ implementation * *======================================================================*/ -HINSTANCE MCIQTZ_hInstance = 0; +static HINSTANCE MCIQTZ_hInstance = 0; /*********************************************************************** * DllMain (MCIQTZ.0) @@ -145,8 +145,8 @@ { WINE_MCIQTZ* wma; HRESULT hr; - IBasicVideo *vidbasic; - IVideoWindow *vidwin; + DWORD style = 0; + RECT rc = { 0, 0, 0, 0 }; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); @@ -171,6 +171,30 @@ hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaControl, (LPVOID*)&wma->pmctrl); if (FAILED(hr)) { TRACE("Cannot get IMediaControl interface (hr = %x)\n", hr); + goto err; + } + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaSeeking, (void**)&wma->seek); + if (FAILED(hr)) { + TRACE("Cannot get IMediaSeeking interface (hr = %x)\n", hr); + goto err; + } + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaEvent, (void**)&wma->mevent); + if (FAILED(hr)) { + TRACE("Cannot get IMediaEvent interface (hr = %x)\n", hr); + goto err; + } + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&wma->vidwin); + if (FAILED(hr)) { + TRACE("Cannot get IVideoWindow interface (hr = %x)\n", hr); + goto err; + } + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&wma->vidbasic); + if (FAILED(hr)) { + TRACE("Cannot get IBasicVideo interface (hr = %x)\n", hr); goto err; } @@ -192,33 +216,22 @@ goto err; } - hr = IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); - if (SUCCEEDED(hr)) - hr = IFilterGraph2_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&vidbasic); - if (SUCCEEDED(hr)) { - DWORD style; - RECT rc = { 0, 0, 0, 0 }; - IVideoWindow_put_AutoShow(vidwin, OAFALSE); - IVideoWindow_put_Visible(vidwin, OAFALSE); - style = 0; - if (dwFlags & MCI_DGV_OPEN_WS) - style |= lpOpenParms->dwStyle; - if (dwFlags & MCI_DGV_OPEN_PARENT) { - IVideoWindow_put_MessageDrain(vidwin, (OAHWND)lpOpenParms->hWndParent); - IVideoWindow_put_WindowState(vidwin, SW_HIDE); - IVideoWindow_put_WindowStyle(vidwin, WS_CHILD); - IVideoWindow_put_Owner(vidwin, (OAHWND)lpOpenParms->hWndParent); - wma->parent = (HWND)lpOpenParms->hWndParent; - } - else if (style) - IVideoWindow_put_WindowStyle(vidwin, style); - IBasicVideo_GetVideoSize(vidbasic, &rc.right, &rc.bottom); - IVideoWindow_SetWindowPosition(vidwin, rc.left, rc.top, rc.right, rc.bottom); - IBasicVideo_Release(vidbasic); - } - if (vidwin) - IVideoWindow_Release(vidwin); - + IVideoWindow_put_AutoShow(wma->vidwin, OAFALSE); + IVideoWindow_put_Visible(wma->vidwin, OAFALSE); + if (dwFlags & MCI_DGV_OPEN_WS) + style = lpOpenParms->dwStyle; + if (dwFlags & MCI_DGV_OPEN_PARENT) { + IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)lpOpenParms->hWndParent); + IVideoWindow_put_WindowState(wma->vidwin, SW_HIDE); + IVideoWindow_put_WindowStyle(wma->vidwin, style|WS_CHILD); + IVideoWindow_put_Owner(wma->vidwin, (OAHWND)lpOpenParms->hWndParent); + GetClientRect(lpOpenParms->hWndParent, &rc); + IVideoWindow_SetWindowPosition(wma->vidwin, rc.left, rc.top, rc.right - rc.top, rc.bottom - rc.top); + wma->parent = (HWND)lpOpenParms->hWndParent; + } + else if (style) + IVideoWindow_put_WindowStyle(wma->vidwin, style); + IBasicVideo_GetVideoSize(wma->vidbasic, &rc.right, &rc.bottom); wma->opened = TRUE; if (dwFlags & MCI_NOTIFY) @@ -227,15 +240,28 @@ return 0; err: + if (wma->vidbasic) + IUnknown_Release(wma->vidbasic); + wma->vidbasic = NULL; + if (wma->seek) + IUnknown_Release(wma->seek); + wma->seek = NULL; + if (wma->vidwin) + IUnknown_Release(wma->vidwin); + wma->vidwin = NULL; if (wma->pgraph) IGraphBuilder_Release(wma->pgraph); wma->pgraph = NULL; + if (wma->mevent) + IMediaEvent_Release(wma->mevent); + wma->mevent = NULL; if (wma->pmctrl) IMediaControl_Release(wma->pmctrl); wma->pmctrl = NULL; if (wma->uninit) CoUninitialize(); + wma->uninit = 0; return MCIERR_INTERNAL; } @@ -256,6 +282,10 @@ MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); if (wma->opened) { + IUnknown_Release(wma->vidwin); + IUnknown_Release(wma->vidbasic); + IUnknown_Release(wma->seek); + IMediaEvent_Release(wma->mevent); IGraphBuilder_Release(wma->pgraph); IMediaControl_Release(wma->pmctrl); if (wma->uninit) @@ -273,6 +303,9 @@ { WINE_MCIQTZ* wma; HRESULT hr; + REFERENCE_TIME time1 = 0, time2 = 0; + GUID format; + DWORD pos1; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -283,21 +316,34 @@ if (!wma) return MCIERR_INVALID_DEVICE_ID; + IMediaSeeking_GetTimeFormat(wma->seek, &format); + if (dwFlags & MCI_FROM) { + if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) + time1 = lpParms->dwFrom * 10000; + else + time1 = lpParms->dwFrom; + pos1 = AM_SEEKING_AbsolutePositioning; + } else + pos1 = AM_SEEKING_NoPositioning; + if (dwFlags & MCI_TO) { + if (IsEqualGUID(&format, &TIME_FORMAT_MEDIA_TIME)) + time2 = lpParms->dwTo * 10000; + else + time2 = lpParms->dwTo; + } else + IMediaSeeking_GetDuration(wma->seek, &time2); + IMediaSeeking_SetPositions(wma->seek, &time1, pos1, &time2, AM_SEEKING_AbsolutePositioning); + hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { TRACE("Cannot run filtergraph (hr = %x)\n", hr); return MCIERR_INTERNAL; } - if (!wma->parent) { - IVideoWindow *vidwin; - IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); - if (vidwin) { - IVideoWindow_put_Visible(vidwin, OATRUE); - IVideoWindow_Release(vidwin); - } - } - + IVideoWindow_put_Visible(wma->vidwin, OATRUE); + + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); return 0; } @@ -308,7 +354,6 @@ { WINE_MCIQTZ* wma; HRESULT hr; - IMediaPosition* pmpos; LONGLONG newpos; TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); @@ -335,20 +380,11 @@ return MCIERR_MISSING_PARAMETER; } - hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); - if (FAILED(hr)) { - FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + hr = IMediaSeeking_SetPositions(wma->seek, &newpos, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); + if (FAILED(hr)) { + FIXME("Cannot set position (hr = %x)\n", hr); return MCIERR_INTERNAL; } - - hr = IMediaPosition_put_CurrentPosition(pmpos, newpos); - if (FAILED(hr)) { - FIXME("Cannot set position (hr = %x)\n", hr); - IMediaPosition_Release(pmpos); - return MCIERR_INTERNAL; - } - - IMediaPosition_Release(pmpos); if (dwFlags & MCI_NOTIFY) mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); @@ -379,14 +415,8 @@ return MCIERR_INTERNAL; } - if (!wma->parent) { - IVideoWindow *vidwin; - IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); - if (vidwin) { - IVideoWindow_put_Visible(vidwin, OAFALSE); - IVideoWindow_Release(vidwin); - } - } + if (!wma->parent) + IVideoWindow_put_Visible(wma->vidwin, OAFALSE); return 0; } @@ -592,7 +622,6 @@ switch (lpParms->dwItem) { case MCI_STATUS_LENGTH: { - IMediaSeeking *seek; LONGLONG duration = -1; GUID format; switch (wma->time_format) { @@ -600,20 +629,13 @@ case MCI_FORMAT_FRAMES: format = TIME_FORMAT_FRAME; break; default: ERR("Unhandled format %x\n", wma->time_format); break; } - hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaSeeking, (void**)&seek); + hr = IMediaSeeking_SetTimeFormat(wma->seek, &format); if (FAILED(hr)) { - FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); - return MCIERR_INTERNAL; - } - hr = IMediaSeeking_SetTimeFormat(seek, &format); - if (FAILED(hr)) { - IMediaSeeking_Release(seek); FIXME("Cannot set time format (hr = %x)\n", hr); lpParms->dwReturn = 0; break; } - hr = IMediaSeeking_GetDuration(seek, &duration); - IMediaSeeking_Release(seek); + hr = IMediaSeeking_GetDuration(wma->seek, &duration); if (FAILED(hr) || duration < 0) { FIXME("Cannot read duration (hr = %x)\n", hr); lpParms->dwReturn = 0; @@ -624,33 +646,42 @@ break; } case MCI_STATUS_POSITION: { - IMediaPosition* pmpos; - REFTIME curpos; - - hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); + REFERENCE_TIME curpos; + + hr = IMediaSeeking_GetCurrentPosition(wma->seek, &curpos); if (FAILED(hr)) { - FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + FIXME("Cannot get position (hr = %x)\n", hr); return MCIERR_INTERNAL; } - - hr = IMediaPosition_get_CurrentPosition(pmpos, &curpos); - if (FAILED(hr)) { - FIXME("Cannot get position (hr = %x)\n", hr); - IMediaPosition_Release(pmpos); - return MCIERR_INTERNAL; - } - - IMediaPosition_Release(pmpos); lpParms->dwReturn = curpos / 10000; - break; } case MCI_STATUS_NUMBER_OF_TRACKS: FIXME("MCI_STATUS_NUMBER_OF_TRACKS not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; - case MCI_STATUS_MODE: - FIXME("MCI_STATUS_MODE not implemented yet\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MODE: { + LONG state = State_Stopped; + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (state == State_Stopped) + lpParms->dwReturn = MCI_MODE_STOP; + else if (state == State_Running) { + LONG code; + LONG_PTR p1, p2; + + lpParms->dwReturn = MCI_MODE_PLAY; + + do { + hr = IMediaEvent_GetEvent(wma->mevent, &code, &p1, &p2, 0); + if (hr == S_OK && code == EC_COMPLETE){ + lpParms->dwReturn = MCI_MODE_STOP; + IMediaControl_Stop(wma->pmctrl); + } + } while (hr == S_OK); + + } else if (state == State_Paused) + lpParms->dwReturn = MCI_MODE_PAUSE; + break; + } case MCI_STATUS_MEDIA_PRESENT: FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; @@ -680,8 +711,6 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) { WINE_MCIQTZ* wma; - IVideoWindow* pVideoWindow; - IBasicVideo *pBasicVideo; HRESULT hr; HWND hWnd; RECT rc; @@ -696,47 +725,23 @@ if (!wma) return MCIERR_INVALID_DEVICE_ID; - /* Find if there is a video stream and get the display window */ - hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IVideoWindow, (LPVOID*)&pVideoWindow); - if (FAILED(hr)) { - ERR("Cannot get IVideoWindow interface (hr = %x)\n", hr); - return MCIERR_INTERNAL; - } - - hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IBasicVideo, (LPVOID*)&pBasicVideo); - if (FAILED(hr)) { - ERR("Cannot get IBasicVideo interface (hr = %x)\n", hr); - IUnknown_Release(pVideoWindow); - return MCIERR_INTERNAL; - } - - hr = IVideoWindow_get_Owner(pVideoWindow, (OAHWND*)&hWnd); + hr = IVideoWindow_get_Owner(wma->vidwin, (OAHWND*)&hWnd); if (FAILED(hr)) { TRACE("No video stream, returning no window error\n"); - IUnknown_Release(pVideoWindow); return MCIERR_NO_WINDOW; } if (dwFlags & MCI_DGV_WHERE_SOURCE) { if (dwFlags & MCI_DGV_WHERE_MAX) FIXME("MCI_DGV_WHERE_SOURCE_MAX stub %s\n", wine_dbgstr_rect(&rc)); - IBasicVideo_get_SourceLeft(pBasicVideo, &rc.left); - IBasicVideo_get_SourceTop(pBasicVideo, &rc.top); - IBasicVideo_get_SourceWidth(pBasicVideo, &rc.right); - IBasicVideo_get_SourceHeight(pBasicVideo, &rc.bottom); - /* Undo conversion done below */ - rc.right += rc.left; - rc.bottom += rc.top; + IBasicVideo_GetSourcePosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_SOURCE %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_DESTINATION) { - if (dwFlags & MCI_DGV_WHERE_MAX) { - GetClientRect(hWnd, &rc); - TRACE("MCI_DGV_WHERE_DESTINATION_MAX %s\n", wine_dbgstr_rect(&rc)); - } else { - FIXME("MCI_DGV_WHERE_DESTINATION not supported yet\n"); - goto out; - } + if (dwFlags & MCI_DGV_WHERE_MAX) + FIXME("MCI_DGV_WHERE_DESTINATION_MAX stub %s\n", wine_dbgstr_rect(&rc)); + IBasicVideo_GetDestinationPosition(wma->vidbasic, &rc.left, &rc.top, &rc.right, &rc.bottom); + TRACE("MCI_DGV_WHERE_DESTINATION %s\n", wine_dbgstr_rect(&rc)); } if (dwFlags & MCI_DGV_WHERE_FRAME) { if (dwFlags & MCI_DGV_WHERE_MAX) @@ -755,25 +760,62 @@ if (dwFlags & MCI_DGV_WHERE_WINDOW) { if (dwFlags & MCI_DGV_WHERE_MAX) { GetWindowRect(GetDesktopWindow(), &rc); + rc.right -= rc.left; + rc.bottom -= rc.top; TRACE("MCI_DGV_WHERE_WINDOW_MAX %s\n", wine_dbgstr_rect(&rc)); } else { - GetWindowRect(hWnd, &rc); + IVideoWindow_GetWindowPosition(wma->vidwin, &rc.left, &rc.top, &rc.right, &rc.bottom); TRACE("MCI_DGV_WHERE_WINDOW %s\n", wine_dbgstr_rect(&rc)); } } ret = 0; - out: - /* In MCI, RECT structure is used differently: rc.right = width & rc.bottom = height - * So convert the normal RECT into a MCI RECT before returning */ - IVideoWindow_Release(pVideoWindow); - IBasicVideo_Release(pBasicVideo); - lpParms->rc.left = rc.left; - lpParms->rc.top = rc.top; - lpParms->rc.right = rc.right - rc.left; - lpParms->rc.bottom = rc.bottom - rc.top; - + lpParms->rc = rc; return ret; +} + +/*************************************************************************** + * MCIQTZ_mciWindow [internal] + */ +static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpParms) +{ + WINE_MCIQTZ *wma = MCIQTZ_mciGetOpenDev(wDevID); + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + if (dwFlags & MCI_TEST) + return 0; + + if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) { + LONG visible = OATRUE; + LONG style = 0; + TRACE("Setting hWnd to %p\n", lpParms->hWnd); + IVideoWindow_get_Visible(wma->vidwin, &visible); + IVideoWindow_put_Visible(wma->vidwin, OAFALSE); + IVideoWindow_get_WindowStyle(wma->vidwin, &style); + style &= ~WS_CHILD; + if (lpParms->hWnd) + IVideoWindow_put_WindowStyle(wma->vidwin, style|WS_CHILD); + else + IVideoWindow_put_WindowStyle(wma->vidwin, style); + IVideoWindow_put_Owner(wma->vidwin, (OAHWND)lpParms->hWnd); + IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)lpParms->hWnd); + IVideoWindow_put_Visible(wma->vidwin, visible); + wma->parent = lpParms->hWnd; + } + if (dwFlags & MCI_DGV_WINDOW_STATE) { + TRACE("Setting nCmdShow to %d\n", lpParms->nCmdShow); + IVideoWindow_put_WindowState(wma->vidwin, lpParms->nCmdShow); + } + if (dwFlags & MCI_DGV_WINDOW_TEXT) { + TRACE("Setting caption to %s\n", debugstr_w(lpParms->lpstrText)); + IVideoWindow_put_Caption(wma->vidwin, lpParms->lpstrText); + } + return 0; } /****************************************************************************** @@ -794,51 +836,46 @@ return MCIERR_INVALID_DEVICE_ID; if (dwFlags & MCI_DGV_UPDATE_HDC) { - IBasicVideo *vidbasic; - IVideoWindow *vidwin; + LONG state, size; + BYTE *data; + BITMAPINFO *info; + HRESULT hr; + RECT src, dest; + LONG visible = OATRUE; + res = MCIERR_INTERNAL; - IFilterGraph2_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&vidwin); - IFilterGraph2_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&vidbasic); - if (vidbasic && vidwin) { - LONG state, size; - BYTE *data; - BITMAPINFO *info; - HRESULT hr; - RECT src, dest; - - /* If in stopped state, nothing has been drawn to screen - * moving to pause, which is needed for the old dib renderer, will result - * in a single frame drawn, so hide the window here */ - IVideoWindow_put_Visible(vidwin, OAFALSE); - /* FIXME: Should we check the original state and restore it? */ - IMediaControl_Pause(wma->pmctrl); - IMediaControl_GetState(wma->pmctrl, -1, &state); - if (FAILED(hr = IBasicVideo_GetCurrentImage(vidbasic, &size, NULL))) { - WARN("Could not get image size (hr = %x)\n", hr); - goto out; - } - data = HeapAlloc(GetProcessHeap(), 0, size); - info = (BITMAPINFO*)data; - IBasicVideo_GetCurrentImage(vidbasic, &size, (LONG*)data); - data += info->bmiHeader.biSize; - - IBasicVideo_GetSourcePosition(vidbasic, &src.left, &src.top, &src.right, &src.bottom); - IBasicVideo_GetDestinationPosition(vidbasic, &dest.left, &dest.top, &dest.right, &dest.bottom); - StretchDIBits(lpParms->hDC, - dest.left, dest.top, dest.right + dest.left, dest.bottom + dest.top, - src.left, src.top, src.right + src.left, src.bottom + src.top, - data, info, DIB_RGB_COLORS, SRCCOPY); - HeapFree(GetProcessHeap(), 0, data); + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (state == State_Running) + return MCIERR_UNSUPPORTED_FUNCTION; + /* If in stopped state, nothing has been drawn to screen + * moving to pause, which is needed for the old dib renderer, will result + * in a single frame drawn, so hide the window here */ + IVideoWindow_get_Visible(wma->vidwin, &visible); + if (wma->parent) + IVideoWindow_put_Visible(wma->vidwin, OAFALSE); + /* FIXME: Should we check the original state and restore it? */ + IMediaControl_Pause(wma->pmctrl); + IMediaControl_GetState(wma->pmctrl, -1, &state); + if (FAILED(hr = IBasicVideo_GetCurrentImage(wma->vidbasic, &size, NULL))) { + WARN("Could not get image size (hr = %x)\n", hr); + goto out; } + data = HeapAlloc(GetProcessHeap(), 0, size); + info = (BITMAPINFO*)data; + IBasicVideo_GetCurrentImage(wma->vidbasic, &size, (LONG*)data); + data += info->bmiHeader.biSize; + + IBasicVideo_GetSourcePosition(wma->vidbasic, &src.left, &src.top, &src.right, &src.bottom); + IBasicVideo_GetDestinationPosition(wma->vidbasic, &dest.left, &dest.top, &dest.right, &dest.bottom); + StretchDIBits(lpParms->hDC, + dest.left, dest.top, dest.right + dest.left, dest.bottom + dest.top, + src.left, src.top, src.right + src.left, src.bottom + src.top, + data, info, DIB_RGB_COLORS, SRCCOPY); + HeapFree(GetProcessHeap(), 0, data); res = 0; out: - if (vidbasic) - IBasicVideo_Release(vidbasic); - if (vidwin) { - if (wma->parent) - IVideoWindow_put_Visible(vidwin, OATRUE); - IVideoWindow_Release(vidwin); - } + if (wma->parent) + IVideoWindow_put_Visible(wma->vidwin, visible); } else if (dwFlags) FIXME("Unhandled flags %x\n", dwFlags); @@ -911,11 +948,12 @@ case MCI_SETAUDIO: return MCIQTZ_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); case MCI_UPDATE: return MCIQTZ_mciUpdate(dwDevID, dwParam1, (LPMCI_DGV_UPDATE_PARMS)dwParam2); + case MCI_WINDOW: + return MCIQTZ_mciWindow(dwDevID, dwParam1, (LPMCI_DGV_WINDOW_PARMSW)dwParam2); + case MCI_PUT: case MCI_RECORD: case MCI_RESUME: case MCI_INFO: - case MCI_PUT: - case MCI_WINDOW: case MCI_LOAD: case MCI_SAVE: case MCI_FREEZE: Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz_… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz_private.h [iso-8859-1] Sat May 19 11:26:15 2012 @@ -31,6 +31,10 @@ BOOL uninit; IGraphBuilder* pgraph; IMediaControl* pmctrl; + IMediaSeeking* seek; + IMediaEvent* mevent; + IVideoWindow* vidwin; + IBasicVideo* vidbasic; DWORD time_format; UINT command_table; HWND parent; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 11:26:15 2012 @@ -85,7 +85,7 @@ reactos/dll/win32/mapi32 # Autosync reactos/dll/win32/mciavi32 # Synced to Wine-1.3.37 reactos/dll/win32/mcicda # Synced to Wine-1.3.37 -reactos/dll/win32/mciqtz32 # Autosync +reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4 reactos/dll/win32/mciseq # Synced to Wine-1.3.37 reactos/dll/win32/mciwave # Synced to Wine-1.3.37 reactos/dll/win32/mlang # Synced to Wine-1.3.37

1 0

[akhaldi] 56618: [ITSS] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 10:54:54 2012 New Revision: 56618 URL: http://svn.reactos.org/svn/reactos?rev=56618&view=rev Log: [ITSS] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/itss/storage.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/itss/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/storage.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] Sat May 19 10:54:54 2012 @@ -406,7 +406,6 @@ IStorage** ppstg) { ITSS_IStorageImpl *This = impl_from_IStorage(iface); - static const WCHAR szRoot[] = { '/', 0 }; struct chmFile *chmfile; WCHAR *path, *p; DWORD len; @@ -418,7 +417,7 @@ if( !chmfile ) return E_FAIL; - len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; + len = strlenW( This->dir ) + strlenW( pwcsName ) + 2; /* need room for a terminating slash */ path = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); strcpyW( path, This->dir ); @@ -435,10 +434,12 @@ *p = '/'; } - if(*--p == '/') + /* add a terminating slash if one does not already exist */ + if(*(p-1) != '/') + { + *p++ = '/'; *p = 0; - - strcatW( path, szRoot ); + } TRACE("Resolving %s\n", debugstr_w(path)); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 19 10:54:54 2012 @@ -77,7 +77,7 @@ reactos/dll/win32/inseng # Synced to Wine-1.3.37 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to Wine-1.3.37 -reactos/dll/win32/itss # Synced to Wine-1.3.37 +reactos/dll/win32/itss # Synced to Wine-1.5.4 reactos/dll/win32/jscript # Autosync reactos/dll/win32/localspl # Autosync reactos/dll/win32/localui # Autosync

1 0

[akhaldi] 56617: [HLINK_WINETEST] * Add to msvc build.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 10:34:23 2012 New Revision: 56617 URL: http://svn.reactos.org/svn/reactos?rev=56617&view=rev Log: [HLINK_WINETEST] * Add to msvc build. Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat May 19 10:34:23 2012 @@ -22,9 +22,7 @@ add_subdirectory(fusion) add_subdirectory(gdi32) add_subdirectory(gdiplus) -if(NOT MSVC) - add_subdirectory(hlink) # FIXME: msvc build. -endif() +add_subdirectory(hlink) add_subdirectory(icmp) if(NOT MSVC) add_subdirectory(imagehlp) # FIXME: msvc build.

1 0

[akhaldi] 56616: [HLINK_WINETEST] * Sync to Wine 1.5.4.
by akhaldi＠svn.reactos.org 19 May '12

19 May '12

Author: akhaldi Date: Sat May 19 10:13:05 2012 New Revision: 56616 URL: http://svn.reactos.org/svn/reactos?rev=56616&view=rev Log: [HLINK_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/hlink/hlink.c Modified: trunk/rostests/winetests/hlink/hlink.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/hlink/hlink.c?r… ============================================================================== --- trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] (original) +++ trunk/rostests/winetests/hlink/hlink.c [iso-8859-1] Sat May 19 10:13:05 2012 @@ -1024,6 +1024,7 @@ CHECK_CALLED(BindToStorage); IBindCtx_Release(bctx); + _bctx = NULL; } static void test_HlinkGetSetMonikerReference(void) @@ -1136,6 +1137,26 @@ IHlink_Release(hlink); IMoniker_Release(dummy2); IMoniker_Release(dummy); + + SET_EXPECT(Reduce); + SET_EXPECT(Enum); + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + hres = HlinkCreateFromMoniker(&Moniker, NULL, NULL, NULL, 0, NULL, + &IID_IHlink, (void **)&hlink); + ok(hres == S_OK, "CreateFromMoniker failed: %08x\n", hres); + + hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_ABSOLUTE, + &found_trgt, &found_loc); + ok(hres == S_OK, "CreateFromMoniker failed: %08x\n", hres); + ok(found_trgt == &Moniker, "Got unexpected moniker: %p\n", found_trgt); + ok(found_loc == NULL, "Got unexpected location: %p\n", found_loc); + todo_wine CHECK_CALLED(Reduce); + todo_wine CHECK_CALLED(Enum); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); + + IHlink_Release(hlink); } static void test_HlinkGetSetStringReference(void) @@ -1305,14 +1326,14 @@ } /* passing 0xFFFFFFFF as exp_tgt will return the retrieved target & not test it */ -#define getMonikerRef(h,t,l) r_getMonikerRef(__LINE__,h,t,l) -static IMoniker *r_getMonikerRef(unsigned line, IHlink *hlink, IMoniker *exp_tgt, const WCHAR *exp_loc) +#define getMonikerRef(h,t,l,r) r_getMonikerRef(__LINE__,h,t,l,r) +static IMoniker *r_getMonikerRef(unsigned line, IHlink *hlink, IMoniker *exp_tgt, const WCHAR *exp_loc, DWORD ref) { HRESULT hres; IMoniker *fnd_tgt; WCHAR *fnd_loc; - hres = IHlink_GetMonikerReference(hlink, HLINKGETREF_DEFAULT, &fnd_tgt, &fnd_loc); + hres = IHlink_GetMonikerReference(hlink, ref, &fnd_tgt, &fnd_loc); ok_(__FILE__,line) (hres == S_OK, "IHlink_GetMonikerReference failed: 0x%08x\n", hres); if(exp_loc) @@ -1346,12 +1367,12 @@ hres = HlinkCreateFromString(NULL, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void**)&hlink); ok(hres == S_OK, "HlinkCreateFromString failed: 0x%08x\n", hres); getStringRef(hlink, NULL, NULL); - getMonikerRef(hlink, NULL, NULL); + getMonikerRef(hlink, NULL, NULL, HLINKGETREF_RELATIVE); /* setting a string target creates a moniker reference */ setStringRef(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, aW, wordsW); getStringRef(hlink, aW, wordsW); - aMon = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, wordsW); + aMon = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, wordsW, HLINKGETREF_RELATIVE); ok(aMon != NULL, "Moniker from %s target should not be NULL\n", wine_dbgstr_w(aW)); if(aMon) IMoniker_Release(aMon); @@ -1360,7 +1381,7 @@ * reference */ setStringRef(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, emptyW, emptyW); getStringRef(hlink, NULL, NULL); - getMonikerRef(hlink, NULL, NULL); + getMonikerRef(hlink, NULL, NULL, HLINKGETREF_RELATIVE); /* setting a moniker target also sets the target string to that moniker's * display name */ @@ -1369,7 +1390,7 @@ setMonikerRef(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, file_mon, wordsW); getStringRef(hlink, bW, wordsW); - getMonikerRef(hlink, file_mon, wordsW); + getMonikerRef(hlink, file_mon, wordsW, HLINKGETREF_RELATIVE); IMoniker_Release(file_mon); @@ -1396,7 +1417,7 @@ if(hlink){ getStringRef(hlink, tgt_partW, loc_partW); - pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW, HLINKGETREF_RELATIVE); ok(pmk != NULL, "Found moniker should not be NULL\n"); if(pmk) IMoniker_Release(pmk); @@ -1414,7 +1435,7 @@ if(hlink){ getStringRef(hlink, tgt_partW, two_hash_loc_partW); - pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, two_hash_loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, two_hash_loc_partW, HLINKGETREF_RELATIVE); ok(pmk != NULL, "Found moniker should not be NULL\n"); if(pmk) IMoniker_Release(pmk); @@ -1429,7 +1450,7 @@ if(hlink){ getStringRef(hlink, tgt_partW, test_locW); - pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, test_locW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, test_locW, HLINKGETREF_RELATIVE); ok(pmk != NULL, "Found moniker should not be NULL\n"); if(pmk) IMoniker_Release(pmk); @@ -1444,7 +1465,7 @@ if(hlink){ getStringRef(hlink, NULL, loc_partW); - pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW); + pmk = getMonikerRef(hlink, (IMoniker*)0xFFFFFFFF, loc_partW, HLINKGETREF_RELATIVE); ok(pmk == NULL, "Found moniker should be NULL\n"); if(pmk) IMoniker_Release(pmk); @@ -1588,12 +1609,21 @@ return E_NOTIMPL; } +#define SITEDATA_SUCCESS 1 +#define SITEDATA_NOTIMPL 2 + static HRESULT WINAPI hls_GetMoniker(IHlinkSite *iface, DWORD siteData, DWORD assign, DWORD which, IMoniker **pmk) { - ok(siteData == 17, "Expected siteData == 17, got: %d\n", siteData); - *pmk = &hls_site_Moniker; - return S_OK; + ok(siteData == SITEDATA_NOTIMPL || + siteData == SITEDATA_SUCCESS, "Unexpected site data: %u\n", siteData); + + if(siteData == SITEDATA_SUCCESS){ + *pmk = &hls_site_Moniker; + return S_OK; + } + + return E_NOTIMPL; } static HRESULT WINAPI hls_ReadyToNavigate(IHlinkSite *iface, DWORD siteData, @@ -1607,7 +1637,7 @@ DWORD siteData, DWORD reserved, HRESULT error, LPCWSTR errorStr) { CHECK_EXPECT(OnNavigationComplete); - ok(siteData == 17, "Expected siteData == 17, got: %d\n", siteData); + ok(siteData == SITEDATA_SUCCESS, "Unexpected site data: %u\n", siteData); ok(error == E_OUTOFMEMORY, "Expected E_OUTOFMEMORY, got: %08x\n", error); return E_NOTIMPL; } @@ -1634,11 +1664,11 @@ hres = HlinkCreateFromString(NULL, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (LPVOID*)&hl); ok(hres == S_OK, "HlinkCreateFromString failed: %08x\n", hres); - getMonikerRef(hl, NULL, NULL); - - hres = IHlink_SetHlinkSite(hl, &HlinkSite, 17); + getMonikerRef(hl, NULL, NULL, HLINKGETREF_RELATIVE); + + hres = IHlink_SetHlinkSite(hl, &HlinkSite, SITEDATA_SUCCESS); ok(hres == S_OK, "SetHlinkSite failed: %08x\n", hres); - getMonikerRef(hl, NULL, NULL); + getMonikerRef(hl, NULL, NULL, HLINKGETREF_RELATIVE); getStringRef(hl, NULL, NULL); hres = IHlink_GetMonikerReference(hl, HLINKGETREF_RELATIVE, &mon_ref, NULL); @@ -1656,7 +1686,7 @@ todo_wine CHECK_CALLED(Reduce); todo_wine CHECK_CALLED(Enum); - getMonikerRef(hl, &hls_ref_Moniker, NULL); + getMonikerRef(hl, &hls_ref_Moniker, NULL, HLINKGETREF_RELATIVE); SET_EXPECT(Enum); getStringRef(hl, ref_monikerW, NULL); @@ -1688,19 +1718,33 @@ SET_EXPECT(Reduce); SET_EXPECT(Enum); - hres = HlinkCreateFromMoniker(&hls_ref_Moniker, NULL, NULL, &HlinkSite, 17, + hres = HlinkCreateFromMoniker(&hls_ref_Moniker, NULL, NULL, &HlinkSite, SITEDATA_SUCCESS, NULL, &IID_IHlink, (LPVOID*)&hl); ok(hres == S_OK, "HlinkCreateFromMoniker failed: %08x\n", hres); todo_wine CHECK_CALLED(Reduce); todo_wine CHECK_CALLED(Enum); - getMonikerRef(hl, &hls_ref_Moniker, NULL); + getMonikerRef(hl, &hls_ref_Moniker, NULL, HLINKGETREF_RELATIVE); IHlink_Release(hl); - hres = HlinkCreateFromMoniker(NULL, NULL, NULL, &HlinkSite, 17, + hres = HlinkCreateFromMoniker(NULL, NULL, NULL, &HlinkSite, SITEDATA_SUCCESS, NULL, &IID_IHlink, (LPVOID*)&hl); ok(hres == S_OK, "HlinkCreateFromMoniker failed: %08x\n", hres); - getMonikerRef(hl, NULL, NULL); + getMonikerRef(hl, NULL, NULL, HLINKGETREF_RELATIVE); IHlink_Release(hl); + + SET_EXPECT(Reduce); + SET_EXPECT(Enum); + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(GetDisplayName); + hres = HlinkCreateFromMoniker(&Moniker, NULL, NULL, &HlinkSite, SITEDATA_NOTIMPL, + NULL, &IID_IHlink, (LPVOID*)&hl); + ok(hres == S_OK, "HlinkCreateFromMoniker failed: %08x\n", hres); + getMonikerRef(hl, &Moniker, NULL, HLINKGETREF_ABSOLUTE); + IHlink_Release(hl); + todo_wine CHECK_CALLED(Reduce); + todo_wine CHECK_CALLED(Enum); + CHECK_CALLED(IsSystemMoniker); + CHECK_CALLED(GetDisplayName); } static void test_HlinkClone(void) @@ -1736,7 +1780,7 @@ hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); ok(cloned != NULL, "Didn't get a clone\n"); - getMonikerRef(cloned, NULL, NULL); + getMonikerRef(cloned, NULL, NULL, HLINKGETREF_RELATIVE); IHlink_Release(cloned); IHlink_Release(hl); @@ -1747,7 +1791,7 @@ todo_wine CHECK_CALLED(Reduce); todo_wine CHECK_CALLED(Enum); ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); - getMonikerRef(hl, &hls_ref_Moniker, two); + getMonikerRef(hl, &hls_ref_Moniker, two, HLINKGETREF_RELATIVE); SET_EXPECT(Save); SET_EXPECT(GetClassID); @@ -1764,16 +1808,16 @@ hres = CreateItemMoniker(one, one, &dummy); ok(hres == S_OK, "CreateItemMoniker failed: 0x%08x\n", hres); - hres = HlinkCreateFromMoniker(dummy, two, name, &HlinkSite, 17, NULL, &IID_IHlink, (void**)&hl); + hres = HlinkCreateFromMoniker(dummy, two, name, &HlinkSite, SITEDATA_SUCCESS, NULL, &IID_IHlink, (void**)&hl); ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); - getMonikerRef(hl, dummy, two); + getMonikerRef(hl, dummy, two, HLINKGETREF_RELATIVE); cloned = NULL; hres = HlinkClone(hl, &IID_IHlink, NULL, 0, (void**)&cloned); ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); ok(cloned != NULL, "Should have gotten a clone\n"); - fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, two); + fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, two, HLINKGETREF_RELATIVE); ok(fnd_mk != NULL, "Expected non-null Moniker\n"); ok(fnd_mk != dummy, "Expected a new Moniker to be created\n"); @@ -1797,14 +1841,14 @@ hres = HlinkCreateFromMoniker(dummy, NULL, NULL, NULL, 0, NULL, &IID_IHlink, (void**)&hl); ok(hres == S_OK, "HlinkCreateFromMoniker failed: 0x%08x\n", hres); - getMonikerRef(hl, dummy, NULL); + getMonikerRef(hl, dummy, NULL, HLINKGETREF_RELATIVE); cloned = NULL; - hres = HlinkClone(hl, &IID_IHlink, &HlinkSite, 17, (void**)&cloned); + hres = HlinkClone(hl, &IID_IHlink, &HlinkSite, SITEDATA_SUCCESS, (void**)&cloned); ok(hres == S_OK, "HlinkClone failed: %08x\n", hres); ok(cloned != NULL, "Should have gotten a clone\n"); - fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, NULL); + fnd_mk = getMonikerRef(cloned, (IMoniker*)0xFFFFFFFF, NULL, HLINKGETREF_RELATIVE); ok(fnd_mk != NULL, "Expected non-null Moniker\n"); ok(fnd_mk != dummy, "Expected a new Moniker to be created\n"); @@ -1813,7 +1857,7 @@ hres = IHlink_GetHlinkSite(cloned, &fnd_site, &fnd_data); ok(hres == S_OK, "GetHlinkSite failed: %08x\n", hres); ok(fnd_site == &HlinkSite, "Expected found site to be HlinkSite, was: %p\n", fnd_site); - ok(fnd_data == 17, "Expected site data to be 17, was: %d\n", fnd_data); + ok(fnd_data == SITEDATA_SUCCESS, "Unexpected site data: %u\n", fnd_data); IHlink_Release(cloned); IHlink_Release(hl);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs