wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Juan Lang : cryptnet: If the caller specifies the location of a CRL, check a cert's revocation status against it.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 60ddb1365d77f0ac982b2a2e7e913c8dc40e4d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ddb1365d77f0ac982b2a2e7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 30 11:02:50 2009 -0800 cryptnet: If the caller specifies the location of a CRL, check a cert's revocation status against it. --- dlls/cryptnet/cryptnet_main.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 8d6dd8f..9e29daa 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1582,8 +1582,34 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, 0, NULL, &cbUrlArray, NULL, NULL, NULL); if (!ret && GetLastError() == CRYPT_E_NOT_FOUND) { - error = CRYPT_E_NO_REVOCATION_CHECK; - pRevStatus->dwIndex = index; + if (pRevPara && pRevPara->hCrlStore && pRevPara->pIssuerCert) + { + PCCRL_CONTEXT crl; + + /* If the caller was helpful enough to tell us where to find a CRL + * for the cert, look for one and check it. + */ + crl = CertFindCRLInStore(pRevPara->hCrlStore, + cert->dwCertEncodingType, + CRL_FIND_ISSUED_BY_SIGNATURE_FLAG | CRL_FIND_ISSUED_BY_AKI_FLAG, + CRL_FIND_ISSUED_BY, pRevPara->pIssuerCert, NULL); + if (crl) + { + error = verify_cert_revocation_with_crl(cert, crl, index, + pTime, pRevStatus); + CertFreeCRLContext(crl); + } + else + { + error = CRYPT_E_NO_REVOCATION_CHECK; + pRevStatus->dwIndex = index; + } + } + else + { + error = CRYPT_E_NO_REVOCATION_CHECK; + pRevStatus->dwIndex = index; + } } else if (ret) {

1 0

Juan Lang : cryptnet: Use helper function to check a cert against a CRL.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 44e4ac2128f8f4d7194c50e94f10cfa91e4a6870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e4ac2128f8f4d7194c50e94… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 30 10:14:48 2009 -0800 cryptnet: Use helper function to check a cert against a CRL. --- dlls/cryptnet/cryptnet_main.c | 45 ++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ea6047c..8d6dd8f 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1544,6 +1544,33 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +static DWORD verify_cert_revocation_with_crl(PCCERT_CONTEXT cert, + PCCRL_CONTEXT crl, DWORD index, FILETIME *pTime, + PCERT_REVOCATION_STATUS pRevStatus) +{ + DWORD error; + + if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) + { + /* The CRL isn't time valid */ + error = CRYPT_E_NO_REVOCATION_CHECK; + } + else + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = index; + } + else + error = ERROR_SUCCESS; + } + return error; +} + static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) @@ -1591,22 +1618,8 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, NULL, NULL, NULL, NULL); if (ret) { - if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) - { - /* The CRL isn't time valid */ - error = CRYPT_E_NO_REVOCATION_CHECK; - } - else - { - PCRL_ENTRY entry = NULL; - - CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); - if (entry) - { - error = CRYPT_E_REVOKED; - pRevStatus->dwIndex = index; - } - } + error = verify_cert_revocation_with_crl(cert, crl, index, + pTime, pRevStatus); if (!error && timeout) { DWORD time = GetTickCount();

1 0

Juan Lang : cryptnet: Change guard variable to simplify loop.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 165d380852dbeb391ef22b63af33dad1f1f5a85c URL: http://source.winehq.org/git/wine.git/?a=commit;h=165d380852dbeb391ef22b63a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 1 15:08:21 2009 -0800 cryptnet: Change guard variable to simplify loop. --- dlls/cryptnet/cryptnet_main.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ff9ab86..ea6047c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1580,7 +1580,9 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, } else endTime = timeout = 0; - for (j = 0; ret && j < urlArray->cUrl; j++) + if (!ret) + error = GetLastError(); + for (j = 0; !error && j < urlArray->cUrl; j++) { PCCRL_CONTEXT crl; @@ -1593,7 +1595,6 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, { /* The CRL isn't time valid */ error = CRYPT_E_NO_REVOCATION_CHECK; - ret = FALSE; } else { @@ -1604,10 +1605,9 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, { error = CRYPT_E_REVOKED; pRevStatus->dwIndex = index; - ret = FALSE; } } - if (ret && timeout) + if (!error && timeout) { DWORD time = GetTickCount(); @@ -1615,7 +1615,6 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, { error = ERROR_TIMEOUT; pRevStatus->dwIndex = index; - ret = FALSE; } else timeout = endTime - time;

1 0

Juan Lang : cryptnet: Use helper function to verify a certificate' s revocation.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 4729cdd1e9419ff9dd13bd603e9c64afbf60ce31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4729cdd1e9419ff9dd13bd603… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 3 10:54:50 2009 -0800 cryptnet: Use helper function to verify a certificate's revocation. --- dlls/cryptnet/cryptnet_main.c | 202 +++++++++++++++++++++-------------------- 1 files changed, 102 insertions(+), 100 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 8b47602..ff9ab86 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1544,6 +1544,103 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, return ret; } +static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, + FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, + PCERT_REVOCATION_STATUS pRevStatus) +{ + BOOL ret; + DWORD error = ERROR_SUCCESS, cbUrlArray; + + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, (void *)cert, + 0, NULL, &cbUrlArray, NULL, NULL, NULL); + if (!ret && GetLastError() == CRYPT_E_NOT_FOUND) + { + error = CRYPT_E_NO_REVOCATION_CHECK; + pRevStatus->dwIndex = index; + } + else if (ret) + { + CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); + + if (urlArray) + { + DWORD j, retrievalFlags = 0, startTime, endTime, timeout; + + ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, + (void *)cert, 0, urlArray, &cbUrlArray, NULL, NULL, NULL); + if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) + retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; + if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && + pRevPara && pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, + dwUrlRetrievalTimeout) + sizeof(DWORD)) + { + startTime = GetTickCount(); + endTime = startTime + pRevPara->dwUrlRetrievalTimeout; + timeout = pRevPara->dwUrlRetrievalTimeout; + } + else + endTime = timeout = 0; + for (j = 0; ret && j < urlArray->cUrl; j++) + { + PCCRL_CONTEXT crl; + + ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], + CONTEXT_OID_CRL, retrievalFlags, timeout, (void **)&crl, + NULL, NULL, NULL, NULL); + if (ret) + { + if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) + { + /* The CRL isn't time valid */ + error = CRYPT_E_NO_REVOCATION_CHECK; + ret = FALSE; + } + else + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = index; + ret = FALSE; + } + } + if (ret && timeout) + { + DWORD time = GetTickCount(); + + if ((int)(endTime - time) <= 0) + { + error = ERROR_TIMEOUT; + pRevStatus->dwIndex = index; + ret = FALSE; + } + else + timeout = endTime - time; + } + CertFreeCRLContext(crl); + } + else + error = CRYPT_E_REVOCATION_OFFLINE; + } + CryptMemFree(urlArray); + } + else + { + error = ERROR_OUTOFMEMORY; + pRevStatus->dwIndex = index; + } + } + else + { + error = GetLastError(); + pRevStatus->dwIndex = index; + } + return error; +} + typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS { DWORD cbSize; PCCERT_CONTEXT pIssuerCert; @@ -1596,113 +1693,18 @@ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, } memset(&pRevStatus->dwIndex, 0, pRevStatus->cbSize - sizeof(DWORD)); if (dwRevType != CERT_CONTEXT_REVOCATION_TYPE) - { error = CRYPT_E_NO_REVOCATION_CHECK; - ret = FALSE; - } else { - ret = TRUE; - for (i = 0; ret && i < cContext; i++) - { - DWORD cbUrlArray; - - ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, - rgpvContext[i], 0, NULL, &cbUrlArray, NULL, NULL, NULL); - if (!ret && GetLastError() == CRYPT_E_NOT_FOUND) - { - error = CRYPT_E_NO_REVOCATION_CHECK; - pRevStatus->dwIndex = i; - } - else if (ret) - { - CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); - - if (urlArray) - { - DWORD j, retrievalFlags = 0, startTime, endTime, timeout; - - ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, - rgpvContext[i], 0, urlArray, &cbUrlArray, NULL, NULL, - NULL); - if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) - retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; - if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && - pRevPara && - pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, - dwUrlRetrievalTimeout) + sizeof(DWORD)) - { - startTime = GetTickCount(); - endTime = startTime + pRevPara->dwUrlRetrievalTimeout; - timeout = pRevPara->dwUrlRetrievalTimeout; - } - else - endTime = timeout = 0; - for (j = 0; ret && j < urlArray->cUrl; j++) - { - PCCRL_CONTEXT crl; - - ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], - CONTEXT_OID_CRL, retrievalFlags, timeout, - (void **)&crl, NULL, NULL, NULL, NULL); - if (ret) - { - if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) - { - /* The CRL isn't time valid */ - error = CRYPT_E_NO_REVOCATION_CHECK; - ret = FALSE; - } - else - { - PCRL_ENTRY entry = NULL; - - CertFindCertificateInCRL( - rgpvContext[i], crl, 0, NULL, - &entry); - if (entry) - { - error = CRYPT_E_REVOKED; - pRevStatus->dwIndex = i; - ret = FALSE; - } - } - if (ret && timeout) - { - DWORD time = GetTickCount(); - - if ((int)(endTime - time) <= 0) - { - error = ERROR_TIMEOUT; - pRevStatus->dwIndex = i; - ret = FALSE; - } - else - timeout = endTime - time; - } - CertFreeCRLContext(crl); - } - else - error = CRYPT_E_REVOCATION_OFFLINE; - } - CryptMemFree(urlArray); - } - else - { - error = ERROR_OUTOFMEMORY; - pRevStatus->dwIndex = i; - ret = FALSE; - } - } - else - pRevStatus->dwIndex = i; - } + for (i = 0; !error && i < cContext; i++) + error = verify_cert_revocation(rgpvContext[i], i, pTime, dwFlags, + pRevPara, pRevStatus); } - - if (!ret) + if (error) { SetLastError(error); pRevStatus->dwError = error; + ret = FALSE; } TRACE("returning %d (%08x)\n", ret, error); return ret;

