November 2011 - Wine-Commits

Alexandre Julliard : kernel32/tests: Avoid size_t in traces.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 1998c22d1b6e5c345b2e55e1516be047a7b6abfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1998c22d1b6e5c345b2e55e15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 18:19:06 2011 +0100 kernel32/tests: Avoid size_t in traces. --- dlls/kernel32/tests/module.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 06cf557..e86b63b 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -395,8 +395,7 @@ static void testGetDllDirectory(void) { CHAR bufferA[MAX_PATH]; WCHAR bufferW[MAX_PATH]; - size_t length; - DWORD ret; + DWORD length, ret; int i; static const char *dll_directories[] = {

1 0

Alexander Morozov : crypt32/tests: Add some tests for CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: fc78c2242ea1cb92c1bede700066bafd33736995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc78c2242ea1cb92c1bede700… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Nov 21 19:47:32 2011 +0400 crypt32/tests: Add some tests for CryptDecodeObjectEx without CRYPT_DECODE_ALLOC_FLAG. --- dlls/crypt32/tests/encode.c | 107 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b79c34d..d74b1c9 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2710,6 +2710,21 @@ static void test_decodeExtensions(DWORD dwEncoding) } LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, + exts[i].encoded, exts[i].encoded[1] + 2, 0, NULL, NULL, &bufSize); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufSize); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, + exts[i].encoded, exts[i].encoded[1] + 2, 0, NULL, buf, &bufSize); + if (!i) + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + else + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } } @@ -3601,6 +3616,20 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ok(!lstrcmpW(U(*entry).pwszURL, url), "Unexpected name\n"); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, 0, + NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, + distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, 0, + NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static const BYTE badFlagsIDP[] = { 0x30,0x06,0x81,0x01,0xff,0x82,0x01,0xff }; @@ -4741,6 +4770,18 @@ static void test_decodeEnhancedKeyUsage(DWORD dwEncoding) usage->rgpszUsageIdentifier[i]); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + encodedUsage, sizeof(encodedUsage), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, + encodedUsage, sizeof(encodedUsage), 0, NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static BYTE keyId[] = { 1,2,3,4 }; @@ -5215,6 +5256,20 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) LocalFree(buf); buf = NULL; } + ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + authorityInfoAccessWithUrlAndIPAddr, + sizeof(authorityInfoAccessWithUrlAndIPAddr), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, + authorityInfoAccessWithUrlAndIPAddr, + sizeof(authorityInfoAccessWithUrlAndIPAddr), 0, NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static const BYTE emptyCTL[] = { @@ -6168,6 +6223,18 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) attributes->rgAttr[1].rgValue[0].cbData), "Unexpected value\n"); LocalFree(buf); } + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + doublePKCSAttributes, sizeof(doublePKCSAttributes), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (buf) + { + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, + doublePKCSAttributes, sizeof(doublePKCSAttributes), 0, NULL, buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, buf); + } } static const BYTE singleCapability[] = { @@ -6325,6 +6392,20 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) compareSMimeCapabilities("two capabilities", &capabilities, ptr); LocalFree(ptr); } + SetLastError(0xdeadbeef); + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + twoCapabilities, sizeof(twoCapabilities), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (ptr) + { + SetLastError(0xdeadbeef); + ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, + twoCapabilities, sizeof(twoCapabilities), 0, NULL, ptr, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, ptr); + } } static BYTE encodedCommonNameNoNull[] = { 0x30,0x14,0x31,0x12,0x30,0x10, @@ -7487,6 +7568,18 @@ static void test_decodeCertPolicies(DWORD dwEncoding) "unexpected qualifier value\n"); LocalFree(info); } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + twoPolicies, sizeof(twoPolicies), 0, NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (info) + { + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + twoPolicies, sizeof(twoPolicies), 0, NULL, info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, info); + } } static const BYTE policyMappingWithOneMapping[] = { @@ -7630,6 +7723,20 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) info->rgPolicyMapping[1].pszSubjectDomainPolicy); LocalFree(info); } + ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), 0, + NULL, NULL, &size); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + info = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (info) + { + ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], + policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), 0, + NULL, info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, info); + } } }

1 0

