December 2009 - Wine-Commits

Eric Pouech : dbghelp: For mingw32 (stabs debug info), parse the FileHeader 's symbol table to offset properly the global variables.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 185e5daed64acfe2dcf18578ef5ae88b9429b87b URL: http://source.winehq.org/git/wine.git/?a=commit;h=185e5daed64acfe2dcf18578e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 9 20:55:27 2009 +0100 dbghelp: For mingw32 (stabs debug info), parse the FileHeader's symbol table to offset properly the global variables. --- dlls/dbghelp/pe_module.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 44a4d6a..3b9cceb 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -36,6 +36,69 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); /****************************************************************** + * pe_load_symbol_table + * + * Use the COFF symbol table (if any) from the IMAGE_FILE_HEADER to set the absolute address + * of global symbols. + * Mingw32 requires this for stabs debug information as address for global variables isn't filled in + * (this is similar to what is done in elf_module.c when using the .symtab ELF section) + */ +static BOOL pe_load_symbol_table(struct module* module, IMAGE_NT_HEADERS* nth, void* mapping) +{ + const IMAGE_SYMBOL* isym; + int i, numsym, naux; + const char* strtable; + char tmp[9]; + const char* name; + struct hash_table_iter hti; + void* ptr; + struct symt_data* sym; + const IMAGE_SECTION_HEADER* sect; + + numsym = nth->FileHeader.NumberOfSymbols; + if (!nth->FileHeader.PointerToSymbolTable || !numsym) + return TRUE; + isym = (const IMAGE_SYMBOL*)((char*)mapping + nth->FileHeader.PointerToSymbolTable); + /* FIXME: no way to get strtable size */ + strtable = (const char*)&isym[numsym]; + sect = IMAGE_FIRST_SECTION(nth); + + for (i = 0; i < numsym; i+= naux, isym += naux) + { + if (isym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL && + isym->SectionNumber > 0 && isym->SectionNumber <= nth->FileHeader.NumberOfSections) + { + if (isym->N.Name.Short) + { + name = memcpy(tmp, isym->N.ShortName, 8); + tmp[8] = '\0'; + } + else name = strtable + isym->N.Name.Long; + if (name[0] == '_') name++; + hash_table_iter_init(&module->ht_symbols, &hti, name); + while ((ptr = hash_table_iter_up(&hti))) + { + sym = GET_ENTRY(ptr, struct symt_data, hash_elt); + if (sym->symt.tag == SymTagData && + (sym->kind == DataIsGlobal || sym->kind == DataIsFileStatic) && + !strcmp(sym->hash_elt.name, name)) + { + TRACE("Changing absolute address for %d.%s: %lx -> %s\n", + isym->SectionNumber, name, sym->u.var.offset, + wine_dbgstr_longlong(module->module.BaseOfImage + + sect[isym->SectionNumber - 1].VirtualAddress + isym->Value)); + sym->u.var.offset = module->module.BaseOfImage + + sect[isym->SectionNumber - 1].VirtualAddress + isym->Value; + break; + } + } + } + naux = isym->NumberOfAuxSymbols + 1; + } + return TRUE; +} + +/****************************************************************** * pe_load_stabs * * look for stabs information in PE header (it's how the mingw compiler provides @@ -74,6 +137,7 @@ static BOOL pe_load_stabs(const struct process* pcs, struct module* module, RtlImageRvaToVa(nth, mapping, stabstr, NULL), stabstrsize, NULL, NULL); + if (ret) pe_load_symbol_table(module, nth, mapping); } TRACE("%s the STABS debug info\n", ret ? "successfully loaded" : "failed to load");

1 0

Eric Pouech : winedump: Rewrote a bit the COFF symbol table stuff.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 947f2456a930b28d69c29ff3c3037e0f6276d1bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=947f2456a930b28d69c29ff3c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 9 20:55:07 2009 +0100 winedump: Rewrote a bit the COFF symbol table stuff. --- tools/winedump/debug.c | 106 ++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 52 deletions(-) diff --git a/tools/winedump/debug.c b/tools/winedump/debug.c index be8150f..4f2cedf 100644 --- a/tools/winedump/debug.c +++ b/tools/winedump/debug.c @@ -512,70 +512,72 @@ static const char *get_coff_name( const IMAGE_SYMBOL *coff_sym, const char *coff return nampnt; } -void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) +static const char* storage_class(BYTE sc) +{ + static char tmp[7]; + switch (sc) + { + case IMAGE_SYM_CLASS_STATIC: return "static"; + case IMAGE_SYM_CLASS_EXTERNAL: return "extrnl"; + case IMAGE_SYM_CLASS_LABEL: return "label "; + } + sprintf(tmp, "#%d", sc); + return tmp; +} + +void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sym, + const IMAGE_SECTION_HEADER *sectHead) { - const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); const IMAGE_SYMBOL *coff_sym; - const IMAGE_SYMBOL *coff_symbols = - (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); - const char *coff_strtab = (const char *) (coff_symbols + coff->NumberOfSymbols); - const IMAGE_SECTION_HEADER *sectHead = pmt; + const char *coff_strtab = (const char *) (coff_symbols + num_sym); unsigned int i; const char *nampnt; int naux; - printf("\nDebug table: COFF format. modbase %p, coffbase %p\n", PRD(0, 0), coff); - printf(" ID | seg:offs [ abs ] | symbol/function name\n"); - for(i=0; i < coff->NumberOfSymbols; i++ ) + printf("\nDebug table: COFF format.\n"); + printf(" ID | seg:offs [ abs ] | Kind | symbol/function name\n"); + for (i=0; i < num_sym; i++) { - coff_sym = coff_symbols + i; - naux = coff_sym->NumberOfAuxSymbols; - - if( coff_sym->StorageClass == IMAGE_SYM_CLASS_FILE ) - { - printf("file %s\n", (const char *) (coff_sym + 1)); - i += naux; - continue; - } - - if( (coff_sym->StorageClass == IMAGE_SYM_CLASS_STATIC) - && (naux == 0) - && (coff_sym->SectionNumber == 1) ) - { - DWORD base = sectHead[coff_sym->SectionNumber - 1].VirtualAddress; - /* - * This is a normal static function when naux == 0. - * Just register it. The current file is the correct - * one in this instance. - */ - nampnt = get_coff_name( coff_sym, coff_strtab ); - - printf("%05d | %02d:%08x [%08x] | %s\n", i, coff_sym->SectionNumber - 1, coff_sym->Value - base, coff_sym->Value, nampnt); - i += naux; - continue; - } + coff_sym = coff_symbols + i; + naux = coff_sym->NumberOfAuxSymbols; - if( (coff_sym->StorageClass == IMAGE_SYM_CLASS_EXTERNAL) - && ISFCN(coff_sym->Type) - && (coff_sym->SectionNumber > 0) ) + switch (coff_sym->StorageClass) { - DWORD base = sectHead[coff_sym->SectionNumber - 1].VirtualAddress; - - nampnt = get_coff_name( coff_sym, coff_strtab ); + case IMAGE_SYM_CLASS_FILE: + printf("file %s\n", (const char *) (coff_sym + 1)); + break; + case IMAGE_SYM_CLASS_STATIC: + case IMAGE_SYM_CLASS_EXTERNAL: + case IMAGE_SYM_CLASS_LABEL: + if (coff_sym->SectionNumber > 0) + { + DWORD base = sectHead[coff_sym->SectionNumber - 1].VirtualAddress; + nampnt = get_coff_name( coff_sym, coff_strtab ); - /* FIXME: add code to find out the file this symbol belongs to, - * see winedbg */ - printf("%05d | %02d:%08x [%08x] | %s\n", i, coff_sym->SectionNumber - 1, coff_sym->Value - base, coff_sym->Value, nampnt); - i += naux; - continue; - } + printf("%05d | %02d:%08x [%08x] | %s | %s\n", + i, coff_sym->SectionNumber - 1, coff_sym->Value, + base + coff_sym->Value, + storage_class(coff_sym->StorageClass), nampnt); + } + break; + default: + printf("%05d | %s\n", i, storage_class(coff_sym->StorageClass)); + } + /* + * For now, skip past the aux entries. + */ + i += naux; + } +} - /* - * For now, skip past the aux entries. - */ - i += naux; +void dump_coff(unsigned long coffbase, unsigned long len, const void* pmt) +{ + const IMAGE_COFF_SYMBOLS_HEADER *coff = PRD(coffbase, len); + const IMAGE_SYMBOL *coff_symbols = + (const IMAGE_SYMBOL *) ((const char *)coff + coff->LvaToFirstSymbol); + const IMAGE_SECTION_HEADER *sectHead = pmt; - } + dump_coff_symbol_table(coff_symbols, coff->NumberOfSymbols, sectHead); } void dump_codeview(unsigned long base, unsigned long len)

