September 2008 - Wine-commits

Andrew Talbot : ddraw: Sign-compare warnings fix.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: a697d99d66245601e47b5b1b9c877020eef21b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a697d99d66245601e47b5b1b9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Sep 27 17:35:03 2008 +0100 ddraw: Sign-compare warnings fix. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/utils.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9fdbd27..3af4da4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1842,7 +1842,7 @@ D3D7CB_CreateSurface(IUnknown *device, { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, device); IDirectDrawSurfaceImpl *surf = NULL; - int i = 0; + UINT i = 0; DDSCAPS2 searchcaps = This->tex_root->surface_desc.ddsCaps; TRACE("(%p) call back. surf=%p. Face %d level %d\n", device, This->tex_root, Face, level); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 84d55e0..cb0bda5 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1165,7 +1165,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); HRESULT hr; WINED3DDISPLAYMODE mode; - int i; + unsigned int i; WINED3DFORMAT FormatList[] = { /* 32 bit */ @@ -1328,7 +1328,7 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice2, iface); HRESULT hr; - int i; + unsigned int i; WINED3DDISPLAYMODE mode; WINED3DFORMAT FormatList[] = { @@ -3982,7 +3982,7 @@ IDirect3DDeviceImpl_7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); WineDirect3DVertexStridedData WineD3DStrided; - int i; + DWORD i; UINT PrimitiveCount; HRESULT hr; @@ -4160,7 +4160,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); WineDirect3DVertexStridedData WineD3DStrided; - int i; + DWORD i; UINT PrimitiveCount; HRESULT hr; diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index d3ce886..5e21e5b 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -1138,7 +1138,7 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface, { ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D7, iface); HRESULT hr; - int i; + unsigned int i; WINED3DDISPLAYMODE d3ddm; WINED3DDEVTYPE type; diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 937caa4..02d74c7 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -902,7 +902,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) { DWORD size = 0; - int i; + DWORD i; if (d3dvtVertexType & D3DFVF_NORMAL) size += 3 * sizeof(D3DVALUE); if (d3dvtVertexType & D3DFVF_DIFFUSE) size += sizeof(DWORD);

1 0

Hans Leidekker : winhttp: Skip notifications that may arrive out of order.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: ee1a4650fd638bf746373edd05dc66246d4157a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1a4650fd638bf746373edd0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 28 21:35:57 2008 +0200 winhttp: Skip notifications that may arrive out of order. --- dlls/winhttp/tests/notification.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 64adaea..de8508a 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -45,6 +45,7 @@ struct notification enum api function; /* api responsible for notification */ unsigned int status; /* status received */ int todo; + int ignore; }; struct info @@ -73,12 +74,12 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW status_ok = (info->test[i].status == status); function_ok = (info->test[i].function == info->function); - if (!info->test[i].todo) + if (!info->test[i].ignore && !info->test[i].todo) { ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[i].status, status); ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); } - else + else if (!info->test[i].ignore) { todo_wine ok(status_ok, "%u: expected status 0x%08x got 0x%08x\n", info->line, info->test[i].status, status); if (status_ok) @@ -305,9 +306,9 @@ static const struct notification async_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0 }, { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, 0 }, { winhttp_query_data, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, 0 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 1 }, - { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, 1 }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE, 0, 1 }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED, 0, 1 }, + { winhttp_read_data, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, 0, 1 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, 0 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, 0 }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, 0 },

1 0

