February 2009 - Wine-Commits

Juan Lang : wintrust: Remove a couple tests that fail on a variety of systems.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 22ea6bd61126ad72b20778bd456352b5503e4b2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22ea6bd61126ad72b20778bd4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 18:03:14 2009 -0800 wintrust: Remove a couple tests that fail on a variety of systems. --- dlls/wintrust/tests/register.c | 45 ---------------------------------------- 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 37801cc..9d1437f 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -165,12 +165,10 @@ static void test_AddRem_ActionID(void) static void test_AddDefaultForUsage(void) { BOOL ret; - LONG res; static GUID ActionID = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }}; static WCHAR DummyDllW[] = {'d','e','a','d','b','e','e','f','.','d','l','l',0 }; static CHAR DummyFunction[] = "dummyfunction"; static const CHAR oid[] = "1.2.3.4.5.6.7.8.9.10"; - static const CHAR Usages[] = "SOFTWARE\\Microsoft\\Cryptography\\Providers\\Trust\\Usages\\1.2.3.4.5.6.7.8.9.10"; static CRYPT_PROVIDER_REGDEFUSAGE DefUsage; if (!pWintrustAddDefaultForUsage) @@ -206,27 +204,6 @@ static void test_AddDefaultForUsage(void) ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); - /* Just the ActionID */ - memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); - DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); - DefUsage.pgActionID = &ActionID; - SetLastError(0xdeadbeef); - ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); - ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: %u\n", GetLastError()); - - /* No ActionID */ - memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); - DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); - DefUsage.pwszDllName = DummyDllW; - DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; - DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; - ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); - ok (GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); - /* cbStruct set to 0 */ memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); DefUsage.cbStruct = 0; @@ -239,28 +216,6 @@ static void test_AddDefaultForUsage(void) ok (!ret, "Expected WintrustAddDefaultForUsage to fail.\n"); ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); - - /* All OK */ - memset(&DefUsage, 0 , sizeof(CRYPT_PROVIDER_REGDEFUSAGE)); - DefUsage.cbStruct = sizeof(CRYPT_PROVIDER_REGDEFUSAGE); - DefUsage.pgActionID = &ActionID; - DefUsage.pwszDllName = DummyDllW; - DefUsage.pwszLoadCallbackDataFunctionName = DummyFunction; - DefUsage.pwszFreeCallbackDataFunctionName = DummyFunction; - SetLastError(0xdeadbeef); - ret = pWintrustAddDefaultForUsage(oid, &DefUsage); - ok ( ret, "Expected WintrustAddDefaultForUsage to succeed\n"); - ok (GetLastError() == 0xdeadbeef, - "Last error should not have been changed: %u\n", GetLastError()); - - /* There is no corresponding remove for WintrustAddDefaultForUsage - * so we delete the registry key manually. - */ - if (ret) - { - res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, Usages); - ok (res == ERROR_SUCCESS, "Key delete failed : 0x%08x\n", res); - } } static void test_LoadFunctionPointers(void)

1 0