1 0

Jacek Caban : urlmon: Fixed race in tests.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 4b461bc05cb80c14951155837409245f9b924521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b461bc05cb80c14951155837… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 19:57:10 2009 +0100 urlmon: Fixed race in tests. --- dlls/urlmon/tests/url.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 11bd2ac..d5b9d12 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2650,6 +2650,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) SET_EXPECT(QueryInterface_IHttpNegotiate2); SET_EXPECT(GetRootSecurityId); SET_EXPECT(QueryInterface_IWindowForBindingUI); + SET_EXPECT(OnProgress_CONNECTING); } if(test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == FILE_TEST) SET_EXPECT(OnProgress_SENDINGREQUEST); @@ -2693,6 +2694,7 @@ static void test_URLDownloadToFile(DWORD prot, BOOL emul) CHECK_CALLED(GetRootSecurityId); } CLEAR_CALLED(QueryInterface_IWindowForBindingUI); + CLEAR_CALLED(OnProgress_CONNECTING); } if(test_protocol == FILE_TEST) CHECK_CALLED(OnProgress_SENDINGREQUEST); @@ -2942,7 +2944,7 @@ START_TEST(url) test_BindToStorage(ABOUT_TEST, 0, TYMED_ISTREAM); trace("about test (to file)...\n"); - test_BindToStorage(ABOUT_TEST, BINDTEST_EMULATE, TYMED_FILE); + test_BindToStorage(ABOUT_TEST, 0, TYMED_FILE); trace("about test (to object)...\n"); test_BindToObject(ABOUT_TEST, 0);

