January 2007 - Wine-Commits

Mike McCormack : kernel32: Merge existing resources in EndUpdateResource.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: f01707dfc14d7aec496f66e1810e210bf329e64e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01707dfc14d7aec496f66e18… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 11 17:43:54 2007 +0900 kernel32: Merge existing resources in EndUpdateResource. --- dlls/kernel32/resource.c | 174 +++++++++++++++++++++++++++++++++++++--- dlls/kernel32/tests/resource.c | 9 +-- 2 files changed, 166 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 54955c5..2b1bdf4 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -3,6 +3,7 @@ * * Copyright 1993 Robert J. Amstadt * Copyright 1995, 2003 Alexandre Julliard + * Copyright 2006 Mike McCormack * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -621,9 +622,9 @@ DWORD WINAPI SizeofResource( HINSTANCE h * Type/Name/Language is a keyset for accessing resource data. * * QUEUEDUPDATES (root) -> - * list of struct resouce_dir_entry (Type) -> - * list of struct resouce_dir_entry (Name) -> - * list of struct resouce_data Language + Data + * list of struct resource_dir_entry (Type) -> + * list of struct resource_dir_entry (Name) -> + * list of struct resource_data Language + Data */ typedef struct @@ -938,6 +939,150 @@ struct mapping_info { BOOL read_write; }; +static const IMAGE_SECTION_HEADER *section_from_rva( void *base, DWORD mapping_size, DWORD rva ) +{ + const IMAGE_SECTION_HEADER *sec; + DWORD num_sections = 0; + int i; + + sec = get_section_header( base, mapping_size, &num_sections ); + if (!sec) + return NULL; + + for (i=num_sections-1; i>=0; i--) + { + if (sec[i].VirtualAddress <= rva && + rva <= (DWORD)sec[i].VirtualAddress + sec[i].SizeOfRawData) + { + return &sec[i]; + } + } + + return NULL; +} + +static void *address_from_rva( void *base, DWORD mapping_size, DWORD rva, DWORD len ) +{ + const IMAGE_SECTION_HEADER *sec; + + sec = section_from_rva( base, mapping_size, rva ); + if (!sec) + return NULL; + + if (rva + len <= (DWORD)sec->VirtualAddress + sec->SizeOfRawData) + return (void*)((const BYTE*) base + (sec->PointerToRawData + rva - sec->VirtualAddress)); + + return NULL; +} + +static LPWSTR resource_dup_string( const IMAGE_RESOURCE_DIRECTORY *root, const IMAGE_RESOURCE_DIRECTORY_ENTRY *entry ) +{ + const IMAGE_RESOURCE_DIR_STRING_U* string; + LPWSTR s; + + if (!entry->u1.s1.NameIsString) + return (LPWSTR) (DWORD) entry->u1.s2.Id; + + string = (const IMAGE_RESOURCE_DIR_STRING_U*) (((const char *)root) + entry->u1.s1.NameOffset); + s = HeapAlloc(GetProcessHeap(), 0, (string->Length + 1)*sizeof (WCHAR) ); + memcpy( s, string->NameString, (string->Length + 1)*sizeof (WCHAR) ); + s[string->Length] = 0; + + return s; +} + +/* this function is based on the code in winedump's pe.c */ +static BOOL enumerate_mapped_resources( QUEUEDUPDATES *updates, + void *base, DWORD mapping_size, + const IMAGE_RESOURCE_DIRECTORY *root ) +{ + const IMAGE_RESOURCE_DIRECTORY *namedir, *langdir; + const IMAGE_RESOURCE_DIRECTORY_ENTRY *e1, *e2, *e3; + const IMAGE_RESOURCE_DATA_ENTRY *data; + DWORD i, j, k; + + TRACE("version (%d.%d) %d named %d id entries\n", + root->MajorVersion, root->MinorVersion, root->NumberOfNamedEntries, root->NumberOfIdEntries); + + for (i = 0; i< root->NumberOfNamedEntries + root->NumberOfIdEntries; i++) + { + LPWSTR Type; + + e1 = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*)(root + 1) + i; + + Type = resource_dup_string( root, e1 ); + + namedir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e1->u2.s3.OffsetToDirectory); + for (j = 0; j < namedir->NumberOfNamedEntries + namedir->NumberOfIdEntries; j++) + { + LPWSTR Name; + + e2 = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*)(namedir + 1) + j; + + Name = resource_dup_string( root, e2 ); + + langdir = (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + e2->u2.s3.OffsetToDirectory); + for (k = 0; k < langdir->NumberOfNamedEntries + langdir->NumberOfIdEntries; k++) + { + LANGID Lang; + void *p; + struct resource_data *resdata; + + e3 = (const IMAGE_RESOURCE_DIRECTORY_ENTRY*)(langdir + 1) + k; + + Lang = e3->u1.s2.Id; + + data = (const IMAGE_RESOURCE_DATA_ENTRY *)((const char *)root + e3->u2.OffsetToData); + + p = address_from_rva( base, mapping_size, data->OffsetToData, data->Size ); + + resdata = allocate_resource_data( Lang, data->CodePage, p, data->Size, FALSE ); + if (resdata) + update_add_resource( updates, Type, Name, resdata, FALSE ); + } + res_free_str( Name ); + } + res_free_str( Type ); + } + + return TRUE; +} + +static BOOL read_mapped_resources( QUEUEDUPDATES *updates, void *base, DWORD mapping_size ) +{ + const IMAGE_RESOURCE_DIRECTORY *root; + const IMAGE_NT_HEADERS *nt; + const IMAGE_SECTION_HEADER *sec; + DWORD num_sections = 0, i; + + nt = get_nt_header( base, mapping_size ); + if (!nt) + return FALSE; + + sec = get_section_header( base, mapping_size, &num_sections ); + if (!sec) + return FALSE; + + for (i=0; i<num_sections; i++) + if (!memcmp(sec[i].Name, ".rsrc", 6)) + break; + + if (i == num_sections) + return TRUE; + + /* check the resource data is inside the mapping */ + if (sec[i].PointerToRawData > mapping_size || + (sec[i].PointerToRawData + sec[i].SizeOfRawData) > mapping_size) + return TRUE; + + TRACE("found .rsrc at %08x, size %08x\n", sec[i].PointerToRawData, sec[i].SizeOfRawData); + + root = (void*) ((BYTE*)base + sec[i].PointerToRawData); + enumerate_mapped_resources( updates, base, mapping_size, root ); + + return TRUE; +} + static BOOL map_file_into_memory( struct mapping_info *mi ) { DWORD page_attr, perm; @@ -1293,7 +1438,7 @@ static BOOL write_raw_resources( QUEUEDU IMAGE_NT_HEADERS *nt; struct resource_size_info res_size; BYTE *res_base; - struct mapping_info *write_map = NULL; + struct mapping_info *read_map = NULL, *write_map = NULL; /* copy the exe to a temp file then update the temp file... */ tempdir[0] = 0; @@ -1308,6 +1453,20 @@ static BOOL write_raw_resources( QUEUEDU TRACE("tempfile %s\n", debugstr_w(tempfile)); + if (!updates->bDeleteExistingResources) + { + read_map = create_mapping( updates->pFileName, FALSE ); + if (!read_map) + goto done; + + ret = read_mapped_resources( updates, read_map->base, read_map->size ); + if (!ret) + { + ERR("failed to read existing resources\n"); + goto done; + } + } + write_map = create_mapping( tempfile, TRUE ); if (!write_map) goto done; @@ -1386,6 +1545,7 @@ static BOOL write_raw_resources( QUEUEDU TRACE("after .rsrc at %08x, size %08x\n", sec->PointerToRawData, sec->SizeOfRawData); done: + destroy_mapping( read_map ); destroy_mapping( write_map ); if (ret) @@ -1470,12 +1630,6 @@ BOOL WINAPI EndUpdateResourceW( HANDLE h if (!updates) return FALSE; - if (!updates->bDeleteExistingResources) - { - FIXME("preserving existing resources not yet implemented\n"); - fDiscard = TRUE; - } - ret = fDiscard || write_raw_resources( updates ); free_resource_directory( &updates->root, 2 ); diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 0826c34..b77f86c 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -266,13 +266,8 @@ START_TEST(resource) update_missing_exe(); update_empty_exe(); build_exe(); - - /* for when BeginUpdateResource( bDeleteExisting = FALSE ) works right */ - if (0) - { - update_resources_none(); - check_exe( check_empty ); - } + update_resources_none(); + check_exe( check_empty ); update_resources_delete(); check_exe( check_empty ); update_resources_version();

1 0

Mike McCormack : kernel32: Create a simple abstraction for file mappings.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 8f8fecd00e37d1869485d40b93f891f3872682fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8fecd00e37d1869485d40b9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 11 17:41:21 2007 +0900 kernel32: Create a simple abstraction for file mappings. --- dlls/kernel32/resource.c | 175 ++++++++++++++++++++++++++++++---------------- 1 files changed, 116 insertions(+), 59 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index fdf06a7..d8d1afb 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -910,6 +910,105 @@ struct resource_size_info { DWORD total_size; }; +struct mapping_info { + HANDLE file; + HANDLE mapping; + void *base; + DWORD size; + BOOL read_write; +}; + +static BOOL map_file_into_memory( struct mapping_info *mi ) +{ + DWORD page_attr, perm; + + if (mi->read_write) + { + page_attr = PAGE_READWRITE; + perm = FILE_MAP_WRITE | FILE_MAP_READ; + } + else + { + page_attr = PAGE_READONLY; + perm = FILE_MAP_READ; + } + + mi->mapping = CreateFileMappingW( mi->file, NULL, page_attr, 0, 0, NULL ); + if (!mi->mapping) + return FALSE; + + mi->base = MapViewOfFile( mi->mapping, perm, 0, 0, mi->size ); + if (!mi->base) + return FALSE; + + return TRUE; +} + +static BOOL unmap_file_from_memory( struct mapping_info *mi ) +{ + if (mi->base) + UnmapViewOfFile( mi->base ); + mi->base = NULL; + if (mi->mapping) + CloseHandle( mi->mapping ); + mi->mapping = NULL; + return TRUE; +} + +static void destroy_mapping( struct mapping_info *mi ) +{ + if (!mi) + return; + unmap_file_from_memory( mi ); + if (mi->file) + CloseHandle( mi->file ); + HeapFree( GetProcessHeap(), 0, mi ); +} + +static struct mapping_info *create_mapping( LPCWSTR name, BOOL rw ) +{ + struct mapping_info *mi; + + mi = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof *mi ); + if (!mi) + return NULL; + + mi->read_write = rw; + + mi->file = CreateFileW( name, GENERIC_READ | (rw ? GENERIC_WRITE : 0), + 0, NULL, OPEN_EXISTING, 0, 0 ); + + if (mi->file != INVALID_HANDLE_VALUE) + { + mi->size = GetFileSize( mi->file, NULL ); + + if (map_file_into_memory( mi )) + return mi; + } + + unmap_file_from_memory( mi ); + + return NULL; +} + +static BOOL resize_mapping( struct mapping_info *mi, DWORD new_size ) +{ + if (!unmap_file_from_memory( mi )) + return FALSE; + + /* change the file size */ + SetFilePointer( mi->file, new_size, NULL, FILE_BEGIN ); + if (!SetEndOfFile( mi->file )) + { + ERR("failed to set file size to %08x\n", new_size ); + return FALSE; + } + + mi->size = new_size; + + return map_file_into_memory( mi ); +} + static void get_resource_sizes( QUEUEDUPDATES *updates, struct resource_size_info *si ) { struct resource_dir_entry *types, *names; @@ -1169,13 +1268,12 @@ static BOOL write_raw_resources( QUEUEDU static const WCHAR prefix[] = { 'r','e','s','u',0 }; WCHAR tempdir[MAX_PATH], tempfile[MAX_PATH]; DWORD mapping_size, section_size, old_size; - HANDLE file = NULL, mapping = NULL; BOOL ret = FALSE; - void *base = NULL; IMAGE_SECTION_HEADER *sec; IMAGE_NT_HEADERS *nt; struct resource_size_info res_size; BYTE *res_base; + struct mapping_info *write_map = NULL; /* copy the exe to a temp file then update the temp file... */ tempdir[0] = 0; @@ -1190,21 +1288,11 @@ static BOOL write_raw_resources( QUEUEDU TRACE("tempfile %s\n", debugstr_w(tempfile)); - file = CreateFileW( tempfile, GENERIC_READ | GENERIC_WRITE, - 0, NULL, OPEN_EXISTING, 0, 0 ); - - mapping_size = GetFileSize( file, NULL ); - old_size = mapping_size; - - mapping = CreateFileMappingW( file, NULL, PAGE_READWRITE, 0, 0, NULL ); - if (!mapping) - goto done; - - base = MapViewOfFile( mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, mapping_size ); - if (!base) + write_map = create_mapping( tempfile, TRUE ); + if (!write_map) goto done; - nt = get_nt_header( base, mapping_size ); + nt = get_nt_header( write_map->base, write_map->size ); if (!nt) goto done; @@ -1214,14 +1302,14 @@ static BOOL write_raw_resources( QUEUEDU goto done; } - sec = get_resource_section( base, mapping_size ); + sec = get_resource_section( write_map->base, write_map->size ); if (!sec) - goto done; + goto done; - if ((sec->SizeOfRawData + sec->PointerToRawData) != mapping_size) + if ((sec->SizeOfRawData + sec->PointerToRawData) != write_map->size) { FIXME(".rsrc isn't at the end of the image %08x + %08x != %08x\n", - sec->SizeOfRawData, sec->PointerToRawData, mapping_size); + sec->SizeOfRawData, sec->PointerToRawData, write_map->size); goto done; } @@ -1240,43 +1328,22 @@ static BOOL write_raw_resources( QUEUEDU /* check if the file size needs to be changed */ if (section_size != sec->SizeOfRawData) { + old_size = write_map->size; + TRACE("file size %08x -> %08x\n", old_size, mapping_size); /* unmap the file before changing the file size */ - UnmapViewOfFile( base ); - base = NULL; - CloseHandle( mapping ); - mapping = NULL; - - /* change the file size */ - SetFilePointer( file, mapping_size, NULL, FILE_BEGIN ); - if (!SetEndOfFile( file )) - { - ERR("failed to set file size to %08x\n", mapping_size ); - goto done; - } - - mapping = CreateFileMappingW( file, NULL, PAGE_READWRITE, 0, 0, NULL ); - if (!mapping) - goto done; - - /* remap the file */ - base = MapViewOfFile( mapping, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, mapping_size ); - if (!base) - { - ERR("failed to map file again\n"); - goto done; - } + ret = resize_mapping( write_map, mapping_size ); /* get the pointers again - they might be different after remapping */ - nt = get_nt_header( base, mapping_size ); + nt = get_nt_header( write_map->base, mapping_size ); if (!nt) { ERR("couldn't get NT header\n"); goto done; } - sec = get_resource_section( base, mapping_size ); + sec = get_resource_section( write_map->base, mapping_size ); if (!sec) goto done; @@ -1285,12 +1352,12 @@ static BOOL write_raw_resources( QUEUEDU sec->SizeOfRawData = section_size; sec->Misc.VirtualSize = section_size; nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].Size = res_size.total_size; - nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( base, mapping_size ); + nt->OptionalHeader.SizeOfInitializedData = get_init_data_size( write_map->base, mapping_size ); } - res_base = (LPBYTE) base + sec->PointerToRawData; + res_base = (LPBYTE) write_map->base + sec->PointerToRawData; - TRACE("base = %p offset = %08x\n", base, sec->PointerToRawData); + TRACE("base = %p offset = %08x\n", write_map->base, sec->PointerToRawData); ret = write_resources( updates, res_base, &res_size, sec->VirtualAddress ); @@ -1299,17 +1366,7 @@ static BOOL write_raw_resources( QUEUEDU TRACE("after .rsrc at %08x, size %08x\n", sec->PointerToRawData, sec->SizeOfRawData); done: - if (base) - { - FlushViewOfFile( base, mapping_size ); - UnmapViewOfFile( base ); - } - - if (mapping) - CloseHandle( mapping ); - - if (file) - CloseHandle( file ); + destroy_mapping( write_map ); if (ret) ret = CopyFileW( tempfile, updates->pFileName, FALSE );

1 0

Mike McCormack : kernel32: Split update_add_resource() into two functions.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 38e27fa9f82b670fb12ff011083f4faf9901b7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e27fa9f82b670fb12ff0110… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Jan 11 17:43:23 2007 +0900 kernel32: Split update_add_resource() into two functions. --- dlls/kernel32/resource.c | 62 +++++++++++++++++++++++++++++++--------------- 1 files changed, 42 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index d8d1afb..54955c5 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -646,7 +646,7 @@ struct resource_data { LANGID lang; DWORD codepage; DWORD cbData; - BYTE data[1]; + void *lpData; }; static int resource_strcmp( LPCWSTR a, LPCWSTR b ) @@ -737,15 +737,13 @@ static void res_free_str( LPWSTR str ) } static BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name, - WORD Language, DWORD codepage, LPCVOID lpData, DWORD cbData ) + struct resource_data *resdata, BOOL overwrite_existing ) { struct resource_dir_entry *restype, *resname; - struct resource_data *resdata; - - TRACE("%p %s %s %04x %04x %p %d bytes\n", updates, debugstr_w(Type), debugstr_w(Name), Language, codepage, lpData, cbData); + struct resource_data *existing; - if (!lpData || !cbData) - return FALSE; + TRACE("%p %s %s %p %d\n", updates, + debugstr_w(Type), debugstr_w(Name), resdata, overwrite_existing ); restype = find_resource_dir_entry( &updates->root, Type ); if (!restype) @@ -769,24 +767,46 @@ static BOOL update_add_resource( QUEUEDU * If there's an existing resource entry with matching (Type,Name,Language) * it needs to be removed before adding the new data. */ - resdata = find_resource_data( &resname->children, Language ); - if (resdata) + existing = find_resource_data( &resname->children, resdata->lang ); + if (existing) { - list_remove( &resdata->entry ); - HeapFree( GetProcessHeap(), 0, resdata ); + if (!overwrite_existing) + return TRUE; + list_remove( &existing->entry ); + HeapFree( GetProcessHeap(), 0, existing ); } - resdata = HeapAlloc( GetProcessHeap(), 0, sizeof *resdata + cbData ); - resdata->lang = Language; - resdata->codepage = codepage; - resdata->cbData = cbData; - memcpy( resdata->data, lpData, cbData ); - add_resource_data_entry( &resname->children, resdata ); return TRUE; } +static struct resource_data *allocate_resource_data( WORD Language, DWORD codepage, + LPVOID lpData, DWORD cbData, BOOL copy_data ) +{ + struct resource_data *resdata; + + if (!lpData || !cbData) + return NULL; + + resdata = HeapAlloc( GetProcessHeap(), 0, sizeof *resdata + (copy_data ? cbData : 0) ); + if (resdata) + { + resdata->lang = Language; + resdata->codepage = codepage; + resdata->cbData = cbData; + if (copy_data) + { + resdata->lpData = &resdata[1]; + memcpy( resdata->lpData, lpData, cbData ); + } + else + resdata->lpData = lpData; + } + + return resdata; +} + static void free_resource_directory( struct list *head, int level ) { struct list *ptr = NULL; @@ -1184,7 +1204,7 @@ static BOOL write_resources( QUEUEDUPDAT si->data_entry_ofs += sizeof (IMAGE_RESOURCE_DATA_ENTRY); /* write out the resource data */ - memcpy( &base[si->data_ofs], data->data, data->cbData ); + memcpy( &base[si->data_ofs], data->lpData, data->cbData ); si->data_ofs += data->cbData; pad_size = (-si->data_ofs)&3; @@ -1492,8 +1512,10 @@ BOOL WINAPI UpdateResourceW( HANDLE hUpd updates = GlobalLock(hUpdate); if (updates) { - ret = update_add_resource( updates, lpType, lpName, - wLanguage, GetACP(), lpData, cbData ); + struct resource_data *data; + data = allocate_resource_data( wLanguage, 0, lpData, cbData, TRUE ); + if (data) + ret = update_add_resource( updates, lpType, lpName, data, TRUE ); GlobalUnlock(hUpdate); } return ret;

1 0

Dmitry Timoshkov : user32: Add a simple DrawState test, make it pass under Wine.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: f097da9f835776cdd81f75069919633dcefd074a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f097da9f835776cdd81f75069… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jan 11 18:06:19 2007 +0800 user32: Add a simple DrawState test, make it pass under Wine. --- dlls/user32/tests/text.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/user32/uitools.c | 2 ++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 76d4184..01bd306 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -2,6 +2,7 @@ * DrawText tests * * Copyright (c) 2004 Zach Gorman + * Copyright 2007 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -243,11 +244,53 @@ static void test_TabbedText(void) } } + ReleaseDC( hwnd, hdc ); + DestroyWindow( hwnd ); +} + +static void test_DrawState(void) +{ + static const char text[] = "Sample text string"; + HWND hwnd; + HDC hdc; + BOOL ret; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, + 0, 0, 200, 200, 0, 0, 0, NULL); + assert(hwnd); + + hdc = GetDC(hwnd); + assert(hdc); + + SetLastError(0xdeadbeef); + ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, (LPARAM)text, strlen(text), + 0, 0, 10, 10, DST_TEXT); + ok(ret, "DrawState error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, (LPARAM)text, 0, + 0, 0, 10, 10, DST_TEXT); + ok(ret, "DrawState error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, strlen(text), + 0, 0, 10, 10, DST_TEXT); + ok(!ret, "DrawState succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = DrawState(hdc, GetStockObject(DKGRAY_BRUSH), NULL, 0, 0, + 0, 0, 10, 10, DST_TEXT); + ok(!ret, "DrawState succeeded\n"); + ok(GetLastError() == 0xdeadbeef, "not expected error %u\n", GetLastError()); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); } START_TEST(text) { test_TabbedText(); test_DrawTextCalcRect(); + test_DrawState(); } diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index c504c4c..036379c 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1587,6 +1587,8 @@ static BOOL UITOOLS_DrawState(HDC hdc, H if((opcode == DST_TEXT || opcode == DST_PREFIXTEXT) && !len) /* The string is '\0' terminated */ { + if (!lp) return FALSE; + if(unicode) len = strlenW((LPWSTR)lp); else

1 0

James Hawkins : mshtml: Use the correct variable in the FIXME.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: d06ff0ea6909fa2ba12bf296565191e857384fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06ff0ea6909fa2ba12bf2965… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 11 03:56:55 2007 -0600 mshtml: Use the correct variable in the FIXME. --- dlls/mshtml/olecmd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 1b6f71b..75af04a 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -701,7 +701,7 @@ static HRESULT exec_fontsize(HTMLDocumen set_font_size(This, V_BSTR(in)); break; default: - FIXME("unsupported vt %d\n", V_VT(out)); + FIXME("unsupported vt %d\n", V_VT(in)); } }

1 0

James Hawkins : winedbg: Check buffer for NULL before writing to it.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 8be71fef5ba74034170259e40a2ec3cec5ac0942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be71fef5ba74034170259e40… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 11 03:11:37 2007 -0600 winedbg: Check buffer for NULL before writing to it. --- programs/winedbg/memory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index 84f43b0..b51257e 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -652,7 +652,7 @@ BOOL memory_get_register(DWORD regno, DW else *value = div->pval; - snprintf(buffer, len, div->name); + if (buffer) snprintf(buffer, len, div->name); return TRUE; } }

1 0

James Hawkins : winspool.drv: Check for get_filename failure.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 68406933714001224b367d4d6f40f563c00fd092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68406933714001224b367d4d6… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jan 11 03:19:58 2007 -0600 winspool.drv: Check for get_filename failure. --- dlls/winspool.drv/info.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 551e8fc..41b706c 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -7340,8 +7340,8 @@ LPWSTR WINAPI StartDocDlgW( HANDLE hPrin if(doc->lpszOutput == NULL || !strcmpW(doc->lpszOutput, FILE_Port)) { LPWSTR name; - get_filename(&name); - if(name) + + if (get_filename(&name)) { if(!(len = GetFullPathNameW(name, 0, NULL, NULL))) {

1 0

Clinton Stimpson : riched20: Fix modification state for several operations.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: bf86302e198a7d96bf9db8e3ad9eaf72f676cb07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf86302e198a7d96bf9db8e3a… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Thu Jan 11 00:46:35 2007 -0700 riched20: Fix modification state for several operations. --- dlls/riched20/caret.c | 3 +++ dlls/riched20/editor.c | 7 ++++++- dlls/riched20/tests/editor.c | 8 -------- dlls/riched20/undo.c | 3 --- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a58d9f0..f6e0d7f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -435,6 +435,9 @@ void ME_InsertTextFromCursor(ME_TextEdit /* Didn't affect performance for WM_SETTEXT (around 50sec/30K) */ int freeSpace = editor->nTextLimit - ME_GetTextLength(editor); + /* text operations set modified state */ + editor->nModifyStep = 1; + assert(style); /* FIXME really HERE ? */ diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 738a6fc..c939c81 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1639,6 +1639,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND size_t len = wszText ? lstrlenW(wszText) : 0; int from, to; ME_Style *style; + int oldModify = editor->nModifyStep; TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", debugstr_w(wszText), (int)pStruct->flags, pStruct->codepage); if (pStruct->codepage != 1200) { FIXME("EM_SETTEXTEX only supports unicode right now!\n"); @@ -1659,7 +1660,10 @@ LRESULT WINAPI RichEditANSIWndProc(HWND } ME_CommitUndo(editor); if (!(pStruct->flags & ST_KEEPUNDO)) + { + editor->nModifyStep = oldModify; ME_EmptyUndoStack(editor); + } ME_UpdateRepaint(editor); return len; } @@ -1690,7 +1694,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND case EM_SETMODIFY: { if (wParam) - editor->nModifyStep = 0x80000000; + editor->nModifyStep = 1; else editor->nModifyStep = 0; @@ -1732,6 +1736,7 @@ LRESULT WINAPI RichEditANSIWndProc(HWND bRepaint = (from != to); ME_SetSelectionCharFormat(editor, p); } + editor->nModifyStep = 1; ME_CommitUndo(editor); if (bRepaint) ME_RewrapRepaint(editor); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 281206a..687ab25 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1192,10 +1192,8 @@ static void test_EM_GETMODIFY(void) SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); SendMessage(hwndRichEdit, WM_SETFONT, (WPARAM)testFont,(LPARAM) MAKELONG((WORD) TRUE, 0)); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); - todo_wine { ok (result == 0, "EM_GETMODIFY returned non-zero, instead of zero on setting font\n"); - } /* setting text should set modify flag */ SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); @@ -1207,20 +1205,16 @@ static void test_EM_GETMODIFY(void) /* undo previous text doesn't reset modify flag */ SendMessage(hwndRichEdit, WM_UNDO, 0, 0); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); - todo_wine { ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero on undo after setting text\n"); - } /* set text with no flag to keep undo stack should not set modify flag */ SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); setText.flags = 0; SendMessage(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); - todo_wine { ok (result == 0, "EM_GETMODIFY returned non-zero, instead of zero when setting text while not keeping undo stack\n"); - } /* WM_SETTEXT doesn't modify */ SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); @@ -1295,10 +1289,8 @@ static void test_EM_GETMODIFY(void) pf2.wAlignment = PFA_RIGHT; SendMessage(hwndRichEdit, EM_SETPARAFORMAT, 0, (LPARAM) &pf2); result = SendMessage(hwndRichEdit, EM_GETMODIFY, 0, 0); - todo_wine { ok (result == 0, "EM_GETMODIFY returned zero, instead of non-zero for EM_SETPARAFORMAT\n"); - } /* EM_STREAM */ SendMessage(hwndRichEdit, EM_SETMODIFY, FALSE, 0); diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 181121a..88de04a 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -163,7 +163,6 @@ void ME_CommitUndo(ME_TextEditor *editor ME_AddUndoItem(editor, diUndoEndTransaction, NULL); ME_SendSelChange(editor); - editor->nModifyStep++; } void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) @@ -260,7 +259,6 @@ void ME_Undo(ME_TextEditor *editor) { if (p) p->prev = NULL; editor->nUndoMode = nMode; - editor->nModifyStep--; ME_UpdateRepaint(editor); } @@ -293,6 +291,5 @@ void ME_Redo(ME_TextEditor *editor) { if (p) p->prev = NULL; editor->nUndoMode = nMode; - editor->nModifyStep++; ME_UpdateRepaint(editor); }

1 0

Rob Shearman : ole32: Add tests for the default handler.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: bbedf3d0967e60a6b09c64b9f0d2a003b8bee4b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbedf3d0967e60a6b09c64b9f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 10 17:02:48 2007 -0600 ole32: Add tests for the default handler. --- dlls/ole32/tests/ole2.c | 172 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 166 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 7c24103..73378dd 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdarg.h> @@ -35,6 +36,14 @@ static IPersistStorage OleObjectPersistS static IOleCache *cache; static IRunnableObject *runnable; +static const CLSID CLSID_WineTest = +{ /* 9474ba1a-258b-490b-bc13-516e9239ace0 */ + 0x9474ba1a, + 0x258b, + 0x490b, + {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe0} +}; + static char const * const *expected_method_list; #define CHECK_EXPECTED_METHOD(method_name) \ @@ -311,7 +320,7 @@ static HRESULT WINAPI OleObject_SetColor return E_NOTIMPL; } -static IOleObjectVtbl OleObjectVtbl = +static const IOleObjectVtbl OleObjectVtbl = { OleObject_QueryInterface, OleObject_AddRef, @@ -424,7 +433,7 @@ static HRESULT WINAPI OleObjectPersistSt return S_OK; } -static IPersistStorageVtbl OleObjectPersistStgVtbl = +static const IPersistStorageVtbl OleObjectPersistStgVtbl = { OleObjectPersistStg_QueryInterface, OleObjectPersistStg_AddRef, @@ -514,7 +523,7 @@ static HRESULT WINAPI OleObjectCache_Set } -static IOleCacheVtbl OleObjectCacheVtbl = +static const IOleCacheVtbl OleObjectCacheVtbl = { OleObjectCache_QueryInterface, OleObjectCache_AddRef, @@ -560,7 +569,7 @@ static HRESULT WINAPI OleObjectCF_LockSe return S_OK; } -static IClassFactoryVtbl OleObjectCFVtbl = +static const IClassFactoryVtbl OleObjectCFVtbl = { OleObjectCF_QueryInterface, OleObjectCF_AddRef, @@ -627,7 +636,7 @@ static HRESULT WINAPI OleObjectRunnable_ return S_OK; } -static IRunnableObjectVtbl OleObjectRunnableVtbl = +static const IRunnableObjectVtbl OleObjectRunnableVtbl = { OleObjectRunnable_QueryInterface, OleObjectRunnable_AddRef, @@ -893,7 +902,7 @@ static void WINAPI AdviseSink_OnClose(IA CHECK_EXPECTED_METHOD("AdviseSink_OnClose"); } -static IAdviseSinkVtbl AdviseSinkVtbl = +static const IAdviseSinkVtbl AdviseSinkVtbl = { AdviseSink_QueryInterface, AdviseSink_AddRef, @@ -1294,6 +1303,156 @@ static void test_data_cache(void) ReleaseStgMedium(&stgmedium); } +static void test_default_handler(void) +{ + HRESULT hr; + IOleObject *pObject; + IRunnableObject *pRunnableObject; + IOleClientSite *pClientSite; + IDataObject *pDataObject; + SIZEL sizel; + DWORD dwStatus; + CLSID clsid; + LPOLESTR pszUserType; + LOGPALETTE palette; + DWORD dwAdvConn; + IMoniker *pMoniker; + FORMATETC fmtetc; + IOleInPlaceObject *pInPlaceObj; + IEnumOLEVERB *pEnumVerbs; + static const WCHAR wszUnknown[] = {'U','n','k','n','o','w','n',0}; + static const WCHAR wszHostName[] = {'W','i','n','e',' ','T','e','s','t',' ','P','r','o','g','r','a','m',0}; + static const WCHAR wszDelim[] = {'!',0}; + + hr = CoCreateInstance(&CLSID_WineTest, NULL, CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void **)&pObject); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed with REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + + hr = OleCreateDefaultHandler(&CLSID_WineTest, NULL, &IID_IOleObject, (void **)&pObject); + ok_ole_success(hr, "OleCreateDefaultHandler"); + + hr = IOleObject_QueryInterface(pObject, &IID_IOleInPlaceObject, (void **)&pInPlaceObj); + ok(hr == E_NOINTERFACE, "IOleObject_QueryInterface(&IID_IOleInPlaceObject) should return E_NOINTERFACE instead of 0x%08x\n", hr); + + hr = IOleObject_Advise(pObject, &AdviseSink, &dwAdvConn); + ok_ole_success(hr, "IOleObject_Advise"); + + hr = IOleObject_Close(pObject, OLECLOSE_NOSAVE); + ok_ole_success(hr, "IOleObject_Close"); + + /* FIXME: test IOleObject_EnumAdvise */ + + hr = IOleObject_EnumVerbs(pObject, &pEnumVerbs); + ok(hr == REGDB_E_CLASSNOTREG, "IOleObject_EnumVerbs should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + + hr = IOleObject_GetClientSite(pObject, &pClientSite); + ok_ole_success(hr, "IOleObject_GetClientSite"); + + hr = IOleObject_GetClipboardData(pObject, 0, &pDataObject); + ok(hr == OLE_E_NOTRUNNING, + "IOleObject_GetClipboardData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", + hr); + + hr = IOleObject_GetExtent(pObject, DVASPECT_CONTENT, &sizel); + ok(hr == OLE_E_BLANK, "IOleObject_GetExtent should have returned OLE_E_BLANK instead of 0x%08x\n", + hr); + + hr = IOleObject_GetMiscStatus(pObject, DVASPECT_CONTENT, &dwStatus); + todo_wine + ok(hr == REGDB_E_CLASSNOTREG, "IOleObject_GetMiscStatus should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + + hr = IOleObject_GetUserClassID(pObject, &clsid); + ok_ole_success(hr, "IOleObject_GetUserClassID"); + ok(IsEqualCLSID(&clsid, &CLSID_WineTest), "clsid != CLSID_WineTest\n"); + + hr = IOleObject_GetUserType(pObject, USERCLASSTYPE_FULL, &pszUserType); + todo_wine { + ok_ole_success(hr, "IOleObject_GetUserType"); + ok(!lstrcmpW(pszUserType, wszUnknown), "Retrieved user type was wrong\n"); + } + + hr = IOleObject_InitFromData(pObject, NULL, TRUE, 0); + ok(hr == OLE_E_NOTRUNNING, "IOleObject_InitFromData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); + + hr = IOleObject_IsUpToDate(pObject); + ok(hr == OLE_E_NOTRUNNING, "IOleObject_IsUpToDate should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); + + palette.palNumEntries = 1; + palette.palVersion = 2; + memset(&palette.palPalEntry[0], 0, sizeof(palette.palPalEntry[0])); + hr = IOleObject_SetColorScheme(pObject, &palette); + ok(hr == OLE_E_NOTRUNNING, "IOleObject_SetColorScheme should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); + + sizel.cx = sizel.cy = 0; + hr = IOleObject_SetExtent(pObject, DVASPECT_CONTENT, &sizel); + + hr = IOleObject_SetHostNames(pObject, wszHostName, NULL); + ok_ole_success(hr, "IOleObject_SetHostNames"); + + hr = CreateItemMoniker(wszDelim, wszHostName, &pMoniker); + ok_ole_success(hr, "CreateItemMoniker"); + hr = IOleObject_SetMoniker(pObject, OLEWHICHMK_CONTAINER, pMoniker); + ok_ole_success(hr, "IOleObject_SetMoniker"); + + hr = IOleObject_GetMoniker(pObject, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &pMoniker); + ok(hr == E_FAIL, "IOleObject_GetMoniker should have returned E_FAIL instead of 0x%08x\n", hr); + + hr = IOleObject_Update(pObject); + todo_wine + ok(hr == REGDB_E_CLASSNOTREG, "IOleObject_Update should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + + hr = IOleObject_QueryInterface(pObject, &IID_IDataObject, (void **)&pDataObject); + ok_ole_success(hr, "IOleObject_QueryInterface"); + + fmtetc.cfFormat = CF_TEXT; + fmtetc.ptd = NULL; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.lindex = -1; + fmtetc.tymed = TYMED_NULL; + hr = IDataObject_DAdvise(pDataObject, &fmtetc, 0, &AdviseSink, &dwAdvConn); + ok_ole_success(hr, "IDataObject_DAdvise"); + + fmtetc.cfFormat = CF_ENHMETAFILE; + fmtetc.ptd = NULL; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.lindex = -1; + fmtetc.tymed = TYMED_ENHMF; + hr = IDataObject_DAdvise(pDataObject, &fmtetc, 0, &AdviseSink, &dwAdvConn); + ok_ole_success(hr, "IDataObject_DAdvise"); + + fmtetc.cfFormat = CF_ENHMETAFILE; + fmtetc.ptd = NULL; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.lindex = -1; + fmtetc.tymed = TYMED_ENHMF; + hr = IDataObject_QueryGetData(pDataObject, &fmtetc); + todo_wine + ok(hr == OLE_E_NOTRUNNING, "IDataObject_QueryGetData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); + + fmtetc.cfFormat = CF_TEXT; + fmtetc.ptd = NULL; + fmtetc.dwAspect = DVASPECT_CONTENT; + fmtetc.lindex = -1; + fmtetc.tymed = TYMED_NULL; + hr = IDataObject_QueryGetData(pDataObject, &fmtetc); + todo_wine + ok(hr == OLE_E_NOTRUNNING, "IDataObject_QueryGetData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); + + hr = IOleObject_QueryInterface(pObject, &IID_IRunnableObject, (void **)&pRunnableObject); + ok_ole_success(hr, "IOleObject_QueryInterface"); + + hr = IRunnableObject_SetContainedObject(pRunnableObject, TRUE); + ok_ole_success(hr, "IRunnableObject_SetContainedObject"); + + hr = IRunnableObject_Run(pRunnableObject, NULL); + ok(hr == REGDB_E_CLASSNOTREG, "IOleObject_Run should have returned REGDB_E_CLASSNOTREG instead of 0x%08x\n", hr); + + hr = IOleObject_Close(pObject, OLECLOSE_NOSAVE); + ok_ole_success(hr, "IOleObject_Close"); + + IRunnableObject_Release(pRunnableObject); + IOleObject_Release(pObject); +} + START_TEST(ole2) { DWORD dwRegister; @@ -1323,6 +1482,7 @@ START_TEST(ole2) ok_ole_success(hr, "CoRevokeClassObject"); test_data_cache(); + test_default_handler(); CoUninitialize(); }

1 0

Rob Shearman : ole32: Add tests for error info functions.
by Alexandre Julliard Jan. 11, 2007

Jan. 11, 2007

Module: wine Branch: master Commit: 5c71583b53e2a4ea994aec2d884c9e767b393124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c71583b53e2a4ea994aec2d8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 10 16:56:30 2007 -0600 ole32: Add tests for error info functions. Return E_INVALIDARG if dwReserved is not set to zero for both GetErrorInfo and SetErrorInfo. --- dlls/ole32/errorinfo.c | 16 +++++- dlls/ole32/tests/Makefile.in | 1 + dlls/ole32/tests/errorinfo.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index b184003..c1789ef 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -488,8 +488,14 @@ HRESULT WINAPI GetErrorInfo(ULONG dwRese { TRACE("(%d, %p, %p)\n", dwReserved, pperrinfo, COM_CurrentInfo()->errorinfo); + if (dwReserved) + { + ERR("dwReserved (0x%x) != 0\n", dwReserved); + return E_INVALIDARG; + } + if(!pperrinfo) return E_INVALIDARG; - + if (!COM_CurrentInfo()->errorinfo) { *pperrinfo = NULL; @@ -511,7 +517,13 @@ HRESULT WINAPI SetErrorInfo(ULONG dwRese IErrorInfo * pei; TRACE("(%d, %p)\n", dwReserved, perrinfo); - + + if (dwReserved) + { + ERR("dwReserved (0x%x) != 0\n", dwReserved); + return E_INVALIDARG; + } + /* release old errorinfo */ pei = COM_CurrentInfo()->errorinfo; if (pei) IErrorInfo_Release(pei); diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index f34aef3..ef01690 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -9,6 +9,7 @@ EXTRALIBS = -luuid CTESTS = \ clipboard.c \ compobj.c \ + errorinfo.c \ hglobalstream.c \ marshal.c \ moniker.c \ diff --git a/dlls/ole32/tests/errorinfo.c b/dlls/ole32/tests/errorinfo.c new file mode 100644 index 0000000..c3fe19d --- /dev/null +++ b/dlls/ole32/tests/errorinfo.c @@ -0,0 +1,111 @@ +/* + * Component Object Tests + * + * Copyright 2005 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "wine/test.h" + +#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) + +static const CLSID CLSID_WineTest = +{ /* 9474ba1a-258b-490b-bc13-516e9239ace0 */ + 0x9474ba1a, + 0x258b, + 0x490b, + {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe0} +}; + +static void test_error_info(void) +{ + HRESULT hr; + ICreateErrorInfo *pCreateErrorInfo; + IErrorInfo *pErrorInfo; + static WCHAR wszDescription[] = {'F','a','i','l','e','d',' ','S','p','r','o','c','k','e','t',0}; + static WCHAR wszHelpFile[] = {'s','p','r','o','c','k','e','t','.','h','l','p',0}; + static WCHAR wszSource[] = {'s','p','r','o','c','k','e','t',0}; + + hr = CreateErrorInfo(&pCreateErrorInfo); + ok_ole_success(hr, "CreateErrorInfo"); + + hr = ICreateErrorInfo_SetDescription(pCreateErrorInfo, NULL); + ok_ole_success(hr, "ICreateErrorInfo_SetDescription"); + + hr = ICreateErrorInfo_SetDescription(pCreateErrorInfo, wszDescription); + ok_ole_success(hr, "ICreateErrorInfo_SetDescription"); + + hr = ICreateErrorInfo_SetGUID(pCreateErrorInfo, &CLSID_WineTest); + ok_ole_success(hr, "ICreateErrorInfo_SetGUID"); + + hr = ICreateErrorInfo_SetHelpContext(pCreateErrorInfo, 0xdeadbeef); + ok_ole_success(hr, "ICreateErrorInfo_SetHelpContext"); + + hr = ICreateErrorInfo_SetHelpFile(pCreateErrorInfo, NULL); + ok_ole_success(hr, "ICreateErrorInfo_SetHelpFile"); + + hr = ICreateErrorInfo_SetHelpFile(pCreateErrorInfo, wszHelpFile); + ok_ole_success(hr, "ICreateErrorInfo_SetHelpFile"); + + hr = ICreateErrorInfo_SetSource(pCreateErrorInfo, NULL); + ok_ole_success(hr, "ICreateErrorInfo_SetSource"); + + hr = ICreateErrorInfo_SetSource(pCreateErrorInfo, wszSource); + ok_ole_success(hr, "ICreateErrorInfo_SetSource"); + + hr = ICreateErrorInfo_QueryInterface(pCreateErrorInfo, &IID_IErrorInfo, (void **)&pErrorInfo); + ok_ole_success(hr, "ICreateErrorInfo_QueryInterface"); + + ICreateErrorInfo_Release(pCreateErrorInfo); + + hr = SetErrorInfo(0, pErrorInfo); + ok_ole_success(hr, "SetErrorInfo"); + + IErrorInfo_Release(pErrorInfo); + pErrorInfo = NULL; + + hr = GetErrorInfo(0, &pErrorInfo); + ok_ole_success(hr, "GetErrorInfo"); + + IErrorInfo_Release(pErrorInfo); + + hr = GetErrorInfo(0, &pErrorInfo); + ok(hr == S_FALSE, "GetErrorInfo should have returned S_FALSE instead of 0x%08x\n", hr); + ok(!pErrorInfo, "pErrorInfo should be set to NULL\n"); + + hr = SetErrorInfo(0, NULL); + ok_ole_success(hr, "SetErrorInfo"); + + hr = GetErrorInfo(0xdeadbeef, &pErrorInfo); + ok(hr == E_INVALIDARG, "GetErrorInfo should have returned E_INVALIDARG instead of 0x%08x\n", hr); + + hr = SetErrorInfo(0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "SetErrorInfo should have returned E_INVALIDARG instead of 0x%08x\n", hr); +} + +START_TEST(errorinfo) +{ + test_error_info(); +}

1 0