Alexander Morozov : crypt32: Initialize a pointer for dynamic data.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 9d63e6f944d570c9e0dac175d6ecf4f2df4e45f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d63e6f944d570c9e0dac175d… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Nov 21 19:52:31 2011 +0400 crypt32: Initialize a pointer for dynamic data. --- dlls/crypt32/decode.c | 25 +++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 13 +------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 649ca55..4a22533 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1465,7 +1465,10 @@ static BOOL WINAPI CRYPT_AsnDecodeExtensions(DWORD dwCertEncodingType, sizeof(CERT_EXTENSIONS), CRYPT_AsnDecodeExtension, sizeof(CERT_EXTENSION), TRUE, offsetof(CERT_EXTENSION, pszObjId) }; + CERT_EXTENSIONS *exts = pvStructInfo; + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + exts->rgExtension = (CERT_EXTENSION *)(exts + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } @@ -2356,7 +2359,10 @@ static BOOL WINAPI CRYPT_AsnDecodeSMIMECapabilities(DWORD dwCertEncodingType, sizeof(CRYPT_SMIME_CAPABILITIES), CRYPT_AsnDecodeSMIMECapability, sizeof(CRYPT_SMIME_CAPABILITY), TRUE, offsetof(CRYPT_SMIME_CAPABILITY, pszObjId) }; + CRYPT_SMIME_CAPABILITIES *capabilities = pvStructInfo; + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + capabilities->rgCapability = (CRYPT_SMIME_CAPABILITY *)(capabilities + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } @@ -2832,7 +2838,10 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttributes(DWORD dwCertEncodingType, sizeof(CRYPT_ATTRIBUTES), CRYPT_AsnDecodePKCSAttributeInternal, sizeof(CRYPT_ATTRIBUTE), TRUE, offsetof(CRYPT_ATTRIBUTE, pszObjId) }; + CRYPT_ATTRIBUTES *attrs = pvStructInfo; + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + attrs->rgAttr = (CRYPT_ATTRIBUTE *)(attrs + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } @@ -3232,7 +3241,10 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityInfoAccess(DWORD dwCertEncodingType, sizeof(CERT_AUTHORITY_INFO_ACCESS), CRYPT_AsnDecodeAccessDescription, sizeof(CERT_ACCESS_DESCRIPTION), TRUE, offsetof(CERT_ACCESS_DESCRIPTION, pszAccessMethod) }; + CERT_AUTHORITY_INFO_ACCESS *info = pvStructInfo; + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + info->rgAccDescr = (CERT_ACCESS_DESCRIPTION *)(info + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } @@ -3653,6 +3665,10 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicies(DWORD dwCertEncodingType, sizeof(CERT_POLICIES_INFO), CRYPT_AsnDecodeCertPolicy, sizeof(CERT_POLICY_INFO), TRUE, offsetof(CERT_POLICY_INFO, pszPolicyIdentifier) }; + CERT_POLICIES_INFO *info = pvStructInfo; + + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + info->rgPolicyInfo = (CERT_POLICY_INFO *)(info + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); @@ -3706,7 +3722,10 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicyMappings(DWORD dwCertEncodingType, sizeof(CERT_POLICY_MAPPING), CRYPT_AsnDecodeCertPolicyMapping, sizeof(CERT_POLICY_MAPPING), TRUE, offsetof(CERT_POLICY_MAPPING, pszIssuerDomainPolicy) }; + CERT_POLICY_MAPPINGS_INFO *info = pvStructInfo; + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + info->rgPolicyMapping = (CERT_POLICY_MAPPING *)(info + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } @@ -5020,7 +5039,10 @@ static BOOL WINAPI CRYPT_AsnDecodeCRLDistPoints(DWORD dwCertEncodingType, sizeof(CRL_DIST_POINTS_INFO), CRYPT_AsnDecodeDistPoint, sizeof(CRL_DIST_POINT), TRUE, offsetof(CRL_DIST_POINT, DistPointName.u.FullName.rgAltEntry) }; + CRL_DIST_POINTS_INFO *info = pvStructInfo; + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + info->rgDistPoint = (CRL_DIST_POINT *)(info + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } @@ -5049,7 +5071,10 @@ static BOOL WINAPI CRYPT_AsnDecodeEnhancedKeyUsage(DWORD dwCertEncodingType, offsetof(CERT_ENHKEY_USAGE, rgpszUsageIdentifier), sizeof(CERT_ENHKEY_USAGE), CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), TRUE, 0 }; + CERT_ENHKEY_USAGE *usage = pvStructInfo; + if (pvStructInfo && !(dwFlags & CRYPT_DECODE_ALLOC_FLAG)) + usage->rgpszUsageIdentifier = (LPSTR *)(usage + 1); ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL); } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index d74b1c9..5d9e76b 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2718,11 +2718,7 @@ static void test_decodeExtensions(DWORD dwEncoding) { ret = pCryptDecodeObjectEx(dwEncoding, X509_EXTENSIONS, exts[i].encoded, exts[i].encoded[1] + 2, 0, NULL, buf, &bufSize); - if (!i) - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); - else - todo_wine - ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); } } @@ -3626,7 +3622,6 @@ static void test_decodeCRLDistPoints(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CRL_DIST_POINTS, distPointWithUrlAndIssuer, distPointWithUrlAndIssuer[1] + 2, 0, NULL, buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); } @@ -4778,7 +4773,6 @@ static void test_decodeEnhancedKeyUsage(DWORD dwEncoding) { ret = pCryptDecodeObjectEx(dwEncoding, X509_ENHANCED_KEY_USAGE, encodedUsage, sizeof(encodedUsage), 0, NULL, buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); } @@ -5266,7 +5260,6 @@ static void test_decodeAuthorityInfoAccess(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_AUTHORITY_INFO_ACCESS, authorityInfoAccessWithUrlAndIPAddr, sizeof(authorityInfoAccessWithUrlAndIPAddr), 0, NULL, buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); } @@ -6231,7 +6224,6 @@ static void test_decodePKCSAttributes(DWORD dwEncoding) { ret = pCryptDecodeObjectEx(dwEncoding, PKCS_ATTRIBUTES, doublePKCSAttributes, sizeof(doublePKCSAttributes), 0, NULL, buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, buf); } @@ -6402,7 +6394,6 @@ static void test_decodePKCSSMimeCapabilities(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = pCryptDecodeObjectEx(dwEncoding, PKCS_SMIME_CAPABILITIES, twoCapabilities, sizeof(twoCapabilities), 0, NULL, ptr, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, ptr); } @@ -7576,7 +7567,6 @@ static void test_decodeCertPolicies(DWORD dwEncoding) { ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, twoPolicies, sizeof(twoPolicies), 0, NULL, info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, info); } @@ -7733,7 +7723,6 @@ static void test_decodeCertPolicyMappings(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, mappingOids[i], policyMappingWithTwoMappings, sizeof(policyMappingWithTwoMappings), 0, NULL, info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, info); }

