November 2009 - Wine-commits

Henri Verbeet : d3d9/tests: Don' t require dynamic usage for textures in the stateblock tests.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 5f8e6cb5e0e0188243ba973d8a00c9635dbbce19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8e6cb5e0e0188243ba973d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 12 10:26:52 2009 +0100 d3d9/tests: Don't require dynamic usage for textures in the stateblock tests. --- dlls/d3d9/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index d8f75c3..f580062 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1966,7 +1966,7 @@ static void resource_test_data_init(IDirect3DDevice9 *device, data->tex = HeapAlloc(GetProcessHeap(), 0, arg->tex_count * sizeof(*data->tex)); for (i = 0; i < arg->tex_count; ++i) { - hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_DYNAMIC, + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &data->tex[i], NULL); ok(SUCCEEDED(hr), "CreateTexture (%u) returned %#x.\n", i, hr); }

1 0

Vincent Povirk : ole32: Rename the StgProperty structure to DirEntry.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 39e894f4f6a5d3134945b56c4ec0a048e501e094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e894f4f6a5d3134945b56c4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:30:59 2009 -0600 ole32: Rename the StgProperty structure to DirEntry. The term "property" is misleading (ole32 has an unrelated feature called a "property set storage"), and I haven't seen it used anywhere outside the Wine code. The term "directory entry" matches the MS documentation and more accurately describes their use in the file. --- dlls/ole32/stg_stream.c | 6 +- dlls/ole32/storage32.c | 104 +++++++++++++++++++++++----------------------- dlls/ole32/storage32.h | 16 ++++---- 3 files changed, 63 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39e894f4f6a5d3134945b…

1 0

Vincent Povirk : ole32: Rename StorageImpl_ReadProperty to StorageImpl_ReadDirEntry.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: b3c30b1f4a87a5fc5aa7e87936097456eac57e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c30b1f4a87a5fc5aa7e8793… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:39:10 2009 -0600 ole32: Rename StorageImpl_ReadProperty to StorageImpl_ReadDirEntry. --- dlls/ole32/stg_stream.c | 8 +++--- dlls/ole32/storage32.c | 60 +++++++++++++++++++++++----------------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3c30b1f4a87a5fc5aa7e…

1 0