1 0

Henri Verbeet : msi: Remove an unused field from the string table.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 2102dbe854b24ffe7f63692f189d3ec426e9ae11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2102dbe854b24ffe7f63692f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:59 2009 +0100 msi: Remove an unused field from the string table. --- dlls/msi/string.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 5359104..3bdc436 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -55,7 +55,6 @@ struct string_table UINT freeslot; UINT codepage; UINT sortcount; - BOOL valid_index; msistring *strings; /* an array of strings */ UINT *sorted; /* index */ };

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_GetBackBuffer().
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: bd1ec9eb0211179b56d9a494e8f18780e5dac9e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1ec9eb0211179b56d9a494e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:58 2009 +0100 wined3d: Cleanup IWineD3DDeviceImpl_GetBackBuffer(). --- dlls/wined3d/device.c | 33 +++++++++++++++++++++------------ 1 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9d603d5..bedccb0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4009,22 +4009,31 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetTexture(IWineD3DDevice *iface, DWORD /***** * Get Back Buffer *****/ -static HRESULT WINAPI IWineD3DDeviceImpl_GetBackBuffer(IWineD3DDevice *iface, UINT iSwapChain, UINT BackBuffer, WINED3DBACKBUFFER_TYPE Type, - IWineD3DSurface **ppBackBuffer) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSwapChain *swapChain; +static HRESULT WINAPI IWineD3DDeviceImpl_GetBackBuffer(IWineD3DDevice *iface, UINT swapchain_idx, + UINT backbuffer_idx, WINED3DBACKBUFFER_TYPE backbuffer_type, IWineD3DSurface **backbuffer) +{ + IWineD3DSwapChain *swapchain; HRESULT hr; - TRACE("(%p) : BackBuf %d Type %d SwapChain %d returning %p\n", This, BackBuffer, Type, iSwapChain, *ppBackBuffer); + TRACE("iface %p, swapchain_idx %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", + iface, swapchain_idx, backbuffer_idx, backbuffer_type, backbuffer); - hr = IWineD3DDeviceImpl_GetSwapChain(iface, iSwapChain, &swapChain); - if (hr == WINED3D_OK) { - hr = IWineD3DSwapChain_GetBackBuffer(swapChain, BackBuffer, Type, ppBackBuffer); - IWineD3DSwapChain_Release(swapChain); - } else { - *ppBackBuffer = NULL; + hr = IWineD3DDeviceImpl_GetSwapChain(iface, swapchain_idx, &swapchain); + if (FAILED(hr)) + { + WARN("Failed to get swapchain %u, hr %#x.\n", swapchain_idx, hr); + return hr; } - return hr; + + hr = IWineD3DSwapChain_GetBackBuffer(swapchain, backbuffer_idx, backbuffer_type, backbuffer); + IWineD3DSwapChain_Release(swapchain); + if (FAILED(hr)) + { + WARN("Failed to get backbuffer %u, hr %#x.\n", backbuffer_idx, hr); + return hr; + } + + return WINED3D_OK; } static HRESULT WINAPI IWineD3DDeviceImpl_GetDeviceCaps(IWineD3DDevice *iface, WINED3DCAPS* pCaps) {

1 0

Henri Verbeet : wined3d: Change an ERR to a WARN in IWineD3DVolumeImpl_UnlockBox().
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: 35d5e7669e6f6b122d6a215db07b74267e15173d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d5e7669e6f6b122d6a215db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:57 2009 +0100 wined3d: Change an ERR to a WARN in IWineD3DVolumeImpl_UnlockBox(). Trying to unlock a volume that isn't locked is questionable behaviour on the side of the application, but not an internal error. --- dlls/wined3d/volume.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fa4cb29..7f65f2a 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -281,9 +281,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DL static HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - if (!This->locked) { - ERR("trying to lock unlocked volume@%p\n", This); - return WINED3DERR_INVALIDCALL; + if (!This->locked) + { + WARN("Trying to unlock unlocked volume %p.\n", iface); + return WINED3DERR_INVALIDCALL; } TRACE("(%p) : unlocking volume\n", This); This->locked = FALSE;

1 0

Henri Verbeet : wined3d: Change an ERR to a TRACE in IWineD3DEventQueryImpl_GetData().
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: d5a8637ecce0d1e02f8d7a0294a5524861d70b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a8637ecce0d1e02f8d7a029… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:56 2009 +0100 wined3d: Change an ERR to a TRACE in IWineD3DEventQueryImpl_GetData(). This is allowed behaviour. --- dlls/wined3d/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index f3e51de..a8295cc 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -347,7 +347,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void if (!query->context) { - ERR("Query not started, returning TRUE.\n"); + TRACE("Query not started, returning TRUE.\n"); *data = TRUE; return S_OK;

1 0

Henri Verbeet : ddraw/tests: Add tests for ddraw window proc handling.
by Alexandre Julliard 17 Dec '09

17 Dec '09

Module: wine Branch: master Commit: e79a6b20d2bc465860ba986750aae4a6397c8da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79a6b20d2bc465860ba98675… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 16 19:55:55 2009 +0100 ddraw/tests: Add tests for ddraw window proc handling. --- dlls/ddraw/tests/d3d.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ee49dc8..5f08929 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3077,6 +3077,101 @@ static void SetRenderTargetTest(void) IDirectDrawSurface7_Release(newrt); } +static UINT expect_message; + +static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if (expect_message && message == expect_message) expect_message = 0; + + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +static void test_wndproc(void) +{ + IDirectDraw7 *ddraw7; + WNDCLASSA wc = {0}; + LONG_PTR proc; + HWND window; + HRESULT hr; + ULONG ref; + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + wc.lpfnWndProc = test_proc; + wc.lpszClassName = "d3d7_test_wndproc_wc"; + ok(RegisterClassA(&wc), "Failed to register window class.\n"); + + window = CreateWindowA("d3d7_test_wndproc_wc", "d3d7_test", + WS_MAXIMIZE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + expect_message = WM_SETFOCUS; + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + todo_wine ok(!expect_message, "Expected message %#x, but didn't receive it.\n", expect_message); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + todo_wine ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + { + skip("Failed to create IDirectDraw7 object (%#x), skipping tests.\n", hr); + return; + } + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + if (FAILED(hr)) + { + IDirectDraw7_Release(ddraw7); + goto done; + } + + proc = SetWindowLongPtrA(window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); + todo_wine ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", + (LONG_PTR)test_proc, proc); + + ref = IDirectDraw7_Release(ddraw7); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + proc = GetWindowLongPtrA(window, GWLP_WNDPROC); + ok(proc == (LONG_PTR)DefWindowProcA, "Expected wndproc %#lx, got %#lx.\n", + (LONG_PTR)DefWindowProcA, proc); + +done: + expect_message = 0; + DestroyWindow(window); + UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL)); +} + START_TEST(d3d) { init_function_pointers(); @@ -3111,4 +3206,6 @@ START_TEST(d3d) TextureLoadTest(); D3D1_releaseObjects(); } + + test_wndproc(); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009