1 0

Jörg Höhle : mmdevapi: SHAREDMODE_EXCLUSIVE + EVENTCALLBACK is too ... exclusive for now.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 7c5b90006c957a4080e5b4b0e7c95872da6d522b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5b90006c957a4080e5b4b0e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 23 21:16:24 2011 +0200 mmdevapi: SHAREDMODE_EXCLUSIVE + EVENTCALLBACK is too ... exclusive for now. --- dlls/winealsa.drv/mmdevdrv.c | 5 +++++ dlls/winecoreaudio.drv/mmdevdrv.c | 5 +++++ dlls/wineoss.drv/mmdevdrv.c | 5 +++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3cebd4f..bfff159 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -835,6 +835,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_INVALIDARG; } + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + return AUDCLNT_E_DEVICE_IN_USE; + } + if(!duration) duration = 300000; /* 0.03s */ diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ae85f37..a648429 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -961,6 +961,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_INVALIDARG; } + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + return AUDCLNT_E_DEVICE_IN_USE; + } + OSSpinLockLock(&This->lock); if(This->aqueue){ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ac1b2a3..51ae720 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -907,6 +907,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_INVALIDARG; } + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + return AUDCLNT_E_DEVICE_IN_USE; + } + EnterCriticalSection(&This->lock); if(This->initted){

1 0

Alexandre Julliard : shlwapi: Convert dialogs to po files.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 3d818c3aa83b614a9ef7a6ddb974ee2e39d31feb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d818c3aa83b614a9ef7a6ddb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:20:10 2011 +0100 shlwapi: Convert dialogs to po files. --- dlls/shlwapi/Makefile.in | 30 +--------------------- dlls/shlwapi/shlwapi.rc | 14 ++++++++++ dlls/shlwapi/shlwapi_Da.rc | 37 -------------------------- dlls/shlwapi/shlwapi_De.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_En.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Eo.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Es.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Fi.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Fr.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_He.rc | 41 ----------------------------- dlls/shlwapi/shlwapi_Hu.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_It.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Ja.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Ko.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Lt.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Nl.rc | 37 -------------------------- dlls/shlwapi/shlwapi_No.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Pl.rc | 38 --------------------------- dlls/shlwapi/shlwapi_Pt.rc | 41 ----------------------------- dlls/shlwapi/shlwapi_Ro.rc | 38 --------------------------- dlls/shlwapi/shlwapi_Ru.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Si.rc | 39 ---------------------------- dlls/shlwapi/shlwapi_Sk.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Sr.rc | 56 ---------------------------------------- dlls/shlwapi/shlwapi_Sv.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Tr.rc | 37 -------------------------- dlls/shlwapi/shlwapi_Uk.rc | 40 ---------------------------- dlls/shlwapi/shlwapi_Zh.rc | 56 ---------------------------------------- po/ar.po | 51 +++++++++++++++++++++++------------- po/bg.po | 52 +++++++++++++++++++++++------------- po/ca.po | 52 +++++++++++++++++++++++------------- po/cs.po | 52 +++++++++++++++++++++++------------- po/da.po | 51 +++++++++++++++++++++++------------- po/de.po | 51 +++++++++++++++++++++++------------- po/el.po | 52 +++++++++++++++++++++++------------- po/en.po | 51 +++++++++++++++++++++++------------- po/en_US.po | 51 +++++++++++++++++++++++------------- po/eo.po | 51 +++++++++++++++++++++++------------- po/es.po | 51 +++++++++++++++++++++++------------- po/fa.po | 51 +++++++++++++++++++++++------------- po/fi.po | 51 +++++++++++++++++++++++------------- po/fr.po | 51 +++++++++++++++++++++++------------- po/he.po | 51 +++++++++++++++++++++++------------- po/hi.po | 51 +++++++++++++++++++++++------------- po/hu.po | 51 +++++++++++++++++++++++------------- po/it.po | 51 +++++++++++++++++++++++------------- po/ja.po | 51 +++++++++++++++++++++++------------- po/ko.po | 51 +++++++++++++++++++++++------------- po/lt.po | 51 +++++++++++++++++++++++------------- po/ml.po | 51 +++++++++++++++++++++++------------- po/nb_NO.po | 51 +++++++++++++++++++++++------------- po/nl.po | 51 +++++++++++++++++++++++------------- po/or.po | 51 +++++++++++++++++++++++------------- po/pa.po | 51 +++++++++++++++++++++++------------- po/pl.po | 51 +++++++++++++++++++++++------------- po/pt_BR.po | 51 +++++++++++++++++++++++------------- po/pt_PT.po | 51 +++++++++++++++++++++++------------- po/rm.po | 51 +++++++++++++++++++++++------------- po/ro.po | 51 +++++++++++++++++++++++------------- po/ru.po | 51 +++++++++++++++++++++++------------- po/sk.po | 51 +++++++++++++++++++++++------------- po/sl.po | 51 +++++++++++++++++++++++------------- po/sr_RS(a)cyrillic.po | 51 +++++++++++++++++++++++------------- po/sr_RS(a)latin.po | 51 +++++++++++++++++++++++------------- po/sv.po | 51 +++++++++++++++++++++++------------- po/te.po | 51 +++++++++++++++++++++++------------- po/th.po | 52 +++++++++++++++++++++++------------- po/tr.po | 51 +++++++++++++++++++++++------------- po/uk.po | 51 +++++++++++++++++++++++------------- po/wa.po | 51 +++++++++++++++++++++++------------- po/wine.pot | 51 +++++++++++++++++++++++------------- po/zh_CN.po | 51 +++++++++++++++++++++++------------- po/zh_TW.po | 61 ++++++++++++++++++++++++++----------------- 73 files changed, 1465 insertions(+), 1925 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d818c3aa83b614a9ef7a…

1 0

Alexandre Julliard : makefiles: Build tags from all the source files.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: c360ee0b661a759ca5c3e6903a13c8be790c4633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c360ee0b661a759ca5c3e6903… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 18:20:05 2011 +0100 makefiles: Build tags from all the source files. --- Makefile.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 723bd82..72161fc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,10 +84,12 @@ $(MAKEDEP): include/config.h # Misc rules +TAGSFLAGS = --langmap='c:+.idl.l.rh,make:(Make*.in)' + TAGS etags: $(RM) TAGS - (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a + (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs etags -a $(TAGSFLAGS) tags ctags: $(RM) tags - (test -d .git && git ls-files '*.[chly]' '*.idl' || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a + (test -d .git && git ls-files || find -L $(top_srcdir) -name '*.[ch]' -print) | xargs ctags -a $(TAGSFLAGS)

1 0

Andrew Eikum : winecoreaudio.drv: Make driver sample accurate.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 2da60016affdbc13356aef162e0ff6d70b03d677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da60016affdbc13356aef162… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 22 09:50:48 2011 -0600 winecoreaudio.drv: Make driver sample accurate. --- dlls/winecoreaudio.drv/mmdevdrv.c | 176 ++++++++++++++++++++++++++++++------- 1 files changed, 144 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da60016affdbc13356ae…

1 0

Jacek Caban : jscript: Added tests of unary '+' on not existent property.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: dcca57fd87d84bef6f71a809d771d73c3719711f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcca57fd87d84bef6f71a809d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:31:29 2011 +0100 jscript: Added tests of unary '+' on not existent property. --- dlls/jscript/tests/lang.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7cd20dd..c85907c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -216,6 +216,10 @@ tmp = new Object(); ok((~tmp.nonexistent) === -1, "!tmp.nonexistent = " + ~tmp.nonexistent); ok(!("nonexistent" in tmp), "nonexistent is in tmp after '~' expression") +tmp = new Object(); +ok(isNaN(tmp.nonexistent), "!tmp.nonexistent = " + (+tmp.nonexistent)); +ok(!("nonexistent" in tmp), "nonexistent is in tmp after '+' expression") + tmp = 0; if(true) tmp = 1;

1 0

Jacek Caban : jscript: Use bytecode for '+' expression implementation.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: b1b0aadaab522d8ca97c31e3ac4483d65d167594 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b0aadaab522d8ca97c31e3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 22 16:31:44 2011 +0100 jscript: Use bytecode for '+' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 16 ++++++++++++---- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 1bc887c..1e496a8 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -107,6 +107,8 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_ADD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_EQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1f5863a..cbfde6d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2213,13 +2213,21 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.1 */ -HRESULT add_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_add(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT *l, *r, ret; + HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); + + TRACE("%s + %s\n", debugstr_variant(l), debugstr_variant(r)); + + hres = add_eval(ctx->parser->script, l, r, &ctx->ei, &ret); + if(FAILED(hres)) + return hres; - return binary_expr_eval(ctx, expr, add_eval, ei, ret); + return stack_push(ctx, &ret); } /* ECMA-262 3rd Edition 11.6.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c004af3..829274d 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -42,6 +42,7 @@ typedef struct _func_stack { } func_stack_t; #define OP_LIST \ + X(add, 1, 0) \ X(bneg, 1, 0) \ X(eq2, 1, 0) \ X(neg, 1, 0) \ @@ -529,7 +530,6 @@ HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT in_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT add_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 92c79fc..98813b4 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1313,7 +1313,7 @@ static const expression_eval_t expression_eval_table[] = { binary_and_expression_eval, instanceof_expression_eval, in_expression_eval, - add_expression_eval, + compiled_expression_eval, sub_expression_eval, mul_expression_eval, div_expression_eval,

1 0

Alexandre Julliard : browseui: Make sure that common controls are loaded before creating the dialog.
by Alexandre Julliard Nov. 22, 2011

Nov. 22, 2011

Module: wine Branch: master Commit: 01593894846537244d938cbbf1c746d5db970efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=01593894846537244d938cbbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 22 14:15:23 2011 +0100 browseui: Make sure that common controls are loaded before creating the dialog. --- dlls/browseui/Makefile.in | 2 +- dlls/browseui/progressdlg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 102b9e6..b463cd7 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -1,5 +1,5 @@ MODULE = browseui.dll -IMPORTS = uuid ole32 user32 advapi32 +IMPORTS = uuid ole32 comctl32 user32 advapi32 EXTRADEFS = -DCOM_NO_WINDOWS_H C_SRCS = \ diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 2de858c..9b970e2 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -304,6 +304,7 @@ static ULONG WINAPI ProgressDialog_Release(IProgressDialog *iface) static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) { + static const INITCOMMONCONTROLSEX init = { sizeof(init), ICC_ANIMATE_CLASS }; ProgressDialog *This = impl_from_IProgressDialog(iface); struct create_params params; HANDLE hThread; @@ -316,6 +317,8 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, if (dwFlags & PROGDLG_NOTIME) FIXME("Flags PROGDLG_NOTIME not supported\n"); + InitCommonControlsEx( &init ); + EnterCriticalSection(&This->cs); if (This->hwnd)

1 0