Juan Lang : crypt32: Support an alternate OID in order to fix a test on some Windows 98 systems .
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: b972a5d355fe9f9098f4b12dbfa313266a65a9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b972a5d355fe9f9098f4b12db… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 20:33:25 2009 -0800 crypt32: Support an alternate OID in order to fix a test on some Windows 98 systems. --- dlls/crypt32/tests/oid.c | 113 +++++++++++++++++++++++++++------------------- 1 files changed, 66 insertions(+), 47 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 1145131..fb4607d 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -34,58 +34,59 @@ static BOOL (WINAPI *pCryptEnumOIDInfo)(DWORD,DWORD,void*,PFN_CRYPT_ENUM_OID_INF struct OIDToAlgID { LPCSTR oid; + LPCSTR altOid; DWORD algID; }; static const struct OIDToAlgID oidToAlgID[] = { - { szOID_RSA_RSA, CALG_RSA_KEYX }, - { szOID_RSA_MD2RSA, CALG_MD2 }, - { szOID_RSA_MD4RSA, CALG_MD4 }, - { szOID_RSA_MD5RSA, CALG_MD5 }, - { szOID_RSA_SHA1RSA, CALG_SHA }, - { szOID_RSA_DH, CALG_DH_SF }, - { szOID_RSA_SMIMEalgESDH, CALG_DH_EPHEM }, - { szOID_RSA_SMIMEalgCMS3DESwrap, CALG_3DES }, - { szOID_RSA_SMIMEalgCMSRC2wrap, CALG_RC2 }, - { szOID_RSA_MD2, CALG_MD2 }, - { szOID_RSA_MD4, CALG_MD4 }, - { szOID_RSA_MD5, CALG_MD5 }, - { szOID_RSA_RC2CBC, CALG_RC2 }, - { szOID_RSA_RC4, CALG_RC4 }, - { szOID_RSA_DES_EDE3_CBC, CALG_3DES }, - { szOID_ANSI_X942_DH, CALG_DH_SF }, - { szOID_X957_DSA, CALG_DSS_SIGN }, - { szOID_X957_SHA1DSA, CALG_SHA }, - { szOID_OIWSEC_md4RSA, CALG_MD4 }, - { szOID_OIWSEC_md5RSA, CALG_MD5 }, - { szOID_OIWSEC_md4RSA2, CALG_MD4 }, - { szOID_OIWSEC_desCBC, CALG_DES }, - { szOID_OIWSEC_dsa, CALG_DSS_SIGN }, - { szOID_OIWSEC_shaDSA, CALG_SHA }, - { szOID_OIWSEC_shaRSA, CALG_SHA }, - { szOID_OIWSEC_sha, CALG_SHA }, - { szOID_OIWSEC_rsaXchg, CALG_RSA_KEYX }, - { szOID_OIWSEC_sha1, CALG_SHA }, - { szOID_OIWSEC_dsaSHA1, CALG_SHA }, - { szOID_OIWSEC_sha1RSASign, CALG_SHA }, - { szOID_OIWDIR_md2RSA, CALG_MD2 }, - { szOID_INFOSEC_mosaicUpdatedSig, CALG_SHA }, - { szOID_INFOSEC_mosaicKMandUpdSig, CALG_DSS_SIGN }, + { szOID_RSA_RSA, NULL, CALG_RSA_KEYX }, + { szOID_RSA_MD2RSA, NULL, CALG_MD2 }, + { szOID_RSA_MD4RSA, NULL, CALG_MD4 }, + { szOID_RSA_MD5RSA, NULL, CALG_MD5 }, + { szOID_RSA_SHA1RSA, NULL, CALG_SHA }, + { szOID_RSA_DH, NULL, CALG_DH_SF }, + { szOID_RSA_SMIMEalgESDH, NULL, CALG_DH_EPHEM }, + { szOID_RSA_SMIMEalgCMS3DESwrap, NULL, CALG_3DES }, + { szOID_RSA_SMIMEalgCMSRC2wrap, NULL, CALG_RC2 }, + { szOID_RSA_MD2, NULL, CALG_MD2 }, + { szOID_RSA_MD4, NULL, CALG_MD4 }, + { szOID_RSA_MD5, NULL, CALG_MD5 }, + { szOID_RSA_RC2CBC, NULL, CALG_RC2 }, + { szOID_RSA_RC4, NULL, CALG_RC4 }, + { szOID_RSA_DES_EDE3_CBC, NULL, CALG_3DES }, + { szOID_ANSI_X942_DH, NULL, CALG_DH_SF }, + { szOID_X957_DSA, NULL, CALG_DSS_SIGN }, + { szOID_X957_SHA1DSA, NULL, CALG_SHA }, + { szOID_OIWSEC_md4RSA, NULL, CALG_MD4 }, + { szOID_OIWSEC_md5RSA, NULL, CALG_MD5 }, + { szOID_OIWSEC_md4RSA2, NULL, CALG_MD4 }, + { szOID_OIWSEC_desCBC, NULL, CALG_DES }, + { szOID_OIWSEC_dsa, NULL, CALG_DSS_SIGN }, + { szOID_OIWSEC_shaDSA, NULL, CALG_SHA }, + { szOID_OIWSEC_shaRSA, NULL, CALG_SHA }, + { szOID_OIWSEC_sha, NULL, CALG_SHA }, + { szOID_OIWSEC_rsaXchg, NULL, CALG_RSA_KEYX }, + { szOID_OIWSEC_sha1, NULL, CALG_SHA }, + { szOID_OIWSEC_dsaSHA1, NULL, CALG_SHA }, + { szOID_OIWSEC_sha1RSASign, NULL, CALG_SHA }, + { szOID_OIWDIR_md2RSA, NULL, CALG_MD2 }, + { szOID_INFOSEC_mosaicUpdatedSig, NULL, CALG_SHA }, + { szOID_INFOSEC_mosaicKMandUpdSig, NULL, CALG_DSS_SIGN }, }; static const struct OIDToAlgID algIDToOID[] = { - { szOID_RSA_RSA, CALG_RSA_KEYX }, - { szOID_RSA_SMIMEalgESDH, CALG_DH_EPHEM }, - { szOID_RSA_MD2, CALG_MD2 }, - { szOID_RSA_MD4, CALG_MD4 }, - { szOID_RSA_MD5, CALG_MD5 }, - { szOID_RSA_RC2CBC, CALG_RC2 }, - { szOID_RSA_RC4, CALG_RC4 }, - { szOID_RSA_DES_EDE3_CBC, CALG_3DES }, - { szOID_ANSI_X942_DH, CALG_DH_SF }, - { szOID_X957_DSA, CALG_DSS_SIGN }, - { szOID_OIWSEC_desCBC, CALG_DES }, - { szOID_OIWSEC_sha1, CALG_SHA }, + { szOID_RSA_RSA, NULL, CALG_RSA_KEYX }, + { szOID_RSA_SMIMEalgESDH, NULL, CALG_DH_EPHEM }, + { szOID_RSA_MD2, NULL, CALG_MD2 }, + { szOID_RSA_MD4, NULL, CALG_MD4 }, + { szOID_RSA_MD5, NULL, CALG_MD5 }, + { szOID_RSA_RC2CBC, NULL, CALG_RC2 }, + { szOID_RSA_RC4, NULL, CALG_RC4 }, + { szOID_RSA_DES_EDE3_CBC, NULL, CALG_3DES }, + { szOID_ANSI_X942_DH, NULL, CALG_DH_SF }, + { szOID_X957_DSA, szOID_OIWSEC_dsa /* some Win98 */, CALG_DSS_SIGN }, + { szOID_OIWSEC_desCBC, NULL, CALG_DES }, + { szOID_OIWSEC_sha1, NULL, CALG_SHA }, }; static const WCHAR bogusDll[] = { 'b','o','g','u','s','.','d','l','l',0 }; @@ -134,8 +135,26 @@ static void testAlgIDToOID(void) oid = CertAlgIdToOID(algIDToOID[i].algID); /* Allow failure, not every version of Windows supports every algo */ if (oid) - ok(!strcmp(oid, algIDToOID[i].oid), - "Expected %s, got %s\n", algIDToOID[i].oid, oid); + { + if (strcmp(oid, algIDToOID[i].oid)) + { + if (algIDToOID[i].altOid) + ok(!strcmp(oid, algIDToOID[i].oid) || + !strcmp(oid, algIDToOID[i].altOid), + "Expected %s or %s, got %s\n", algIDToOID[i].oid, + algIDToOID[i].altOid, oid); + else + { + /* No need to rerun the test, we already know it failed. */ + ok(0, "Expected %s, got %s\n", algIDToOID[i].oid, oid); + } + } + else + { + /* No need to rerun the test, we already know it succeeded. */ + ok(1, "Expected %s, got %s\n", algIDToOID[i].oid, oid); + } + } } }

