wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Vincent Povirk : ole32: Make CreateDirEntry a virtual method.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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

Vincent Povirk : windowscodecs: Accept GIF files with no trailer.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: f1405ca0d20b24aeb2d49b6a8565f0a876cce460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1405ca0d20b24aeb2d49b6a8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 11:15:23 2009 -0600 windowscodecs: Accept GIF files with no trailer. --- dlls/windowscodecs/tests/bmpformat.c | 66 ++++++++++++++++++++++++++++++++++ dlls/windowscodecs/ungif.c | 5 ++- 2 files changed, 70 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 1f114a2..cf5a6f8 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -1034,6 +1034,71 @@ static void test_createfromstream(void) IWICImagingFactory_Release(factory); } +/* 1x1 pixel gif, missing trailer */ +static unsigned char gifimage_notrailer[] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, +0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, +0x01,0x00 +}; + +static void test_gif_notrailer(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + IWICStream *gifstream; + IWICBitmapFrameDecode *framedecode; + UINT framecount; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateStream(factory, &gifstream); + ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICStream_InitializeFromMemory(gifstream, gifimage_notrailer, + sizeof(gifimage_notrailer)); + ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = CoCreateInstance(&CLSID_WICGifDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void**)&decoder); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)gifstream, + WICDecodeMetadataCacheOnDemand); + ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) IWICBitmapFrameDecode_Release(framedecode); + } + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetFrameCount(decoder, &framecount); + ok(hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + ok(framecount == 1, "framecount=%u\n", framecount); + } + + IWICBitmapDecoder_Release(decoder); + } + + IWICStream_Release(gifstream); + } + + IWICImagingFactory_Release(factory); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -1045,6 +1110,7 @@ START_TEST(bmpformat) test_decode_rle4(); test_componentinfo(); test_createfromstream(); + test_gif_notrailer(); CoUninitialize(); } diff --git a/dlls/windowscodecs/ungif.c b/dlls/windowscodecs/ungif.c index c24f387..cfc7613 100644 --- a/dlls/windowscodecs/ungif.c +++ b/dlls/windowscodecs/ungif.c @@ -320,7 +320,10 @@ DGifGetRecordType(GifFileType * GifFile, GifByteType Buf; if (READ(GifFile, &Buf, 1) != 1) { - return GIF_ERROR; + /* Wine-specific behavior: Native accepts broken GIF files that have no + * terminator, so we match this by treating EOF as a terminator. */ + *Type = TERMINATE_RECORD_TYPE; + return GIF_OK; } switch (Buf) {

1 0

Owen Rudge : imagehlp: Recalculate PE checksum after file modification.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: b49cc56614bd60ad2efd40d3c4dba570f33e6087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49cc56614bd60ad2efd40d3c… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Fri Dec 4 10:12:02 2009 -0600 imagehlp: Recalculate PE checksum after file modification. --- dlls/imagehlp/integrity.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index 3aaac7d..72bf155 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -285,6 +285,88 @@ static BOOL IMAGEHLP_GetCertificateOffset( HANDLE handle, DWORD num, return TRUE; } +/*********************************************************************** + * IMAGEHLP_RecalculateChecksum (INTERNAL) + * + * Update the NT header checksum for the specified file. + */ +static BOOL IMAGEHLP_RecalculateChecksum(HANDLE handle) +{ + DWORD FileLength, count, HeaderSum, pe_offset, nt_hdr_size; + IMAGE_NT_HEADERS32 nt_hdr32; + IMAGE_NT_HEADERS64 nt_hdr64; + LPVOID BaseAddress; + HANDLE hMapping; + DWORD *CheckSum; + void *nt_hdr; + int ret; + BOOL r; + + TRACE("handle %p\n", handle); + + ret = IMAGEHLP_GetNTHeaders(handle, &pe_offset, &nt_hdr32, &nt_hdr64); + + if (ret == HDR_NT32) + { + CheckSum = &nt_hdr32.OptionalHeader.CheckSum; + + nt_hdr = &nt_hdr32; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS32); + } + else if (ret == HDR_NT64) + { + CheckSum = &nt_hdr64.OptionalHeader.CheckSum; + + nt_hdr = &nt_hdr64; + nt_hdr_size = sizeof(IMAGE_NT_HEADERS64); + } + else + return FALSE; + + hMapping = CreateFileMappingW(handle, NULL, PAGE_READONLY, 0, 0, NULL); + + if (!hMapping) + return FALSE; + + BaseAddress = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0); + + if (!BaseAddress) + { + CloseHandle(hMapping); + return FALSE; + } + + FileLength = GetFileSize(handle, NULL); + + *CheckSum = 0; + CheckSumMappedFile(BaseAddress, FileLength, &HeaderSum, CheckSum); + + UnmapViewOfFile(BaseAddress); + CloseHandle(hMapping); + + if (*CheckSum) + { + /* 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; + } + + return FALSE; +} /*********************************************************************** * ImageAddCertificate (IMAGEHLP.@) @@ -392,6 +474,9 @@ BOOL WINAPI ImageAddCertificate( if (!IMAGEHLP_SetSecurityDirOffset(FileHandle, sd_VirtualAddr, size)) return FALSE; + if (!IMAGEHLP_RecalculateChecksum(FileHandle)) + return FALSE; + return TRUE; } @@ -636,6 +721,9 @@ BOOL WINAPI ImageRemoveCertificate(HANDLE FileHandle, DWORD Index) if (!r) return FALSE; + if (!IMAGEHLP_RecalculateChecksum(FileHandle)) + return FALSE; + return TRUE; error:

1 0

Owen Rudge : imagehlp: Check for 64-bit PE files in CheckSumMappedFile.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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

Owen Rudge : imagehlp/tests: Add tests for adding/ removing multiple certificates.
by Alexandre Julliard 07 Dec '09

07 Dec '09

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 07 Dec '09

07 Dec '09

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

Rob Shearman : hlink: Fix more memory leaks in tests.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 74e5e0b33f59883177a37a590b2b39973483ba9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=74e5e0b33f59883177a37a590… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:08:56 2009 +0000 hlink: Fix more memory leaks in tests. --- dlls/hlink/tests/hlink.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index fc00998..1a7536f 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1044,6 +1044,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* set location => two */ hres = IHlink_SetMonikerReference(hlink, HLINKSETF_LOCATION, dummy2, two); @@ -1053,6 +1054,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* set target => dummy2 */ hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET, dummy2, one);

1 0

Rob Shearman : netapi32: Fix off-by-one errors in ACCESS_QueryAdminDisplayInformation and ACCESS_QueryGuestDisplayInformation .
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 0450235db446f845766a42acd7e465de388e0ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0450235db446f845766a42acd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:09:02 2009 +0000 netapi32: Fix off-by-one errors in ACCESS_QueryAdminDisplayInformation and ACCESS_QueryGuestDisplayInformation. --- dlls/netapi32/access.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 0044035..7170259 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -494,7 +494,7 @@ static void ACCESS_QueryAdminDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p PNET_DISPLAY_USER usr; /* set up buffer */ - name_sz = lstrlenW(sAdminUserName); + name_sz = lstrlenW(sAdminUserName) + 1; comment_sz = 1; full_name_sz = 1; @@ -533,7 +533,7 @@ static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p PNET_DISPLAY_USER usr; /* set up buffer */ - name_sz = lstrlenW(sGuestUserName); + name_sz = lstrlenW(sGuestUserName) + 1; comment_sz = 1; full_name_sz = 1;

1 0

Rob Shearman : ole32: Add tests for HGLOBAL stream ignoring the HighPart of the offset for seeks .
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 2b74e774f94dd9dd66447aaf1de96915deb3981a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b74e774f94dd9dd66447aaf1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:08:51 2009 +0000 ole32: Add tests for HGLOBAL stream ignoring the HighPart of the offset for seeks. --- dlls/ole32/tests/hglobalstream.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index cae13ed..4fee612 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -75,6 +75,23 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); + /* ignores HighPart */ + ll.u.HighPart = -1; + ll.u.LowPart = 0; + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); + todo_wine + ok_ole_success(hr, "IStream_Seek"); + ok(ull.u.LowPart == 0, "should have set LowPart to 0 instead of %d\n", ull.u.LowPart); + todo_wine + ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); + + /* ignores HighPart */ + ll.u.HighPart = -1; + ll.u.LowPart = 0; + hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, NULL); + todo_wine + ok_ole_success(hr, "IStream_Seek"); + hr = IStream_Commit(pStream, STGC_DEFAULT); ok_ole_success(hr, "IStream_Commit");

