December 2009 - Wine-Commits

Juan Lang : crypt32/tests: Don' t pass as a parameter a variable that could be local.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: cdbf6e86145233186bd1243587874fbbb4edc65f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbf6e86145233186bd124358… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sat Dec 5 15:42:06 2009 -0800 crypt32/tests: Don't pass as a parameter a variable that could be local. --- dlls/crypt32/tests/cert.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 0566797..d3b362c 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1639,16 +1639,16 @@ static void verifySig(HCRYPTPROV csp, const BYTE *toSign, size_t toSignLen, /* Tests signing the certificate described by toBeSigned with the CSP passed in, * using the algorithm with OID sigOID. The CSP is assumed to be empty, and a - * keyset named AT_SIGNATURE will be added to it. The signing key will be - * stored in *key, and the signature will be stored in sig. sigLen should be - * at least 64 bytes. + * keyset named AT_SIGNATURE will be added to it. The signature will be stored + * in sig. sigLen should be at least 64 bytes. */ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, - LPCSTR sigOID, HCRYPTKEY *key, BYTE *sig, DWORD *sigLen) + LPCSTR sigOID, BYTE *sig, DWORD *sigLen) { BOOL ret; DWORD size = 0; CRYPT_ALGORITHM_IDENTIFIER algoID = { NULL, { 0, NULL } }; + HCRYPTKEY key; /* These all crash ret = CryptSignCertificate(0, 0, 0, NULL, 0, NULL, NULL, NULL, NULL); @@ -1680,7 +1680,7 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, ok(!ret && (GetLastError() == NTE_BAD_KEYSET || GetLastError() == NTE_NO_KEY), "Expected NTE_BAD_KEYSET or NTE_NO_KEY, got %08x\n", GetLastError()); - ret = CryptGenKey(csp, AT_SIGNATURE, 0, key); + ret = CryptGenKey(csp, AT_SIGNATURE, 0, &key); ok(ret, "CryptGenKey failed: %08x\n", GetLastError()); if (ret) { @@ -1700,6 +1700,7 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned, size); } } + CryptDestroyKey(key); } } @@ -1809,7 +1810,6 @@ static void testCertSigs(void) HCRYPTPROV csp; CRYPT_DATA_BLOB toBeSigned = { sizeof(emptyCert), emptyCert }; BOOL ret; - HCRYPTKEY key; BYTE sig[64]; DWORD sigSize = sizeof(sig); @@ -1820,10 +1820,9 @@ static void testCertSigs(void) CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContext failed: %08x\n", GetLastError()); - testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, &key, sig, &sigSize); + testSignCert(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, &sigSize); testVerifyCertSig(csp, &toBeSigned, szOID_RSA_SHA1RSA, sig, sigSize); - CryptDestroyKey(key); CryptReleaseContext(csp, 0); ret = pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_DELETEKEYSET);

1 0

James Hawkins : msi: The second parameter to Installer. OpenPackage is optional, so set a default value of 0 if the parameter is not provided.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 25ab6930089940f2b88d92b5755c8fa46033484e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ab6930089940f2b88d92b57… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:17:12 2009 -0800 msi: The second parameter to Installer.OpenPackage is optional, so set a default value of 0 if the parameter is not provided. --- dlls/msi/automation.c | 17 +++++++++++++---- dlls/msi/tests/automation.c | 4 ++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index baf406d..3b3aa8f 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1591,11 +1591,20 @@ static HRESULT WINAPI InstallerImpl_Invoke( return DISP_E_TYPEMISMATCH; hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); - if (FAILED(hr)) + if (pDispParams->cArgs == 2) { - VariantClear(&varg0); - return hr; + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) + { + VariantClear(&varg0); + return hr; + } + } + else + { + VariantInit(&varg1); + V_VT(&varg1) = VT_I4; + V_I4(&varg1) = 0; } V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 90a8ebf..6c24908 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -721,7 +721,7 @@ static void test_dispatch(void) V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(szMsifile); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); + todo_wine ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); ok_exception(hr, szOpenPackageException); VariantClear(&vararg[0]); @@ -733,7 +733,7 @@ static void test_dispatch(void) V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(path); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - todo_wine ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); + ok(hr == S_OK, "IDispatch::Invoke returned 0x%08x\n", hr); VariantClear(&vararg[0]); VariantClear(&varresult);

1 0

Huw Davies : winhttp: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 24b437942ef92396f14d693c795c8c54a214d006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b437942ef92396f14d693c7… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Dec 5 11:41:48 2009 +0000 winhttp: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 3ed3b1b..21b1966 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -115,7 +115,6 @@ MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( SSL_CTX_set_verify ); -MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( BIO_new_fp ); MAKE_FUNCPTR( CRYPTO_num_locks ); @@ -123,6 +122,7 @@ MAKE_FUNCPTR( CRYPTO_set_id_callback ); MAKE_FUNCPTR( CRYPTO_set_locking_callback ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); +MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( i2d_X509 ); #undef MAKE_FUNCPTR @@ -423,7 +423,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_get_peer_certificate ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); LOAD_FUNCPTR( SSL_CTX_set_verify ); - LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); #undef LOAD_FUNCPTR #define LOAD_FUNCPTR(x) \ @@ -440,6 +439,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( CRYPTO_set_locking_callback ); LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); + LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); LOAD_FUNCPTR( i2d_X509 ); #undef LOAD_FUNCPTR

1 0

Juan Lang : winhttp: Use sk_ functions rather than accessing an OpenSSL stack type directly.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: a5facc9bdab28987560e70463aa9706eb9735fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5facc9bdab28987560e70463… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 4 16:41:53 2009 -0800 winhttp: Use sk_ functions rather than accessing an OpenSSL stack type directly. --- dlls/winhttp/net.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 21b1966..ea1afd3 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -124,6 +124,8 @@ MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); MAKE_FUNCPTR( i2d_X509 ); +MAKE_FUNCPTR( sk_value ); +MAKE_FUNCPTR( sk_num ); #undef MAKE_FUNCPTR static CRITICAL_SECTION *ssl_locks; @@ -339,11 +341,11 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx ) PCCERT_CONTEXT endCert = NULL; ret = TRUE; - for (i = 0; ret && i < ctx->chain->num; i++) + for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) { PCCERT_CONTEXT context; - cert = (X509 *)ctx->chain->data[i]; + cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); if ((context = X509_to_cert_context( cert ))) { if (i == 0) @@ -441,6 +443,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); LOAD_FUNCPTR( i2d_X509 ); + LOAD_FUNCPTR( sk_value ); + LOAD_FUNCPTR( sk_num ); #undef LOAD_FUNCPTR pSSL_library_init();

1 0

James Hawkins : oleaut32: Report the parameter index for any failure in DispGetParam.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 89b2cde891e6316cd1bef7c4c28396a575f4aced URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b2cde891e6316cd1bef7c4c… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Dec 4 17:15:11 2009 -0800 oleaut32: Report the parameter index for any failure in DispGetParam. --- dlls/oleaut32/dispatch.c | 36 +++++++++++++++++++++++++----------- dlls/oleaut32/tests/dispatch.c | 27 ++++++--------------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 5d96bfb..ed3fad4 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -131,16 +131,13 @@ HRESULT WINAPI DispGetParam( TRACE("position=%d, cArgs=%d, cNamedArgs=%d\n", position, pdispparams->cArgs, pdispparams->cNamedArgs); - if (pdispparams->cArgs > 0 && !pdispparams->rgvarg) - return E_INVALIDARG; - - if (!pvarResult) - return E_INVALIDARG; - - if (position < pdispparams->cArgs) { + if (position < pdispparams->cArgs) + { /* positional arg? */ pos = pdispparams->cArgs - position - 1; - } else { + } + else + { /* FIXME: is this how to handle named args? */ for (pos=0; pos<pdispparams->cNamedArgs; pos++) if (pdispparams->rgdispidNamedArgs[pos] == position) break; @@ -148,10 +145,27 @@ HRESULT WINAPI DispGetParam( if (pos==pdispparams->cNamedArgs) return DISP_E_PARAMNOTFOUND; } + + if (pdispparams->cArgs > 0 && !pdispparams->rgvarg) + { + hr = E_INVALIDARG; + goto done; + } + + if (!pvarResult) + { + hr = E_INVALIDARG; + goto done; + } + hr = VariantChangeType(pvarResult, &pdispparams->rgvarg[pos], 0, vtTarg); - if (hr == DISP_E_TYPEMISMATCH) *puArgErr = pos; + +done: + if (FAILED(hr)) + *puArgErr = pos; + return hr; } @@ -241,8 +255,8 @@ static HRESULT WINAPI StdDispatch_QueryInterface( IsEqualIID(riid, &IID_IUnknown)) { *ppvObject = This; - IUnknown_AddRef((LPUNKNOWN)*ppvObject); - return S_OK; + IUnknown_AddRef((LPUNKNOWN)*ppvObject); + return S_OK; } return E_NOINTERFACE; } diff --git a/dlls/oleaut32/tests/dispatch.c b/dlls/oleaut32/tests/dispatch.c index fb1e310..c81210f 100644 --- a/dlls/oleaut32/tests/dispatch.c +++ b/dlls/oleaut32/tests/dispatch.c @@ -103,11 +103,8 @@ void test_DispGetParam(void) INIT_DISPPARAMS(dispparams, NULL, NULL, 0, 0); err_index = 0xdeadbeef; hr = DispGetParam(&dispparams, 0, VT_I2, NULL, &err_index); - todo_wine - { - ok(hr == DISP_E_PARAMNOTFOUND, - "Expected DISP_E_PARAMNOTFOUND, got %08x\n", hr); - } + ok(hr == DISP_E_PARAMNOTFOUND, + "Expected DISP_E_PARAMNOTFOUND, got %08x\n", hr); ok(err_index == 0xdeadbeef, "Expected err_index to be unchanged, got %d\n", err_index); @@ -128,10 +125,7 @@ void test_DispGetParam(void) ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); ok(V_VT(&result) == VT_EMPTY, "Expected VT_EMPTY, got %08x\n", V_VT(&result)); - todo_wine - { - ok(err_index == 0, "Expected 0, got %d\n", err_index); - } + ok(err_index == 0, "Expected 0, got %d\n", err_index); /* pdispparams.cNamedArgs is 1, yet pdispparams.rgdispidNamedArgs is NULL. * @@ -195,10 +189,7 @@ void test_DispGetParam(void) err_index = 0xdeadbeef; hr = DispGetParam(&dispparams, 2, VT_I2, NULL, &err_index); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - todo_wine - { - ok(err_index == 0, "Expected 0, got %d\n", err_index); - } + ok(err_index == 0, "Expected 0, got %d\n", err_index); /* puArgErr is NULL. */ INIT_DISPPARAMS(dispparams, vararg, NULL, 3, 0); @@ -239,10 +230,7 @@ void test_DispGetParam(void) ok(hr == DISP_E_OVERFLOW, "Expected DISP_E_OVERFLOW, got %08x\n", hr); ok(V_VT(&result) == VT_EMPTY, "Expected VT_EMPTY, got %08x\n", V_VT(&result)); - todo_wine - { - ok(err_index == 1, "Expected 1, got %d\n", err_index); - } + ok(err_index == 1, "Expected 1, got %d\n", err_index); /* Coerce the third (VT_BSTR) param to VT_I2. */ INIT_DISPPARAMS(dispparams, vararg, NULL, 3, 0); @@ -263,10 +251,7 @@ void test_DispGetParam(void) ok(hr == DISP_E_BADVARTYPE, "Expected DISP_E_BADVARTYPE, got %08x\n", hr); ok(V_VT(&result) == VT_EMPTY, "Expected VT_EMPTY, got %08x\n", V_VT(&result)); - todo_wine - { - ok(err_index == 0, "Expected 0, got %d\n", err_index); - } + ok(err_index == 0, "Expected 0, got %d\n", err_index); CLEAR_VARARG(vararg);