1 0

Juan Lang : wintrust: Don't fail if a registry value doesn't exist.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 9e07f0de08fda81954d7cf56957d8041bc64c672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e07f0de08fda81954d7cf569… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 17:47:40 2009 -0800 wintrust: Don't fail if a registry value doesn't exist. --- dlls/wintrust/tests/register.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index 81be104..37801cc 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -332,9 +332,9 @@ static void test_RegPolicyFlags(void) size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); - ok(!r, "RegQueryValueEx failed: %d\n", r); - - ok(flags1 == flags2, "Got %08x flags instead of %08x\n", flags1, flags2); + ok(!r || r == ERROR_FILE_NOT_FOUND, "RegQueryValueEx failed: %d\n", r); + if (r) + ok(flags1 == flags2, "Got %08x flags instead of %08x\n", flags1, flags2); flags3 = flags2 | 1; ret = pWintrustSetRegPolicyFlags(flags3);

1 0

Juan Lang : crypt32: Remove a test that fails on some Windows 98 systems, and document it.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: ab586ae903639d1f3d83d0e8419c0e4d56f91b89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab586ae903639d1f3d83d0e84… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 17:21:50 2009 -0800 crypt32: Remove a test that fails on some Windows 98 systems, and document it. --- dlls/crypt32/tests/sip.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 7ffa2b9..1ef23b3 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -72,9 +72,14 @@ static void test_AddRemoveProvider(void) } else { - ok (!ret, "Expected CryptSIPRemoveProvider to fail.\n"); - ok (GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); + /* On some Win98 systems, CryptSIPRemoveProvider always succeeds if + * the arguments are correct, whether or not the registry key is + * present, so don't test ret, just check the last error if it does + * return FALSE. + */ + if (!ret) + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); } /* Everything OK, pwszIsFunctionName and pwszIsFunctionNameFmt2 are left NULL @@ -104,9 +109,14 @@ static void test_AddRemoveProvider(void) */ SetLastError(0xdeadbeef); ret = CryptSIPRemoveProvider(&actionid); - ok (!ret, "Expected CryptSIPRemoveProvider to fail.\n"); - ok (GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); + /* On some Win98 systems, CryptSIPRemoveProvider always succeeds if + * the arguments are correct, whether or not the registry key is + * present, so don't test ret, just check the last error if it does + * return FALSE. + */ + if (!ret) + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); /* Everything OK */ memset(&newprov, 0, sizeof(SIP_ADD_NEWPROVIDER));