Vincent Povirk : ole32: Rename StorageImpl_WriteProperty to StorageImpl_WriteDirEntry.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 42a4b11e2dfcf19f1112f63a209df2f6fac37ff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a4b11e2dfcf19f1112f63a2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:40:05 2009 -0600 ole32: Rename StorageImpl_WriteProperty to StorageImpl_WriteDirEntry. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 34 +++++++++++++++++----------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 813e629..781649c 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -659,7 +659,7 @@ static HRESULT WINAPI StgStreamImpl_SetSize( if (Success) { - StorageImpl_WriteProperty(This->parentStorage->ancestorStorage, + StorageImpl_WriteDirEntry(This->parentStorage->ancestorStorage, This->ownerProperty, &curProperty); } diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 65f0f3e..0639599 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -729,7 +729,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* Change the name of the element */ strcpyW(currentProperty.name, pwcsNewName); - StorageImpl_WriteProperty(This->ancestorStorage, foundPropertyIndex, + StorageImpl_WriteDirEntry(This->ancestorStorage, foundPropertyIndex, &currentProperty); /* Insert the element in a new position in the tree */ @@ -932,7 +932,7 @@ static HRESULT WINAPI StorageBaseImpl_SetClass( { curProperty.propertyUniqueID = *clsid; - success = StorageImpl_WriteProperty(This->ancestorStorage, + success = StorageImpl_WriteDirEntry(This->ancestorStorage, This->rootPropertySetIndex, &curProperty); if (success) @@ -1313,7 +1313,7 @@ static HRESULT insertIntoTree( else { currentProperty.leftChild = newPropertyIndex; - StorageImpl_WriteProperty(This, + StorageImpl_WriteDirEntry(This, current, &currentProperty); found = 1; @@ -1331,7 +1331,7 @@ static HRESULT insertIntoTree( else { currentProperty.rightChild = newPropertyIndex; - StorageImpl_WriteProperty(This, + StorageImpl_WriteDirEntry(This, current, &currentProperty); found = 1; @@ -1356,7 +1356,7 @@ static HRESULT insertIntoTree( * The root storage is empty, link the new property to its dir property */ currentProperty.dirProperty = newPropertyIndex; - StorageImpl_WriteProperty(This, + StorageImpl_WriteDirEntry(This, parentStorageIndex, &currentProperty); } @@ -2002,7 +2002,7 @@ static HRESULT removeFromTree( */ setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.leftChild); - res = StorageImpl_WriteProperty( + res = StorageImpl_WriteDirEntry( This, parentPropertyId, &parentProperty); @@ -2038,7 +2038,7 @@ static HRESULT removeFromTree( newRightChildParentProperty.rightChild = propertyToDelete.rightChild; - res = StorageImpl_WriteProperty( + res = StorageImpl_WriteDirEntry( This, newRightChildParent, &newRightChildParentProperty); @@ -2055,7 +2055,7 @@ static HRESULT removeFromTree( */ setPropertyLink(&parentProperty, typeOfRelation, propertyToDelete.rightChild); - res = StorageImpl_WriteProperty( + res = StorageImpl_WriteDirEntry( This, parentPropertyId, &parentProperty); @@ -2277,7 +2277,7 @@ static HRESULT StorageImpl_Construct( rootProp.size.u.HighPart = 0; rootProp.size.u.LowPart = 0; - StorageImpl_WriteProperty(This, 0, &rootProp); + StorageImpl_WriteDirEntry(This, 0, &rootProp); } /* @@ -3206,7 +3206,7 @@ BOOL StorageImpl_ReadDirEntry( /********************************************************************* * Write the specified property into the property chain */ -BOOL StorageImpl_WriteProperty( +BOOL StorageImpl_WriteDirEntry( StorageImpl* This, ULONG index, const DirEntry* buffer) @@ -3388,7 +3388,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( chainProperty.startingBlock = bbHeadOfChain; - StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); + StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); /* * Destroy the temporary propertyless big block chain. @@ -3477,7 +3477,7 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty); chainProperty.startingBlock = sbHeadOfChain; - StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); + StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); SmallBlockChainStream_Destroy(sbTempChain); return SmallBlockChainStream_Construct(This, NULL, propertyIndex); @@ -4507,7 +4507,7 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, chainProp.startingBlock = blockIndex; - StorageImpl_WriteProperty( + StorageImpl_WriteDirEntry( This->parentStorage, This->ownerPropertyIndex, &chainProp); @@ -4907,7 +4907,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( rootProp.size.u.HighPart = 0; rootProp.size.u.LowPart = This->parentStorage->bigBlockSize; - StorageImpl_WriteProperty( + StorageImpl_WriteDirEntry( This->parentStorage, This->parentStorage->base.rootPropertySetIndex, &rootProp); @@ -4942,7 +4942,7 @@ static ULONG SmallBlockChainStream_GetNextFreeBlock( This->parentStorage->smallBlockRootChain, rootProp.size); - StorageImpl_WriteProperty( + StorageImpl_WriteDirEntry( This->parentStorage, This->parentStorage->base.rootPropertySetIndex, &rootProp); @@ -5183,7 +5183,7 @@ static BOOL SmallBlockChainStream_Shrink( chainProp.startingBlock = BLOCK_END_OF_CHAIN; - StorageImpl_WriteProperty(This->parentStorage, + StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex, &chainProp); @@ -5260,7 +5260,7 @@ static BOOL SmallBlockChainStream_Enlarge( chainProp.startingBlock = blockIndex; - StorageImpl_WriteProperty(This->parentStorage, This->ownerPropertyIndex, + StorageImpl_WriteDirEntry(This->parentStorage, This->ownerPropertyIndex, &chainProp); } } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fe8668e..405301c 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -307,7 +307,7 @@ BOOL StorageImpl_ReadDirEntry( ULONG index, DirEntry* buffer); -BOOL StorageImpl_WriteProperty( +BOOL StorageImpl_WriteDirEntry( StorageImpl* This, ULONG index, const DirEntry* buffer);

1 0

Vincent Povirk : ole32: Rename StorageUtl_CopyPropertyToSTATSTG.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 1bd2617c7a8b919735ba253710c463dca9740950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd2617c7a8b919735ba25371… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 10 14:49:47 2009 -0600 ole32: Rename StorageUtl_CopyPropertyToSTATSTG. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 6 +++--- dlls/ole32/storage32.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 781649c..4cc114a 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -860,7 +860,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( { StorageImpl *root = This->parentStorage->ancestorStorage; - StorageUtl_CopyPropertyToSTATSTG(pstatstg, + StorageUtl_CopyDirEntryToSTATSTG(pstatstg, &curProperty, grfStatFlag); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0639599..fa2980c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -657,7 +657,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( if (readSuccessful) { - StorageUtl_CopyPropertyToSTATSTG( + StorageUtl_CopyDirEntryToSTATSTG( pstatstg, &curProperty, grfStatFlag); @@ -3621,7 +3621,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( /* * Copy the information to the return buffer. */ - StorageUtl_CopyPropertyToSTATSTG(currentReturnStruct, + StorageUtl_CopyDirEntryToSTATSTG(currentReturnStruct, &currentProperty, STATFLAG_DEFAULT); @@ -4050,7 +4050,7 @@ void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value) memcpy(buffer+offset+8, value->Data4, sizeof(value->Data4)); } -void StorageUtl_CopyPropertyToSTATSTG( +void StorageUtl_CopyDirEntryToSTATSTG( STATSTG* destination, const DirEntry* source, int statFlags) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 405301c..090f8b5 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -419,7 +419,7 @@ void StorageUtl_WriteULargeInteger(BYTE* buffer, ULONG offset, const ULARGE_INTEGER *value); void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value); void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value); -void StorageUtl_CopyPropertyToSTATSTG(STATSTG* destination, const DirEntry* source, +void StorageUtl_CopyDirEntryToSTATSTG(STATSTG* destination, const DirEntry* source, int statFlags); /****************************************************************************

1 0

Paul Vriens : setupapi/tests: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: f4a5294c89761d5836e5d4a6a889dcb0c768cb80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a5294c89761d5836e5d4a6a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 11 17:40:05 2009 +0100 setupapi/tests: Fix some test failures on Win9x/WinMe. --- dlls/setupapi/tests/install.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 7b93d97..35514d5 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -491,7 +491,13 @@ static void test_inffilelist(void) * get the value as reference */ expected = 0; + SetLastError(0xdeadbeef); ret = pSetupGetInfFileListW(NULL, INF_STYLE_WIN4, NULL, 0, &expected); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("SetupGetInfFileListW not implemented\n"); + return; + } ok(ret, "expected SetupGetInfFileListW to succeed! Error: %d\n", GetLastError()); ok(expected > 0, "expected required buffersize to be at least 1\n");

1 0

Roderick Colenbrander : wgl: Fix a violation of the GLX specs in ConvertAttribWGLtoGLX.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 521598560e95b4190367c9c09a45fcb559627150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=521598560e95b4190367c9c09… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Nov 11 16:27:43 2009 +0100 wgl: Fix a violation of the GLX specs in ConvertAttribWGLtoGLX. Nvidia and Mesa ignore GLX_RENDER_TYPE when it is set to an invalid value like 0 but AMD for instance doesn't, which is legal. --- dlls/winex11.drv/opengl.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9f97099..6171f9b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -600,7 +600,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf int pop; int drawattrib = 0; int nvfloatattrib = GLX_DONT_CARE; - int pixelattrib = 0; + int pixelattrib = ~0; /* The list of WGL attributes is allowed to be NULL. We don't return here for NULL * because we need to do fixups for GLX_DRAWABLE_TYPE/GLX_RENDER_TYPE/GLX_FLOAT_COMPONENTS_NV. */ @@ -801,7 +801,9 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf PUSH2(oGLXAttr, GLX_DRAWABLE_TYPE, drawattrib); TRACE("pAttr[?] = GLX_DRAWABLE_TYPE: %#x\n", drawattrib); - /* Set GLX_RENDER_TYPE all the time */ + /* By default glXChooseFBConfig uses GLX_RGBA_BIT as the default value. Since wglChoosePixelFormatARB + * searches in all formats we have to do the same. For this reason we set GLX_RENDER_TYPE to ~0 unless + * it is overridden. */ PUSH2(oGLXAttr, GLX_RENDER_TYPE, pixelattrib); TRACE("pAttr[?] = GLX_RENDER_TYPE: %#x\n", pixelattrib);

1 0

Roderick Colenbrander : winex11: Fix a regression when the same depth was used but in a different bit-ordering .
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 61633b6251d83db7a254e6ce28e14c8523f696f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61633b6251d83db7a254e6ce2… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Nov 11 18:00:09 2009 +0100 winex11: Fix a regression when the same depth was used but in a different bit-ordering. --- dlls/winex11.drv/bitblt.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 435e2c2..50a5a2f 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1350,6 +1350,14 @@ static BOOL client_side_dib_copy( X11DRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc return TRUE; } +static BOOL same_format(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst) +{ + if (physDevSrc->depth != physDevDst->depth) return FALSE; + if (!physDevSrc->color_shifts && !physDevDst->color_shifts) return TRUE; + if (physDevSrc->color_shifts && physDevDst->color_shifts) + return !memcmp(physDevSrc->color_shifts, physDevDst->color_shifts, sizeof(ColorShifts)); + return FALSE; +} /*********************************************************************** * X11DRV_StretchBlt @@ -1446,7 +1454,7 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN /* try client-side DIB copy */ if (!fStretch && rop == SRCCOPY && sSrc == DIB_Status_AppMod && sDst == DIB_Status_AppMod && - physDevSrc->depth == physDevDst->depth) + same_format(physDevSrc, physDevDst)) { if (client_side_dib_copy( physDevSrc, visRectSrc.left, visRectSrc.top, physDevDst, visRectDst.left, visRectDst.top, width, height )) @@ -1519,7 +1527,7 @@ BOOL CDECL X11DRV_StretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT yDst, IN } else if (OP_SRCDST(*opcode) == OP_ARGS(SRC,DST)) { - if (physDevSrc->depth == physDevDst->depth) + if (same_format(physDevSrc, physDevDst)) { wine_tsx11_lock(); XSetFunction( gdi_display, physDevDst->gc, OP_ROP(*opcode) );

1 0

Juan Lang : crypt32/tests: Fix test failures.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: 4d2c9c3e87fd1713bfbf785b7bbdb06349bcfbcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2c9c3e87fd1713bfbf785b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 11:22:45 2009 -0800 crypt32/tests: Fix test failures. --- dlls/crypt32/tests/encode.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 9c2d739..f2fc727 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1714,8 +1714,10 @@ static void test_decodeAltName(DWORD dwEncoding) NULL, &buf, &bufSize); /* Fails on WinXP with CRYPT_E_ASN1_RULE. I'm not too concerned about the * particular failure, just that it doesn't decode. + * It succeeds on (broken) Windows versions that haven't addressed + * embedded NULLs in alternate names. */ - ok(!ret, "expected failure\n"); + ok(!ret || broken(ret), "expected failure\n"); /* An embedded bell character is allowed, however. */ ret = pCryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, dns_embedded_bell, sizeof(dns_embedded_bell), CRYPT_DECODE_ALLOC_FLAG, @@ -1737,8 +1739,10 @@ static void test_decodeAltName(DWORD dwEncoding) NULL, &buf, &bufSize); /* Again, fails on WinXP with CRYPT_E_ASN1_RULE. I'm not too concerned * about the particular failure, just that it doesn't decode. + * It succeeds on (broken) Windows versions that haven't addressed + * embedded NULLs in alternate names. */ - ok(!ret, "expected failure\n"); + ok(!ret || broken(ret), "expected failure\n"); } struct UnicodeExpectedError @@ -3073,7 +3077,8 @@ static void test_encodeCertToBeSigned(DWORD dwEncoding) info.IssuerUniqueId.pbData = (BYTE *)serialNum; ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_TO_BE_SIGNED, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_BAD_PTR /* Win98 */), + "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (buf) { ok(size == sizeof(v1CertWithIssuerUniqueId), "Wrong size %d\n", size);

1 0

Juan Lang : crypt32: Fix more test failures on older crypt32 versions.
by Alexandre Julliard 12 Nov '09

12 Nov '09

Module: wine Branch: master Commit: ba3433fa02375aee1fded15c76bfee6e1f063228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba3433fa02375aee1fded15c7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 12:21:44 2009 -0800 crypt32: Fix more test failures on older crypt32 versions. --- dlls/crypt32/tests/chain.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index eb1fac0..d3d33ac 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2731,9 +2731,14 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus19 }, 0 }, + /* Older versions of crypt32 do not set + * CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, though they should. So + * ignore it (on Windows) but require it (on Wine.) + */ { { sizeof(chain20) / sizeof(chain20[0]), chain20 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, @@ -2749,7 +2754,8 @@ static ChainCheck chainCheck[] = { 0 }, { { sizeof(chain22) / sizeof(chain22[0]), chain22 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, @@ -2757,7 +2763,8 @@ static ChainCheck chainCheck[] = { 0 }, { { sizeof(chain23) / sizeof(chain23[0]), chain23 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, @@ -2765,7 +2772,8 @@ static ChainCheck chainCheck[] = { 0 }, { { sizeof(chain24) / sizeof(chain24[0]), chain24 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, @@ -2773,7 +2781,8 @@ static ChainCheck chainCheck[] = { 0 }, { { sizeof(chain25) / sizeof(chain25[0]), chain25 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, @@ -2781,7 +2790,8 @@ static ChainCheck chainCheck[] = { 0 }, { { sizeof(chain26) / sizeof(chain26[0]), chain26 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, @@ -2796,7 +2806,8 @@ static ChainCheck chainCheck[] = { 0 }, { { sizeof(chain28) / sizeof(chain28[0]), chain28 }, { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | - CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 },

1 0