November 2009 - Wine-Commits

Rob Shearman : oledb32: Fix style of accessing prgPropertySets in Test_DBProperties_GetProperty.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: bafd91106ec93cb795756066b0642bc97c356cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bafd91106ec93cb795756066b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Nov 12 00:30:32 2009 +0000 oledb32: Fix style of accessing prgPropertySets in Test_DBProperties_GetProperty. The parameter is a pointer to an array, so don't access it like it is an array of pointers. --- dlls/oledb32/tests/marshal.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 4ca3aac..67fc7fd 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -168,21 +168,21 @@ static HRESULT WINAPI Test_DBProperties_GetProperties( todo_wine ok(*pcPropertySets == 0, "Expected *pcPropertySets to be 0 instead of %d\n", *pcPropertySets); *pcPropertySets = 1; - prgPropertySets[0] = CoTaskMemAlloc(sizeof(DBPROPSET)); - prgPropertySets[0]->rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); - prgPropertySets[0]->rgProperties[0].dwPropertyID = TEST_PROPID; - prgPropertySets[0]->rgProperties[0].dwOptions = DBPROPOPTIONS_REQUIRED; - prgPropertySets[0]->rgProperties[0].dwStatus = S_OK; - prgPropertySets[0]->rgProperties[0].colid.eKind = DBKIND_GUID_NAME; + *prgPropertySets = CoTaskMemAlloc(sizeof(DBPROPSET)); + (*prgPropertySets)[0].rgProperties = CoTaskMemAlloc(sizeof(DBPROP)); + (*prgPropertySets)[0].rgProperties[0].dwPropertyID = TEST_PROPID; + (*prgPropertySets)[0].rgProperties[0].dwOptions = DBPROPOPTIONS_REQUIRED; + (*prgPropertySets)[0].rgProperties[0].dwStatus = S_OK; + (*prgPropertySets)[0].rgProperties[0].colid.eKind = DBKIND_GUID_NAME; /* colid contents */ - prgPropertySets[0]->rgProperties[0].colid.uGuid.guid = IID_IDBProperties; - prgPropertySets[0]->rgProperties[0].colid.uName.pwszName = CoTaskMemAlloc(sizeof(wszDBPropertyColumnName)); - memcpy(prgPropertySets[0]->rgProperties[0].colid.uName.pwszName, wszDBPropertyColumnName, sizeof(wszDBPropertyColumnName)); + (*prgPropertySets)[0].rgProperties[0].colid.uGuid.guid = IID_IDBProperties; + (*prgPropertySets)[0].rgProperties[0].colid.uName.pwszName = CoTaskMemAlloc(sizeof(wszDBPropertyColumnName)); + memcpy((*prgPropertySets)[0].rgProperties[0].colid.uName.pwszName, wszDBPropertyColumnName, sizeof(wszDBPropertyColumnName)); /* vValue contents */ - V_VT(&prgPropertySets[0]->rgProperties[0].vValue) = VT_BSTR; - V_BSTR(&prgPropertySets[0]->rgProperties[0].vValue) = SysAllocString(wszDBPropertyTestString); - prgPropertySets[0]->cProperties = 1; - prgPropertySets[0]->guidPropertySet = IID_IDBProperties; + V_VT(&(*prgPropertySets)[0].rgProperties[0].vValue) = VT_BSTR; + V_BSTR(&(*prgPropertySets)[0].rgProperties[0].vValue) = SysAllocString(wszDBPropertyTestString); + (*prgPropertySets)[0].cProperties = 1; + (*prgPropertySets)[0].guidPropertySet = IID_IDBProperties; return S_OK; }

1 0

Frédéric Delanoy : jscript: Update French translation.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 564c619ae3c13bb4c56b419b8b343a8fa49ccf2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=564c619ae3c13bb4c56b419b8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 12 00:12:22 2009 +0100 jscript: Update French translation. --- dlls/jscript/jscript_Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Fr.rc b/dlls/jscript/jscript_Fr.rc index 8c23e41..f70029d 100644 --- a/dlls/jscript/jscript_Fr.rc +++ b/dlls/jscript/jscript_Fr.rc @@ -46,6 +46,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_BOOL "Objet booléen attendu" IDS_JSCRIPT_EXPECTED "Objet JScript attendu" IDS_REGEXP_SYNTAX_ERROR "Erreur de syntaxe dans l'expression rationnelle" + IDS_URI_INVALID_CHAR "L'URI à coder contient des caractères invalides" IDS_INVALID_LENGTH "La longueur d'un tableau doit être un entier positif" IDS_ARRAY_EXPECTED "Objet tableau attendu" }