1 0

Juan Lang : crypt32: Fix a couple tests on some Windows 98 systems.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 44ab73e289b8e877e3eaf8b21dff22c040a0d3e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ab73e289b8e877e3eaf8b21… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 17:23:52 2009 -0800 crypt32: Fix a couple tests on some Windows 98 systems. --- dlls/crypt32/tests/sip.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 1ef23b3..372d7ce 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -238,8 +238,9 @@ static void test_SIPRetrieveSubjectGUID(void) ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == ERROR_FILE_INVALID || GetLastError() == ERROR_INVALID_PARAMETER /* Vista */ || - GetLastError() == ERROR_SUCCESS /* Win98 */, - "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_SUCCESS /* most Win98 */ || + GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, + "Expected ERROR_FILE_INVALID, ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1)); @@ -253,8 +254,9 @@ static void test_SIPRetrieveSubjectGUID(void) ret = CryptSIPRetrieveSubjectGuid(tempfileW, NULL, &subject); ok ( !ret, "Expected CryptSIPRetrieveSubjectGuid to fail\n"); ok ( GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_SUCCESS /* Win98 */, - "Expected ERROR_INVALID_PARAMETER or ERROR_SUCCESS, got 0x%08x\n", GetLastError()); + GetLastError() == ERROR_SUCCESS /* most Win98 */ || + GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN /* some Win98 */, + "Expected ERROR_INVALID_PARAMETER, ERROR_SUCCESS or TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError()); ok ( !memcmp(&subject, &nullSubject, sizeof(GUID)), "Expected a NULL GUID for empty file %s, not %s\n", tempfile, show_guid(&subject, guid1));

1 0