1 0

Rob Shearman : ole32: Initialise all of position variables in test_save_load_filemoniker.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4ad631286a01be1b4998d189b2ba0dd3973a632f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ad631286a01be1b4998d189b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Fri Dec 4 15:08:44 2009 +0000 ole32: Initialise all of position variables in test_save_load_filemoniker. Initialise all 8-bytes instead of just the lower 4-bytes. This test isn't designed to be testing whether the Seek method of the object return by CreateStreamOnHGlobal uses the high part of the positions passed in. --- dlls/ole32/tests/moniker.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index d27f766..7cc5f78 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1878,9 +1878,9 @@ static void test_save_load_filemoniker(void) int i; /* see FileMonikerImpl_Save docs */ - zero_pos.u.LowPart = 0; - dead_pos.u.LowPart = sizeof(WORD) + sizeof(DWORD) + (lstrlenW(wszFileName1) + 1) + sizeof(WORD); - nulls_pos.u.LowPart = dead_pos.u.LowPart + sizeof(WORD); + zero_pos.QuadPart = 0; + dead_pos.QuadPart = sizeof(WORD) + sizeof(DWORD) + (lstrlenW(wszFileName1) + 1) + sizeof(WORD); + nulls_pos.QuadPart = dead_pos.QuadPart + sizeof(WORD); /* create the stream we're going to write to */ hr = CreateStreamOnHGlobal(NULL, TRUE, &pStm);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009