wine-commits September 2007

wine-commits@winehq.org

7 participants
787 discussions

Stefan Dösinger : wined3d: Fix texdepth instruction.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: a006d2568b7f8efb772736c7541fe6338446866b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a006d2568b7f8efb772736c75… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 17:00:16 2007 +0200 wined3d: Fix texdepth instruction. --- dlls/d3d9/tests/visual.c | 212 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/arb_program_shader.c | 26 +++++ dlls/wined3d/glsl_shader.c | 8 ++- dlls/wined3d/pixelshader.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 247 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a006d2568b7f8efb77273…

1 0

Stefan Dösinger : wined3d: Fix the z range.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: a305af0b30b0e1440575dfd286727861f13975e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a305af0b30b0e1440575dfd28… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 20:32:52 2007 +0200 wined3d: Fix the z range. --- dlls/d3d9/tests/visual.c | 188 +++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/state.c | 33 +++++++- dlls/wined3d/vertexshader.c | 12 +++ 3 files changed, 213 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a305af0b30b0e1440575d…

1 0

Maarten Lankhorst : dsound: Support arbitrarily sized buffers for waveout.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: d65ae3ffe9533fbadd7a4ea92240840f6b7e045f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65ae3ffe9533fbadd7a4ea92… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Sep 6 17:35:58 2007 +0200 dsound: Support arbitrarily sized buffers for waveout. --- dlls/dsound/mixer.c | 28 +++++++++++++++++----------- dlls/dsound/primary.c | 14 +++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index fcbf678..2486e72 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -802,18 +802,24 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) TRACE("wave_fragpos = %i, wave_writepos = %i, pwqueue = %i, prebuf = %i\n", wave_fragpos, wave_writepos, device->pwqueue, device->prebuf); - if(force == FALSE){ + if (!force) + { /* check remaining prebuffered frags */ - prebuf_frags = DSOUND_BufPtrDiff(device->buflen, device->mixpos, wave_writepos); - prebuf_frags = prebuf_frags / device->fraglen; + prebuf_frags = device->mixpos / device->fraglen; + if (prebuf_frags == device->helfrags) + --prebuf_frags; + TRACE("wave_fragpos = %d, mixpos_frags = %d\n", wave_fragpos, prebuf_frags); + if (prebuf_frags < wave_fragpos) + prebuf_frags += device->helfrags; + prebuf_frags -= wave_fragpos; + TRACE("wanted prebuf_frags = %d\n", prebuf_frags); } - else{ + else /* buffer the maximum amount of frags */ prebuf_frags = device->prebuf; - } /* limit to the queue we have left */ - if((prebuf_frags + device->pwqueue) > device->prebuf) + if ((prebuf_frags + device->pwqueue) > device->prebuf) prebuf_frags = device->prebuf - device->pwqueue; TRACE("prebuf_frags = %i\n", prebuf_frags); @@ -846,7 +852,6 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - TRACE("(%p)\n", device); /* **** */ @@ -907,6 +912,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* calc maximum prebuff */ prebuff_max = (device->prebuf * device->fraglen); + if (!device->hwbuf && playpos + prebuff_max >= device->helfrags * device->fraglen) + prebuff_max += device->buflen - device->helfrags * device->fraglen; /* check how close we are to an underrun. It occurs when the writepos overtakes the mixpos */ prebuff_left = DSOUND_BufPtrDiff(device->buflen, device->mixpos, playpos); @@ -964,9 +971,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (prebuff_left >= device->fraglen){ /* update the wave queue if using wave system */ - if(device->hwbuf == NULL){ - DSOUND_WaveQueue(device,TRUE); - } + if (!device->hwbuf) + DSOUND_WaveQueue(device, FALSE); /* buffers are full. start playing if applicable */ if(device->state == STATE_STARTING){ @@ -1005,7 +1011,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) } else { /* update the wave queue if using wave system */ - if(device->hwbuf == NULL) + if (!device->hwbuf) DSOUND_WaveQueue(device, TRUE); else /* Keep alsa happy, which needs GetPosition called once every 10 ms */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ce2f943..a27ee14 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -381,23 +381,19 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP return err; } } else { + TRACE("pwplay=%i, pwqueue=%i\n", device->pwplay, device->pwqueue); /* check if playpos was requested */ - if (playpos) { + if (playpos) /* use the cached play position */ *playpos = device->pwplay * device->fraglen; - } /* check if writepos was requested */ - if (writepos) { - TRACE("pwplay=%i, pwqueue=%i\n", device->pwplay, device->pwqueue); - + if (writepos) /* the writepos is the first non-queued position */ - *writepos = (device->pwplay + device->pwqueue) * device->fraglen; - *writepos %= device->buflen; - } + *writepos = ((device->pwplay + device->pwqueue) % device->helfrags) * device->fraglen; } - TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:0, writepos?*writepos:0, device, GetTickCount()); + TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, device, GetTickCount()); return DS_OK; }

