October 2007 - Wine-Commits

Dan Hipschman : widl: Make structs containing user types bogus; fix square_test_us test failure.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: d00ff2ed58a0ca17354fcc3072fede626821e6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00ff2ed58a0ca17354fcc307… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Oct 5 13:52:20 2007 -0700 widl: Make structs containing user types bogus; fix square_test_us test failure. --- dlls/rpcrt4/tests/server.c | 2 +- tools/widl/parser.y | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 7db9202..55da875 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -698,7 +698,7 @@ pointer_tests(void) ok(test_list_length(list) == 3, "RPC test_list_length\n"); ok(square_puint(p1) == 121, "RPC square_puint\n"); - todo_wine ok(square_test_us(&tus) == 121, "RPC square_test_us\n"); + ok(square_test_us(&tus) == 121, "RPC square_test_us\n"); pa[0] = &a[0]; pa[1] = &a[1]; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8799e89..ae7f8f1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1740,6 +1740,9 @@ static int get_struct_type(var_list_t *fields) { type_t *t = field->type; + if (is_user_type(t)) + return RPC_FC_BOGUS_STRUCT; + if (is_ptr(t)) { do

1 0

Dan Hipschman : rpcrt4/tests: Make server.idl compatible with MIDL.
by Alexandre Julliard Oct. 9, 2007

Oct. 9, 2007

Module: wine Branch: master Commit: e0b209815ddd31c95de8f4b5e6fd06cd0f28e858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b209815ddd31c95de8f4b5e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Oct 5 13:50:54 2007 -0700 rpcrt4/tests: Make server.idl compatible with MIDL. --- dlls/rpcrt4/tests/server.idl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index d8a1ca3..69ae1d6 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -29,7 +29,9 @@ typedef struct tag_vector [ uuid(00000000-4114-0704-2301-000000000000), +#ifndef __midl implicit_handle(handle_t IServer_IfHandle) +#endif ] interface IServer {

1 0

Alexander Nicolaysen Sørnes : objectManager: Add object caching support
by Chris Morgan Oct. 8, 2007

Oct. 8, 2007

Module: appdb Branch: master Commit: c95da59dd1823947a1e0a18e74cef0ec36d6d1d4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c95da59dd1823947a1e0a18e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 8 11:43:24 2007 +0200 objectManager: Add object caching support --- include/objectManager.php | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 807824b..48366e5 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -15,11 +15,36 @@ class ObjectManager private $sReturnTo; private $oMultiPage; private $oTableRow; + private $oObject; /* Store an instance of the object of the class + we are working with. This is useful if + we are calling object functions which modify + the object without storing it in the database, + and then call objectManager functions which + operate on the object, such as in processForm + where we first run the object's getOutputEditorValues() + and then objectManager's delete_entry(). */ // an array of common responses used when replying to // queued entries private $aCommonResponses; + /* Get an instance of the object of the class we are working with */ + private function getObject() + { + if(!$this->oObject) + $this->oObject = new $this->sClass($this->iId); + + return $this->oObject; + } + + private function setId($iId) + { + $this->iId = $iId; + + if($this->oObject) + $this->oObject = new $this->sClass($this->iId); + } + public function getClass() { return $this->sClass; @@ -466,7 +491,7 @@ class ObjectManager { $this->checkMethods(array("delete", "canEdit")); - $oObject = new $this->sClass($this->iId); + $oObject = $this->getObject(); if(!$oObject->objectGetId()) return FALSE; @@ -933,6 +958,11 @@ class ObjectManager break; case "Delete": + /* Heere we call an objectManager function instead + of a function of the object's class. Thus we + need to store the object so changes in + getOutputEditorValues() are caught. */ + $this->oObject = $oObject; $this->delete_entry($aClean['sReplyText']); break;

1 0

Jeremy Newman : use TT instead of CODE here
by Jeremy Newman Oct. 6, 2007

Oct. 6, 2007

Module: website Branch: master Commit: 5654765a5bade702fe7eaba8aca025024d1124dc URL: http://source.winehq.org/git/website.git/?a=commit;h=5654765a5bade702fe7eab… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Sat Oct 6 08:27:21 2007 -0500 use TT instead of CODE here --- templates/en/resources.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/resources.template b/templates/en/resources.template index 5c2c763..c11ec16 100644 --- a/templates/en/resources.template +++ b/templates/en/resources.template @@ -82,7 +82,7 @@ <ul> <li><a href="http://www.accu.org/resources/public/terse/cpp.htm">C/C++ Resources</a> From the Association of C & C++ Users. <li><a href="http://www.lysator.liu.se/c/">Programming in C</a> Standards, suggestions, and trivia. - If you're curious about Unicode and <code><wctype.h></code>, + If you're curious about Unicode and <tt><wctype.h></tt>, see <a href="http://www.lysator.liu.se/c/na1.html">Normative Addendum 1</a>. </ul>

1 0

Juan Lang : crypt32: Add tests for CertGetValidUsages.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 9abd47ca7ac78e996a15edd77c6927106d2714be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abd47ca7ac78e996a15edd77… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 15:29:08 2007 -0700 crypt32: Add tests for CertGetValidUsages. --- dlls/crypt32/tests/cert.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index d0cac68..879438b 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2211,6 +2211,146 @@ static void testKeyUsage(void) } } +static const BYTE cert2WithUsage[] = { +0x30,0x81,0x89,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31,0x13,0x30, +0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61, +0x6e,0x67,0x00,0x30,0x22,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31,0x30,0x31, +0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x18,0x0f,0x31,0x36,0x30,0x31,0x30,0x31, +0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x15,0x31,0x13,0x30,0x11, +0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75,0x61,0x6e,0x20,0x4c,0x61,0x6e, +0x67,0x00,0x30,0x07,0x30,0x02,0x06,0x00,0x03,0x01,0x00,0xa3,0x25,0x30,0x23, +0x30,0x21,0x06,0x03,0x55,0x1d,0x25,0x01,0x01,0xff,0x04,0x17,0x30,0x15,0x06, +0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x03,0x02,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x01 }; + +static void testGetValidUsages(void) +{ + static const LPCSTR expectedOIDs[] = { + "1.3.6.1.5.5.7.3.3", + "1.3.6.1.5.5.7.3.2", + "1.2.840.113549.1.1.1", + }; + static const LPCSTR expectedOIDs2[] = { + "1.3.6.1.5.5.7.3.2", + "1.2.840.113549.1.1.1", + }; + BOOL ret; + int numOIDs; + DWORD size; + LPSTR *oids = NULL; + PCCERT_CONTEXT contexts[3]; + + /* Crash + ret = CertGetValidUsages(0, NULL, NULL, NULL, NULL); + ret = CertGetValidUsages(0, NULL, NULL, NULL, &size); + */ + contexts[0] = NULL; + numOIDs = size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CertGetValidUsages(1, &contexts[0], &numOIDs, NULL, &size); + ok(ret, "CertGetValidUsages failed: %d\n", GetLastError()); + ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); + ok(size == 0, "Expected size 0, got %d\n", size); + contexts[0] = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, + sizeof(bigCert)); + contexts[1] = CertCreateCertificateContext(X509_ASN_ENCODING, certWithUsage, + sizeof(certWithUsage)); + contexts[2] = CertCreateCertificateContext(X509_ASN_ENCODING, + cert2WithUsage, sizeof(cert2WithUsage)); + numOIDs = size = 0xdeadbeef; + ret = CertGetValidUsages(0, NULL, &numOIDs, NULL, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); + ok(size == 0, "Expected size 0, got %d\n", size); + numOIDs = size = 0xdeadbeef; + ret = CertGetValidUsages(1, contexts, &numOIDs, NULL, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); + ok(size == 0, "Expected size 0, got %d\n", size); + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, NULL, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + ok(numOIDs == 3, "Expected 3, got %d\n", numOIDs); + ok(size, "Expected non-zero size\n"); + oids = HeapAlloc(GetProcessHeap(), 0, size); + if (oids) + { + int i; + DWORD smallSize = 1; + + SetLastError(0xdeadbeef); + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, oids, &smallSize); + ok(!ret && GetLastError() == ERROR_MORE_DATA, + "Expected ERROR_MORE_DATA, got %d\n", GetLastError()); + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, oids, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + for (i = 0; i < numOIDs; i++) + ok(!lstrcmpA(oids[i], expectedOIDs[i]), "unexpected OID %s\n", + oids[i]); + HeapFree(GetProcessHeap(), 0, oids); + } + numOIDs = size = 0xdeadbeef; + /* Oddly enough, this crashes when the number of contexts is not 1: + ret = CertGetValidUsages(2, contexts, &numOIDs, NULL, &size); + * but setting size to 0 allows it to succeed: + */ + size = 0; + ret = CertGetValidUsages(2, contexts, &numOIDs, NULL, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + ok(numOIDs == 3, "Expected 3, got %d\n", numOIDs); + ok(size, "Expected non-zero size\n"); + oids = HeapAlloc(GetProcessHeap(), 0, size); + if (oids) + { + int i; + + ret = CertGetValidUsages(1, &contexts[1], &numOIDs, oids, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + for (i = 0; i < numOIDs; i++) + ok(!lstrcmpA(oids[i], expectedOIDs[i]), "unexpected OID %s\n", + oids[i]); + HeapFree(GetProcessHeap(), 0, oids); + } + numOIDs = 0xdeadbeef; + size = 0; + ret = CertGetValidUsages(1, &contexts[2], &numOIDs, NULL, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + ok(numOIDs == 2, "Expected 2, got %d\n", numOIDs); + ok(size, "Expected non-zero size\n"); + oids = HeapAlloc(GetProcessHeap(), 0, size); + if (oids) + { + int i; + + ret = CertGetValidUsages(1, &contexts[2], &numOIDs, oids, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + for (i = 0; i < numOIDs; i++) + ok(!lstrcmpA(oids[i], expectedOIDs2[i]), "unexpected OID %s\n", + oids[i]); + HeapFree(GetProcessHeap(), 0, oids); + } + numOIDs = 0xdeadbeef; + size = 0; + ret = CertGetValidUsages(3, contexts, &numOIDs, NULL, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + ok(numOIDs == 2, "Expected 2, got %d\n", numOIDs); + ok(size, "Expected non-zero size\n"); + oids = HeapAlloc(GetProcessHeap(), 0, size); + if (oids) + { + int i; + + ret = CertGetValidUsages(3, contexts, &numOIDs, oids, &size); + ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); + for (i = 0; i < numOIDs; i++) + ok(!lstrcmpA(oids[i], expectedOIDs2[i]), "unexpected OID %s\n", + oids[i]); + HeapFree(GetProcessHeap(), 0, oids); + } + CertFreeCertificateContext(contexts[0]); + CertFreeCertificateContext(contexts[1]); + CertFreeCertificateContext(contexts[2]); +} + static void testCompareCertName(void) { static BYTE bogus[] = { 1, 2, 3, 4 }; @@ -2788,6 +2928,7 @@ START_TEST(cert) testSignAndEncodeCert(); testCreateSelfSignCert(); testKeyUsage(); + testGetValidUsages(); testCompareCertName(); testCompareIntegerBlob(); testComparePublicKeyInfo();

1 0

Aric Stewart : msdmo: Implement DMOGetTypes.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 54720c78f7e0f60490ecca099ce5b65370621c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54720c78f7e0f60490ecca099… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 3 14:51:10 2007 -0500 msdmo: Implement DMOGetTypes. --- dlls/msdmo/dmoreg.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 118 insertions(+), 7 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index ff0440a..8dd2592 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -76,6 +76,12 @@ static const WCHAR szCat2Fmt[] = '%','s','\\','%','s',0 }; +static const WCHAR szToGuidFmt[] = +{ + '{','%','s','}',0 +}; + + typedef struct { const IEnumDMOVtbl *lpVtbl; @@ -439,6 +445,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( FILETIME ft; HKEY hkey; WCHAR szNextKey[MAX_PATH]; + WCHAR szGuidKey[64]; WCHAR szKey[MAX_PATH]; WCHAR szValue[MAX_PATH]; DWORD len; @@ -447,7 +454,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( IEnumDMOImpl *This = (IEnumDMOImpl *)iface; - TRACE("%d\n", cItemsToFetch); + TRACE("--> (%p) %d %p %p %p\n", iface, cItemsToFetch, pCLSID, Names, pcItemsFetched); if (!pCLSID || !Names || !pcItemsFetched) return E_POINTER; @@ -556,7 +563,8 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (Names[count]) strcmpW(Names[count], szValue); } - CLSIDFromString(szNextKey, &pCLSID[count]); + wsprintfW(szGuidKey,szToGuidFmt,szNextKey); + CLSIDFromString(szGuidKey, &pCLSID[count]); TRACE("found match %s %s\n", debugstr_w(szValue), debugstr_w(szNextKey)); RegCloseKey(hkey); @@ -567,6 +575,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (*pcItemsFetched < cItemsToFetch) hres = S_FALSE; + TRACE("<-- %i found\n",count); return hres; } @@ -650,11 +659,113 @@ static const IEnumDMOVtbl edmovt = }; -HRESULT WINAPI DMOGetTypes(REFCLSID a, ULONG b, ULONG* c, - DMO_PARTIAL_MEDIATYPE* d, ULONG e, - ULONG* f, DMO_PARTIAL_MEDIATYPE* g) +HRESULT build_types(HKEY root, LPCWSTR key, ULONG *supplied, ULONG requested, DMO_PARTIAL_MEDIATYPE* types ) { - FIXME("(%p,%u,%p,%p,%u,%p,%p),stub!\n",a,b,c,d,e,f,g); + HRESULT ret = S_OK; + HKEY hkey; + WCHAR szGuidKey[64]; - return E_NOTIMPL; + *supplied = 0; + if (ERROR_SUCCESS == RegOpenKeyExW(root, key, 0, KEY_READ, &hkey)) + { + int index = 0; + WCHAR szNextKey[MAX_PATH]; + DWORD len; + LONG rc = ERROR_SUCCESS; + + len = MAX_PATH; + while (rc == ERROR_SUCCESS) + { + len = MAX_PATH; + rc = RegEnumKeyExW(hkey, index, szNextKey, &len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + HKEY subk; + int sub_index = 0; + LONG rcs = ERROR_SUCCESS; + WCHAR szSubKey[MAX_PATH]; + + RegOpenKeyExW(hkey, szNextKey, 0, KEY_READ, &subk); + while (rcs == ERROR_SUCCESS) + { + len = MAX_PATH; + rcs = RegEnumKeyExW(subk, sub_index, szSubKey, &len, NULL, NULL, NULL, NULL); + if (rcs == ERROR_SUCCESS) + { + if (*supplied >= requested) + { + /* Bailing */ + ret = S_FALSE; + rc = ERROR_MORE_DATA; + rcs = ERROR_MORE_DATA; + break; + } + + wsprintfW(szGuidKey,szToGuidFmt,szNextKey); + CLSIDFromString(szGuidKey, &types[*supplied].type); + wsprintfW(szGuidKey,szToGuidFmt,szSubKey); + CLSIDFromString(szGuidKey, &types[*supplied].subtype); + TRACE("Adding type %s subtype %s at index %i\n", + debugstr_guid(&types[*supplied].type), + debugstr_guid(&types[*supplied].subtype), + *supplied); + (*supplied)++; + } + sub_index++; + } + index++; + } + } + RegCloseKey(hkey); + } + return ret; +} + + +HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO, + ULONG ulInputTypesRequested, + ULONG* pulInputTypesSupplied, + DMO_PARTIAL_MEDIATYPE* pInputTypes, + ULONG ulOutputTypesRequested, + ULONG* pulOutputTypesSupplied, + DMO_PARTIAL_MEDIATYPE* pOutputTypes) +{ + HKEY root,hkey; + HRESULT ret = S_OK; + WCHAR szguid[64]; + + TRACE ("(%s,%u,%p,%p,%u,%p,%p),stub!\n", debugstr_guid(clsidDMO), + ulInputTypesRequested, pulInputTypesSupplied, pInputTypes, + ulOutputTypesRequested, pulOutputTypesSupplied, pOutputTypes); + + if (ERROR_SUCCESS != RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, + KEY_READ, &root)) + return E_FAIL; + + if (ERROR_SUCCESS != RegOpenKeyExW(root,GUIDToString(szguid,clsidDMO) , 0, + KEY_READ, &hkey)) + { + RegCloseKey(root); + return E_FAIL; + } + + if (ulInputTypesRequested > 0) + { + ret = build_types(hkey, szDMOInputType, pulInputTypesSupplied, ulInputTypesRequested, pInputTypes ); + } + else + *pulInputTypesSupplied = 0; + + if (ulOutputTypesRequested > 0) + { + HRESULT ret2; + ret2 = build_types(hkey, szDMOOutputType, pulOutputTypesSupplied, ulOutputTypesRequested, pOutputTypes ); + + if (ret == S_OK) + ret = ret2; + } + else + *pulOutputTypesSupplied = 0; + + return ret; }

1 0

Juan Lang : crypt32: Don't assume a maximum of 32 valid usages.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 75c13b8e5d6737a379799d054607b3807f7448d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c13b8e5d6737a379799d054… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 16:12:41 2007 -0700 crypt32: Don't assume a maximum of 32 valid usages. --- dlls/crypt32/cert.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9697ab8..dcad7fa 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1922,6 +1922,42 @@ BOOL WINAPI CertRemoveEnhancedKeyUsageIdentifier(PCCERT_CONTEXT pCertContext, return ret; } +struct BitField +{ + DWORD cIndexes; + DWORD *indexes; +}; + +#define BITS_PER_DWORD (sizeof(DWORD) * 8) + +static void CRYPT_SetBitInField(struct BitField *field, DWORD bit) +{ + DWORD indexIndex = bit / BITS_PER_DWORD; + + if (indexIndex + 1 > field->cIndexes) + { + if (field->cIndexes) + field->indexes = CryptMemRealloc(field->indexes, + (indexIndex + 1) * sizeof(DWORD)); + else + field->indexes = CryptMemAlloc(sizeof(DWORD)); + if (field->indexes) + field->cIndexes = indexIndex + 1; + } + if (field->indexes) + field->indexes[indexIndex] |= 1 << (bit % BITS_PER_DWORD); +} + +static BOOL CRYPT_IsBitInFieldSet(struct BitField *field, DWORD bit) +{ + BOOL set = FALSE; + DWORD indexIndex = bit / BITS_PER_DWORD; + + assert(field->cIndexes); + set = field->indexes[indexIndex] & (1 << (bit % BITS_PER_DWORD)); + return set; +} + BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, int *cNumOIDs, LPSTR *rghOIDs, DWORD *pcbOIDs) { @@ -1978,7 +2014,8 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, } else { - DWORD j, k, validIndexes = 0, numRemoved = 0; + struct BitField validIndexes = { 0, NULL }; + DWORD j, k, numRemoved = 0; /* Merge: build a bitmap of all the indexes of * validUsages.rgpszUsageIdentifier that are in pUsage. @@ -1990,7 +2027,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, if (!strcmp(pUsage->rgpszUsageIdentifier[j], validUsages.rgpszUsageIdentifier[k])) { - validIndexes |= (1 << k); + CRYPT_SetBitInField(&validIndexes, k); break; } } @@ -2000,7 +2037,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, */ for (j = 0; j < validUsages.cUsageIdentifier; j++) { - if (!(validIndexes & (1 << j))) + if (!CRYPT_IsBitInFieldSet(&validIndexes, j)) { if (j < validUsages.cUsageIdentifier - 1) { @@ -2019,6 +2056,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, validUsages.cUsageIdentifier--; } } + CryptMemFree(validIndexes.indexes); } } CryptMemFree(pUsage);

1 0

Dan Kegel : msvcrt: Improve CR CR LF handling.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: 4cd3a16f181b30ffa0a1099d6d676c413b25cc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cd3a16f181b30ffa0a1099d6… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 4 20:43:31 2007 -0700 msvcrt: Improve CR CR LF handling. --- dlls/msvcrt/file.c | 17 ++++++++++++----- dlls/msvcrt/tests/file.c | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4ceae0b..b878781 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1639,15 +1639,21 @@ int CDECL _rmtmp(void) /********************************************************************* * (internal) remove_cr * - * Remove all \r inplace. + * Translate all \r\n to \n inplace. * return the number of \r removed + * Corner cases required by some apps: + * \r\r\n -> \r\n + * BUG: should save state across calls somehow, so CR LF that + * straddles buffer boundary gets recognized properly? */ static unsigned int remove_cr(char *buf, unsigned int count) { unsigned int i, j; - for (i = 0; i < count; i++) if (buf[i] == '\r') break; - for (j = i + 1; j < count; j++) if (buf[j] != '\r') buf[i++] = buf[j]; + for (i=0, j=0; j < count; j++) + if ((buf[j] != '\r') || ((j+1) < count && buf[j+1] != '\n')) + buf[i++] = buf[j]; + return count - i; } @@ -2210,8 +2216,9 @@ int CDECL MSVCRT_fgetc(MSVCRT_FILE* file) j = *i; } else j = MSVCRT__filbuf(file); - if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) || (j != '\r')) - return j; + if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) + || ((j != '\r') || (file->_cnt && ((char *)file->_ptr)[0] != '\n'))) + return j; } while(1); } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index bdf0d0a..4a311e4 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -271,6 +271,23 @@ static void test_readmode( BOOL ascii_mode ) unlink ("fdopen.tst"); } +static void test_asciimode(void) +{ + FILE *fp; + char buf[64]; + + /* Simple test of CR CR LF handling. Test both fgets and fread code paths, they're different! */ + fp = fopen("ascii.tst", "wb"); + fputs("\r\r\n", fp); + fclose(fp); + fp = fopen("ascii.tst", "rt"); + ok(fgets(buf, sizeof(buf), fp) != NULL, "fgets\n"); + ok(0 == strcmp(buf, "\r\n"), "CR CR LF not read as CR LF\n"); + rewind(fp); + ok((fread(buf, 1, sizeof(buf), fp) == 2) && (0 == strcmp(buf, "\r\n")), "CR CR LF not read as CR LF\n"); + fclose(fp); + unlink("ascii.tst"); +} static WCHAR* AtoW( const char* p ) { @@ -996,6 +1013,7 @@ START_TEST(file) test_fdopen(); test_fopen_fclose_fcloseall(); test_fileops(); + test_asciimode(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ test_fgetc();

1 0

Juan Lang : crypt32: Reduce valid usages count when removing a valid usage.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: f8e830a253169659a032efd0b1f3729bc56d286f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e830a253169659a032efd0b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 15:28:46 2007 -0700 crypt32: Reduce valid usages count when removing a valid usage. --- dlls/crypt32/cert.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ce9c2f5..9697ab8 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -2012,6 +2012,7 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, cbOIDs -= lstrlenA( validUsages.rgpszUsageIdentifier[j]) + 1 + sizeof(LPSTR); + validUsages.cUsageIdentifier--; numRemoved++; } else

1 0

Juan Lang : crypt32: Don't set ret to FALSE when it isn't checked.
by Alexandre Julliard Oct. 5, 2007

Oct. 5, 2007

Module: wine Branch: master Commit: b5531163a902134a9cddd838f565dd476cfba5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5531163a902134a9cddd838f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 4 15:22:43 2007 -0700 crypt32: Don't set ret to FALSE when it isn't checked. --- dlls/crypt32/cert.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 486ba5b..ce9c2f5 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1975,8 +1975,6 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, nextOID += lstrlenA(nextOID) + 1; } } - else - ret = FALSE; } else { @@ -2024,8 +2022,6 @@ BOOL WINAPI CertGetValidUsages(DWORD cCerts, PCCERT_CONTEXT *rghCerts, } CryptMemFree(pUsage); } - else - ret = FALSE; } } ret = TRUE;

1 0