1 0

Juan Lang : rsaenh/tests: Fix length of copied buffer.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 9369dfbab6554abed3bc3ad89258dfcd28561c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9369dfbab6554abed3bc3ad89… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 13:38:17 2009 -0800 rsaenh/tests: Fix length of copied buffer. --- dlls/rsaenh/tests/rsaenh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4a69483..e59ad95 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -459,7 +459,7 @@ static void test_block_cipher_modes(void) result = derive_key(CALG_RC2, &hKey, 40); if (!result) return; - memcpy(abData, plain, sizeof(abData)); + memcpy(abData, plain, sizeof(plain)); dwMode = CRYPT_MODE_ECB; result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0);

1 0

Vincent Povirk : ole32: Rename StorageImpl_ReadProperty to StorageImpl_ReadDirEntry.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

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 the StgProperty structure to DirEntry.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

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

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

Nov. 12, 2009

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: Fix more test failures on older crypt32 versions.
by Alexandre Julliard Nov. 12, 2009

Nov. 12, 2009

Module: wine Branch: master Commit: 574de15f515adb94b502e69285816e1d34bd0f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=574de15f515adb94b502e6928… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 11 12:40:19 2009 -0800 crypt32: Fix more test failures on older crypt32 versions. --- dlls/crypt32/tests/chain.c | 53 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index d3d33ac..65be7ec 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2547,6 +2547,15 @@ static const CERT_TRUST_STATUS elementStatus27[] = { static const SimpleChainStatusCheck simpleStatus27[] = { { sizeof(elementStatus27) / sizeof(elementStatus27[0]), elementStatus27 }, }; +static const CERT_TRUST_STATUS elementStatus27Broken[] = { + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck simpleStatus27Broken[] = { + { sizeof(elementStatus27Broken) / sizeof(elementStatus27Broken[0]), + elementStatus27Broken }, +}; static CONST_DATA_BLOB chain28[] = { { sizeof(chain28_0), chain28_0 }, { sizeof(chain28_1), chain28_1 }, @@ -2797,13 +2806,7 @@ static ChainCheck chainCheck[] = { CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT, 0 }, 1, simpleStatus26 }, 0 }, - { { sizeof(chain27) / sizeof(chain27[0]), chain27 }, - { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, - CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_NAME_CONSTRAINTS | - CERT_TRUST_INVALID_EXTENSION, 0 }, - 1, simpleStatus27 }, - 0 }, + /* chain27 is handled separately elsewhere */ { { 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 | @@ -2852,6 +2855,29 @@ static ChainCheck chainCheckNoStore[] = { 0 }, }; +/* Chain27 checks a certificate with a subject alternate name containing an + * embedded NULL. Newer crypt32 versions fail to decode such alternate names, + * correctly prohibiting them. Older crypt32 versions do not. Rather than + * ignoring the expected error bits, check each version separately depending + * on the chain's error status. + */ +static ChainCheck chainCheckEmbeddedNull = { + { sizeof(chain27) / sizeof(chain27[0]), chain27 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE, + CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_NAME_CONSTRAINTS | + CERT_TRUST_INVALID_EXTENSION, 0 }, + 1, simpleStatus27 }, + 0 }; +static ChainCheck chainCheckEmbeddedNullBroken = { + { sizeof(chain27) / sizeof(chain27[0]), chain27 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT, + CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, + 1, simpleStatus27Broken }, + 0 }; + /* Wednesday, Oct 1, 2007 */ static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 }; /* Wednesday, Oct 28, 2009 */ @@ -2946,6 +2972,19 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); } } + chain = getChain(&chainCheckEmbeddedNull.certs, 0, TRUE, &oct2007, + chainCheckEmbeddedNull.todo, 0); + if (chain) + { + if (chainCheckEmbeddedNull.status.status.dwErrorStatus == + chain->TrustStatus.dwErrorStatus) + checkChainStatus(chain, &chainCheckEmbeddedNull.status, + chainCheckEmbeddedNull.todo, 0); + else + checkChainStatus(chain, &chainCheckEmbeddedNullBroken.status, + chainCheckEmbeddedNullBroken.todo, 0); + pCertFreeCertificateChain(chain); + } } static void test_CERT_CHAIN_PARA_cbSize(void)

1 0

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

Nov. 12, 2009

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

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

Nov. 12, 2009

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

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

Nov. 12, 2009

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