September 2013 - Wine-commits

Stefan Dösinger : ddraw/tests: Test WM_ACTIVATEAPP messages generated by SetCooperativeLevel.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 91fa7c07c9deadf77f449b8ce26c637bf9cfb28a URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fa7c07c9deadf77f449b8ce… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:31 2013 +0200 ddraw/tests: Test WM_ACTIVATEAPP messages generated by SetCooperativeLevel. --- dlls/ddraw/tests/ddraw1.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 556 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91fa7c07c9deadf77f449…

1 0

Stefan Dösinger : d3d9/tests: Add a DXT5 volume test.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 0cb72cdeb5ed0d530592f80180075fb450766ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cb72cdeb5ed0d530592f8018… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:32 2013 +0200 d3d9/tests: Add a DXT5 volume test. --- dlls/d3d9/tests/visual.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index aeb6faf..b856c93 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14549,6 +14549,102 @@ static void volume_srgb_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to set srgb state, hr %#x.\n", hr); } +static void volume_dxt5_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3D9 *d3d9; + IDirect3DVolumeTexture9 *texture; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + static const char texture_data[] = + { + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); + IDirect3D9_Release(d3d9); + if (FAILED(hr)) + { + skip("Volume dxt5 textures are not supported, skipping test.\n"); + return; + } + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, + D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, texture_data, sizeof(texture_data)); + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + for (i = 0; i < 4; i++) + { + color = getPixelColor(device, 80 + 160 * i, 240); + ok (color_match(color, expected_colors[i], 1), + "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + } + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(texture); +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -14728,6 +14824,7 @@ START_TEST(visual) zenable_test(device_ptr); fog_special_test(device_ptr); volume_srgb_test(device_ptr); + volume_dxt5_test(device_ptr); hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr);

1 0