1 0

Maarten Lankhorst : dsound: Fix overshot calculations.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 0c4ec8a1ccc352e15e447c927cb146cb000075c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4ec8a1ccc352e15e447c927… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Sep 5 13:54:33 2007 +0200 dsound: Fix overshot calculations. --- dlls/dsound/primary.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f358aec..ce2f943 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -173,7 +173,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) buflen = ds_hel_buflen; else /* In case we move from hw accelerated to waveout */ buflen = device->buflen; - buflen -= ds_hel_buflen % device->pwfx->nBlockAlign; + buflen -= buflen % device->pwfx->nBlockAlign; TRACE("desired buflen=%d, old buffer=%p\n", buflen, device->buffer); @@ -223,11 +223,13 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) } } - overshot = device->buflen % device->helfrags; + overshot = device->buflen % device->fraglen; /* sanity */ if(overshot) { - WARN("helfrags (%d x %d) doesn't fit entirely in buflen (%d) overshot: %d\n", device->helfrags, device->fraglen, device->buflen, overshot); + overshot -= overshot % device->pwfx->nBlockAlign; + if (overshot) + WARN("helfrags (%d x %d) doesn't fit entirely in buflen (%d) overshot: %d\n", device->helfrags, device->fraglen, device->buflen, overshot); device->pwave[device->helfrags - 1].dwBufferLength += overshot; }

1 0