1 0

Vincent Povirk : ole32: Make CreateDirEntry a virtual method.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 382ffed00388225a57db8c7313a149a547ffa587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382ffed00388225a57db8c731… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 15:28:34 2009 -0600 ole32: Make CreateDirEntry a virtual method. --- dlls/ole32/storage32.c | 28 ++++++++++++++++------------ dlls/ole32/storage32.h | 7 +++++++ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 384722d..1df4d9f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -184,11 +184,6 @@ static HRESULT removeFromTree( * Declaration of the functions used to manipulate DirEntry */ -static HRESULT createDirEntry( - StorageImpl *storage, - const DirEntry *newData, - DirRef *index); - static HRESULT destroyDirEntry( StorageImpl *storage, DirRef index); @@ -926,8 +921,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( /* * Create an entry with the new data */ - createDirEntry(This->ancestorStorage, &newStreamEntry, &newStreamEntryRef); - + StorageBaseImpl_CreateDirEntry(This, &newStreamEntry, &newStreamEntryRef); /* * Insert the new entry in the parent storage's tree. */ @@ -1117,7 +1111,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( /* * Create a new directory entry for the storage */ - createDirEntry(This->ancestorStorage, &newEntry, &newEntryRef); + StorageBaseImpl_CreateDirEntry(This, &newEntry, &newEntryRef); /* * Insert the new directory entry into the parent storage's tree @@ -1148,11 +1142,12 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( * * Reserve a directory entry in the file and initialize it. */ -static HRESULT createDirEntry( - StorageImpl *storage, +static HRESULT StorageImpl_CreateDirEntry( + StorageBaseImpl *base, const DirEntry *newData, DirRef *index) { + StorageImpl *storage = (StorageImpl*)base; ULONG currentEntryIndex = 0; ULONG newEntryIndex = DIRENTRY_NULL; HRESULT hr = S_OK; @@ -2221,7 +2216,8 @@ static const IStorageVtbl Storage32Impl_Vtbl = static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { - StorageImpl_Destroy + StorageImpl_Destroy, + StorageImpl_CreateDirEntry }; static HRESULT StorageImpl_Construct( @@ -3639,6 +3635,13 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT StorageInternalImpl_CreateDirEntry(StorageBaseImpl *base, + const DirEntry *newData, DirRef *index) +{ + return StorageBaseImpl_CreateDirEntry(&base->ancestorStorage->base, + newData, index); +} + /****************************************************************************** ** ** Storage32InternalImpl_Commit @@ -4081,7 +4084,8 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { - StorageInternalImpl_Destroy + StorageInternalImpl_Destroy, + StorageInternalImpl_CreateDirEntry }; /****************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index c97a2b7..cfdc6df 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -248,6 +248,7 @@ struct StorageBaseImpl /* virtual methods for StorageBaseImpl objects */ struct StorageBaseImplVtbl { void (*Destroy)(StorageBaseImpl*); + HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); }; static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) @@ -255,6 +256,12 @@ static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) This->baseVtbl->Destroy(This); } +static inline HRESULT StorageBaseImpl_CreateDirEntry(StorageBaseImpl *This, + const DirEntry *newData, DirRef *index) +{ + return This->baseVtbl->CreateDirEntry(This, newData, index); +} + /**************************************************************************** * StorageBaseImpl stream list handlers */

1 0

Owen Rudge : imagehlp: Check for 64-bit PE files in CheckSumMappedFile.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: ba5a86e349bc4f5943413b2d89cd1f1165b93ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5a86e349bc4f5943413b2d8… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Dec 4 10:12:00 2009 -0600 imagehlp: Check for 64-bit PE files in CheckSumMappedFile. --- dlls/imagehlp/modify.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 02636bd..debccc0 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -89,11 +89,14 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( LPVOID BaseAddress, DWORD FileLength, LPDWORD HeaderSum, LPDWORD CheckSum) { - PIMAGE_NT_HEADERS Header; + IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *) BaseAddress; + PIMAGE_NT_HEADERS32 Header32; + PIMAGE_NT_HEADERS64 Header64; + DWORD *ChecksumFile; DWORD CalcSum; DWORD HdrSum; - FIXME("(%p, %d, %p, %p): stub\n", + TRACE("(%p, %d, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum ); @@ -101,8 +104,25 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( BaseAddress, (FileLength + 1) / sizeof(WORD)); - Header = RtlImageNtHeader(BaseAddress); - HdrSum = Header->OptionalHeader.CheckSum; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) + return NULL; + + Header32 = (IMAGE_NT_HEADERS32 *)((char *)dos + dos->e_lfanew); + + if (Header32->Signature != IMAGE_NT_SIGNATURE) + return NULL; + + if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + ChecksumFile = &Header32->OptionalHeader.CheckSum; + else if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + Header64 = (IMAGE_NT_HEADERS64 *)Header32; + ChecksumFile = &Header64->OptionalHeader.CheckSum; + } + else + return NULL; + + HdrSum = *ChecksumFile; /* Subtract image checksum from calculated checksum. */ /* fix low word of checksum */ @@ -129,9 +149,9 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( CalcSum += FileLength; *CheckSum = CalcSum; - *HeaderSum = Header->OptionalHeader.CheckSum; + *HeaderSum = *ChecksumFile; - return Header; + return (PIMAGE_NT_HEADERS) Header32; } /***********************************************************************

1 0

Vincent Povirk : ole32: Change ReadDirEntry return type to HRESULT.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 8a332db2c514198b8e130154cb9148c34484d5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a332db2c514198b8e130154c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 16:20:55 2009 -0600 ole32: Change ReadDirEntry return type to HRESULT. --- dlls/ole32/stg_stream.c | 26 ++++++++-------- dlls/ole32/storage32.c | 72 +++++++++++++++++++++------------------------- dlls/ole32/storage32.h | 2 +- 3 files changed, 47 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a332db2c514198b8e130…

1 0

Owen Rudge : imagehlp/tests: Add tests for adding/ removing multiple certificates.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: b27701276517394ea94d8e2c26cc348c746aa090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27701276517394ea94d8e2c2… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Dec 4 10:11:58 2009 -0600 imagehlp/tests: Add tests for adding/removing multiple certificates. --- dlls/imagehlp/tests/integrity.c | 68 +++++++++++++++++++++++++++++++-------- 1 files changed, 54 insertions(+), 14 deletions(-) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 718ca3e..df77dab 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -31,6 +31,7 @@ static HMODULE hImageHlp; static char test_dll_path[MAX_PATH]; static BOOL (WINAPI *pImageAddCertificate)(HANDLE, LPWIN_CERTIFICATE, PDWORD); +static BOOL (WINAPI *pImageEnumerateCertificates)(HANDLE, WORD, PDWORD, PDWORD, DWORD); static BOOL (WINAPI *pImageGetCertificateData)(HANDLE, DWORD, LPWIN_CERTIFICATE, PDWORD); static BOOL (WINAPI *pImageGetCertificateHeader)(HANDLE, DWORD, LPWIN_CERTIFICATE); static BOOL (WINAPI *pImageRemoveCertificate)(HANDLE, DWORD); @@ -87,6 +88,8 @@ static char test_cert_data[] = ,0x46,0xCA,0xEB,0xEA,0x67,0x89,0x49,0x7C,0x43,0xA2,0x52,0xD9,0x41,0xCC,0x65 ,0xED,0x2D,0xA1,0x00,0x31,0x00}; +static char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03}; + static BOOL copy_dll_file(void) { char sys_dir[MAX_PATH+15]; @@ -116,7 +119,17 @@ static BOOL copy_dll_file(void) return TRUE; } -static void test_add_certificate(void) +static DWORD get_file_size(void) +{ + WIN32_FILE_ATTRIBUTE_DATA info; + + if (GetFileAttributesEx(test_dll_path, GetFileExInfoStandard, &info)) + return 0; + + return info.nFileSizeLow; +} + +static void test_add_certificate(char *cert_data, int len) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -131,7 +144,7 @@ static void test_add_certificate(void) return; } - cert_len = sizeof(WIN_CERTIFICATE) + sizeof(test_cert_data); + cert_len = sizeof(WIN_CERTIFICATE) + len; cert = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cert_len); if (!cert) @@ -144,7 +157,7 @@ static void test_add_certificate(void) cert->dwLength = cert_len; cert->wRevision = WIN_CERT_REVISION_1_0; cert->wCertificateType = WIN_CERT_TYPE_PKCS_SIGNED_DATA; - CopyMemory(cert->bCertificate, test_cert_data, sizeof(test_cert_data)); + CopyMemory(cert->bCertificate, cert_data, len); ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to image, error %x\n", GetLastError()); @@ -152,7 +165,7 @@ static void test_add_certificate(void) CloseHandle(hFile); } -static void test_get_certificate(void) +static void test_get_certificate(char *cert_data, int index) { HANDLE hFile; LPWIN_CERTIFICATE cert; @@ -167,7 +180,7 @@ static void test_get_certificate(void) return; } - ret = pImageGetCertificateData(hFile, 0, NULL, &cert_len); + ret = pImageGetCertificateData(hFile, index, NULL, &cert_len); err = GetLastError(); ok ((ret == FALSE) && (err == ERROR_INSUFFICIENT_BUFFER), "ImageGetCertificateData gave unexpected result; ret=%d / err=%x\n", ret, err); @@ -181,17 +194,17 @@ static void test_get_certificate(void) return; } - ok(ret = pImageGetCertificateData(hFile, 0, cert, &cert_len), "Unable to retrieve certificate; err=%x\n", GetLastError()); - ok(memcmp(cert->bCertificate, test_cert_data, cert_len - sizeof(WIN_CERTIFICATE)) == 0, "Certificate retrieved did not match original\n"); + ok(ret = pImageGetCertificateData(hFile, index, cert, &cert_len), "Unable to retrieve certificate; err=%x\n", GetLastError()); + ok(memcmp(cert->bCertificate, cert_data, cert_len - sizeof(WIN_CERTIFICATE)) == 0, "Certificate retrieved did not match original\n"); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); } -static void test_remove_certificate(void) +static void test_remove_certificate(int index) { + DWORD orig_count = 0, count = 0; HANDLE hFile; - WIN_CERTIFICATE cert; hFile = CreateFileA(test_dll_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -201,16 +214,21 @@ static void test_remove_certificate(void) return; } - ok (pImageRemoveCertificate(hFile, 0), "Unable to remove certificate from file; err=%x\n", GetLastError()); + ok (pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &orig_count, NULL, 0), "Unable to enumerate certificates in file; err=%x\n", GetLastError()); + + ok (pImageRemoveCertificate(hFile, index), "Unable to remove certificate from file; err=%x\n", GetLastError()); /* Test to see if the certificate has actually been removed */ - ok(pImageGetCertificateHeader(hFile, 0, &cert) == FALSE, "Certificate header retrieval succeeded when it should have failed\n"); + pImageEnumerateCertificates(hFile, CERT_SECTION_TYPE_ANY, &count, NULL, 0); + ok (count == orig_count - 1, "Certificate count mismatch; orig=%d new=%d\n", orig_count, count); CloseHandle(hFile); } START_TEST(integrity) { + DWORD file_size, file_size_orig; + hImageHlp = LoadLibraryA("imagehlp.dll"); if (!hImageHlp) @@ -225,14 +243,36 @@ START_TEST(integrity) return; } + file_size_orig = get_file_size(); + pImageAddCertificate = (void *) GetProcAddress(hImageHlp, "ImageAddCertificate"); + pImageEnumerateCertificates = (void *) GetProcAddress(hImageHlp, "ImageEnumerateCertificates"); pImageGetCertificateData = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateData"); pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); - test_add_certificate(); - test_get_certificate(); - test_remove_certificate(); + test_add_certificate(test_cert_data, sizeof(test_cert_data)); + test_get_certificate(test_cert_data, 0); + test_remove_certificate(0); + + file_size = get_file_size(); + ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); + + /* Try adding multiple certificates */ + test_add_certificate(test_cert_data, sizeof(test_cert_data)); + test_add_certificate(test_cert_data_2, sizeof(test_cert_data_2)); + + test_get_certificate(test_cert_data, 0); + test_get_certificate(test_cert_data_2, 1); + + /* Remove the first one and verify the second certificate is intact */ + test_remove_certificate(0); + test_get_certificate(test_cert_data_2, 0); + + test_remove_certificate(0); + + file_size = get_file_size(); + ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); FreeLibrary(hImageHlp); DeleteFile(test_dll_path);