Hans Leidekker : shlwapi: Fix PathIsValidChar tests that fail on some versions of Windows.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: a14e967135b1a598d7cb44734c2043531d8ccef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14e967135b1a598d7cb44734… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sun Sep 28 21:34:28 2008 +0200 shlwapi: Fix PathIsValidChar tests that fail on some versions of Windows. --- dlls/shlwapi/tests/path.c | 38 +++++--------------------------------- 1 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 0fc092d..cc9ded5 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -271,62 +271,34 @@ static void test_PathIsValidCharA(void) BOOL ret; unsigned int c; - ret = pPathIsValidCharA( 0x7f, 0 ); - ok ( !ret, "PathIsValidCharA succeeded: 0x%08x\n", (DWORD)ret ); - - ret = pPathIsValidCharA( 0x7f, 1 ); - ok ( !ret, "PathIsValidCharA succeeded: 0x%08x\n", (DWORD)ret ); - for (c = 0; c < 0x7f; c++) { ret = pPathIsValidCharA( c, ~0U ); - ok ( ret == SHELL_charclass[c] || (ret == 1 && SHELL_charclass[c] == 0xffffffff), - "PathIsValidCharA failed: 0x%02x got 0x%08x expected 0x%08x\n", - c, (DWORD)ret, SHELL_charclass[c] ); + ok ( ret || !SHELL_charclass[c], "PathIsValidCharA failed: 0x%02x got 0x%08x\n", c, ret ); } for (c = 0x7f; c <= 0xff; c++) { ret = pPathIsValidCharA( c, ~0U ); - ok ( ret == 0x00000100, - "PathIsValidCharA failed: 0x%02x got 0x%08x expected 0x00000100\n", - c, (DWORD)ret ); + ok ( ret, "PathIsValidCharA failed: 0x%02x got 0x%08x\n", c, ret ); } } static void test_PathIsValidCharW(void) { BOOL ret; - unsigned int c, err_count = 0; - - ret = pPathIsValidCharW( 0x7f, 0 ); - ok ( !ret, "PathIsValidCharW succeeded: 0x%08x\n", (DWORD)ret ); - - ret = pPathIsValidCharW( 0x7f, 1 ); - ok ( !ret, "PathIsValidCharW succeeded: 0x%08x\n", (DWORD)ret ); + unsigned int c; for (c = 0; c < 0x7f; c++) { ret = pPathIsValidCharW( c, ~0U ); - ok ( ret == SHELL_charclass[c] || (ret == 1 && SHELL_charclass[c] == 0xffffffff), - "PathIsValidCharW failed: 0x%02x got 0x%08x expected 0x%08x\n", - c, (DWORD)ret, SHELL_charclass[c] ); + ok ( ret || !SHELL_charclass[c], "PathIsValidCharW failed: 0x%02x got 0x%08x\n", c, ret ); } for (c = 0x007f; c <= 0xffff; c++) { ret = pPathIsValidCharW( c, ~0U ); - ok ( ret == 0x00000100, - "PathIsValidCharW failed: 0x%02x got 0x%08x expected 0x00000100\n", - c, (DWORD)ret ); - if (ret != 0x00000100) - { - if(++err_count > 100 ) { - trace("skipping rest of PathIsValidCharW tests " - "because of the current number of errors\n"); - break; - } - } + ok ( ret, "PathIsValidCharW failed: 0x%02x got 0x%08x\n", c, ret ); } }

1 0