Andrew Talbot : shell32: Constify some variables.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: c333402b7f8f2657ee11e8380431c20861afd04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c333402b7f8f2657ee11e8380… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Sep 10 23:09:58 2007 +0100 shell32: Constify some variables. --- dlls/shell32/brsfolder.c | 2 +- dlls/shell32/changenotify.c | 2 +- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/shell32_main.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index ff5c1f0..7f73bec 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -179,7 +179,7 @@ static void InitializeTreeView( browse_info *info ) IShellFolder_Release(lpsfParent); } -static int GetIcon(LPITEMIDLIST lpi, UINT uFlags) +static int GetIcon(LPCITEMIDLIST lpi, UINT uFlags) { SHFILEINFOW sfi; SHGetFileInfoW((LPCWSTR)lpi, 0 ,&sfi, sizeof(SHFILEINFOW), uFlags); diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 9f827eb..c88ca1f 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -105,7 +105,7 @@ static const char * DumpEvent( LONG event ) #undef DUMPEV } -static const char * NodeName(LPNOTIFICATIONLIST item) +static const char * NodeName(const NOTIFICATIONLIST *item) { const char *str; WCHAR path[MAX_PATH]; diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index fef45b5..aa09edf 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -917,7 +917,7 @@ static const IPersistFolder2Vtbl vt_PersistFolder2 = ICPanel_PersistFolder2_GetCurFolder }; -HRESULT CPanel_GetIconLocationW(LPITEMIDLIST pidl, +HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST pidl, LPWSTR szIconFile, UINT cchMax, int* piIndex) { PIDLCPanelStruct* pcpanel = _ILGetCPanelPointer(pidl); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index c974c8e..f5fcf37 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -99,7 +99,7 @@ HRESULT WINAPI FolderShortcut_Constructor(IUnknown * pUnkOuter, REFIID riid, LPV HRESULT WINAPI MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID *ppv); HRESULT WINAPI ShellFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID *ppv); -extern HRESULT CPanel_GetIconLocationW(LPITEMIDLIST, LPWSTR, UINT, int*); +extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*); HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize); HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize);

1 0

Juan Lang : crypt32: Implement CertVerifyCertificateChainPolicy for the basic constraints policy .
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 039beff4415cc6b92aa2ed19619f0d66bcfaf1d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=039beff4415cc6b92aa2ed196… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 10 16:12:39 2007 -0700 crypt32: Implement CertVerifyCertificateChainPolicy for the basic constraints policy. --- dlls/crypt32/chain.c | 19 +++++++++++++++++++ dlls/crypt32/tests/chain.c | 43 +++++++++++++++---------------------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b716be9..ed23180 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1126,6 +1126,22 @@ static BOOL WINAPI verify_authenticode_policy(LPCSTR szPolicyOID, return ret; } +static BOOL WINAPI verify_basic_constraints_policy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = -1; + if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_INVALID_BASIC_CONSTRAINTS) + { + pPolicyStatus->dwError = TRUST_E_BASIC_CONSTRAINTS; + find_element_with_error(pChainContext, + CERT_TRUST_INVALID_BASIC_CONSTRAINTS, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + return TRUE; +} + typedef BOOL (WINAPI *CertVerifyCertificateChainPolicyFunc)(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus); @@ -1152,6 +1168,9 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, case (int)CERT_CHAIN_POLICY_AUTHENTICODE: verifyPolicy = verify_authenticode_policy; break; + case (int)CERT_CHAIN_POLICY_BASIC_CONSTRAINTS: + verifyPolicy = verify_basic_constraints_policy; + break; default: FIXME("unimplemented for %d\n", LOWORD(szPolicyOID)); } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 17cab3a..e320e79 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1783,50 +1783,37 @@ static ChainPolicyCheck authenticodePolicyCheck[] = { static ChainPolicyCheck basicConstraintsPolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, - { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, - TODO_POLICY }, + { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, 0 }, { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, - { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, - TODO_POLICY }, + { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, 0 }, { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, - TODO_POLICY }, + TODO_ERROR | TODO_CHAINS | TODO_ELEMENTS }, { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, { 0, TRUST_E_BASIC_CONSTRAINTS, 0, 1, NULL }, - TODO_POLICY }, + TODO_ERROR | TODO_CHAINS | TODO_ELEMENTS }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, }; static void checkChainPolicyStatus(LPCSTR policy, ChainPolicyCheck *check,

1 0

Juan Lang : crypt32: Implement CertVerifyCertificateChainPolicy for the authenticode policy.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 5f06293eb10f21ef852a267235023ed8f5a6cea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f06293eb10f21ef852a26723… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 10 16:12:14 2007 -0700 crypt32: Implement CertVerifyCertificateChainPolicy for the authenticode policy. --- dlls/crypt32/chain.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/chain.c | 45 +++++++++++---------------------- 2 files changed, 75 insertions(+), 30 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8249596..b716be9 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1069,6 +1069,63 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, return TRUE; } +static BYTE msTestPubKey1[] = { +0x30,0x47,0x02,0x40,0x81,0x55,0x22,0xb9,0x8a,0xa4,0x6f,0xed,0xd6,0xe7,0xd9, +0x66,0x0f,0x55,0xbc,0xd7,0xcd,0xd5,0xbc,0x4e,0x40,0x02,0x21,0xa2,0xb1,0xf7, +0x87,0x30,0x85,0x5e,0xd2,0xf2,0x44,0xb9,0xdc,0x9b,0x75,0xb6,0xfb,0x46,0x5f, +0x42,0xb6,0x9d,0x23,0x36,0x0b,0xde,0x54,0x0f,0xcd,0xbd,0x1f,0x99,0x2a,0x10, +0x58,0x11,0xcb,0x40,0xcb,0xb5,0xa7,0x41,0x02,0x03,0x01,0x00,0x01 }; +static BYTE msTestPubKey2[] = { +0x30,0x48,0x02,0x41,0x00,0x81,0x55,0x22,0xb9,0x8a,0xa4,0x6f,0xed,0xd6,0xe7, +0xd9,0x66,0x0f,0x55,0xbc,0xd7,0xcd,0xd5,0xbc,0x4e,0x40,0x02,0x21,0xa2,0xb1, +0xf7,0x87,0x30,0x85,0x5e,0xd2,0xf2,0x44,0xb9,0xdc,0x9b,0x75,0xb6,0xfb,0x46, +0x5f,0x42,0xb6,0x9d,0x23,0x36,0x0b,0xde,0x54,0x0f,0xcd,0xbd,0x1f,0x99,0x2a, +0x10,0x58,0x11,0xcb,0x40,0xcb,0xb5,0xa7,0x41,0x02,0x03,0x01,0x00,0x01 }; +static BYTE msTestPubKey3[] = { +0x30,0x47,0x02,0x40,0x9c,0x50,0x05,0x1d,0xe2,0x0e,0x4c,0x53,0xd8,0xd9,0xb5, +0xe5,0xfd,0xe9,0xe3,0xad,0x83,0x4b,0x80,0x08,0xd9,0xdc,0xe8,0xe8,0x35,0xf8, +0x11,0xf1,0xe9,0x9b,0x03,0x7a,0x65,0x64,0x76,0x35,0xce,0x38,0x2c,0xf2,0xb6, +0x71,0x9e,0x06,0xd9,0xbf,0xbb,0x31,0x69,0xa3,0xf6,0x30,0xa0,0x78,0x7b,0x18, +0xdd,0x50,0x4d,0x79,0x1e,0xeb,0x61,0xc1,0x02,0x03,0x01,0x00,0x01 }; + +static BOOL WINAPI verify_authenticode_policy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + BOOL ret = verify_base_policy(szPolicyOID, pChainContext, pPolicyPara, + pPolicyStatus); + + if (ret && pPolicyStatus->dwError == CERT_E_UNTRUSTEDROOT) + { + CERT_PUBLIC_KEY_INFO msPubKey = { { 0 } }; + BOOL isMSTestRoot = FALSE; + PCCERT_CONTEXT failingCert = + pChainContext->rgpChain[pPolicyStatus->lChainIndex]-> + rgpElement[pPolicyStatus->lElementIndex]->pCertContext; + DWORD i; + CRYPT_DATA_BLOB keyBlobs[] = { + { sizeof(msTestPubKey1), msTestPubKey1 }, + { sizeof(msTestPubKey2), msTestPubKey2 }, + { sizeof(msTestPubKey3), msTestPubKey3 }, + }; + + /* Check whether the root is an MS test root */ + for (i = 0; !isMSTestRoot && i < sizeof(keyBlobs) / sizeof(keyBlobs[0]); + i++) + { + msPubKey.PublicKey.cbData = keyBlobs[i].cbData; + msPubKey.PublicKey.pbData = keyBlobs[i].pbData; + if (CertComparePublicKeyInfo( + X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, + &failingCert->pCertInfo->SubjectPublicKeyInfo, &msPubKey)) + isMSTestRoot = TRUE; + } + if (isMSTestRoot) + pPolicyStatus->dwError = CERT_E_UNTRUSTEDTESTROOT; + } + return ret; +} + typedef BOOL (WINAPI *CertVerifyCertificateChainPolicyFunc)(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus); @@ -1092,6 +1149,9 @@ BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, case (int)CERT_CHAIN_POLICY_BASE: verifyPolicy = verify_base_policy; break; + case (int)CERT_CHAIN_POLICY_AUTHENTICODE: + verifyPolicy = verify_authenticode_policy; + break; default: FIXME("unimplemented for %d\n", LOWORD(szPolicyOID)); } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index fd8952f..17cab3a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1750,50 +1750,35 @@ static ChainPolicyCheck basePolicyCheck[] = { static ChainPolicyCheck authenticodePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, - { 0, TRUST_E_CERT_SIGNATURE, 0, 0, NULL }, - TODO_POLICY }, + { 0, TRUST_E_CERT_SIGNATURE, 0, 0, NULL }, 0 }, { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, 0 }, { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, 0 }, { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, - { 0, CERT_E_CHAINING, 0, -1, NULL }, - TODO_POLICY }, + { 0, CERT_E_CHAINING, 0, -1, NULL }, 0 }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, - { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, - TODO_POLICY }, + { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, - { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, - TODO_POLICY }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, 0 }, { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, - { 0, 0, -1, -1, NULL }, - TODO_POLICY }, + { 0, 0, -1, -1, NULL }, 0 }, }; static ChainPolicyCheck basicConstraintsPolicyCheck[] = {

1 0

Juan Lang : crypt32: Implement CertVerifyCertificateChainPolicy for the base policy.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: b56f0c5b687043bd8c8d09d1773bd606800b35a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b56f0c5b687043bd8c8d09d17… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 10 16:11:49 2007 -0700 crypt32: Implement CertVerifyCertificateChainPolicy for the base policy. --- dlls/crypt32/chain.c | 86 ++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/chain.c | 42 ++++++++++++++++++---- 2 files changed, 119 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 7b6d7bd..8249596 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1021,11 +1021,93 @@ void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) } } +static void find_element_with_error(PCCERT_CHAIN_CONTEXT chain, DWORD error, + LONG *iChain, LONG *iElement) +{ + DWORD i, j; + + for (i = 0; i < chain->cChain; i++) + for (j = 0; j < chain->rgpChain[i]->cElement; j++) + if (chain->rgpChain[i]->rgpElement[j]->TrustStatus.dwErrorStatus & + error) + { + *iChain = i; + *iElement = j; + return; + } +} + +static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + pPolicyStatus->lChainIndex = pPolicyStatus->lElementIndex = -1; + if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_NOT_SIGNATURE_VALID) + { + pPolicyStatus->dwError = TRUST_E_CERT_SIGNATURE; + find_element_with_error(pChainContext, + CERT_TRUST_IS_NOT_SIGNATURE_VALID, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + else if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_UNTRUSTED_ROOT) + { + pPolicyStatus->dwError = CERT_E_UNTRUSTEDROOT; + find_element_with_error(pChainContext, + CERT_TRUST_IS_UNTRUSTED_ROOT, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } + else if (pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_CYCLIC) + { + pPolicyStatus->dwError = CERT_E_CHAINING; + find_element_with_error(pChainContext, CERT_TRUST_IS_CYCLIC, + &pPolicyStatus->lChainIndex, &pPolicyStatus->lElementIndex); + /* For a cyclic chain, which element is a cycle isn't meaningful */ + pPolicyStatus->lElementIndex = -1; + } + return TRUE; +} + +typedef BOOL (WINAPI *CertVerifyCertificateChainPolicyFunc)(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus); + BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, PCERT_CHAIN_POLICY_STATUS pPolicyStatus) { - FIXME("(%s, %p, %p, %p): stub\n", debugstr_a(szPolicyOID), pChainContext, + static HCRYPTOIDFUNCSET set = NULL; + BOOL ret = FALSE; + CertVerifyCertificateChainPolicyFunc verifyPolicy = NULL; + HCRYPTOIDFUNCADDR hFunc = NULL; + + TRACE("(%s, %p, %p, %p)\n", debugstr_a(szPolicyOID), pChainContext, pPolicyPara, pPolicyStatus); - return FALSE; + + if (!HIWORD(szPolicyOID)) + { + switch (LOWORD(szPolicyOID)) + { + case (int)CERT_CHAIN_POLICY_BASE: + verifyPolicy = verify_base_policy; + break; + default: + FIXME("unimplemented for %d\n", LOWORD(szPolicyOID)); + } + } + if (!verifyPolicy) + { + if (!set) + set = CryptInitOIDFunctionSet( + CRYPT_OID_VERIFY_CERTIFICATE_CHAIN_POLICY_FUNC, 0); + CryptGetOIDFunctionAddress(set, X509_ASN_ENCODING, szPolicyOID, 0, + (void **)&verifyPolicy, hFunc); + } + if (verifyPolicy) + ret = verifyPolicy(szPolicyOID, pChainContext, pPolicyPara, + pPolicyStatus); + if (hFunc) + CryptFreeOIDFunctionAddress(hFunc, 0); + return ret; } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index cbbf0aa..fd8952f 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1717,6 +1717,39 @@ typedef struct _ChainPolicyCheck static ChainPolicyCheck basePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, + { 0, TRUST_E_CERT_SIGNATURE, 0, 0, NULL }, 0 }, + { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, 0 }, + { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 2, NULL }, 0 }, + { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, + { 0, CERT_E_CHAINING, 0, -1, NULL }, 0 }, + { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, 0 }, + { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { 0, TRUST_E_CERT_SIGNATURE, 0, 1, NULL }, 0 }, + { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, + { 0, CERT_E_UNTRUSTEDROOT, 0, 0, NULL }, 0 }, + { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, + { 0, 0, -1, -1, NULL }, 0 }, +}; + +static ChainPolicyCheck authenticodePolicyCheck[] = { + { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, TODO_POLICY }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, @@ -1881,7 +1914,6 @@ static void testVerifyCertChainPolicy(void) */ SetLastError(0xdeadbeef); ret = CertVerifyCertificateChainPolicy(NULL, NULL, NULL, &policyStatus); - todo_wine ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); /* Crashes @@ -1902,9 +1934,7 @@ static void testVerifyCertChainPolicy(void) /* Size of policy status is apparently ignored, as is pChainPolicyPara */ ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, NULL, &policyStatus); - todo_wine ok(ret, "CertVerifyCertificateChainPolicy failed: %08x\n", GetLastError()); - todo_wine ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT, "Expected CERT_E_UNTRUSTEDROOT, got %08x\n", policyStatus.dwError); ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0, @@ -1912,9 +1942,7 @@ static void testVerifyCertChainPolicy(void) policyStatus.lElementIndex); ret = CertVerifyCertificateChainPolicy(CERT_CHAIN_POLICY_BASE, chain, &policyPara, &policyStatus); - todo_wine ok(ret, "CertVerifyCertificateChainPolicy failed: %08x\n", GetLastError()); - todo_wine ok(policyStatus.dwError == CERT_E_UNTRUSTEDROOT, "Expected CERT_E_UNTRUSTEDROOT, got %08x\n", policyStatus.dwError); ok(policyStatus.lChainIndex == 0 && policyStatus.lElementIndex == 0, @@ -1930,9 +1958,9 @@ static void testVerifyCertChainPolicy(void) * of these chains is. */ for (i = 0; i < - sizeof(basePolicyCheck) / sizeof(basePolicyCheck[0]); i++) + sizeof(authenticodePolicyCheck) / sizeof(authenticodePolicyCheck[0]); i++) checkChainPolicyStatus(CERT_CHAIN_POLICY_AUTHENTICODE, - &basePolicyCheck[i], i); + &authenticodePolicyCheck[i], i); for (i = 0; i < sizeof(basicConstraintsPolicyCheck) / sizeof(basicConstraintsPolicyCheck[0]); i++)