1 0

Eric Pouech : winedump: Dump PE symbols table if any.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 2271a8d417fa5ac1c51d554811b5d420d92dfea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2271a8d417fa5ac1c51d55481… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Dec 9 20:55:18 2009 +0100 winedump: Dump PE symbols table if any. --- tools/winedump/main.c | 7 +++++++ tools/winedump/pe.c | 20 ++++++++++++++++++++ tools/winedump/winedump.h | 3 +++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index 3524a1e..d5f39b5 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -187,9 +187,15 @@ static void do_dumpall(const char *arg) { globals.do_dumpheader = 1; globals.do_dump_rawdata = 1; + globals.do_symbol_table = 1; globals.dumpsect = "ALL"; } +static void do_symtable(const char* arg) +{ + globals.do_symbol_table = 1; +} + struct my_option { const char *name; @@ -222,6 +228,7 @@ static const struct my_option option_table[] = { {"-f", DUMP, 0, do_dumphead, "-f Dumps file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dumps raw debug information"}, {"-j", DUMP, 1, do_dumpsect, "-j sect_name Dumps only the content of section sect_name (import, export, debug, resource, tls, clr)"}, + {"-t", DUMP, 0, do_symtable, "-t Dumps symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dumps everything"}, {NULL, NONE, 0, NULL, NULL} }; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 9761215..a79593c 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1399,6 +1399,24 @@ static void dump_debug(void) dump_stabs(stabs, szstabs, stabstr, szstr); } +static void dump_symbol_table(void) +{ + const IMAGE_SYMBOL* sym; + int numsym; + const char* strtable; + + numsym = PE_nt_headers->FileHeader.NumberOfSymbols; + if (!PE_nt_headers->FileHeader.PointerToSymbolTable || !numsym) + return; + sym = (const IMAGE_SYMBOL*)PRD(PE_nt_headers->FileHeader.PointerToSymbolTable, + sizeof(*sym) * numsym); + if (!sym) return; + /* FIXME: no way to get strtable size */ + strtable = (const char*)&sym[numsym]; + + dump_coff_symbol_table(sym, numsym, IMAGE_FIRST_SECTION(PE_nt_headers)); +} + enum FileSig get_kind_exec(void) { const WORD* pw; @@ -1468,6 +1486,8 @@ void pe_dump(void) if (all || !strcmp(globals.dumpsect, "except")) dump_dir_exceptions(); } + if (globals.do_symbol_table) + dump_symbol_table(); if (globals.do_debug) dump_debug(); } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 15a8cdb..9ad20a5 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -123,6 +123,7 @@ typedef struct __globals int do_dumpheader; /* -f */ int do_dump_rawdata; /* -x */ int do_debug; /* -G == 1, -g == 2 */ + int do_symbol_table; /* -t */ /* Option arguments: spec mode */ int start_ordinal; /* -s */ @@ -263,6 +264,8 @@ void codeview_dump_linetab2(const char* linetab, DWORD size, const ch void dump_stabs(const void* pv_stabs, unsigned szstabs, const char* stabstr, unsigned szstr); void dump_codeview(unsigned long ptr, unsigned long len); void dump_coff(unsigned long coffbase, unsigned long len, const void* sect_map); +void dump_coff_symbol_table(const IMAGE_SYMBOL *coff_symbols, unsigned num_sym, + const IMAGE_SECTION_HEADER *sectHead); void dump_frame_pointer_omission(unsigned long base, unsigned long len); FILE *open_file (const char *name, const char *ext, const char *mode);

1 0

Henri Verbeet : wined3d: Don't restore the draw buffer in color_fill_fbo().
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: bd9828a0393a45b7fdd8c1ecb01a294355e3aa58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd9828a0393a45b7fdd8c1ecb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:07 2009 +0100 wined3d: Don't restore the draw buffer in color_fill_fbo(). This should be done by the context management these days. --- dlls/wined3d/device.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 51c2fa7..cebb709 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5742,12 +5742,6 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, glClear(GL_COLOR_BUFFER_BIT); checkGLcall("glClear"); - if (swapchain && surface == ((IWineD3DSwapChainImpl *)swapchain)->frontBuffer - && ((IWineD3DSwapChainImpl *)swapchain)->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer()"); - } - LEAVE_GL(); context_release(context); }

1 0

Vincent Povirk : ole32: Make IEnumSTATSTGImpl reference the parent storage.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 5d39c31bff8266a097ea658dfd751276c4b3496a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d39c31bff8266a097ea658df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 17:17:13 2009 -0600 ole32: Make IEnumSTATSTGImpl reference the parent storage. --- dlls/ole32/storage32.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 2465863..2812555 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -234,7 +234,7 @@ struct IEnumSTATSTGImpl * since we want to cast this in an IEnumSTATSTG pointer */ LONG ref; /* Reference count */ - StorageImpl* parentStorage; /* Reference to the parent storage */ + StorageBaseImpl* parentStorage; /* Reference to the parent storage */ DirRef storageDirEntry; /* Directory entry of the storage to enumerate */ /* @@ -250,7 +250,7 @@ struct IEnumSTATSTGImpl }; -static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageImpl* This, DirRef storageDirEntry); +static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageBaseImpl* This, DirRef storageDirEntry); static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This); static void IEnumSTATSTGImpl_PushSearchNode(IEnumSTATSTGImpl* This, DirRef nodeToPush); static DirRef IEnumSTATSTGImpl_PopSearchNode(IEnumSTATSTGImpl* This, BOOL remove); @@ -642,7 +642,7 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( return STG_E_REVERTED; newEnum = IEnumSTATSTGImpl_Construct( - This->ancestorStorage, + This, This->storageDirEntry); if (newEnum!=0) @@ -4034,14 +4034,14 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( /* * Read the entry from the storage. */ - StorageImpl_ReadDirEntry(This->parentStorage, + StorageBaseImpl_ReadDirEntry(This->parentStorage, currentSearchNode, &currentEntry); /* * Copy the information to the return buffer. */ - StorageUtl_CopyDirEntryToSTATSTG(&This->parentStorage->base, + StorageUtl_CopyDirEntryToSTATSTG(This->parentStorage, currentReturnStruct, &currentEntry, STATFLAG_DEFAULT); @@ -4096,7 +4096,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Skip( /* * Read the entry from the storage. */ - StorageImpl_ReadDirEntry(This->parentStorage, + StorageBaseImpl_ReadDirEntry(This->parentStorage, currentSearchNode, &currentEntry); @@ -4138,7 +4138,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( /* * Read the storage entry from the top-level storage. */ - hr = StorageImpl_ReadDirEntry( + hr = StorageBaseImpl_ReadDirEntry( This->parentStorage, This->storageDirEntry, &storageEntry); @@ -4232,7 +4232,7 @@ static void IEnumSTATSTGImpl_PushSearchNode( /* * Read the storage entry from the top-level storage. */ - hr = StorageImpl_ReadDirEntry( + hr = StorageBaseImpl_ReadDirEntry( This->parentStorage, nodeToPush, &storageEntry); @@ -4284,7 +4284,7 @@ static const IEnumSTATSTGVtbl IEnumSTATSTGImpl_Vtbl = */ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( - StorageImpl* parentStorage, + StorageBaseImpl* parentStorage, DirRef storageDirEntry) { IEnumSTATSTGImpl* newEnumeration;

1 0

Vincent Povirk : ole32: Add a test for modifying read-only substorage objects.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 1a12141d8691df7df2a9526b097347b058154646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a12141d8691df7df2a9526b0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 4 15:32:16 2009 -0600 ole32: Add a test for modifying read-only substorage objects. --- dlls/ole32/tests/storage32.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b5ecf22..b658a46 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1348,7 +1348,7 @@ static void test_parent_free(void) static void test_nonroot_transacted(void) { - IStorage *stg = NULL, *stg2 = NULL; + IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = NULL; static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; @@ -1398,7 +1398,26 @@ static void test_nonroot_transacted(void) IStorage_Release(stg2); } - IStream_Release(stg); + /* create a read-only transacted substorage */ + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, NULL, 0, &stg2); + ok(r==S_OK, "IStorage->OpenStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* The storage can be modified. */ + r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + todo_wine ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + if (r == S_OK) + IStream_Release(stg3); + + /* But changes cannot be committed. */ + r = IStorage_Commit(stg2, 0); + todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->Commit should fail, hr=%08x\n", r); + + IStorage_Release(stg2); + } + + IStorage_Release(stg); /* create a non-transacted file */ r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE |

1 0

Alexandre Julliard : ntdll: Search the whole filesystem under the starting directory when opening files by id .
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 6509044087ad5588d9f5904fb6237c84102bebf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6509044087ad5588d9f5904fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 23:34:45 2009 +0100 ntdll: Search the whole filesystem under the starting directory when opening files by id. --- dlls/ntdll/directory.c | 190 ++++++++++++++++++++++++++++++++++++----------- dlls/ntdll/tests/file.c | 21 +++++- 2 files changed, 166 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6509044087ad5588d9f59…

1 0

Vincent Povirk : ole32: Make findElement take a StorageBaseImpl.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 43184aaf52f29a02ab3babe35cc47dfdde92b0b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43184aaf52f29a02ab3babe35… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 17:13:33 2009 -0600 ole32: Make findElement take a StorageBaseImpl. --- dlls/ole32/storage32.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d0b0461..2465863 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -196,7 +196,7 @@ static LONG entryNameCmp( const OLECHAR *name2); static DirRef findElement( - StorageImpl *storage, + StorageBaseImpl *storage, DirRef storageEntry, const OLECHAR *name, DirEntry *data); @@ -447,7 +447,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( * Search for the element with the given name */ streamEntryRef = findElement( - This->ancestorStorage, + This, This->storageDirEntry, pwcsName, &currentEntry); @@ -571,7 +571,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( *ppstg = NULL; storageEntryRef = findElement( - This->ancestorStorage, + This, This->storageDirEntry, pwcsName, &currentEntry); @@ -736,7 +736,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( if (This->reverted) return STG_E_REVERTED; - currentEntryRef = findElement(This->ancestorStorage, + currentEntryRef = findElement(This, This->storageDirEntry, pwcsNewName, &currentEntry); @@ -752,7 +752,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* * Search for the old element name */ - currentEntryRef = findElement(This->ancestorStorage, + currentEntryRef = findElement(This, This->storageDirEntry, pwcsOldName, &currentEntry); @@ -858,7 +858,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( *ppstm = 0; - currentEntryRef = findElement(This->ancestorStorage, + currentEntryRef = findElement(This, This->storageDirEntry, pwcsName, &currentEntry); @@ -1040,7 +1040,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( return STG_E_ACCESSDENIED; } - currentEntryRef = findElement(This->ancestorStorage, + currentEntryRef = findElement(This, This->storageDirEntry, pwcsName, &currentEntry); @@ -1412,13 +1412,13 @@ static HRESULT insertIntoTree( * * Find and read the element of a storage with the given name. */ -static DirRef findElement(StorageImpl *storage, DirRef storageEntry, +static DirRef findElement(StorageBaseImpl *storage, DirRef storageEntry, const OLECHAR *name, DirEntry *data) { DirRef currentEntry; /* Read the storage entry to find the root of the tree. */ - StorageImpl_ReadDirEntry(storage, storageEntry, data); + StorageBaseImpl_ReadDirEntry(storage, storageEntry, data); currentEntry = data->dirRootEntry; @@ -1426,7 +1426,7 @@ static DirRef findElement(StorageImpl *storage, DirRef storageEntry, { LONG cmp; - StorageImpl_ReadDirEntry(storage, currentEntry, data); + StorageBaseImpl_ReadDirEntry(storage, currentEntry, data); cmp = entryNameCmp(name, data->name); @@ -1779,7 +1779,7 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( return STG_E_ACCESSDENIED; entryToDeleteRef = findElement( - This->ancestorStorage, + This, This->storageDirEntry, pwcsName, &entryToDelete);

1 0

Vincent Povirk : ole32: Don' t use ancestorStorage to decide if a storage is transacted.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 55b3a6e59f81013bb9f39bd57d2b6b5f103dabbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b3a6e59f81013bb9f39bd57… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Nov 30 17:10:49 2009 -0600 ole32: Don't use ancestorStorage to decide if a storage is transacted. --- dlls/ole32/storage32.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 266d677..d0b0461 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -435,7 +435,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( * Check that we're compatible with the parent's storage mode, but * only if we are not in transacted mode */ - if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) { + if(!(This->openFlags & STGM_TRANSACTED)) { if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) { res = STG_E_ACCESSDENIED; @@ -560,7 +560,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage( * Check that we're compatible with the parent's storage mode, * but only if we are not transacted */ - if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) { + if(!(This->openFlags & STGM_TRANSACTED)) { if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) { res = STG_E_ACCESSDENIED; @@ -848,7 +848,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( * Check that we're compatible with the parent's storage mode * if not in transacted mode */ - if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) { + if(!(This->openFlags & STGM_TRANSACTED)) { if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) return STG_E_ACCESSDENIED; }

1 0

Alexandre Julliard : clock: Convert to Unicode.
by Alexandre Julliard Dec. 10, 2009

Dec. 10, 2009

Module: wine Branch: master Commit: 58b007b0b7731f4b8ec6182a34e06205a8b09111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58b007b0b7731f4b8ec6182a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 18:53:35 2009 +0100 clock: Convert to Unicode. --- programs/clock/Makefile.in | 1 + programs/clock/main.c | 77 ++++++++++++++++++++++--------------------- programs/clock/main.h | 2 +- programs/clock/winclock.c | 29 ++++++++-------- programs/clock/winclock.h | 2 +- 5 files changed, 56 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58b007b0b7731f4b8ec61…

1 0