1 0

Owen Rudge : imagehlp: Implement ImageRemoveCertificate.
by Alexandre Julliard Dec. 7, 2009

Dec. 7, 2009

Module: wine Branch: master Commit: 5bcc37a9fd6564a8d6b85ce8af169fced5c6f49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcc37a9fd6564a8d6b85ce8a… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Dec 4 10:11:57 2009 -0600 imagehlp: Implement ImageRemoveCertificate. --- dlls/imagehlp/integrity.c | 80 +++++++++++++++++++++++++++++++++++++- dlls/imagehlp/tests/integrity.c | 4 +- 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index 6a13c53..3aaac7d 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -564,7 +564,81 @@ BOOL WINAPI ImageGetDigestStream( */ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) { - FIXME("(%p, %d): stub\n", FileHandle, Index); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD size = 0, count = 0, sd_VirtualAddr = 0, offset = 0; + DWORD data_size = 0, cert_size = 0, cert_size_padded = 0, ret = 0; + LPVOID cert_data; + BOOL r; + + TRACE("(%p, %d)\n", FileHandle, Index); + + r = ImageEnumerateCertificates(FileHandle, CERT_SECTION_TYPE_ANY, &count, NULL, 0); + + if ((!r) || (count == 0)) + return FALSE; + + if ((!IMAGEHLP_GetSecurityDirOffset(FileHandle, &sd_VirtualAddr, &size)) || + (!IMAGEHLP_GetCertificateOffset(FileHandle, Index, &offset, &cert_size))) + return FALSE; + + /* Ignore any padding we have, too */ + if (cert_size % 8) + cert_size_padded = cert_size + (8 - (cert_size % 8)); + else + cert_size_padded = cert_size; + + data_size = size - (offset - sd_VirtualAddr) - cert_size_padded; + + if (data_size == 0) + { + ret = SetFilePointer(FileHandle, sd_VirtualAddr, NULL, FILE_BEGIN); + + if (ret == INVALID_SET_FILE_POINTER) + return FALSE; + } + else + { + cert_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data_size); + + if (!cert_data) + return FALSE; + + ret = SetFilePointer(FileHandle, offset + cert_size_padded, NULL, FILE_BEGIN); + + if (ret == INVALID_SET_FILE_POINTER) + goto error; + + /* Read any subsequent certificates */ + r = ReadFile(FileHandle, cert_data, data_size, &count, NULL); + + if ((!r) || (count != data_size)) + goto error; + + SetFilePointer(FileHandle, offset, NULL, FILE_BEGIN); + + /* Write them one index back */ + r = WriteFile(FileHandle, cert_data, data_size, &count, NULL); + + if ((!r) || (count != data_size)) + goto error; + + HeapFree(GetProcessHeap(), 0, cert_data); + } + + /* If security directory is at end of file, trim the file */ + if (GetFileSize(FileHandle, NULL) == sd_VirtualAddr + size) + SetEndOfFile(FileHandle); + + if (count == 1) + r = IMAGEHLP_SetSecurityDirOffset(FileHandle, 0, 0); + else + r = IMAGEHLP_SetSecurityDirOffset(FileHandle, sd_VirtualAddr, size - cert_size_padded); + + if (!r) + return FALSE; + + return TRUE; + +error: + HeapFree(GetProcessHeap(), 0, cert_data); + return FALSE; } diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index e89167c..718ca3e 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -201,10 +201,10 @@ static void test_remove_certificate(void) return; } - todo_wine ok (pImageRemoveCertificate(hFile, 0), "Unable to remove certificate from file; err=%x\n", GetLastError()); + ok (pImageRemoveCertificate(hFile, 0), "Unable to remove certificate from file; err=%x\n", GetLastError()); /* Test to see if the certificate has actually been removed */ - todo_wine ok(pImageGetCertificateHeader(hFile, 0, &cert) == FALSE, "Certificate header retrieval succeeded when it should have failed\n"); + ok(pImageGetCertificateHeader(hFile, 0, &cert) == FALSE, "Certificate header retrieval succeeded when it should have failed\n"); CloseHandle(hFile); }

1 0