December 2009 - Wine-commits

Vincent Povirk : ole32: Move the create attribute from StorageImpl to StorageBaseImpl.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 5456724fd77b2c5e8e40c87d5c24cb8e1b27a96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5456724fd77b2c5e8e40c87d5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 11:37:54 2009 -0600 ole32: Move the create attribute from StorageImpl to StorageBaseImpl. This is to avoid accessing the top-level StorageImpl directly. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 4 +++- dlls/ole32/storage32.h | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 60cbb88..bf88c64 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -868,7 +868,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( pstatstg->grfMode = This->grfMode; /* In simple create mode cbSize is the current pos */ - if((This->parentStorage->openFlags & STGM_SIMPLE) && root->create) + if((This->parentStorage->openFlags & STGM_SIMPLE) && This->parentStorage->create) pstatstg->cbSize = This->currentPosition; return S_OK; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e7a8c73..971f44a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2276,7 +2276,7 @@ static HRESULT StorageImpl_Construct( This->base.v_destructor = StorageImpl_Destroy; This->base.openFlags = (openFlags & ~STGM_CREATE); This->base.ref = 1; - This->create = create; + This->base.create = create; /* * This is the top-level storage so initialize the ancestor pointer @@ -4131,6 +4131,8 @@ static StorageInternalImpl* StorageInternalImpl_Construct( */ newStorage->base.storageDirEntry = storageDirEntry; + newStorage->base.create = 0; + return newStorage; } diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 508bd70..59a8fb9 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -235,6 +235,9 @@ struct StorageBaseImpl * State bits appear to only be preserved while running. No in the stream */ DWORD stateBits; + + BOOL create; /* Was the storage created or opened. + The behaviour of STGM_SIMPLE depends on this */ }; /**************************************************************************** @@ -260,8 +263,6 @@ struct StorageImpl */ HANDLE hFile; /* Physical support for the Docfile */ LPOLESTR pwcsName; /* Full path of the document file */ - BOOL create; /* Was the storage created or opened. - The behaviour of STGM_SIMPLE depends on this */ /* FIXME: should this be in Storage32BaseImpl ? */ WCHAR filename[DIRENTRY_NAME_BUFFER_LEN];

1 0

