June 2006 - Wine-commits - list.winehq.org

Piotr Caban : oleview: Removed use of strlenW, strcmpW and strcpyW functions.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 4964c1e940125922225b763185620543c30777eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4964c1e940125922225b763… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jun 22 11:43:02 2006 +0200 oleview: Removed use of strlenW, strcmpW and strcpyW functions. --- programs/oleview/details.c | 14 +++++++------- programs/oleview/main.h | 1 - programs/oleview/tree.c | 16 ++++++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index 8924040..f4de6a6 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -59,7 +59,7 @@ void CreateRegRec(HKEY hKey, HTREEITEM p if(retEnum != ERROR_SUCCESS) { - if(!i && strlenW(wszKeyName) > 1) + if(!i && lstrlenW(wszKeyName) > 1) { tvis.item.pszText = (LPWSTR)wszKeyName; addPlace = TreeView_InsertItem(details.hReg, &tvis); @@ -75,8 +75,8 @@ void CreateRegRec(HKEY hKey, HTREEITEM p for(j=0; j<MAX_LOAD_STRING/3-1; j++) wsprintfW(&wszBuf[3*j], wszBinary, (int)((unsigned char)wszData[j])); wszBuf[(lenData*3>=MAX_LOAD_STRING ? MAX_LOAD_STRING-1 : lenData*3)] = '\0'; - strcpyW(wszData, wszBuf); - strcpyW(&wszData[MAX_LOAD_STRING-5], wszDots); + lstrcpyW(wszData, wszBuf); + lstrcpyW(&wszData[MAX_LOAD_STRING-5], wszDots); } if(lenName) wsprintfW(wszTree, wszFormat1, wszKeyName, wszName, wszData); @@ -86,9 +86,9 @@ void CreateRegRec(HKEY hKey, HTREEITEM p if(addings && !memcmp(wszName, wszAppID, sizeof(WCHAR[6]))) { - strcpyW(wszTree, wszName); + lstrcpyW(wszTree, wszName); memmove(&wszData[6], wszData, sizeof(WCHAR[MAX_LOAD_STRING-6])); - strcpyW(wszData, wszCLSID); + lstrcpyW(wszData, wszCLSID); wszData[5] = '\\'; if(RegOpenKey(HKEY_CLASSES_ROOT, wszData, &hCurKey) != ERROR_SUCCESS) @@ -229,7 +229,7 @@ void CreateReg(WCHAR *buffer) return; lastLenBuffer = lenBuffer+1; - lenBuffer = strlenW(buffer); + lenBuffer = lstrlenW(buffer); *path = '\\'; path += 1; @@ -287,7 +287,7 @@ void RefreshDetails(HTREEITEM item) if(tvi.lParam) wsprintfW(wszStaticText, wszFormat, tvi.pszText, ((ITEM_INFO *)tvi.lParam)->clsid); - else strcpyW(wszStaticText, tvi.pszText); + else lstrcpyW(wszStaticText, tvi.pszText); SetWindowText(details.hStatic, wszStaticText); diff --git a/programs/oleview/main.h b/programs/oleview/main.h index e77b181..f715583 100644 --- a/programs/oleview/main.h +++ b/programs/oleview/main.h @@ -24,7 +24,6 @@ #include <windows.h> #include <winreg.h> #include <commctrl.h> #include <unknwn.h> -#include <wine/unicode.h> #include "resource.h" diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index cb504ec..e59f110 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -44,8 +44,8 @@ LPARAM CreateITEM_INFO(INT flag, const W memset(reg, 0, sizeof(ITEM_INFO)); reg->cFlag = flag; - strcpyW(reg->info, info); - if(clsid) strcpyW(reg->clsid, clsid); + lstrcpyW(reg->info, info); + if(clsid) lstrcpyW(reg->clsid, clsid); return (LPARAM)reg; } @@ -116,7 +116,7 @@ #define CASE_ERR(i) case i: \ LoadString(globals.hMainInst, IDS_ERROR_UNKN, wszFlagName, MAX_LOAD_STRING); } - wsprintfW(&wszMessage[strlenW(wszMessage)], wszFormat, + wsprintfW(&wszMessage[lstrlenW(wszMessage)], wszFormat, wszFlagName, (unsigned)hRes); MessageBox(globals.hMainWnd, wszMessage, wszTitle, MB_OK|MB_ICONEXCLAMATION); return; @@ -151,8 +151,8 @@ #define CASE_ERR(i) case i: \ { IUnknown_Release(unk); - strcpyW(wszRegPath, wszInterface); - strcpyW(&wszRegPath[strlenW(wszRegPath)], ((ITEM_INFO *)tvi.lParam)->clsid); + lstrcpyW(wszRegPath, wszInterface); + lstrcpyW(&wszRegPath[lstrlenW(wszRegPath)], ((ITEM_INFO *)tvi.lParam)->clsid); tvis.item.lParam = CreateITEM_INFO(REGTOP|INTERFACE|REGPATH, wszRegPath, ((ITEM_INFO *)tvi.lParam)->clsid); SendMessage(globals.hTree, TVM_INSERTITEM, 0, (LPARAM)&tvis); @@ -216,7 +216,7 @@ BOOL CreateRegPath(HTREEITEM item, WCHAR if(tvi.lParam && (((ITEM_INFO *)tvi.lParam)->cFlag & (REGPATH|REGTOP))) { - bufLen = strlenW(((ITEM_INFO *)tvi.lParam)->info); + bufLen = lstrlenW(((ITEM_INFO *)tvi.lParam)->info); memmove(&buffer[bufLen], buffer, sizeof(WCHAR[bufSize-bufLen])); memcpy(buffer, ((ITEM_INFO *)tvi.lParam)->info, sizeof(WCHAR[bufLen])); } @@ -295,7 +295,7 @@ void AddCOMandAll(void) tvi.hItem = curSearch; SendMessage(globals.hTree, TVM_GETITEM, 0, (LPARAM)&tvi); - if(tvi.lParam && !strcmpW(((ITEM_INFO *)tvi.lParam)->info, wszComp)) + if(tvi.lParam && !lstrcmpW(((ITEM_INFO *)tvi.lParam)->info, wszComp)) { tvis.hParent = curSearch; @@ -403,7 +403,7 @@ void AddTypeLib(void) LoadString(globals.hMainInst, IDS_TL_VER, wszVer, sizeof(WCHAR[MAX_LOAD_STRING])); - wsprintfW(&buffer[strlenW(buffer)], wszFormat, wszVer, valName); + wsprintfW(&buffer[lstrlenW(buffer)], wszFormat, wszVer, valName); tvis.item.pszText = buffer; } else tvis.item.pszText = valName;

1 0

Alexandre Julliard : configure: Send pkg-config error messages to /dev/null .
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: d01063e1d25b732d02399b7e543ba37390a56f0e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d01063e1d25b732d02399b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 22 12:07:57 2006 +0200 configure: Send pkg-config error messages to /dev/null. --- configure | 16 ++++++++-------- configure.ac | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure b/configure index c3faa60..4728e1d 100755 --- a/configure +++ b/configure @@ -3988,7 +3988,7 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4050,7 +4050,7 @@ for ac_dir in `echo "$ac_x_includes $ac_ do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r "$ac_dir/libXt.$ac_extension"; then + if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi @@ -10747,8 +10747,8 @@ XSLTINCL="" if test "$PKG_CONFIG" != "false" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0`" - ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0`" + ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`" + ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_xml_cflags" for ac_header in libxml/parser.h @@ -11092,8 +11092,8 @@ fi done CPPFLAGS="$ac_save_CPPFLAGS" - ac_xslt_libs="`$PKG_CONFIG --libs libxslt`" - ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt`" + ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`" + ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" @@ -11268,8 +11268,8 @@ HALINCL="" if test "$PKG_CONFIG" != "false" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_hal_libs="`$PKG_CONFIG --libs hal`" - ac_hal_cflags="`$PKG_CONFIG --cflags hal`" + ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" + ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_hal_cflags" diff --git a/configure.ac b/configure.ac index 743ac69..8423981 100644 --- a/configure.ac +++ b/configure.ac @@ -480,8 +480,8 @@ AC_SUBST(XSLTINCL,"") if test "$PKG_CONFIG" != "false" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0`" - ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0`" + ac_xml_libs="`$PKG_CONFIG --libs libxml-2.0 2>/dev/null`" + ac_xml_cflags="`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_xml_cflags" AC_CHECK_HEADERS(libxml/parser.h, [AC_CHECK_LIB(xml2, xmlParseMemory, @@ -492,8 +492,8 @@ then [AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs) ]) CPPFLAGS="$ac_save_CPPFLAGS" - ac_xslt_libs="`$PKG_CONFIG --libs libxslt`" - ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt`" + ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`" + ac_xslt_cflags="`$PKG_CONFIG --cflags libxslt 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_xslt_cflags" AC_CHECK_HEADERS([libxslt/pattern.h libxslt/transform.h], [AC_CHECK_LIB(xslt, xsltCompilePattern, @@ -512,8 +512,8 @@ AC_SUBST(HALINCL,"") if test "$PKG_CONFIG" != "false" then ac_save_CPPFLAGS="$CPPFLAGS" - ac_hal_libs="`$PKG_CONFIG --libs hal`" - ac_hal_cflags="`$PKG_CONFIG --cflags hal`" + ac_hal_libs="`$PKG_CONFIG --libs hal 2>/dev/null`" + ac_hal_cflags="`$PKG_CONFIG --cflags hal 2>/dev/null`" CPPFLAGS="$CPPFLAGS $ac_hal_cflags" AC_CHECK_HEADERS([dbus/dbus.h hal/libhal.h]) if test "$ac_cv_header_dbus_dbus_h" = "yes" -a "$ac_cv_header_hal_libhal_h" = "yes"

1 0

Krzysztof Foltman : riched20: Fix message range for get_msg_name.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 02bbf06c43964e502744bbfd22552232b0724b53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=02bbf06c43964e502744bbf… Author: Krzysztof Foltman <wdev(a)foltman.com> Date: Thu Jun 22 00:01:31 2006 +0200 riched20: Fix message range for get_msg_name. --- dlls/riched20/editor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 21f951e..9a2b966 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1381,7 +1381,7 @@ static const char * const richedit_messa static const char * get_msg_name(UINT msg) { - if (msg >= EM_GETSEL && msg <= EM_SETLIMITTEXT) + if (msg >= EM_GETSEL && msg <= EM_CHARFROMPOS) return edit_messages[msg - EM_GETSEL]; if (msg >= EM_CANPASTE && msg <= EM_GETIMEMODEBIAS) return richedit_messages[msg - EM_CANPASTE];

1 0

Juan Lang : crypt32: Implement CertGetCRLFromStore.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 77ea583ab07db77b85119f7fb52084834931dd24 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77ea583ab07db77b85119f7… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jun 21 20:50:11 2006 -0700 crypt32: Implement CertGetCRLFromStore. - implement CertGetCRLFromStore, with tests - update tests for CRL revocation functions to show name isn't checked --- dlls/crypt32/crl.c | 42 +++++++++++++++++++++- dlls/crypt32/crypt32.spec | 2 + dlls/crypt32/tests/crl.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 3 ++ 4 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 283b742..bd0136a 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -184,6 +184,47 @@ PCCRL_CONTEXT WINAPI CertFindCRLInStore( return ret; } +PCCRL_CONTEXT WINAPI CertGetCRLFromStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pIssuerContext, PCCRL_CONTEXT pPrevCrlContext, DWORD *pdwFlags) +{ + static const DWORD supportedFlags = CERT_STORE_SIGNATURE_FLAG | + CERT_STORE_TIME_VALIDITY_FLAG | CERT_STORE_BASE_CRL_FLAG | + CERT_STORE_DELTA_CRL_FLAG; + PCCRL_CONTEXT ret; + + TRACE("(%p, %p, %p, %08lx)\n", hCertStore, pIssuerContext, pPrevCrlContext, + *pdwFlags); + + if (*pdwFlags & ~supportedFlags) + { + SetLastError(E_INVALIDARG); + return NULL; + } + if (pIssuerContext) + ret = CertFindCRLInStore(hCertStore, pIssuerContext->dwCertEncodingType, + 0, CRL_FIND_ISSUED_BY, pIssuerContext, pPrevCrlContext); + else + ret = CertFindCRLInStore(hCertStore, 0, 0, CRL_FIND_ANY, NULL, + pPrevCrlContext); + if (ret) + { + if (*pdwFlags & CERT_STORE_TIME_VALIDITY_FLAG) + { + if (0 == CertVerifyCRLTimeValidity(NULL, ret->pCrlInfo)) + *pdwFlags &= ~CERT_STORE_TIME_VALIDITY_FLAG; + } + if (*pdwFlags & CERT_STORE_SIGNATURE_FLAG) + { + if (CryptVerifyCertificateSignatureEx(0, ret->dwCertEncodingType, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_CRL, (void *)ret, + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)pIssuerContext, 0, + NULL)) + *pdwFlags &= ~CERT_STORE_SIGNATURE_FLAG; + } + } + return ret; +} + PCCRL_CONTEXT WINAPI CertDuplicateCRLContext(PCCRL_CONTEXT pCrlContext) { TRACE("(%p)\n", pCrlContext); @@ -437,7 +478,6 @@ static PCRL_ENTRY CRYPT_FindCertificateI DWORD i; PCRL_ENTRY entry = NULL; - /* FIXME: do I need to compare the issuers of the cert and CRL? */ for (i = 0; !entry && i < crl->cCRLEntry; i++) if (CertCompareIntegerBlob(&crl->rgCRLEntry[i].SerialNumber, &cert->SerialNumber)) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 9d33c2b..120061b 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -48,7 +48,7 @@ @ stub CertFreeCertificateChainEngine @ stdcall CertFreeCertificateContext(ptr) @ stdcall CertGetCRLContextProperty(ptr long ptr ptr) -@ stub CertGetCRLFromStore +@ stdcall CertGetCRLFromStore(ptr ptr ptr ptr) @ stdcall CertGetCTLContextProperty(ptr long ptr ptr) @ stub CertGetCertificateChain @ stdcall CertGetCertificateContextProperty(ptr long ptr ptr) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 5d02e88..5d0ddc6 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -249,6 +249,67 @@ static void testFindCRL(void) CertCloseStore(store, 0); } +static void testGetCRLFromStore(void) +{ + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + PCCRL_CONTEXT context; + PCCERT_CONTEXT cert; + DWORD flags; + BOOL ret; + + if (!store) return; + + /* Crash + context = CertGetCRLFromStore(NULL, NULL, NULL, NULL); + context = CertGetCRLFromStore(store, NULL, NULL, NULL); + */ + + /* Bogus flags */ + flags = 0xffffffff; + context = CertGetCRLFromStore(store, NULL, NULL, &flags); + ok(!context && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08lx\n", GetLastError()); + + /* Test an empty store */ + flags = 0; + context = CertGetCRLFromStore(store, NULL, NULL, &flags); + ok(context == NULL && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + + ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, + sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCRLToStore failed: %08lx\n", GetLastError()); + + /* NULL matches any CRL */ + flags = 0; + context = CertGetCRLFromStore(store, NULL, NULL, &flags); + ok(context != NULL, "Expected a context\n"); + CertFreeCRLContext(context); + + /* This cert's issuer isn't in */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert2, + sizeof(bigCert2)); + ok(cert != NULL, "CertCreateCertificateContext failed: %08lx\n", + GetLastError()); + context = CertGetCRLFromStore(store, cert, NULL, &flags); + ok(context == NULL && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + CertFreeCertificateContext(cert); + + /* But this one is */ + cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, + sizeof(bigCert)); + ok(cert != NULL, "CertCreateCertificateContext failed: %08lx\n", + GetLastError()); + context = CertGetCRLFromStore(store, cert, NULL, &flags); + ok(context != NULL, "Expected a context\n"); + CertFreeCRLContext(context); + CertFreeCertificateContext(cert); + + CertCloseStore(store, 0); +} + static void checkCRLHash(const BYTE *data, DWORD dataLen, ALG_ID algID, PCCRL_CONTEXT context, DWORD propID) { @@ -513,6 +574,13 @@ static void testIsValidCRLForCert(void) CertFreeCertificateContext(cert1); } +static const BYTE crlWithDifferentIssuer[] = { + 0x30,0x47,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30,0x11, + 0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x41,0x6c,0x65,0x78,0x20,0x4c,0x61,0x6e, + 0x67,0x00,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30, + 0x30,0x30,0x30,0x5a,0x30,0x16,0x30,0x14,0x02,0x01,0x01,0x18,0x0f,0x31,0x36, + 0x30,0x31,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a }; + static void testFindCertInCRL(void) { BOOL ret; @@ -549,6 +617,14 @@ static void testFindCertInCRL(void) ok(entry != NULL, "Expected to find an entry in CRL\n"); CertFreeCRLContext(crl); + /* Entry found even though CRL issuer doesn't match cert issuer */ + crl = CertCreateCRLContext(X509_ASN_ENCODING, crlWithDifferentIssuer, + sizeof(crlWithDifferentIssuer)); + ret = CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + ok(ret, "CertFindCertificateInCRL failed: %08lx\n", GetLastError()); + ok(entry != NULL, "Expected to find an entry in CRL\n"); + CertFreeCRLContext(crl); + CertFreeCertificateContext(cert); } @@ -583,6 +659,15 @@ static void testVerifyCRLRevocation(void ok(!ret, "CertVerifyCRLRevocation should have been revoked\n"); CertFreeCRLContext(crl); + /* Check against CRL with different issuer and entry for the cert */ + crl = CertCreateCRLContext(X509_ASN_ENCODING, v1CRLWithIssuerAndEntry, + sizeof(v1CRLWithIssuerAndEntry)); + ok(crl != NULL, "CertCreateCRLContext failed: %08lx\n", GetLastError()); + ret = CertVerifyCRLRevocation(X509_ASN_ENCODING, cert->pCertInfo, 1, + (PCRL_INFO *)&crl->pCrlInfo); + ok(!ret, "CertVerifyCRLRevocation should have been revoked\n"); + CertFreeCRLContext(crl); + /* Check against CRL without entry for the cert */ crl = CertCreateCRLContext(X509_ASN_ENCODING, verisignCRL, sizeof(verisignCRL)); @@ -602,6 +687,7 @@ START_TEST(crl) testCreateCRL(); testAddCRL(); testFindCRL(); + testGetCRLFromStore(); testCRLProperties(); diff --git a/include/wincrypt.h b/include/wincrypt.h index 66b0e57..9a16154 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2881,6 +2881,9 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCerti PCCERT_CONTEXT WINAPI CertGetSubjectCertificateFromStore(HCERTSTORE hCertStore, DWORD dwCertEncodingType, PCERT_INFO pCertId); +PCCRL_CONTEXT WINAPI CertGetCRLFromStore(HCERTSTORE hCertStore, + PCCERT_CONTEXT pIssuerContext, PCCRL_CONTEXT pPrevCrlContext, DWORD *pdwFlags); + BOOL WINAPI CertSerializeCertificateStoreElement(PCCERT_CONTEXT pCertContext, DWORD dwFlags, BYTE *pbElement, DWORD *pcbElement);

1 0

Juan Lang : oleaut32: Correctly handle NULLs embedded in BSTRs, with tests.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 2a0c37d8b99f2c1aae3bf988588cac095e78048d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a0c37d8b99f2c1aae3bf98… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jun 21 23:56:58 2006 +0200 oleaut32: Correctly handle NULLs embedded in BSTRs, with tests. --- dlls/oleaut32/tests/vartype.c | 109 ++++++++++++++++++++++++++++++++++++++--- dlls/oleaut32/vartype.c | 29 ++++++++--- 2 files changed, 122 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 347b256..5e2de4d 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4898,8 +4898,8 @@ #undef BSTR_DEC64 #define _VARBSTRCMP(left,right,lcid,flags,result) \ hres = pVarBstrCmp(left,right,lcid,flags); \ ok(hres == result, "VarBstrCmp: expected " #result ", got hres=0x%lx\n", hres) -#define VARBSTRCMP(left,right,result) \ - _VARBSTRCMP(left,right,lcid,0,result) +#define VARBSTRCMP(left,right,flags,result) \ + _VARBSTRCMP(left,right,lcid,flags,result) static void test_VarBstrCmp(void) { @@ -4907,7 +4907,11 @@ static void test_VarBstrCmp(void) HRESULT hres; static const WCHAR sz[] = {'W','u','r','s','c','h','t','\0'}; static const WCHAR szempty[] = {'\0'}; - BSTR bstr, bstrempty; + static const WCHAR sz1[] = { 'a',0 }; + static const WCHAR sz2[] = { 'A',0 }; + static const WCHAR s1[] = { 'a',0 }; + static const WCHAR s2[] = { 'a',0,'b' }; + BSTR bstr, bstrempty, bstr2; CHECKPTR(VarBstrCmp); @@ -4916,13 +4920,34 @@ static void test_VarBstrCmp(void) bstrempty = SysAllocString(szempty); /* NULL handling. Yepp, MSDN is totaly wrong here */ - VARBSTRCMP(NULL,NULL,VARCMP_EQ); - VARBSTRCMP(bstr,NULL,VARCMP_GT); - VARBSTRCMP(NULL,bstr,VARCMP_LT); + VARBSTRCMP(NULL,NULL,0,VARCMP_EQ); + VARBSTRCMP(bstr,NULL,0,VARCMP_GT); + VARBSTRCMP(NULL,bstr,0,VARCMP_LT); /* NULL and empty string comparisions */ - VARBSTRCMP(bstrempty,NULL,VARCMP_EQ); - VARBSTRCMP(NULL,bstrempty,VARCMP_EQ); + VARBSTRCMP(bstrempty,NULL,0,VARCMP_EQ); + VARBSTRCMP(NULL,bstrempty,0,VARCMP_EQ); + + SysFreeString(bstr); + bstr = SysAllocString(sz1); + + bstr2 = SysAllocString(sz2); + VARBSTRCMP(bstr,bstr2,0,VARCMP_LT); + VARBSTRCMP(bstr,bstr2,NORM_IGNORECASE,VARCMP_EQ); + SysFreeString(bstr2); + /* These two strings are considered equal even though one is + * NULL-terminated and the other not. + */ + bstr2 = SysAllocStringLen(s1, sizeof(s1) / sizeof(WCHAR)); + VARBSTRCMP(bstr,bstr2,0,VARCMP_EQ); + SysFreeString(bstr2); + + /* These two strings are not equal */ + bstr2 = SysAllocStringLen(s2, sizeof(s2) / sizeof(WCHAR)); + VARBSTRCMP(bstr,bstr2,0,VARCMP_LT); + SysFreeString(bstr2); + + SysFreeString(bstr); } /* Get the internal representation of a BSTR */ @@ -5175,6 +5200,73 @@ static void test_BstrCopy(void) } } +static void test_VarBstrCat(void) +{ + static const WCHAR sz1[] = { 'a',0 }; + static const WCHAR sz2[] = { 'b',0 }; + static const WCHAR sz1sz2[] = { 'a','b',0 }; + static const WCHAR s1[] = { 'a',0 }; + static const WCHAR s2[] = { 'b',0 }; + static const WCHAR s1s2[] = { 'a',0,'b',0 }; + HRESULT ret; + BSTR str1, str2, res; + + /* Crash + ret = VarBstrCat(NULL, NULL, NULL); + */ + + /* Concatenation of two NULL strings works */ + ret = VarBstrCat(NULL, NULL, &res); + ok(ret == S_OK, "VarBstrCat failed: %08lx\n", ret); + ok(res != NULL, "Expected a string\n"); + ok(SysStringLen(res) == 0, "Expected a 0-length string\n"); + SysFreeString(res); + + str1 = SysAllocString(sz1); + + /* Concatenation with one NULL arg */ + ret = VarBstrCat(NULL, str1, &res); + ok(ret == S_OK, "VarBstrCat failed: %08lx\n", ret); + ok(res != NULL, "Expected a string\n"); + ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); + ok(!memcmp(res, sz1, SysStringLen(str1)), "Unexpected value\n"); + SysFreeString(res); + ret = VarBstrCat(str1, NULL, &res); + ok(ret == S_OK, "VarBstrCat failed: %08lx\n", ret); + ok(res != NULL, "Expected a string\n"); + ok(SysStringLen(res) == SysStringLen(str1), "Unexpected length\n"); + ok(!memcmp(res, sz1, SysStringLen(str1)), "Unexpected value\n"); + SysFreeString(res); + + /* Concatenation of two zero-terminated strings */ + str2 = SysAllocString(sz2); + ret = VarBstrCat(str1, str2, &res); + ok(ret == S_OK, "VarBstrCat failed: %08lx\n", ret); + ok(res != NULL, "Expected a string\n"); + ok(SysStringLen(res) == sizeof(sz1sz2) / sizeof(WCHAR) - 1, + "Unexpected length\n"); + ok(!memcmp(res, sz1sz2, sizeof(sz1sz2)), "Unexpected value\n"); + SysFreeString(res); + + SysFreeString(str2); + SysFreeString(str1); + + /* Concatenation of two strings with embedded NULLs */ + str1 = SysAllocStringLen(s1, sizeof(s1) / sizeof(WCHAR)); + str2 = SysAllocStringLen(s2, sizeof(s2) / sizeof(WCHAR)); + + ret = VarBstrCat(str1, str2, &res); + ok(ret == S_OK, "VarBstrCat failed: %08lx\n", ret); + ok(res != NULL, "Expected a string\n"); + ok(SysStringLen(res) == sizeof(s1s2) / sizeof(WCHAR), + "Unexpected length\n"); + ok(!memcmp(res, s1s2, sizeof(s1s2)), "Unexpected value\n"); + SysFreeString(res); + + SysFreeString(str2); + SysFreeString(str1); +} + /* IUnknown */ static void test_IUnknownClear(void) @@ -5940,6 +6032,7 @@ START_TEST(vartype) test_SysReAllocString(); test_SysReAllocStringLen(); test_BstrCopy(); + test_VarBstrCat(); test_IUnknownClear(); test_IUnknownCopy(); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index e08a7c0..519c9e0 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6584,27 +6584,31 @@ HRESULT WINAPI VarBstrFromDisp(IDispatch */ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft, BSTR pbstrRight, BSTR *pbstrOut) { - unsigned int len; + unsigned int lenLeft, lenRight; + + TRACE("%s,%s,%p\n", + debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)), + debugstr_wn(pbstrRight, SysStringLen(pbstrRight)), pbstrOut); if (!pbstrOut) return E_INVALIDARG; - len = pbstrLeft ? strlenW(pbstrLeft) : 0; - if (pbstrRight) - len += strlenW(pbstrRight); + lenLeft = pbstrLeft ? SysStringLen(pbstrLeft) : 0; + lenRight = pbstrRight ? SysStringLen(pbstrRight) : 0; - *pbstrOut = SysAllocStringLen(NULL, len); + *pbstrOut = SysAllocStringLen(NULL, lenLeft + lenRight); if (!*pbstrOut) return E_OUTOFMEMORY; (*pbstrOut)[0] = '\0'; if (pbstrLeft) - strcpyW(*pbstrOut, pbstrLeft); + memcpy(*pbstrOut, pbstrLeft, lenLeft * sizeof(WCHAR)); if (pbstrRight) - strcatW(*pbstrOut, pbstrRight); + memcpy(*pbstrOut + lenLeft, pbstrRight, lenRight * sizeof(WCHAR)); + TRACE("%s\n", debugstr_wn(*pbstrOut, SysStringLen(*pbstrOut))); return S_OK; } @@ -6629,6 +6633,12 @@ HRESULT WINAPI VarBstrCat(BSTR pbstrLeft */ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft, BSTR pbstrRight, LCID lcid, DWORD dwFlags) { + HRESULT hres; + + TRACE("%s,%s,%ld,%08lx\n", + debugstr_wn(pbstrLeft, SysStringLen(pbstrLeft)), + debugstr_wn(pbstrRight, SysStringLen(pbstrRight)), lcid, dwFlags); + if (!pbstrLeft || !*pbstrLeft) { if (!pbstrRight || !*pbstrRight) @@ -6638,7 +6648,10 @@ HRESULT WINAPI VarBstrCmp(BSTR pbstrLeft else if (!pbstrRight || !*pbstrRight) return VARCMP_GT; - return CompareStringW(lcid, dwFlags, pbstrLeft, -1, pbstrRight, -1) - 1; + hres = CompareStringW(lcid, dwFlags, pbstrLeft, SysStringLen(pbstrLeft), + pbstrRight, SysStringLen(pbstrRight)) - 1; + TRACE("%ld\n", hres); + return hres; } /*

1 0

Juan Lang : kernel: Use the WinXP method for comparing strings with embedded NULLs. Update tests.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 22d7f141449a4981073b78d1c933a8cded0e7684 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22d7f141449a4981073b78d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Jun 21 14:53:45 2006 -0700 kernel: Use the WinXP method for comparing strings with embedded NULLs. Update tests. --- dlls/kernel/tests/locale.c | 14 ++++++++++++-- libs/unicode/sortkey.c | 5 ++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel/tests/locale.c b/dlls/kernel/tests/locale.c index c099930..d7c0eee 100644 --- a/dlls/kernel/tests/locale.c +++ b/dlls/kernel/tests/locale.c @@ -928,11 +928,21 @@ static void test_CompareStringA(void) ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10); ok(ret == 1, "aLuZkUtZ vs aLuZkUtZ\\0A expected 1, got %d\n", ret); + /* WinXP handles embedded NULLs differently than earlier versions */ ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ\0A", 10); - ok(ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0A expected 2, got %d\n", ret); + ok(ret == 1 || ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0A expected 1 or 2, got %d\n", ret); ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLu\0ZkUtZ", 8, "aLu\0ZkUtZ\0A", 10); - ok(ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 2, got %d\n", ret); + ok(ret == 1 || ret == 2, "aLu\\0ZkUtZ vs aLu\\0ZkUtZ\\0A expected 1 or 2, got %d\n", ret); + + ret = CompareStringA(lcid, 0, "a\0b", -1, "a", -1); + ok(ret == 2, "a vs a expected 2, got %d\n", ret); + + ret = CompareStringA(lcid, 0, "a\0b", 4, "a", 2); + ok(ret == 3, "a\\0b vs a expected 3, got %d\n", ret); + + ret = CompareStringA(lcid, 0, "\1\0\2", 4, "\1\0\1", 4); + todo_wine ok(ret != 2, "\\1\\0\\2 vs \\1\\0\\1 expected unequal\n"); } static void test_LCMapStringA(void) diff --git a/libs/unicode/sortkey.c b/libs/unicode/sortkey.c index 67c2e8d..17b5537 100644 --- a/libs/unicode/sortkey.c +++ b/libs/unicode/sortkey.c @@ -326,9 +326,8 @@ static inline int compare_case_weights(i static inline int real_length(const WCHAR *str, int len) { - int real_len = 0; - while (len-- && *str++) real_len++; - return real_len; + while (len && !str[len - 1]) len--; + return len; } int wine_compare_string(int flags, const WCHAR *str1, int len1,

1 0

Ivan Leo : quartz: Fix media type detection.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 16449744914a400f876fa24eb3829a6f01f08e5c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=16449744914a400f876fa24… Author: Ivan Leo <ivanleo(a)gmail.com> Date: Wed Jun 21 21:49:35 2006 +0100 quartz: Fix media type detection. --- dlls/quartz/filesource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 68ed1b9..a44ca36 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -82,14 +82,14 @@ static unsigned char byte_from_hex_char( case '7': case '8': case '9': - return wHex - '0'; + return (wHex - '0') & 0xf; case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': - return wHex - 'a' + 10; + return (wHex - 'a' + 10) & 0xf; default: return 0; }

1 0

Eric Pouech : dbghelp: Elf for wine and spec definitions.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 41ee9853f7954ccdc419ee2fedfd4ccdd5c54e81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=41ee9853f7954ccdc419ee2… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Jun 21 22:29:50 2006 +0200 dbghelp: Elf for wine and spec definitions. - fixed regression when looking for winebuild's special symbols in ELF symtab - STT_NOTYPE is still accepted as a valid symbol type (on top of STT_FUNC and STT_OBJECT) --- dlls/dbghelp/elf_module.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 508c89c..c1f8296 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -280,7 +280,8 @@ static void elf_hash_symtab(struct modul /* Ignore certain types of entries which really aren't of that much * interest. */ - if ((ELF32_ST_TYPE(symp->st_info) != STT_FILE && + if ((ELF32_ST_TYPE(symp->st_info) != STT_NOTYPE && + ELF32_ST_TYPE(symp->st_info) != STT_FILE && ELF32_ST_TYPE(symp->st_info) != STT_OBJECT && ELF32_ST_TYPE(symp->st_info) != STT_FUNC) || symp->st_shndx == SHN_UNDEF) @@ -549,6 +550,9 @@ static int elf_new_wine_thunks(struct mo ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL, addr, ste->symp->st_size, NULL); break; + case STT_NOTYPE: + /* at least winebuild specific symbols */ + break; default: FIXME("Shouldn't happen\n"); break; @@ -608,10 +612,11 @@ static int elf_new_public_symbols(struct hash_table_iter_init(symtab, &hti, NULL); while ((ste = hash_table_iter_up(&hti))) { - symt_new_public(module, ste->compiland, ste->ht_elt.name, - module->elf_info->elf_addr + ste->symp->st_value, - ste->symp->st_size, TRUE /* FIXME */, - ELF32_ST_TYPE(ste->symp->st_info) == STT_FUNC); + if (ELF32_ST_TYPE(ste->symp->st_info) != STT_NOTYPE) + symt_new_public(module, ste->compiland, ste->ht_elt.name, + module->elf_info->elf_addr + ste->symp->st_value, + ste->symp->st_size, TRUE /* FIXME */, + ELF32_ST_TYPE(ste->symp->st_info) == STT_FUNC); } return TRUE; }

1 0

Detlef Riekenberg : Makefile.in: Add target "ctags" to the overview.
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 5e5a8df970a2fe132f7eb405453c9228076bc881 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5e5a8df970a2fe132f7eb40… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 21 21:43:00 2006 +0200 Makefile.in: Add target "ctags" to the overview. --- Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index c1348e6..02fd676 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,6 +11,7 @@ # install-dev: install development e # install: install everything # uninstall: uninstall everything # depend: create the dependencies +# ctags: create a tags file for vim and others. # etags: create a TAGS file for Emacs. # manpages: compile manpages for Wine API # htmlpages: compile html pages for Wine API

1 0

Detlef Riekenberg : DEVELOPER-HINTS: Some directories where added / renamed .
by Alexandre Julliard 22 Jun '06

22 Jun '06

Module: wine Branch: refs/heads/master Commit: 0ef3da030067606a9fbfb5b108bcd37b29b2b379 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ef3da030067606a9fbfb5b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jun 21 21:04:25 2006 +0200 DEVELOPER-HINTS: Some directories where added / renamed. --- DEVELOPERS-HINTS | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index c329936..d0436b0 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -28,6 +28,7 @@ DLLs (under dlls/): comcat/ - Component category manager comctl32/ - Common controls comdlg32/ - Common dialog boxes (both 16 & 32 bit) + compstui/ - Common Property Sheet User Interface crtdll/ - Old C runtime library crypt32/ - Cryptography cryptdll/ - Cryptography Manager @@ -66,12 +67,14 @@ DLLs (under dlls/): glut32/ - OpenGL Utility Toolkit gphoto2.ds/ - Contains libgphoto2 based TWAIN datasource driver hhctrl.ocx/ - HHCTRL OCX implementation + hlink/ - Microsoft Hyperlink Library iccvid/ - Radius Cinepak Video Decoder icmp/ - ICMP protocol (networking) ifsmgr.vxd/ - IFSMGR VxD implementation imaadp32.acm/ - IMA ADPCM Audio Codec imagehlp/ - PE (Portable Executable) Image Helper lib imm32/ - Input Method Manager + inseng/ - Install engine iphlpapi/ - IP Helper API itss/ - Infotech Structured Storage (HTML Help) kernel/ - The Windows kernel @@ -155,6 +158,7 @@ DLLs (under dlls/): url/ - Internet shortcut shell extension urlmon/ - URL Moniker allows binding to a URL user/ - Window management, standard controls, etc. + userenv/ - User - Environment and Policy Management usp10/ - Uniscribe Script Processor uxtheme/ - Theme library vdhcp.vxd/ - VDHCP VxD implementation @@ -170,12 +174,14 @@ DLLs (under dlls/): winedos/ - DOS features and BIOS calls (Wine specific) winemp3.acm/ - Mpeg Layer 3 Audio Codec wineps.drv/ - Postscript driver (Wine specific) + winex11.drv/ - X11 display driver (Wine specific) wininet/ - Internet extensions winmm/ - Multimedia (16 & 32 bit) winmm/joystick/ - Joystick driver winmm/winealsa/ - ALSA audio driver winmm/winearts/ - aRts audio driver winmm/wineaudioio/ - audioio audio driver + winmm/winecoreaudio/ - CoreAudio audio driver (MacOS) winmm/winejack/ - JACK audio server driver winmm/winenas/ - NAS audio driver winmm/wineoss/ - OSS audio driver @@ -189,7 +195,6 @@ DLLs (under dlls/): ws2_32/ - Sockets 2.0 (networking) wsock32/ - Sockets 1.1 (networking) wtsapi32/ - Terminal Services - x11drv/ - X11 display driver (Wine specific) Winelib programs (under programs/): ----------------------------------- @@ -205,6 +210,7 @@ Winelib programs (under programs/): iexplore/ - Internet Explorer replacement msiexec/ - Microsoft Installer frontend notepad/ - Notepad replacement + oleview/ - OLE/COM Object Viewer progman/ - Program manager regedit/ - Registry editor regsvr32/ - Register COM server @@ -241,6 +247,7 @@ Support programs, libraries, etc: dlls/uuid/ - Windows-compatible UUID import lib documentation/ - some documentation include/ - Windows standard includes + include/ddk/ - Windows DDK compatible headers include/msvcrt/ - MSVC compatible libc headers include/wine/ - Wine specific headers libs/ - the Wine libraries

1 0