Michael Stefaniuc : dsound: Arguments 3,4, 5 of a CALLBACK are of type DWORD_PTR.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: e1d59b94fb8a017450c16950427f03427dfba59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d59b94fb8a017450c169504… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 11 23:17:12 2009 +0100 dsound: Arguments 3,4,5 of a CALLBACK are of type DWORD_PTR. (LPWAVEHDR)->dwUser is also a DWORD_PTR. --- dlls/dsound/capture.c | 14 +++++--------- dlls/dsound/primary.c | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 6b0cd5b..2a8252f 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -410,16 +410,12 @@ static void capture_CheckNotify(IDirectSoundCaptureBufferImpl *This, DWORD from, } static void CALLBACK -DSOUND_capture_callback( - HWAVEIN hwi, - UINT msg, - DWORD dwUser, - DWORD dw1, - DWORD dw2 ) +DSOUND_capture_callback(HWAVEIN hwi, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, + DWORD_PTR dw2) { DirectSoundCaptureDevice * This = (DirectSoundCaptureDevice*)dwUser; IDirectSoundCaptureBufferImpl * Moi = This->capture_buffer; - TRACE("(%p,%08x(%s),%08x,%08x,%08x) entering at %d\n",hwi,msg, + TRACE("(%p,%08x(%s),%08lx,%08lx,%08lx) entering at %d\n",hwi,msg, msg == MM_WIM_OPEN ? "MM_WIM_OPEN" : msg == MM_WIM_CLOSE ? "MM_WIM_CLOSE" : msg == MM_WIM_DATA ? "MM_WIM_DATA" : "UNKNOWN",dwUser,dw1,dw2,GetTickCount()); @@ -1157,7 +1153,7 @@ IDirectSoundCaptureBufferImpl_Start( else device->pwave[c].dwBufferLength = blocksize; device->pwave[c].dwBytesRecorded = 0; - device->pwave[c].dwUser = (DWORD)device; + device->pwave[c].dwUser = (DWORD_PTR)device; device->pwave[c].dwFlags = 0; device->pwave[c].dwLoops = 0; hres = mmErr(waveInPrepareHeader(device->hwi, &(device->pwave[c]),sizeof(WAVEHDR))); @@ -1460,7 +1456,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( DWORD flags = CALLBACK_FUNCTION; err = mmErr(waveInOpen(&(device->hwi), device->drvdesc.dnDevNode, device->pwfx, - (DWORD_PTR)DSOUND_capture_callback, (DWORD)device, flags)); + (DWORD_PTR)DSOUND_capture_callback, (DWORD_PTR)device, flags)); if (err != DS_OK) { WARN("waveInOpen failed\n"); This->device->capture_buffer = 0; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 288466a..a57a5af 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -253,7 +253,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) for (c=0; c<device->helfrags; c++) { device->pwave[c].lpData = (char*)device->buffer + c*device->fraglen; device->pwave[c].dwBufferLength = device->fraglen; - device->pwave[c].dwUser = (DWORD)device; + device->pwave[c].dwUser = (DWORD_PTR)device; device->pwave[c].dwFlags = 0; device->pwave[c].dwLoops = 0; err = mmErr(waveOutPrepareHeader(device->hwo,&device->pwave[c],sizeof(WAVEHDR)));

1 0

Andrew Talbot : winedos: Replace malloc/calloc with HeapAlloc().
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 044e76df9298643df10798ed5bdecde6a5bbe5e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=044e76df9298643df10798ed5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 11 20:35:04 2009 +0000 winedos: Replace malloc/calloc with HeapAlloc(). --- dlls/winedos/devices.c | 2 +- dlls/winedos/dosconf.c | 12 ++++++------ dlls/winedos/dosvm.c | 6 +++--- dlls/winedos/int33.c | 4 ++-- dlls/winedos/ppdev.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/winedos/devices.c b/dlls/winedos/devices.c index 44bafbe..a82fb7b 100644 --- a/dlls/winedos/devices.c +++ b/dlls/winedos/devices.c @@ -134,7 +134,7 @@ static void do_strategy(CONTEXT86*ctx, int id, int extra) void **hdr_ptr = strategy_data[id]; if (!hdr_ptr) { - hdr_ptr = calloc(1,sizeof(void *)+extra); + hdr_ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(void *)+extra); strategy_data[id] = hdr_ptr; } *hdr_ptr = hdr; diff --git a/dlls/winedos/dosconf.c b/dlls/winedos/dosconf.c index 1715aa5..a1500b7 100644 --- a/dlls/winedos/dosconf.c +++ b/dlls/winedos/dosconf.c @@ -264,7 +264,7 @@ static int DOSCONF_Country(char **confline) if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; TRACE( "Country '%s'\n", *confline ); if (DOSCONF_config.country == NULL) - DOSCONF_config.country = malloc(strlen(*confline) + 1); + DOSCONF_config.country = HeapAlloc(GetProcessHeap(), 0, strlen(*confline) + 1); strcpy(DOSCONF_config.country, *confline); return 1; } @@ -304,7 +304,7 @@ static int DOSCONF_Shell(char **confline) if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; TRACE( "Shell '%s'\n", *confline ); if (DOSCONF_config.shell == NULL) - DOSCONF_config.shell = malloc(strlen(*confline) + 1); + DOSCONF_config.shell = HeapAlloc(GetProcessHeap(), 0, strlen(*confline) + 1); strcpy(DOSCONF_config.shell, *confline); return 1; } @@ -354,7 +354,7 @@ static int DOSCONF_Menu(char **confline) && (!(strncasecmp(*confline, DOSCONF_menu_default, strlen(DOSCONF_menu_default))))) { - free(DOSCONF_menu_default); + HeapFree(GetProcessHeap(), 0, DOSCONF_menu_default); DOSCONF_menu_default = NULL; DOSCONF_menu_skip = 0; } @@ -367,7 +367,7 @@ static int DOSCONF_Menu(char **confline) { if (!(DOSCONF_JumpToEntry(confline, '='))) return 0; *confline = strtok(*confline, ","); - DOSCONF_menu_default = malloc(strlen(*confline) + 1); + DOSCONF_menu_default = HeapAlloc(GetProcessHeap(), 0, strlen(*confline) + 1); strcpy(DOSCONF_menu_default, *confline); } @@ -384,10 +384,10 @@ static int DOSCONF_Include(char **confline) fgetpos(DOSCONF_fd, &oldpos); fseek(DOSCONF_fd, 0, SEEK_SET); TRACE( "Including menu '%s'\n", *confline ); - temp = malloc(strlen(*confline) + 1); + temp = HeapAlloc(GetProcessHeap(), 0, strlen(*confline) + 1); strcpy(temp, *confline); DOSCONF_Parse(temp); - free(temp); + HeapFree(GetProcessHeap(), 0, temp); fsetpos(DOSCONF_fd, &oldpos); return 1; } diff --git a/dlls/winedos/dosvm.c b/dlls/winedos/dosvm.c index c139023..7c81fad 100644 --- a/dlls/winedos/dosvm.c +++ b/dlls/winedos/dosvm.c @@ -182,7 +182,7 @@ static void DOSVM_SendOneEvent( CONTEXT86 *context ) DOSVM_BuildCallFrame( context, event->relay, event->data ); } - free(event); + HeapFree(GetProcessHeap(), 0, event); } } @@ -257,7 +257,7 @@ void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data BOOL old_pending; if (MZ_Current()) { - event = malloc(sizeof(DOSEVENT)); + event = HeapAlloc(GetProcessHeap(), 0, sizeof(DOSEVENT)); if (!event) { ERR("out of memory allocating event entry\n"); return; @@ -622,7 +622,7 @@ void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val) current_event = event->next; if (event->relay) (*event->relay)(NULL,event->data); - free(event); + HeapFree(GetProcessHeap(), 0, event); if (DOSVM_HasPendingEvents()) { diff --git a/dlls/winedos/int33.c b/dlls/winedos/int33.c index 7172740..70bb478 100644 --- a/dlls/winedos/int33.c +++ b/dlls/winedos/int33.c @@ -218,7 +218,7 @@ static void MouseRelay(CONTEXT86 *context,void *mdata) ctx.Edi = data->my; ctx.SegCs = SELECTOROF(data->proc); ctx.Eip = OFFSETOF(data->proc); - free(data); + HeapFree(GetProcessHeap(), 0, data); DPMI_CallRMProc(&ctx, NULL, 0, 0); } @@ -264,7 +264,7 @@ static void QueueMouseRelay(DWORD mx, DWORD my, WORD mask) } if ((mask & mouse_info.callmask) && mouse_info.callback) { - MCALLDATA *data = calloc(1,sizeof(MCALLDATA)); + MCALLDATA *data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MCALLDATA)); data->proc = mouse_info.callback; data->mask = mask & mouse_info.callmask; data->but = mouse_info.but; diff --git a/dlls/winedos/ppdev.c b/dlls/winedos/ppdev.c index 0c74ae6..08469a6 100644 --- a/dlls/winedos/ppdev.c +++ b/dlls/winedos/ppdev.c @@ -181,7 +181,7 @@ char IO_pp_init(void) ERR("Perhaps the device is already in use or nonexistent\n"); continue; } - PPDeviceList[nports].devicename = malloc(sizeof(buffer)+1); + PPDeviceList[nports].devicename = HeapAlloc(GetProcessHeap(), 0, sizeof(buffer)+1); if (!PPDeviceList[nports].devicename) { ERR("No (more) space for devicename\n");

1 0

Juan Lang : crypt32: Fix test failures on some Windows 98 systems.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 1137d630a6d8a16bb2b645751972fd4e98c956cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1137d630a6d8a16bb2b645751… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 17:32:49 2009 -0800 crypt32: Fix test failures on some Windows 98 systems. --- dlls/crypt32/tests/ctl.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index fea7b97..2b80bf0 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -135,21 +135,21 @@ static void testCreateCTL(void) */ SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, signedCTL, sizeof(signedCTL)); - ok((!ctl && + ok(!ctl && (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */)) || - broken(ctl != NULL /* some win98 */), - "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), + GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ || + GetLastError() == ERROR_SUCCESS /* some win98 */), + "expected ERROR_INVALID_DATA, CRYPT_E_UNEXPECTED_MSG_TYPE, or ERROR_SUCCESS, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, ctlWithOneEntry, sizeof(ctlWithOneEntry)); - ok((!ctl && + ok(!ctl && (GetLastError() == ERROR_INVALID_DATA || GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ || - GetLastError() == OSS_DATA_ERROR /* some win98 */)) || - broken(ctl != NULL /* some win98 */), - "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), + GetLastError() == OSS_DATA_ERROR /* some win98 */ || + GetLastError() == ERROR_SUCCESS /* some win98 */), + "expected ERROR_INVALID_DATA, CRYPT_E_UNEXPECTED_MSG_TYPE, OSS_DATA_ERROR, or ERROR_SUCCESS, got %d (0x%08x)\n", GetLastError(), GetLastError()); SetLastError(0xdeadbeef); ctl = CertCreateCTLContext(X509_ASN_ENCODING, @@ -373,8 +373,10 @@ static void testAddCTLToStore(void) } else { - ok(!ret && GetLastError() == CRYPT_E_EXISTS, - "expected CRYPT_E_EXISTS, got %d %08x\n", ret, GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_EXISTS || + GetLastError() == OSS_DATA_ERROR), + "expected CRYPT_E_EXISTS or OSS_DATA_ERROR, got %d %08x\n", ret, + GetLastError()); } CertCloseStore(store, 0); @@ -399,7 +401,8 @@ static void testAddCTLToStore(void) if (ctl) numCTLs++; } while (ctl); - ok(numCTLs == 2, "expected 2 CTLs, got %d\n", numCTLs); + ok(numCTLs == 2 || broken(numCTLs == 1 /* some Win98 */), + "expected 2 CTLs, got %d\n", numCTLs); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -410,6 +413,11 @@ static void testAddCTLToStore(void) ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, signedCTLWithListID1, sizeof(signedCTLWithListID1), CERT_STORE_ADD_NEW, NULL); + if (!ret) + { + skip("adding a CTL with an empty usage not supported\n"); + return; + } ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, signedCTLWithListID2, sizeof(signedCTLWithListID2), CERT_STORE_ADD_NEW,

1 0

Erich Hoover : wcmd: Properly cleanup redirects when there are no in/out/ error pipes.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 4691cc4f85d20d3b74e831e79ffcf4c07e805bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=4691cc4f85d20d3b74e831e79… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Feb 9 13:47:54 2009 -0700 wcmd: Properly cleanup redirects when there are no in/out/error pipes. --- programs/cmd/wcmdmain.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2366fc7..4bbd72e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1204,9 +1204,9 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, SECURITY_ATTRIBUTES sa; WCHAR *new_cmd = NULL; WCHAR *new_redir = NULL; - HANDLE old_stdhandles[3] = {INVALID_HANDLE_VALUE, - INVALID_HANDLE_VALUE, - INVALID_HANDLE_VALUE}; + HANDLE old_stdhandles[3] = {GetStdHandle (STD_INPUT_HANDLE), + GetStdHandle (STD_OUTPUT_HANDLE), + GetStdHandle (STD_ERROR_HANDLE)}; DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE}; @@ -1325,7 +1325,6 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, HeapFree( GetProcessHeap(), 0, new_redir ); return; } - old_stdhandles[0] = GetStdHandle (STD_INPUT_HANDLE); SetStdHandle (STD_INPUT_HANDLE, h); /* No need to remember the temporary name any longer once opened */ @@ -1341,7 +1340,6 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, HeapFree( GetProcessHeap(), 0, new_redir ); return; } - old_stdhandles[0] = GetStdHandle (STD_INPUT_HANDLE); SetStdHandle (STD_INPUT_HANDLE, h); } @@ -1396,7 +1394,6 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, WINE_TRACE("Redirect %d to '%s' (%p)\n", handle, wine_dbgstr_w(param), h); } - old_stdhandles[handle] = GetStdHandle (idx_stdhandles[handle]); SetStdHandle (idx_stdhandles[handle], h); } @@ -1559,7 +1556,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, /* Restore old handles */ for (i=0; i<3; i++) { - if (old_stdhandles[i] != INVALID_HANDLE_VALUE) { + if (old_stdhandles[i] != GetStdHandle(idx_stdhandles[i])) { CloseHandle (GetStdHandle (idx_stdhandles[i])); SetStdHandle (idx_stdhandles[i], old_stdhandles[i]); }

1 0

Juan Lang : kernel32: Add more tests for getting/setting a named pipe' s state.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: c82722b3dc40ab64a9e769e216af0f561e9e50e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c82722b3dc40ab64a9e769e21… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 10:12:31 2009 -0800 kernel32: Add more tests for getting/setting a named pipe's state. --- dlls/kernel32/tests/pipe.c | 112 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 41ec1ab..ee10974 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1323,6 +1323,117 @@ static void test_overlapped(void) CloseHandle(thread); } +static void test_NamedPipeHandleState(void) +{ + HANDLE server, client; + BOOL ret; + DWORD state, instances, maxCollectionCount, collectDataTimeout; + char userName[MAX_PATH]; + + server = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "cf failed\n"); + ret = GetNamedPipeHandleState(server, NULL, NULL, NULL, NULL, NULL, 0); + todo_wine + ok(ret, "GetNamedPipeHandleState failed: %d\n", GetLastError()); + ret = GetNamedPipeHandleState(server, &state, &instances, NULL, NULL, NULL, + 0); + todo_wine + ok(ret, "GetNamedPipeHandleState failed: %d\n", GetLastError()); + if (ret) + { + ok(state == 0, "unexpected state %08x\n", state); + ok(instances == 1, "expected 1 instances, got %d\n", instances); + } + /* Some parameters have no meaning, and therefore can't be retrieved, + * on a local pipe. + */ + SetLastError(0xdeadbeef); + ret = GetNamedPipeHandleState(server, &state, &instances, + &maxCollectionCount, &collectDataTimeout, userName, + sizeof(userName) / sizeof(userName[0])); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + /* A byte-mode pipe server can't be changed to message mode. */ + state = PIPE_READMODE_MESSAGE; + SetLastError(0xdeadbeef); + ret = SetNamedPipeHandleState(server, &state, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + client = CreateFileA(PIPENAME, GENERIC_READ|GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); + ok(client != INVALID_HANDLE_VALUE, "cf failed\n"); + + state = PIPE_READMODE_BYTE; + ret = SetNamedPipeHandleState(client, &state, NULL, NULL); + todo_wine + ok(ret, "SetNamedPipeHandleState failed: %d\n", GetLastError()); + /* A byte-mode pipe client can't be changed to message mode, either. */ + state = PIPE_READMODE_MESSAGE; + SetLastError(0xdeadbeef); + ret = SetNamedPipeHandleState(server, &state, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + CloseHandle(client); + CloseHandle(server); + + server = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, + /* dwOpenMode */ PIPE_TYPE_MESSAGE | PIPE_WAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(server != INVALID_HANDLE_VALUE, "cf failed\n"); + ret = GetNamedPipeHandleState(server, NULL, NULL, NULL, NULL, NULL, 0); + todo_wine + ok(ret, "GetNamedPipeHandleState failed: %d\n", GetLastError()); + ret = GetNamedPipeHandleState(server, &state, &instances, NULL, NULL, NULL, + 0); + todo_wine + ok(ret, "GetNamedPipeHandleState failed: %d\n", GetLastError()); + if (ret) + { + ok(state == 0, "unexpected state %08x\n", state); + ok(instances == 1, "expected 1 instances, got %d\n", instances); + } + /* In contrast to byte-mode pipes, a message-mode pipe server can be + * changed to byte mode. + */ + state = PIPE_READMODE_BYTE; + ret = SetNamedPipeHandleState(server, &state, NULL, NULL); + todo_wine + ok(ret, "SetNamedPipeHandleState failed: %d\n", GetLastError()); + + client = CreateFileA(PIPENAME, GENERIC_READ|GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); + ok(client != INVALID_HANDLE_VALUE, "cf failed\n"); + + state = PIPE_READMODE_MESSAGE; + ret = SetNamedPipeHandleState(client, &state, NULL, NULL); + todo_wine + ok(ret, "SetNamedPipeHandleState failed: %d\n", GetLastError()); + /* A message-mode pipe client can also be changed to byte mode. + */ + state = PIPE_READMODE_BYTE; + ret = SetNamedPipeHandleState(client, &state, NULL, NULL); + todo_wine + ok(ret, "SetNamedPipeHandleState failed: %d\n", GetLastError()); + + CloseHandle(client); + CloseHandle(server); +} + START_TEST(pipe) { HMODULE hmod; @@ -1339,4 +1450,5 @@ START_TEST(pipe) test_CreatePipe(); test_impersonation(); test_overlapped(); + test_NamedPipeHandleState(); }

1 0