Vincent Povirk : ole32: Unify the logic for overriding the root storage filename in Stat.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: f434ab1f2aa3b0c330c44f135c8ffce039d7016f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f434ab1f2aa3b0c330c44f135… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Dec 2 12:35:53 2009 -0600 ole32: Unify the logic for overriding the root storage filename in Stat. This is needed so that the new transacted type will be able to easily support this logic. --- dlls/ole32/stg_stream.c | 4 +--- dlls/ole32/storage32.c | 39 +++++++++------------------------------ dlls/ole32/storage32.h | 8 ++++---- 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index bf88c64..5355594 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -858,9 +858,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( if (readSuccessful) { - StorageImpl *root = This->parentStorage->ancestorStorage; - - StorageUtl_CopyDirEntryToSTATSTG(root, + StorageUtl_CopyDirEntryToSTATSTG(This->parentStorage, pstatstg, &currentEntry, grfStatFlag); diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 971f44a..8f9683f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -704,7 +704,7 @@ static HRESULT WINAPI StorageBaseImpl_Stat( if (readSuccessful) { StorageUtl_CopyDirEntryToSTATSTG( - This->ancestorStorage, + This, pstatstg, &currentEntry, grfStatFlag); @@ -1841,30 +1841,6 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( } -/************************************************************************ - * StorageImpl_Stat (IStorage) - * - * This method will retrieve information about this storage object. - * - * See Windows documentation for more details on IStorage methods. - */ -static HRESULT WINAPI StorageImpl_Stat( IStorage* iface, - STATSTG* pstatstg, /* [out] */ - DWORD grfStatFlag) /* [in] */ -{ - StorageImpl* const This = (StorageImpl*)iface; - HRESULT result = StorageBaseImpl_Stat( iface, pstatstg, grfStatFlag ); - - if ( SUCCEEDED(result) && ((grfStatFlag & STATFLAG_NONAME) == 0) && This->pwcsName ) - { - CoTaskMemFree(pstatstg->pwcsName); - pstatstg->pwcsName = CoTaskMemAlloc((lstrlenW(This->pwcsName)+1)*sizeof(WCHAR)); - strcpyW(pstatstg->pwcsName, This->pwcsName); - } - - return result; -} - /****************************************************************************** * Internal stream list handlers */ @@ -2240,7 +2216,7 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_SetElementTimes, StorageBaseImpl_SetClass, StorageBaseImpl_SetStateBits, - StorageImpl_Stat + StorageBaseImpl_Stat }; static HRESULT StorageImpl_Construct( @@ -2295,6 +2271,9 @@ static HRESULT StorageImpl_Construct( goto end; } strcpyW(This->pwcsName, pwcsName); + + memcpy(This->base.filename, pwcsName, DIRENTRY_NAME_BUFFER_LEN-1); + This->base.filename[DIRENTRY_NAME_BUFFER_LEN-1] = 0; } /* @@ -3786,7 +3765,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( /* * Copy the information to the return buffer. */ - StorageUtl_CopyDirEntryToSTATSTG(This->parentStorage, + StorageUtl_CopyDirEntryToSTATSTG(&This->parentStorage->base, currentReturnStruct, &currentEntry, STATFLAG_DEFAULT); @@ -4218,7 +4197,7 @@ void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value) } void StorageUtl_CopyDirEntryToSTATSTG( - StorageImpl* storage, + StorageBaseImpl* storage, STATSTG* destination, const DirEntry* source, int statFlags) @@ -5998,8 +5977,8 @@ HRESULT WINAPI StgOpenStorage( /* prepare the file name string given in lieu of the root property name */ GetFullPathNameW(pwcsName, MAX_PATH, fullname, NULL); - memcpy(newStorage->filename, fullname, DIRENTRY_NAME_BUFFER_LEN); - newStorage->filename[DIRENTRY_NAME_BUFFER_LEN-1] = '\0'; + memcpy(newStorage->base.filename, fullname, DIRENTRY_NAME_BUFFER_LEN); + newStorage->base.filename[DIRENTRY_NAME_BUFFER_LEN-1] = '\0'; /* * Get an "out" pointer for the caller. diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 59a8fb9..20de0eb 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -236,6 +236,9 @@ struct StorageBaseImpl */ DWORD stateBits; + /* If set, this overrides the root storage name returned by IStorage_Stat */ + WCHAR filename[DIRENTRY_NAME_BUFFER_LEN]; + BOOL create; /* Was the storage created or opened. The behaviour of STGM_SIMPLE depends on this */ }; @@ -264,9 +267,6 @@ struct StorageImpl HANDLE hFile; /* Physical support for the Docfile */ LPOLESTR pwcsName; /* Full path of the document file */ - /* FIXME: should this be in Storage32BaseImpl ? */ - WCHAR filename[DIRENTRY_NAME_BUFFER_LEN]; - /* * File header */ @@ -429,7 +429,7 @@ void StorageUtl_WriteULargeInteger(BYTE* buffer, ULONG offset, const ULARGE_INTEGER *value); void StorageUtl_ReadGUID(const BYTE* buffer, ULONG offset, GUID* value); void StorageUtl_WriteGUID(BYTE* buffer, ULONG offset, const GUID* value); -void StorageUtl_CopyDirEntryToSTATSTG(StorageImpl *storage,STATSTG* destination, +void StorageUtl_CopyDirEntryToSTATSTG(StorageBaseImpl *storage,STATSTG* destination, const DirEntry* source, int statFlags); /****************************************************************************

1 0

Vincent Povirk : ole32: Add an internal vtable to StorageBaseImpl objects.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: cc98619ca4627949d2d278858364f4e1b0c1b468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc98619ca4627949d2d278858… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 25 15:07:57 2009 -0600 ole32: Add an internal vtable to StorageBaseImpl objects. --- dlls/ole32/storage32.c | 16 +++++++++++++--- dlls/ole32/storage32.h | 16 ++++++++++++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 8f9683f..384722d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -378,7 +378,7 @@ static ULONG WINAPI StorageBaseImpl_Release( * destructor of the appropriate derived class. To do this, we are * using virtual functions to implement the destructor. */ - This->v_destructor(This); + StorageBaseImpl_Destroy(This); } return ref; @@ -2219,6 +2219,11 @@ static const IStorageVtbl Storage32Impl_Vtbl = StorageBaseImpl_Stat }; +static const StorageBaseImplVtbl StorageImpl_BaseVtbl = +{ + StorageImpl_Destroy +}; + static HRESULT StorageImpl_Construct( HANDLE hFile, LPCOLESTR pwcsName, @@ -2249,7 +2254,7 @@ static HRESULT StorageImpl_Construct( This->base.lpVtbl = &Storage32Impl_Vtbl; This->base.pssVtbl = &IPropertySetStorage_Vtbl; - This->base.v_destructor = StorageImpl_Destroy; + This->base.baseVtbl = &StorageImpl_BaseVtbl; This->base.openFlags = (openFlags & ~STGM_CREATE); This->base.ref = 1; This->base.create = create; @@ -4074,6 +4079,11 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = StorageBaseImpl_Stat }; +static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = +{ + StorageInternalImpl_Destroy +}; + /****************************************************************************** ** Storage32InternalImpl implementation */ @@ -4097,7 +4107,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct( * Initialize the virtual function table. */ newStorage->base.lpVtbl = &Storage32InternalImpl_Vtbl; - newStorage->base.v_destructor = StorageInternalImpl_Destroy; + newStorage->base.baseVtbl = &StorageInternalImpl_BaseVtbl; newStorage->base.openFlags = (openFlags & ~STGM_CREATE); /* diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 20de0eb..c97a2b7 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -114,6 +114,7 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; * module. */ typedef struct StorageBaseImpl StorageBaseImpl; +typedef struct StorageBaseImplVtbl StorageBaseImplVtbl; typedef struct StorageImpl StorageImpl; typedef struct BlockChainStream BlockChainStream; typedef struct SmallBlockChainStream SmallBlockChainStream; @@ -179,6 +180,7 @@ HRESULT BIGBLOCKFILE_WriteAt(LPBIGBLOCKFILE This, ULARGE_INTEGER offset, void OLECONVERT_CreateOleStream(LPSTORAGE pStorage); HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName); + /**************************************************************************** * Storage32BaseImpl definitions. * @@ -222,9 +224,9 @@ struct StorageBaseImpl DirRef storageDirEntry; /* - * virtual Destructor method. + * virtual methods. */ - void (*v_destructor)(StorageBaseImpl*); + const StorageBaseImplVtbl *baseVtbl; /* * flags that this storage was opened or created with @@ -243,6 +245,16 @@ struct StorageBaseImpl The behaviour of STGM_SIMPLE depends on this */ }; +/* virtual methods for StorageBaseImpl objects */ +struct StorageBaseImplVtbl { + void (*Destroy)(StorageBaseImpl*); +}; + +static inline void StorageBaseImpl_Destroy(StorageBaseImpl *This) +{ + This->baseVtbl->Destroy(This); +} + /**************************************************************************** * StorageBaseImpl stream list handlers */

1 0

Owen Rudge : imagehlp: Verify magic numbers and pad certificates to 8 byte boundaries.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: f5ebe032b08ba87aaaee35f7bda571eb92c67fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ebe032b08ba87aaaee35f7b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Dec 3 13:50:58 2009 -0600 imagehlp: Verify magic numbers and pad certificates to 8 byte boundaries. Includes checks for 64-bit file structure and avoids repeating header checks. --- dlls/imagehlp/integrity.c | 143 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 117 insertions(+), 26 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index bbec56b..a46c853 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -3,6 +3,7 @@ * * Copyright 1998 Patrik Stridvall * Copyright 2003 Mike McCormack + * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,49 +37,129 @@ WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); * http://www.cs.auckland.ac.nz/~pgut001/pubs/authenticode.txt */ +#define HDR_FAIL -1 +#define HDR_NT32 0 +#define HDR_NT64 1 + /*********************************************************************** - * IMAGEHLP_GetSecurityDirOffset (INTERNAL) + * IMAGEHLP_GetNTHeaders (INTERNAL) * - * Read a file's PE header, and return the offset and size of the - * security directory. + * Return the IMAGE_NT_HEADERS for a PE file, after validating magic + * numbers and distinguishing between 32-bit and 64-bit files. */ -static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, - DWORD *pdwOfs, DWORD *pdwSize ) +static int IMAGEHLP_GetNTHeaders(HANDLE handle, DWORD *pe_offset, IMAGE_NT_HEADERS32 *nt32, IMAGE_NT_HEADERS64 *nt64) { IMAGE_DOS_HEADER dos_hdr; - IMAGE_NT_HEADERS nt_hdr; DWORD count; BOOL r; - IMAGE_DATA_DIRECTORY *sd; - TRACE("handle %p\n", handle ); + TRACE("handle %p\n", handle); + + if ((!nt32) || (!nt64)) + return HDR_FAIL; /* read the DOS header */ - count = SetFilePointer( handle, 0, NULL, FILE_BEGIN ); - if( count == INVALID_SET_FILE_POINTER ) - return FALSE; + count = SetFilePointer(handle, 0, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return HDR_FAIL; + count = 0; - r = ReadFile( handle, &dos_hdr, sizeof dos_hdr, &count, NULL ); - if( !r ) - return FALSE; - if( count != sizeof dos_hdr ) - return FALSE; + + r = ReadFile(handle, &dos_hdr, sizeof dos_hdr, &count, NULL); + + if (!r) + return HDR_FAIL; + + if (count != sizeof dos_hdr) + return HDR_FAIL; + + /* verify magic number of 'MZ' */ + if (dos_hdr.e_magic != 0x5A4D) + return HDR_FAIL; + + if (pe_offset != NULL) + *pe_offset = dos_hdr.e_lfanew; /* read the PE header */ - count = SetFilePointer( handle, dos_hdr.e_lfanew, NULL, FILE_BEGIN ); - if( count == INVALID_SET_FILE_POINTER ) - return FALSE; + count = SetFilePointer(handle, dos_hdr.e_lfanew, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return HDR_FAIL; + count = 0; - r = ReadFile( handle, &nt_hdr, sizeof nt_hdr, &count, NULL ); - if( !r ) - return FALSE; - if( count != sizeof nt_hdr ) + + r = ReadFile(handle, nt32, sizeof(IMAGE_NT_HEADERS32), &count, NULL); + + if (!r) + return HDR_FAIL; + + if (count != sizeof(IMAGE_NT_HEADERS32)) + return HDR_FAIL; + + /* verify NT signature */ + if (nt32->Signature != IMAGE_NT_SIGNATURE) + return HDR_FAIL; + + /* check if we have a 32-bit or 64-bit executable */ + switch (nt32->OptionalHeader.Magic) + { + case IMAGE_NT_OPTIONAL_HDR32_MAGIC: + return HDR_NT32; + + case IMAGE_NT_OPTIONAL_HDR64_MAGIC: + /* Re-read as 64-bit */ + + count = SetFilePointer(handle, dos_hdr.e_lfanew, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return HDR_FAIL; + + count = 0; + + r = ReadFile(handle, nt64, sizeof(IMAGE_NT_HEADERS64), &count, NULL); + + if (!r) + return HDR_FAIL; + + if (count != sizeof(IMAGE_NT_HEADERS64)) + return HDR_FAIL; + + /* verify NT signature */ + if (nt64->Signature != IMAGE_NT_SIGNATURE) + return HDR_FAIL; + + return HDR_NT64; + } + + return HDR_FAIL; +} + +/*********************************************************************** + * IMAGEHLP_GetSecurityDirOffset (INTERNAL) + * + * Read a file's PE header, and return the offset and size of the + * security directory. + */ +static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, + DWORD *pdwOfs, DWORD *pdwSize ) +{ + IMAGE_NT_HEADERS32 nt_hdr32; + IMAGE_NT_HEADERS64 nt_hdr64; + IMAGE_DATA_DIRECTORY *sd; + int ret; + + ret = IMAGEHLP_GetNTHeaders(handle, NULL, &nt_hdr32, &nt_hdr64); + + if (ret == HDR_NT32) + sd = &nt_hdr32.OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; + else if (ret == HDR_NT64) + sd = &nt_hdr64.OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; + else return FALSE; - sd = &nt_hdr.OptionalHeader. - DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; + TRACE("ret = %d size = %x addr = %x\n", ret, sd->Size, sd->VirtualAddress); - TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress); *pdwSize = sd->Size; *pdwOfs = sd->VirtualAddress; @@ -126,6 +207,11 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, /* calculate the offset of the next certificate */ offset += len; + + /* padded out to the nearest 8-byte boundary */ + if( len % 8 ) + offset += 8 - (len % 8); + if( offset >= size ) return FALSE; } @@ -207,6 +293,11 @@ BOOL WINAPI ImageEnumerateCertificates( /* next certificate */ offset += hdr.dwLength; + + /* padded out to the nearest 8-byte boundary */ + if (hdr.dwLength % 8) + offset += 8 - (hdr.dwLength % 8); + index++; }

1 0

Owen Rudge : imagehlp: Implement ImageAddCertificate.
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 1f6d24565cc3a4ea75747bc8c836a884253602aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6d24565cc3a4ea75747bc8c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Dec 3 13:51:02 2009 -0600 imagehlp: Implement ImageAddCertificate. --- dlls/imagehlp/integrity.c | 166 +++++++++++++++++++++++++++++++++++++- dlls/imagehlp/tests/integrity.c | 10 +- 2 files changed, 166 insertions(+), 10 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index a46c853..6a13c53 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -167,6 +167,67 @@ static BOOL IMAGEHLP_GetSecurityDirOffset( HANDLE handle, } /*********************************************************************** + * IMAGEHLP_SetSecurityDirOffset (INTERNAL) + * + * Read a file's PE header, and update the offset and size of the + * security directory. + */ +static BOOL IMAGEHLP_SetSecurityDirOffset(HANDLE handle, + DWORD dwOfs, DWORD dwSize) +{ + IMAGE_NT_HEADERS32 nt_hdr32; + IMAGE_NT_HEADERS64 nt_hdr64; + IMAGE_DATA_DIRECTORY *sd; + int ret, nt_hdr_size = 0; + DWORD pe_offset; + void *nt_hdr; + DWORD count; + BOOL r; + + ret = IMAGEHLP_GetNTHeaders(handle, &pe_offset, &nt_hdr32, &nt_hdr64); + + if (ret == HDR_NT32) + { + sd = &nt_hdr32.OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; + + nt_hdr = &nt_hdr32; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS32); + } + else if (ret == HDR_NT64) + { + sd = &nt_hdr64.OptionalHeader.DataDirectory[IMAGE_FILE_SECURITY_DIRECTORY]; + + nt_hdr = &nt_hdr64; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS64); + } + else + return FALSE; + + sd->Size = dwSize; + sd->VirtualAddress = dwOfs; + + TRACE("size = %x addr = %x\n", sd->Size, sd->VirtualAddress); + + /* write the header back again */ + count = SetFilePointer(handle, pe_offset, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return FALSE; + + count = 0; + + r = WriteFile(handle, nt_hdr, nt_hdr_size, &count, NULL); + + if (!r) + return FALSE; + + if (count != nt_hdr_size) + return FALSE; + + return TRUE; +} + +/*********************************************************************** * IMAGEHLP_GetCertificateOffset (INTERNAL) * * Read a file's PE header, and return the offset and size of the @@ -227,16 +288,111 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, /*********************************************************************** * ImageAddCertificate (IMAGEHLP.@) + * + * Adds the specified certificate to the security directory of + * open PE file. */ BOOL WINAPI ImageAddCertificate( HANDLE FileHandle, LPWIN_CERTIFICATE Certificate, PDWORD Index) { - FIXME("(%p, %p, %p): stub\n", - FileHandle, Certificate, Index - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD size = 0, count = 0, offset = 0, sd_VirtualAddr = 0, index = 0; + WIN_CERTIFICATE hdr; + const size_t cert_hdr_size = sizeof hdr - sizeof hdr.bCertificate; + BOOL r; + + TRACE("(%p, %p, %p)\n", FileHandle, Certificate, Index); + + r = IMAGEHLP_GetSecurityDirOffset(FileHandle, &sd_VirtualAddr, &size); + + /* If we've already got a security directory, find the end of it */ + if ((r) && (sd_VirtualAddr != 0)) + { + offset = 0; + index = 0; + count = 0; + + /* Check if the security directory is at the end of the file. + If not, we should probably relocate it. */ + if (GetFileSize(FileHandle, NULL) != sd_VirtualAddr + size) + { + FIXME("Security directory already present but not located at EOF, not adding certificate\n"); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; + } + + while (offset < size) + { + /* read the length of the current certificate */ + count = SetFilePointer (FileHandle, sd_VirtualAddr + offset, + NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return FALSE; + + r = ReadFile(FileHandle, &hdr, cert_hdr_size, &count, NULL); + + if (!r) + return FALSE; + + if (count != cert_hdr_size) + return FALSE; + + /* check the certificate is not too big or too small */ + if (hdr.dwLength < cert_hdr_size) + return FALSE; + + if (hdr.dwLength > (size-offset)) + return FALSE; + + /* next certificate */ + offset += hdr.dwLength; + + /* padded out to the nearest 8-byte boundary */ + if (hdr.dwLength % 8) + offset += 8 - (hdr.dwLength % 8); + + index++; + } + + count = SetFilePointer (FileHandle, sd_VirtualAddr + offset, NULL, FILE_BEGIN); + + if (count == INVALID_SET_FILE_POINTER) + return FALSE; + } + else + { + sd_VirtualAddr = SetFilePointer(FileHandle, 0, NULL, FILE_END); + + if (sd_VirtualAddr == INVALID_SET_FILE_POINTER) + return FALSE; + } + + /* Write the certificate to the file */ + r = WriteFile(FileHandle, Certificate, Certificate->dwLength, &count, NULL); + + if (!r) + return FALSE; + + /* Pad out if necessary */ + if (Certificate->dwLength % 8) + { + char null[8]; + + ZeroMemory(null, 8); + WriteFile(FileHandle, null, 8 - (Certificate->dwLength % 8), NULL, NULL); + + size += 8 - (Certificate->dwLength % 8); + } + + size += Certificate->dwLength; + + /* Update the security directory offset and size */ + if (!IMAGEHLP_SetSecurityDirOffset(FileHandle, sd_VirtualAddr, size)) + return FALSE; + + return TRUE; } /*********************************************************************** diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 01fd4e9..e89167c 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -146,7 +146,7 @@ static void test_add_certificate(void) cert->wCertificateType = WIN_CERT_TYPE_PKCS_SIGNED_DATA; CopyMemory(cert->bCertificate, test_cert_data, sizeof(test_cert_data)); - todo_wine ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to image, error %x\n", GetLastError()); + ok(pImageAddCertificate(hFile, cert, &index), "Unable to add certificate to image, error %x\n", GetLastError()); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); @@ -170,7 +170,7 @@ static void test_get_certificate(void) ret = pImageGetCertificateData(hFile, 0, NULL, &cert_len); err = GetLastError(); - todo_wine ok ((ret == FALSE) && (err == ERROR_INSUFFICIENT_BUFFER), "ImageGetCertificateData gave unexpected result; ret=%d / err=%x\n", ret, err); + ok ((ret == FALSE) && (err == ERROR_INSUFFICIENT_BUFFER), "ImageGetCertificateData gave unexpected result; ret=%d / err=%x\n", ret, err); cert = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cert_len); @@ -181,8 +181,8 @@ static void test_get_certificate(void) return; } - todo_wine ok(ret = pImageGetCertificateData(hFile, 0, cert, &cert_len), "Unable to retrieve certificate; err=%x\n", GetLastError()); - todo_wine ok(memcmp(cert->bCertificate, test_cert_data, cert_len - sizeof(WIN_CERTIFICATE)) == 0, "Certificate retrieved did not match original\n"); + 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"); HeapFree(GetProcessHeap(), 0, cert); CloseHandle(hFile); @@ -204,7 +204,7 @@ static void test_remove_certificate(void) todo_wine ok (pImageRemoveCertificate(hFile, 0), "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"); + todo_wine ok(pImageGetCertificateHeader(hFile, 0, &cert) == FALSE, "Certificate header retrieval succeeded when it should have failed\n"); CloseHandle(hFile); }

1 0

Henri Verbeet : d3d8: Simplify GetDevice().
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 3cedef2ffea3a72d9717470f01a3a046db923e4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cedef2ffea3a72d9717470f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:50:46 2009 +0100 d3d8: Simplify GetDevice(). We already store "parentDevice", so we might as well use it. --- dlls/d3d8/cubetexture.c | 21 ++++++++------------- dlls/d3d8/indexbuffer.c | 21 ++++++++------------- dlls/d3d8/surface.c | 21 ++++++++------------- dlls/d3d8/texture.c | 21 ++++++++------------- dlls/d3d8/vertexbuffer.c | 21 ++++++++------------- dlls/d3d8/volumetexture.c | 21 ++++++++------------- 6 files changed, 48 insertions(+), 78 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 02d2bca..7e48dab 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -82,23 +82,18 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa } /* IDirect3DCubeTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(IDirect3DCubeTexture8 *iface, IDirect3DDevice8 **device) +{ IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetDevice(This->wineD3DCubeTexture, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 3369a0c..b98c2d3 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -79,23 +79,18 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa } /* IDirect3DIndexBuffer8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(IDirect3DIndexBuffer8 *iface, IDirect3DDevice8 **device) +{ IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDevice(This->wineD3DIndexBuffer, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 51c7966..1d4b1dc 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -100,23 +100,18 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { } /* IDirect3DSurface8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, IDirect3DDevice8 **device) +{ IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDevice(This->wineD3DSurface, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 57cec4d..67a60b4 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -80,23 +80,18 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { } /* IDirect3DTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(IDirect3DTexture8 *iface, IDirect3DDevice8 **device) +{ IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DTexture_GetDevice(This->wineD3DTexture, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index ae5307a..9a984f2 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -81,23 +81,18 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i } /* IDirect3DVertexBuffer8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(IDirect3DVertexBuffer8 *iface, IDirect3DDevice8 **device) +{ IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDevice(This->wineD3DVertexBuffer, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index cb01540..bc5c5b8 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -80,23 +80,18 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 } /* IDirect3DVolumeTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(IDirect3DVolumeTexture8 *iface, IDirect3DDevice8 **device) +{ IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetDevice(This->wineD3DVolumeTexture, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {

1 0

Henri Verbeet : d3d9: Simplify GetDevice().
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: ff92e6eb6a6b0f5b6ee0d062f8434cad8f31c33d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff92e6eb6a6b0f5b6ee0d062f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 11:50:47 2009 +0100 d3d9: Simplify GetDevice(). --- dlls/d3d9/cubetexture.c | 21 ++++++++------------- dlls/d3d9/indexbuffer.c | 21 ++++++++------------- dlls/d3d9/pixelshader.c | 16 +++++++--------- dlls/d3d9/query.c | 22 ++++++++-------------- dlls/d3d9/stateblock.c | 21 ++++++++------------- dlls/d3d9/surface.c | 21 ++++++++------------- dlls/d3d9/swapchain.c | 20 ++++++++------------ dlls/d3d9/texture.c | 21 ++++++++------------- dlls/d3d9/vertexbuffer.c | 21 ++++++++------------- dlls/d3d9/vertexdeclaration.c | 21 +++++++++------------ dlls/d3d9/vertexshader.c | 23 ++++++++--------------- dlls/d3d9/volumetexture.c | 21 ++++++++------------- 12 files changed, 96 insertions(+), 153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff92e6eb6a6b0f5b6ee0d…

1 0

Marcus Meissner : winex11.drv: Handle if cursor not found (Cpverity).
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 478592cd3d709f16de1c6a4feb54adbbab9ba3f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478592cd3d709f16de1c6a4fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 4 09:48:53 2009 +0100 winex11.drv: Handle if cursor not found (Cpverity). --- dlls/winex11.drv/wintab.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index c333539..7d7bfcc 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -991,6 +991,10 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) for (loop=0; loop < num_devices; loop ++) if (strcmp(devices[loop].name, cursorNameA) == 0) target = &devices[loop]; + if (!target) { + WARN("Cursor Name %s not found in list of targets.\n", cursorNameA); + continue; + } TRACE("Opening cursor %i id %i\n",cur_loop,(INT)target->id);

1 0

Marcus Meissner : shell32: handle corrupt entry in iconcache registry entry (Coverity).
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: 265c959ed9471aec87ba5da8ff9bcb1e3c4bb07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=265c959ed9471aec87ba5da8f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Dec 3 23:47:31 2009 +0100 shell32: handle corrupt entry in iconcache registry entry (Coverity). --- dlls/shell32/iconcache.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index b51ff06..c4087d2 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -495,9 +495,13 @@ static int SIC_LoadOverlayIcon(int icon_idx) { LPWSTR p = strchrW(buffer, ','); - if (p) - *p++ = 0; - + if (!p) + { + ERR("Icon index in %s/%s corrupted, no comma.\n", debugstr_w(wszShellIcons),debugstr_w(wszIdx)); + RegCloseKey(hKeyShellIcons); + return -1; + } + *p++ = 0; iconPath = buffer; iconIdx = atoiW(p); }

1 0

Marcus Meissner : cmd: Break out of the argument scan loop (Coverity).
by Alexandre Julliard 04 Dec '09

04 Dec '09

Module: wine Branch: master Commit: f62218fc66016079b5455e0a7f6c161b8c2b6a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62218fc66016079b5455e0a7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 4 10:06:13 2009 +0100 cmd: Break out of the argument scan loop (Coverity). --- programs/cmd/wcmdmain.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 9f5b6df..fed1fbd 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1153,13 +1153,10 @@ void WCMD_run_program (WCHAR *command, int called) { WCMD_run_program(command, called); return; } - if (!status) { - WCMD_print_error (); - /* If a command fails to launch, it sets errorlevel 9009 - which - does not seem to have any associated constant definition */ - errorlevel = 9009; - return; - } + + if (!status) + break; + if (!assumeInternal && !console) errorlevel = 0; else {

1 0