Stefan Dösinger : d3d8/tests: Add a DXT5 volume test.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 6c1007db1e7913d9187c3067061847676356d967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1007db1e7913d9187c30670… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:33 2013 +0200 d3d8/tests: Add a DXT5 volume test. --- dlls/d3d8/tests/visual.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1436122..e13e1c6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3389,6 +3389,102 @@ static void fog_special_test(IDirect3DDevice8 *device) IDirect3DDevice8_DeletePixelShader(device, ps); } +static void volume_dxt5_test(IDirect3DDevice8 *device) +{ + HRESULT hr; + IDirect3D8 *d3d8; + IDirect3DVolumeTexture8 *texture; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + static const char texture_data[] = + { + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); + ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); + IDirect3D8_Release(d3d8); + if (FAILED(hr)) + { + skip("Volume dxt5 textures are not supported, skipping test.\n"); + return; + } + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, + D3DPOOL_MANAGED, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, texture_data, sizeof(texture_data)); + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + for (i = 0; i < 4; i++) + { + color = getPixelColor(device, 80 + 160 * i, 240); + ok (color_match(color, expected_colors[i], 1), + "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + } + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + IDirect3DVolumeTexture8_Release(texture); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -3473,6 +3569,7 @@ START_TEST(visual) zenable_test(device_ptr); resz_test(device_ptr); fog_special_test(device_ptr); + volume_dxt5_test(device_ptr); cleanup: if(device_ptr) {

1 0

Jacek Caban : crypt32: Get rid of PCertificateChainEngine typedef.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: f4ef543f8aaa1f2ba5c5bd725f643333b55d6c1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4ef543f8aaa1f2ba5c5bd725… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 2 14:35:45 2013 +0200 crypt32: Get rid of PCertificateChainEngine typedef. --- dlls/crypt32/chain.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d112673..b2bee4b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -49,7 +49,7 @@ typedef struct _CertificateChainEngine DWORD dwUrlRetrievalTimeout; DWORD MaximumCachedCertificates; DWORD CycleDetectionModulus; -} CertificateChainEngine, *PCertificateChainEngine; +} CertificateChainEngine; static inline void CRYPT_AddStoresToCollection(HCERTSTORE collection, DWORD cStores, HCERTSTORE *stores) @@ -120,7 +120,7 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, static const WCHAR caW[] = { 'C','A',0 }; static const WCHAR myW[] = { 'M','y',0 }; static const WCHAR trustW[] = { 'T','r','u','s','t',0 }; - PCertificateChainEngine engine = + CertificateChainEngine *engine = CryptMemAlloc(sizeof(CertificateChainEngine)); if (engine) @@ -208,7 +208,7 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, VOID WINAPI CertFreeCertificateChainEngine(HCERTCHAINENGINE hChainEngine) { - PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; TRACE("(%p)\n", hChainEngine); @@ -566,7 +566,7 @@ static BOOL CRYPT_DecodeBasicConstraints(PCCERT_CONTEXT cert, * Returns TRUE if the element can be a CA, and the length of the remaining * chain is valid. */ -static BOOL CRYPT_CheckBasicConstraintsForCA(PCertificateChainEngine engine, +static BOOL CRYPT_CheckBasicConstraintsForCA(CertificateChainEngine *engine, PCCERT_CONTEXT cert, CERT_BASIC_CONSTRAINTS2_INFO *chainConstraints, DWORD remainingCAs, BOOL isRoot, BOOL *pathLengthConstraintViolated) { @@ -1712,7 +1712,7 @@ static void dump_element(PCCERT_CONTEXT cert) dump_extension(&cert->pCertInfo->rgExtension[i]); } -static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, +static BOOL CRYPT_KeyUsageValid(CertificateChainEngine *engine, PCCERT_CONTEXT cert, BOOL isRoot, BOOL isCA, DWORD index) { PCERT_EXTENSION ext; @@ -1868,7 +1868,7 @@ static BOOL CRYPT_IsCertVersionValid(PCCERT_CONTEXT cert) return ret; } -static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, +static void CRYPT_CheckSimpleChain(CertificateChainEngine *engine, PCERT_SIMPLE_CHAIN chain, LPFILETIME time) { PCERT_CHAIN_ELEMENT rootElement = chain->rgpElement[chain->cElement - 1]; @@ -2140,7 +2140,7 @@ static LPCSTR debugstr_filetime(LPFILETIME pTime) return wine_dbg_sprintf("%p (%s)", pTime, filetime_to_str(pTime)); } -static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, +static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, PCERT_SIMPLE_CHAIN *ppChain) { @@ -2175,7 +2175,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain *ppChain) { - PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCERT_SIMPLE_CHAIN simpleChain = NULL; HCERTSTORE world; BOOL ret; @@ -2365,7 +2365,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( HCERTCHAINENGINE hChainEngine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain chain) { - PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCertificateChain alternate; TRACE("(%p, %s, %p, %p)\n", hChainEngine, debugstr_filetime(pTime),

1 0

Jacek Caban : crypt32: Use CertificateChainEngine instead of HCERTCHAINENGINE in a few more places .
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 2584e49bf65f3e6fe29c06d65ceebbe9089533bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2584e49bf65f3e6fe29c06d65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 2 14:35:53 2013 +0200 crypt32: Use CertificateChainEngine instead of HCERTCHAINENGINE in a few more places. --- dlls/crypt32/chain.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b2bee4b..90ca0be 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -477,7 +477,7 @@ static void CRYPT_CheckTrustedStatus(HCERTSTORE hRoot, CertFreeCertificateContext(trustedRoot); } -static void CRYPT_CheckRootCert(HCERTCHAINENGINE hRoot, +static void CRYPT_CheckRootCert(HCERTSTORE hRoot, PCERT_CHAIN_ELEMENT rootElement) { PCCERT_CONTEXT root = rootElement->pCertContext; @@ -2171,11 +2171,10 @@ static BOOL CRYPT_GetSimpleChainForCert(CertificateChainEngine *engine, return ret; } -static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, +static BOOL CRYPT_BuildCandidateChainFromCert(CertificateChainEngine *engine, PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain *ppChain) { - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCERT_SIMPLE_CHAIN simpleChain = NULL; HCERTSTORE world; BOOL ret; @@ -2362,13 +2361,12 @@ static PCertificateChain CRYPT_CopyChainToElement(PCertificateChain chain, } static PCertificateChain CRYPT_BuildAlternateContextFromChain( - HCERTCHAINENGINE hChainEngine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + CertificateChainEngine *engine, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain chain) { - CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; PCertificateChain alternate; - TRACE("(%p, %s, %p, %p)\n", hChainEngine, debugstr_filetime(pTime), + TRACE("(%p, %s, %p, %p)\n", engine, debugstr_filetime(pTime), hAdditionalStore, chain); /* Always start with the last "lower quality" chain to ensure a consistent @@ -2799,10 +2797,11 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, PCCERT_CHAIN_CONTEXT* ppChainContext) { + CertificateChainEngine *engine = (CertificateChainEngine*)hChainEngine; BOOL ret; PCertificateChain chain = NULL; - TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, + TRACE("(%p, %p, %s, %p, %p, %08x, %p, %p)\n", engine, pCertContext, debugstr_filetime(pTime), hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); @@ -2819,12 +2818,12 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, return FALSE; } - if (!hChainEngine) - hChainEngine = CRYPT_GetDefaultChainEngine(); + if (!engine) + engine = CRYPT_GetDefaultChainEngine(); if (TRACE_ON(chain)) dump_chain_para(pChainPara); /* FIXME: what about HCCE_LOCAL_MACHINE? */ - ret = CRYPT_BuildCandidateChainFromCert(hChainEngine, pCertContext, pTime, + ret = CRYPT_BuildCandidateChainFromCert(engine, pCertContext, pTime, hAdditionalStore, &chain); if (ret) { @@ -2832,7 +2831,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCERT_CHAIN_CONTEXT pChain; do { - alternate = CRYPT_BuildAlternateContextFromChain(hChainEngine, + alternate = CRYPT_BuildAlternateContextFromChain(engine, pTime, hAdditionalStore, chain); /* Alternate contexts are added as "lower quality" contexts of

1 0