1 0

Juan Lang : crypt32: Add initial tests for CertVerifyCertificateChainPolicy .
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: f23ec305344dca2ea62a432785358a58af7baa87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23ec305344dca2ea62a43278… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 10 16:11:16 2007 -0700 crypt32: Add initial tests for CertVerifyCertificateChainPolicy. --- dlls/crypt32/tests/chain.c | 235 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 235 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f23ec305344dca2ea62a4…

1 0

Juan Lang : crypt32: Add a stub for CertVerifyCertificateChainPolicy.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 91c76955e7db93606f3e8a92ba844fe618c11745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c76955e7db93606f3e8a92b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Sep 10 16:10:35 2007 -0700 crypt32: Add a stub for CertVerifyCertificateChainPolicy. --- dlls/crypt32/chain.c | 9 +++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 10997af..7b6d7bd 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1020,3 +1020,12 @@ void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) CRYPT_FreeChainContext(chain); } } + +BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR szPolicyOID, + PCCERT_CHAIN_CONTEXT pChainContext, PCERT_CHAIN_POLICY_PARA pPolicyPara, + PCERT_CHAIN_POLICY_STATUS pPolicyStatus) +{ + FIXME("(%s, %p, %p, %p): stub\n", debugstr_a(szPolicyOID), pChainContext, + pPolicyPara, pPolicyStatus); + return FALSE; +} diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index e16b3ae..ac706c7 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -86,6 +86,7 @@ @ stdcall CertSetStoreProperty(ptr long long ptr) @ stdcall CertStrToNameA(long str long ptr ptr ptr ptr) @ stdcall CertStrToNameW(long wstr long ptr ptr ptr ptr) +@ stdcall CertVerifyCertificateChainPolicy(str ptr ptr ptr) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) @ stub CertVerifyCTLUsage

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
79
Older →

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 September 2007