September 2007 - Wine-commits

Stefan Dösinger : wined3d: Emulate D3DFMT_L6V5U5.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 0ed81b20afa640466b0f88335a4a35c3403cca7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed81b20afa640466b0f88335… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 20:41:03 2007 +0200 wined3d: Emulate D3DFMT_L6V5U5. --- dlls/wined3d/surface.c | 54 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4904f24..c41e2eb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1576,6 +1576,20 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *target_bpp = 3; break; + case WINED3DFMT_L6V5U5: + *convert = CONVERT_L6V5U5; + if(GL_SUPPORT(NV_TEXTURE_SHADER)) { + *target_bpp = 3; + /* Use format and types from table */ + } else { + /* Load it into unsigned R5G6B5, swap L and V channels, and revert that in the shader */ + *target_bpp = 2; + *format = GL_RGB; + *internal = GL_RGB5; + *type = GL_UNSIGNED_SHORT_5_6_5; + } + break; + case WINED3DFMT_X8L8V8U8: *convert = CONVERT_X8L8V8U8; *target_bpp = 4; @@ -1838,6 +1852,46 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN break; } + case CONVERT_L6V5U5: + { + unsigned int x, y; + WORD *Source; + unsigned char *Dest; + + if(GL_SUPPORT(NV_TEXTURE_SHADER)) { + /* This makes the gl surface bigger(24 bit instead of 16), but it works with + * fixed function and shaders without further conversion once the surface is + * loaded + */ + for(y = 0; y < height; y++) { + Source = (WORD *) (src + y * pitch); + Dest = (unsigned char *) (dst + y * outpitch); + for (x = 0; x < width; x++ ) { + short color = (*Source++); + unsigned char l = ((color >> 10) & 0xfc); + char v = ((color >> 5) & 0x3e); + char u = ((color ) & 0x1f); + + /* 8 bits destination, 6 bits source, 8th bit is the sign. gl ignores the sign + * and doubles the positive range. Thus shift left only once, gl does the 2nd + * shift. GL reads a signed value and converts it into an unsigned value. + */ + /* M */ Dest[2] = l << 1; + + /* Those are read as signed, but kept signed. Just left-shift 3 times to scale + * from 5 bit values to 8 bit values. + */ + /* V */ Dest[1] = v << 3; + /* U */ Dest[0] = u << 3; + Dest += 3; + } + } + } else { + FIXME("Add D3DFMT_L6V5U5 emulation using standard unsigned RGB and shaders\n"); + } + break; + } + case CONVERT_X8L8V8U8: { unsigned int x, y; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 472907f..d5131e1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -169,7 +169,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_A4L4 ,GL_LUMINANCE4_ALPHA4 ,GL_LUMINANCE4_ALPHA4 ,GL_LUMINANCE_ALPHA ,GL_UNSIGNED_BYTE }, /* Bump mapping stuff */ {WINED3DFMT_V8U8 ,GL_DSDT8_NV ,GL_DSDT8_NV ,GL_DSDT_NV ,GL_BYTE }, - {WINED3DFMT_L6V5U5 ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX8_EXT ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT_5_5_5_1 }, + {WINED3DFMT_L6V5U5 ,GL_DSDT8_MAG8_NV ,GL_DSDT8_MAG8_NV ,GL_DSDT_MAG_NV ,GL_BYTE }, {WINED3DFMT_X8L8V8U8 ,GL_DSDT8_MAG8_INTENSITY8_NV ,GL_DSDT8_MAG8_INTENSITY8_NV ,GL_DSDT_MAG_VIB_NV ,GL_UNSIGNED_INT_8_8_S8_S8_REV_NV}, {WINED3DFMT_Q8W8V8U8 ,GL_SIGNED_RGBA8_NV ,GL_SIGNED_RGBA8_NV ,GL_RGBA ,GL_BYTE }, {WINED3DFMT_V16U16 ,GL_SIGNED_HILO16_NV ,GL_SIGNED_HILO16_NV ,GL_HILO_NV ,GL_SHORT }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 27ef553..b8cbbe7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1231,6 +1231,7 @@ typedef enum { CONVERT_CK_8888_ARGB, CONVERT_RGB32_888, CONVERT_V8U8, + CONVERT_L6V5U5, CONVERT_X8L8V8U8, CONVERT_Q8W8V8U8, CONVERT_V16U16,

1 0

Juan Lang : crypt32: Set subject' s info status from method used to find issuer.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: a5833ac9f42b0968c44492c55b29903be085eb5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5833ac9f42b0968c44492c55… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 11 12:48:54 2007 -0700 crypt32: Set subject's info status from method used to find issuer. --- dlls/crypt32/chain.c | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 8a60038..479bcaf 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -508,7 +508,8 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, } if (CRYPT_IsCertificateSelfSigned(rootElement->pCertContext)) { - rootElement->TrustStatus.dwInfoStatus |= CERT_TRUST_IS_SELF_SIGNED; + rootElement->TrustStatus.dwInfoStatus |= + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER; CRYPT_CheckRootCert(engine->hRoot, rootElement); } /* FIXME: check revocation of every cert with CertVerifyRevocation */ @@ -516,12 +517,13 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, } static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, - PCCERT_CONTEXT prevIssuer) + PCCERT_CONTEXT prevIssuer, DWORD *infoStatus) { PCCERT_CONTEXT issuer = NULL; PCERT_EXTENSION ext; DWORD size; + *infoStatus = 0; if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER, subject->pCertInfo->cExtension, subject->pCertInfo->rgExtension))) { @@ -546,6 +548,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); + if (issuer) + *infoStatus = CERT_TRUST_HAS_EXACT_MATCH_ISSUER; } else if (info->KeyId.cbData) { @@ -554,6 +558,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); + if (issuer) + *infoStatus = CERT_TRUST_HAS_KEY_MATCH_ISSUER; } LocalFree(info); } @@ -595,6 +601,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); + if (issuer) + *infoStatus = CERT_TRUST_HAS_EXACT_MATCH_ISSUER; } else FIXME("no supported name type in authority key id2\n"); @@ -606,6 +614,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, prevIssuer); + if (issuer) + *infoStatus = CERT_TRUST_HAS_KEY_MATCH_ISSUER; } LocalFree(info); } @@ -615,6 +625,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, issuer = CertFindCertificateInStore(store, subject->dwCertEncodingType, 0, CERT_FIND_SUBJECT_NAME, &subject->pCertInfo->Issuer, prevIssuer); + if (issuer) + *infoStatus = CERT_TRUST_HAS_NAME_MATCH_ISSUER; } return issuer; } @@ -631,11 +643,12 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - PCCERT_CONTEXT issuer = CRYPT_GetIssuer(world, cert, NULL); + DWORD infoStatus; + PCCERT_CONTEXT issuer = CRYPT_GetIssuer(world, cert, NULL, &infoStatus); if (issuer) { - ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, 0); + ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, infoStatus); cert = issuer; } else @@ -888,7 +901,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( alternate = NULL; else { - DWORD i, j; + DWORD i, j, infoStatus; PCCERT_CONTEXT alternateIssuer = NULL; alternate = NULL; @@ -902,7 +915,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( chain->context.rgpChain[i]->rgpElement[j + 1]->pCertContext); alternateIssuer = CRYPT_GetIssuer(prevIssuer->hCertStore, - subject, prevIssuer); + subject, prevIssuer, &infoStatus); } if (alternateIssuer) { @@ -912,7 +925,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( if (alternate) { BOOL ret = CRYPT_AddCertToSimpleChain(engine, - alternate->context.rgpChain[i], alternateIssuer, 0); + alternate->context.rgpChain[i], alternateIssuer, infoStatus); if (ret) {

1 0

Juan Lang : crypt32: Make chain tests more strict.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: f0add110077451403b45cbc8ff0e18b2e5d91739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0add110077451403b45cbc8f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 11 12:49:27 2007 -0700 crypt32: Make chain tests more strict. --- dlls/crypt32/tests/chain.c | 42 +++++++++++++++--------------------------- 1 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index e320e79..aa84004 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1537,51 +1537,44 @@ static ChainCheck chainCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, simpleStatus0 }, - TODO_INFO }, + 1, simpleStatus0 }, 0 }, { { sizeof(chain1) / sizeof(chain1[0]), chain1 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_SIGNATURE_VALID | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, simpleStatus1 }, - TODO_INFO }, + 1, simpleStatus1 }, 0 }, { { sizeof(chain2) / sizeof(chain2[0]), chain2 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, simpleStatus2 }, - TODO_INFO }, + 1, simpleStatus2 }, 0 }, { { sizeof(chain3) / sizeof(chain3[0]), chain3 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, simpleStatus3 }, - TODO_INFO }, + 1, simpleStatus3 }, 0 }, { { sizeof(chain4) / sizeof(chain4[0]), chain4 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, - 1, simpleStatus4 }, - TODO_INFO }, + 1, simpleStatus4 }, 0 }, { { sizeof(chain5) / sizeof(chain5[0]), chain5 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus5 }, - TODO_ERROR | TODO_INFO }, + TODO_ERROR }, { { sizeof(chain6) / sizeof(chain6[0]), chain6 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus6 }, - TODO_INFO }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus6 }, 0 }, { { sizeof(chain7) / sizeof(chain7[0]), chain7 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus7 }, - TODO_INFO }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus7 }, 0 }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus8 }, - TODO_ERROR | TODO_INFO }, + TODO_ERROR }, { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT | @@ -1590,29 +1583,24 @@ static ChainCheck chainCheck[] = { TODO_ERROR | TODO_INFO }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, - TODO_INFO }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 }, { { sizeof(chain11) / sizeof(chain11[0]), chain11 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, - TODO_INFO }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, 0 }, { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, - { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, - TODO_INFO }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, 0 }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, - 1, selfSignedSimpleStatus }, - TODO_INFO }, + 1, selfSignedSimpleStatus }, 0 }, /* The iTunes chain may or may not have its root trusted, so ignore the * error */ { { sizeof(iTunesChain) / sizeof(iTunesChain[0]), iTunesChain }, { { CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_HAS_PREFERRED_ISSUER }, { 0, 0 }, - 1, iTunesSimpleStatus }, - TODO_INFO }, + 1, iTunesSimpleStatus }, 0 }, }; static const CERT_TRUST_STATUS elementStatus8NoStore[] = { @@ -1627,7 +1615,7 @@ static ChainCheck chainCheckNoStore[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, selfSignedSimpleStatus }, - TODO_ERROR | TODO_INFO }, + TODO_ERROR }, { { sizeof(chain8) / sizeof(chain8[0]), chain8 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT |

1 0

Stefan Leichter : dmcompos: Remove 'recursive registry key delete' function .
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 6da83955dc9348f4c5ee4b737d8adf79ddb520a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da83955dc9348f4c5ee4b737… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 11 22:30:20 2007 +0200 dmcompos: Remove 'recursive registry key delete' function. --- dlls/dmcompos/regsvr.c | 76 +++++------------------------------------------ 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/dmcompos/regsvr.c b/dlls/dmcompos/regsvr.c index ea3d705..2fcbf89 100644 --- a/dlls/dmcompos/regsvr.c +++ b/dlls/dmcompos/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -413,67 +414,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Stefan Leichter : dmband: Remove 'recursive registry key delete' function.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 260a949f4eae7cb7220bcf1d69ac90a835d6f5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=260a949f4eae7cb7220bcf1d6… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Sep 11 22:32:10 2007 +0200 dmband: Remove 'recursive registry key delete' function. --- dlls/dmband/regsvr.c | 76 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 68 deletions(-) diff --git a/dlls/dmband/regsvr.c b/dlls/dmband/regsvr.c index 988bb1f..4c4fc0f 100644 --- a/dlls/dmband/regsvr.c +++ b/dlls/dmband/regsvr.c @@ -101,9 +101,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -190,7 +187,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) { WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -295,16 +293,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) { WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -413,67 +414,6 @@ error_close_progid_key: } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) { - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) { - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static struct regsvr_coclass const coclass_list[] = {

1 0

Dmitry Timoshkov : shell32: Remove class cache introduced in commit f686cfab2feb9010efe82a932dc9f5904566c8ab .
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: e3cfd6ef32d1e298879b1b1b15f0a039dd04bc6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3cfd6ef32d1e298879b1b1b1… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 12 15:04:02 2007 +0900 shell32: Remove class cache introduced in commit f686cfab2feb9010efe82a932dc9f5904566c8ab. --- dlls/shell32/shlfolder.c | 101 +--------------------------------------------- 1 files changed, 2 insertions(+), 99 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index cbbd12f..b6bdd07 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -50,28 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); -static CRITICAL_SECTION SHELL32_SF_ClassCacheCS; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &SHELL32_SF_ClassCacheCS, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": SHELL32_SF_ClassCacheCS") } -}; -static CRITICAL_SECTION SHELL32_SF_ClassCacheCS = { &critsect_debug, -1, 0, 0, 0, 0 }; - -/* IShellFolder class cache */ -struct _sf_cls_cache_entry -{ - CLSID clsid; - LPVOID pv; -}; - -static struct _sf_class_cache -{ - DWORD allocated, used; - struct _sf_cls_cache_entry *sf_cls_cache_entry; -} sf_cls_cache; - static const WCHAR wszDotShellClassInfo[] = { '.','S','h','e','l','l','C','l','a','s','s','I','n','f','o',0}; @@ -204,70 +182,6 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, return hr; } -static BOOL get_iface_from_cache(REFCLSID clsid, LPVOID *ppvOut) -{ - BOOL ret = FALSE; - int i; - - EnterCriticalSection(&SHELL32_SF_ClassCacheCS); - - for (i = 0; i < sf_cls_cache.used; i++) - { - if (IsEqualIID(&sf_cls_cache.sf_cls_cache_entry[i].clsid, clsid)) - { - *ppvOut = sf_cls_cache.sf_cls_cache_entry[i].pv; - /* Pin it */ - IUnknown_AddRef((IUnknown *)*ppvOut); - ret = TRUE; - break; - } - } - - LeaveCriticalSection(&SHELL32_SF_ClassCacheCS); - return ret; -} - -static void add_iface_to_cache(REFCLSID clsid, LPVOID pv) -{ - EnterCriticalSection(&SHELL32_SF_ClassCacheCS); - - if (sf_cls_cache.used >= sf_cls_cache.allocated) - { - DWORD allocated; - struct _sf_cls_cache_entry *sf_cls_cache_entry; - - if (!sf_cls_cache.allocated) - { - allocated = 4; - sf_cls_cache_entry = HeapAlloc(GetProcessHeap(), 0, - 4 * sizeof(*sf_cls_cache_entry)); - } - else - { - allocated = sf_cls_cache.allocated * 2; - sf_cls_cache_entry = HeapReAlloc(GetProcessHeap(), 0, sf_cls_cache.sf_cls_cache_entry, - allocated * sizeof(*sf_cls_cache_entry)); - } - if (!sf_cls_cache_entry) - { - LeaveCriticalSection(&SHELL32_SF_ClassCacheCS); - return; - } - - sf_cls_cache.allocated = allocated; - sf_cls_cache.sf_cls_cache_entry = sf_cls_cache_entry; - } - - /* Pin it */ - IUnknown_AddRef((IUnknown *)pv); - - sf_cls_cache.sf_cls_cache_entry[sf_cls_cache.used].clsid = *clsid; - sf_cls_cache.sf_cls_cache_entry[sf_cls_cache.used].pv = pv; - sf_cls_cache.used++; - - LeaveCriticalSection(&SHELL32_SF_ClassCacheCS); -} - /*********************************************************************** * SHELL32_CoCreateInitSF * @@ -281,22 +195,11 @@ static void add_iface_to_cache(REFCLSID clsid, LPVOID pv) static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, REFCLSID clsid, LPVOID * ppvOut) { - HRESULT hr = S_OK; + HRESULT hr; TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); - if (!get_iface_from_cache(clsid, ppvOut)) - { - hr = SHCoCreateInstance(NULL, clsid, NULL, &IID_IShellFolder, ppvOut); - if (SUCCEEDED(hr)) - { - TRACE("loaded %p %s\n", *ppvOut, wine_dbgstr_guid(clsid)); - add_iface_to_cache(clsid, *ppvOut); - } - } - else - TRACE("found in the cache %p %s\n", *ppvOut, wine_dbgstr_guid(clsid)); - + hr = SHCoCreateInstance(NULL, clsid, NULL, &IID_IShellFolder, ppvOut); if (SUCCEEDED (hr)) { LPITEMIDLIST pidlAbsolute = ILCombine (pidlRoot, pidlChild);

1 0

Dmitry Timoshkov : gdi32: Use lower case font dir name to match unix directory layout.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 4fb82e3783ecfc4a110e1e0120949102ed0294cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb82e3783ecfc4a110e1e012… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Sep 12 15:05:28 2007 +0900 gdi32: Use lower case font dir name to match unix directory layout. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9881f00..b978d35 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -339,7 +339,7 @@ static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0 static const WCHAR RegularW[] = {'R','e','g','u','l','a','r','\0'}; -static const WCHAR fontsW[] = {'\\','F','o','n','t','s','\0'}; +static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',

1 0

Juan Lang : crypt32: Only decode authority key ID in subject cert once when looking for issuer.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 5c8254886f087a22e3648a87f6494184941b74ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8254886f087a22e3648a87f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 11 12:47:51 2007 -0700 crypt32: Only decode authority key ID in subject cert once when looking for issuer. --- dlls/crypt32/chain.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 98 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index bd26cb1..f34f04a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -17,6 +17,7 @@ * */ #include <stdarg.h> +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "wincrypt.h" @@ -514,11 +515,104 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, static PCCERT_CONTEXT CRYPT_GetIssuer(HCERTSTORE store, PCCERT_CONTEXT subject, PCCERT_CONTEXT prevIssuer) { - PCCERT_CONTEXT issuer; - DWORD flags = 0; + PCCERT_CONTEXT issuer = NULL; + PCERT_EXTENSION ext; + DWORD size; - issuer = CertGetIssuerCertificateFromStore(store, subject, prevIssuer, - &flags); + if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER, + subject->pCertInfo->cExtension, subject->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID_INFO *info; + BOOL ret; + + ret = CryptDecodeObjectEx(subject->dwCertEncodingType, + X509_AUTHORITY_KEY_ID, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + CERT_ID id; + + if (info->CertIssuer.cbData && info->CertSerialNumber.cbData) + { + id.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + memcpy(&id.u.IssuerSerialNumber.Issuer, &info->CertIssuer, + sizeof(CERT_NAME_BLOB)); + memcpy(&id.u.IssuerSerialNumber.SerialNumber, + &info->CertSerialNumber, sizeof(CRYPT_INTEGER_BLOB)); + issuer = CertFindCertificateInStore(store, + subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, + prevIssuer); + } + else if (info->KeyId.cbData) + { + id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); + issuer = CertFindCertificateInStore(store, + subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, + prevIssuer); + } + LocalFree(info); + } + } + else if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER2, + subject->pCertInfo->cExtension, subject->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID2_INFO *info; + BOOL ret; + + ret = CryptDecodeObjectEx(subject->dwCertEncodingType, + X509_AUTHORITY_KEY_ID2, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + CERT_ID id; + + if (info->AuthorityCertIssuer.cAltEntry && + info->AuthorityCertSerialNumber.cbData) + { + PCERT_ALT_NAME_ENTRY directoryName = NULL; + DWORD i; + + for (i = 0; !directoryName && + i < info->AuthorityCertIssuer.cAltEntry; i++) + if (info->AuthorityCertIssuer.rgAltEntry[i].dwAltNameChoice + == CERT_ALT_NAME_DIRECTORY_NAME) + directoryName = + &info->AuthorityCertIssuer.rgAltEntry[i]; + if (directoryName) + { + id.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; + memcpy(&id.u.IssuerSerialNumber.Issuer, + &directoryName->u.DirectoryName, sizeof(CERT_NAME_BLOB)); + memcpy(&id.u.IssuerSerialNumber.SerialNumber, + &info->AuthorityCertSerialNumber, + sizeof(CRYPT_INTEGER_BLOB)); + issuer = CertFindCertificateInStore(store, + subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, + prevIssuer); + } + else + FIXME("no supported name type in authority key id2\n"); + } + else if (info->KeyId.cbData) + { + id.dwIdChoice = CERT_ID_KEY_IDENTIFIER; + memcpy(&id.u.KeyId, &info->KeyId, sizeof(CRYPT_HASH_BLOB)); + issuer = CertFindCertificateInStore(store, + subject->dwCertEncodingType, 0, CERT_FIND_CERT_ID, &id, + prevIssuer); + } + LocalFree(info); + } + } + else + { + issuer = CertFindCertificateInStore(store, + subject->dwCertEncodingType, 0, CERT_FIND_SUBJECT_NAME, + &subject->pCertInfo->Issuer, prevIssuer); + } return issuer; }