Dmitry Timoshkov : gdi32: Add a test for PS_NULL pen being equal to NULL_PEN stock object.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 830f1563c63cabc0b65e615828dc7d6aa47c3763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=830f1563c63cabc0b65e61582… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Sep 29 03:56:41 2008 +0900 gdi32: Add a test for PS_NULL pen being equal to NULL_PEN stock object. --- dlls/gdi32/tests/pen.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 8b2e41a..144875b 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -70,7 +70,7 @@ static void test_logpen(void) for (i = 0; i < sizeof(pen)/sizeof(pen[0]); i++) { - trace("testing style %u\n", pen[i].style); + trace("%d: testing style %u\n", i, pen[i].style); /********************** cosmetic pens **********************/ /* CreatePenIndirect behaviour */ @@ -144,6 +144,8 @@ static void test_logpen(void) /* for some reason XP differentiates PS_NULL here */ if (pen[i].style == PS_NULL) { + todo_wine + ok(hpen == GetStockObject(NULL_PEN), "hpen should be a stock NULL_PEN\n"); ok(size == sizeof(EXTLOGPEN), "GetObject returned %d, error %d\n", size, GetLastError()); ok(elp.elpPenStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, elp.elpPenStyle); ok(elp.elpWidth == 0, "expected 0, got %u\n", elp.elpWidth); @@ -206,7 +208,11 @@ static void test_logpen(void) obj_type = GetObjectType(hpen); /* for some reason XP differentiates PS_NULL here */ if (pen[i].style == PS_NULL) + { ok(obj_type == OBJ_PEN, "wrong object type %u\n", obj_type); + todo_wine + ok(hpen == GetStockObject(NULL_PEN), "hpen should be a stock NULL_PEN\n"); + } else ok(obj_type == OBJ_EXTPEN, "wrong object type %u\n", obj_type);

1 0

James Hawkins : comctl32: Fix a test on locales where default first day of week is not the max value .
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 2f8830d55b71d2fb8be912c7041d7adab7580391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f8830d55b71d2fb8be912c70… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Sep 28 13:22:20 2008 -0500 comctl32: Fix a test on locales where default first day of week is not the max value. --- dlls/comctl32/tests/monthcal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 271dfd1..6f2ae70 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -673,7 +673,8 @@ static void test_monthcal_firstDay(HWND hwnd) if (i == -1){ expect(MAKELONG(fday, FALSE), res); }else if (i >= 7){ - expect(MAKELONG(fday, TRUE), res); + /* out of range sets max first day of week, locale is ignored */ + expect(MAKELONG(6, TRUE), res); }else{ expect(MAKELONG(i, TRUE), res); }

1 0

Jacek Caban : shdocvw: Fixed tests on IE5.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 4d46c9976566ca4711a27ce9597646f240e9f3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d46c9976566ca4711a27ce95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 28 14:04:03 2008 +0200 shdocvw: Fixed tests on IE5. --- dlls/shdocvw/tests/webbrowser.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 86d38db..a203ae1 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -63,6 +63,12 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_CALLED_BROKEN(func) \ + do { \ + ok(called_ ## func || broken(!called_ ## func), "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + DEFINE_EXPECT(GetContainer); DEFINE_EXPECT(Site_GetWindow); DEFINE_EXPECT(ShowObject); @@ -240,6 +246,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case 24: return E_FAIL; /* TODO */ + case 25: + return E_FAIL; /* IE5 */ case 66: return E_FAIL; /* TODO */ default: @@ -1627,13 +1635,13 @@ static void test_ie_funcs(IUnknown *unk) SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_TRUE)); - ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); - CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); + CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); SET_EXPECT(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_put_Resizable(wb, (exvb = VARIANT_FALSE)); - ok(hres == S_OK, "put_Resizable failed: %08x\n", hres); - CHECK_CALLED(Invoke_WINDOWSETRESIZABLE); + ok(hres == S_OK || broken(hres == E_NOTIMPL), "put_Resizable failed: %08x\n", hres); + CHECK_CALLED_BROKEN(Invoke_WINDOWSETRESIZABLE); hres = IWebBrowser2_get_Resizable(wb, &b); ok(hres == E_NOTIMPL, "get_Resizable failed: %08x\n", hres); @@ -1953,12 +1961,12 @@ static void test_Navigate2(IUnknown *unk) CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CHECK_CALLED(Invoke_AMBIENT_PALETTE); CHECK_CALLED(GetOptionKeyPath); - CHECK_CALLED(GetOverridesKeyPath); + CHECK_CALLED_BROKEN(GetOverridesKeyPath); todo_wine CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); todo_wine CHECK_CALLED(Exec_SETPROGRESSMAX); todo_wine CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED(Invoke_SETSECURELOCKICON); - todo_wine CHECK_CALLED(Invoke_FILEDOWNLOAD); + todo_wine CHECK_CALLED_BROKEN(Invoke_SETSECURELOCKICON); + todo_wine CHECK_CALLED_BROKEN(Invoke_FILEDOWNLOAD); todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE); todo_wine CHECK_CALLED(Exec_SETDOWNLOADSTATE_0); CHECK_CALLED(EnableModeless_TRUE);

1 0

James Hawkins : crypt32: Fix several failing tests in win9x.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 5114d652d223479cee8249119052e98c45936ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5114d652d223479cee8249119… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Sep 28 12:12:46 2008 -0500 crypt32: Fix several failing tests in win9x. --- dlls/crypt32/tests/cert.c | 88 +++++++++++++++++++++++++++++++------------- 1 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index b4f8760..558aa11 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2535,11 +2535,15 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(!ret, "CertComparePublicKeyInfo: as raw binary: keys should be unequal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); - ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); + ok(ret || + broken(!ret), /* win9x */ + "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); info1.PublicKey.cUnusedBits = 1; info2.PublicKey.cUnusedBits = 5; ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); - ok(ret, "CertComparePublicKeyInfo: ASN.1 encoding should ignore cUnusedBits\n"); + ok(ret || + broken(!ret), /* win9x */ + "CertComparePublicKeyInfo: ASN.1 encoding should ignore cUnusedBits\n"); info1.PublicKey.cUnusedBits = 0; info2.PublicKey.cUnusedBits = 0; info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ @@ -2592,18 +2596,23 @@ static void testHashPublicKeyInfo(void) "Expected STATUS_ACCESS_VIOLATION, got %08x\n", GetLastError()); } ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, &info, NULL, &len); - ok(ret, "CryptHashPublicKeyInfo failed: %08x\n", GetLastError()); - ok(len == 16, "Expected hash size 16, got %d\n", len); - if (len == 16) + ok(ret || + broken(!ret), /* win9x */ + "CryptHashPublicKeyInfo failed: %08x\n", GetLastError()); + if (ret) { - static const BYTE emptyHash[] = { 0xb8,0x51,0x3a,0x31,0x0e,0x9f,0x40, - 0x36,0x9c,0x92,0x45,0x1b,0x9d,0xc8,0xf9,0xf6 }; - BYTE buf[16]; - - ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, &info, buf, - &len); - ok(ret, "CryptHashPublicKeyInfo failed: %08x\n", GetLastError()); - ok(!memcmp(buf, emptyHash, len), "Unexpected hash\n"); + ok(len == 16, "Expected hash size 16, got %d\n", len); + if (len == 16) + { + static const BYTE emptyHash[] = { 0xb8,0x51,0x3a,0x31,0x0e,0x9f,0x40, + 0x36,0x9c,0x92,0x45,0x1b,0x9d,0xc8,0xf9,0xf6 }; + BYTE buf[16]; + + ret = CryptHashPublicKeyInfo(0, 0, 0, X509_ASN_ENCODING, &info, buf, + &len); + ok(ret, "CryptHashPublicKeyInfo failed: %08x\n", GetLastError()); + ok(!memcmp(buf, emptyHash, len), "Unexpected hash\n"); + } } } @@ -2651,8 +2660,14 @@ static void testHashToBeSigned(void) /* Signing a cert works */ ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), NULL, &size); - ok(ret, "CryptHashToBeSigned failed: %08x\n", GetLastError()); - ok(size == sizeof(md5SignedEmptyCertHash), "unexpected size %d\n", size); + ok(ret || + broken(!ret), /* win9x */ + "CryptHashToBeSigned failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(md5SignedEmptyCertHash), "unexpected size %d\n", size); + } + ret = CryptHashToBeSigned(0, X509_ASN_ENCODING, md5SignedEmptyCert, sizeof(md5SignedEmptyCert), hash, &size); ok(!memcmp(hash, md5SignedEmptyCertHash, size), "unexpected value\n"); @@ -2893,13 +2908,21 @@ static void testAcquireCertPrivateKey(void) /* Don't cache provider */ ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", + ok(ret || + broken(!ret), /* win95 */ + "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); + if (ret) + { + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + } + ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &certCSP, NULL, NULL); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", + ok(ret || + broken(!ret), /* win95 */ + "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); CryptReleaseContext(certCSP, 0); @@ -2907,21 +2930,30 @@ static void testAcquireCertPrivateKey(void) ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", + ok(ret || + broken(!ret), /* win95 */ + "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); - ok(callerFree, "Expected callerFree to be TRUE\n"); - CryptReleaseContext(certCSP, 0); + if (ret) + { + ok(callerFree, "Expected callerFree to be TRUE\n"); + CryptReleaseContext(certCSP, 0); + } /* Cache it (and check that it's cached) */ ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_CACHE_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", + ok(ret || + broken(!ret), /* win95 */ + "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + ok(ret || + broken(!ret), /* win95 */ + "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); /* Remove the cached provider */ @@ -2936,13 +2968,17 @@ static void testAcquireCertPrivateKey(void) ret = pCryptAcquireCertificatePrivateKey(cert, CRYPT_ACQUIRE_USE_PROV_INFO_FLAG, NULL, &certCSP, &keySpec, &callerFree); - ok(ret, "CryptAcquireCertificatePrivateKey failed: %08x\n", + ok(ret || + broken(!ret), /* win95 */ + "CryptAcquireCertificatePrivateKey failed: %08x\n", GetLastError()); ok(!callerFree, "Expected callerFree to be FALSE\n"); size = sizeof(keyContext); ret = CertGetCertificateContextProperty(cert, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + ok(ret || + broken(!ret), /* win95 */ + "CertGetCertificateContextProperty failed: %08x\n", GetLastError()); CryptReleaseContext(certCSP, 0);

1 0

Huw Davies : include: Add a missing WINAPI.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: c3c74ac555860ae6e88b484115a313247b5178d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3c74ac555860ae6e88b48411… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Sep 28 12:06:53 2008 -0500 include: Add a missing WINAPI. --- include/wincrypt.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 4b28f93..fa40266 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4037,7 +4037,7 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType, DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, PCERT_PUBLIC_KEY_INFO pPublicKey); -const void *CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, +const void * WINAPI CertCreateContext(DWORD dwContextType, DWORD dwEncodingType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, PCERT_CREATE_CONTEXT_PARA pCreatePara);

1 0

Kai Blin : dplayx: Set tests to "interactive" to avoid timing out on all machines.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: ab448df3efef1c892d830052b45f467a9911b827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab448df3efef1c892d830052b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Sep 28 18:54:54 2008 +0200 dplayx: Set tests to "interactive" to avoid timing out on all machines. --- dlls/dplayx/tests/dplayx.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 345647a..7a0c657 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6218,21 +6218,34 @@ static void test_remote_data_replication(void) START_TEST(dplayx) { + if (!winetest_interactive) + { + skip("Run in interacive mode to run dplayx tests.\n"); + return; + } + CoInitialize( NULL ); + trace("Running in interactive mode, tests will take a while\n"); + test_DirectPlayCreate(); test_EnumConnections(); test_InitializeConnection(); test_GetCaps(); + /* test_Open() takes almost a minute, */ test_Open(); + /* test_EnumSession takes three minutes */ test_EnumSessions(); test_SessionDesc(); + /* test_CreatePlayer() takes over a minute */ test_CreatePlayer(); test_GetPlayerCaps(); test_PlayerData(); test_PlayerName(); + + /* test_GetPlayerAccount() takes over 30s */ test_GetPlayerAccount(); test_GetPlayerAddress(); test_GetPlayerFlags();

1 0

Francois Gouget : comctl32/tests: Don't crash if adding the tooltip failed.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 1177bbaa9e4bb2330936b987caa623c1b3e4e394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1177bbaa9e4bb2330936b987c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 28 18:41:02 2008 +0200 comctl32/tests: Don't crash if adding the tooltip failed. --- dlls/comctl32/tests/tooltips.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 6bf5a3a..7454b6f 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -257,12 +257,14 @@ static void test_gettext(void) GetClientRect(hwnd, &toolinfoA.rect); r = SendMessageA(hwnd, TTM_ADDTOOL, 0, (LPARAM)&toolinfoA); ok(r, "Adding the tool to the tooltip failed\n"); - - toolinfoA.hwnd = NULL; - toolinfoA.uId = (UINT_PTR)0x1234ABCD; - toolinfoA.lpszText = bufA; - SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); - ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); + if (r) + { + toolinfoA.hwnd = NULL; + toolinfoA.uId = (UINT_PTR)0x1234ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + ok(strcmp(toolinfoA.lpszText, "") == 0, "lpszText should be an empty string\n"); + } DestroyWindow(hwnd);

1 0