1 0

Juan Lang : crypt32: Pass subject' s info status when adding an issuer to a chain.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: 54428bfb99b8396d7027a20dd56f276169a73df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54428bfb99b8396d7027a20dd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 11 12:48:24 2007 -0700 crypt32: Pass subject's info status when adding an issuer to a chain. --- dlls/crypt32/chain.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f34f04a..8a60038 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -279,7 +279,7 @@ static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, } static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, - PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert) + PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD subjectInfoStatus) { BOOL ret = FALSE; PCERT_CHAIN_ELEMENT element = CryptMemAlloc(sizeof(CERT_CHAIN_ELEMENT)); @@ -297,6 +297,9 @@ static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, memset(element, 0, sizeof(CERT_CHAIN_ELEMENT)); element->cbSize = sizeof(CERT_CHAIN_ELEMENT); element->pCertContext = CertDuplicateCertificateContext(cert); + if (chain->cElement > 1) + chain->rgpElement[chain->cElement - 2]->TrustStatus.dwInfoStatus + = subjectInfoStatus; /* FIXME: initialize the rest of element */ if (chain->cElement % engine->CycleDetectionModulus) CRYPT_CheckSimpleChainForCycles(chain); @@ -632,7 +635,7 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, if (issuer) { - ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer); + ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, 0); cert = issuer; } else @@ -658,7 +661,7 @@ static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, { memset(chain, 0, sizeof(CERT_SIMPLE_CHAIN)); chain->cbSize = sizeof(CERT_SIMPLE_CHAIN); - ret = CRYPT_AddCertToSimpleChain(engine, chain, cert); + ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); if (ret) { ret = CRYPT_BuildSimpleChain(engine, world, chain); @@ -909,7 +912,7 @@ static PCertificateChain CRYPT_BuildAlternateContextFromChain( if (alternate) { BOOL ret = CRYPT_AddCertToSimpleChain(engine, - alternate->context.rgpChain[i], alternateIssuer); + alternate->context.rgpChain[i], alternateIssuer, 0); if (ret) {

1 0

Juan Lang : rsaenh: Validate pad byte when decrypting a block cipher.
by Alexandre Julliard 12 Sep '07

12 Sep '07

Module: wine Branch: master Commit: f0d2766fdc945fc967e5efbedbab9e022baabf4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d2766fdc945fc967e5efbed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 11 12:44:26 2007 -0700 rsaenh: Validate pad byte when decrypting a block cipher. --- dlls/rsaenh/rsaenh.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4002f27..3318da6 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2080,7 +2080,16 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, } memcpy(in, out, pCryptKey->dwBlockLen); } - if (Final) *pdwDataLen -= pbData[*pdwDataLen-1]; + if (Final) { + if (pbData[*pdwDataLen-1] && + pbData[*pdwDataLen-1] <= pCryptKey->dwBlockLen && + pbData[*pdwDataLen-1] < *pdwDataLen) + *pdwDataLen -= pbData[*pdwDataLen-1]; + else { + SetLastError(NTE_BAD_DATA); + return FALSE; + } + } } else if (GET_ALG_TYPE(pCryptKey->aiAlgid) == ALG_TYPE_STREAM) { encrypt_stream_impl(pCryptKey->aiAlgid, &pCryptKey->context, pbData, *pdwDataLen);

1 0