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

10 Dec '09

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

Jeremy White : usrmarshal: Add a test for marshalling a SAFEARRAY of VT_BSTR.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: 7e0c4fa404c570e107953b8882a09afcedfe0f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0c4fa404c570e107953b888… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Dec 9 15:02:44 2009 -0600 usrmarshal: Add a test for marshalling a SAFEARRAY of VT_BSTR. --- dlls/oleaut32/tests/usrmarshal.c | 92 +++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d180946..d57802c 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -109,6 +109,14 @@ static ULONG get_cell_count(const SAFEARRAY *psa) return ulNumCells; } +static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) +{ + if (sftype == SF_BSTR) + return sizeof(DWORD); + else + return lpsa->cbElements; +} + static void check_safearray(void *buffer, LPSAFEARRAY lpsa) { unsigned char *wiresa = buffer; @@ -136,7 +144,7 @@ static void check_safearray(void *buffer, LPSAFEARRAY lpsa) wiresa += sizeof(WORD); ok(*(WORD *)wiresa == lpsa->fFeatures, "wiresa + 0xa should be lpsa->fFeatures instead of 0x%08x\n", *(WORD *)wiresa); wiresa += sizeof(WORD); - ok(*(DWORD *)wiresa == lpsa->cbElements, "wiresa + 0xc should be lpsa->cbElements instead of 0x%08x\n", *(DWORD *)wiresa); + ok(*(DWORD *)wiresa == elem_wire_size(lpsa, sftype), "wiresa + 0xc should be 0x%08x instead of 0x%08x\n", elem_wire_size(lpsa, sftype), *(DWORD *)wiresa); wiresa += sizeof(DWORD); ok(*(WORD *)wiresa == lpsa->cLocks, "wiresa + 0x10 should be lpsa->cLocks instead of 0x%04x\n", *(WORD *)wiresa); wiresa += sizeof(WORD); @@ -197,7 +205,7 @@ static void init_user_marshal_cb(USER_MARSHAL_CB *umcb, static void test_marshal_LPSAFEARRAY(void) { - unsigned char *buffer; + unsigned char *buffer, *p; ULONG size, expected; LPSAFEARRAY lpsa; LPSAFEARRAY lpsa2 = NULL; @@ -207,6 +215,10 @@ static void test_marshal_LPSAFEARRAY(void) USER_MARSHAL_CB umcb; HRESULT hr; VARTYPE vt; + OLECHAR *values[10]; + int expected_bstr_size; + int i; + LONG indices[1]; sab.lLbound = 5; sab.cElements = 10; @@ -324,6 +336,82 @@ static void test_marshal_LPSAFEARRAY(void) SafeArrayDestroyData(lpsa); SafeArrayDestroyDescriptor(lpsa); + /* Test an array of VT_BSTR */ + sab.lLbound = 3; + sab.cElements = sizeof(values) / sizeof(values[0]); + + lpsa = SafeArrayCreate(VT_BSTR, 1, &sab); + expected_bstr_size = 0; + for (i = 0; i < sab.cElements; i++) + { + int j; + WCHAR buf[128]; + for (j = 0; j <= i; j++) + buf[j] = 'a' + j; + buf[j] = 0; + indices[0] = i + sab.lLbound; + values[i] = SysAllocString(buf); + hr = SafeArrayPutElement(lpsa, indices, values[i]); + ok(hr == S_OK, "Failed to put bstr element hr 0x%x\n", hr); + expected_bstr_size += (j * sizeof(WCHAR)) + (3 * sizeof(DWORD)); + if (i % 2 == 0) /* Account for DWORD padding. Works so long as cElements is even */ + expected_bstr_size += sizeof(WCHAR); + } + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = LPSAFEARRAY_UserSize(&umcb.Flags, 1, &lpsa); + expected = 44 + (sab.cElements * sizeof(DWORD)) + expected_bstr_size; + if (sizeof(void *) == 8) /* win64 */ + expected += 12; + todo_wine + ok(size == (expected + sizeof(DWORD)), "size should be %u bytes, not %u\n", expected + (ULONG) sizeof(DWORD), size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + size = LPSAFEARRAY_UserSize(&umcb.Flags, 0, &lpsa); + todo_wine + ok(size == expected, "size should be %u bytes, not %u\n", expected, size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memset(buffer, 0xcc, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + p = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa); + trace("LPSAFEARRAY_UserMarshal processed %ld bytes\n", p ? (long) (p - buffer) : 0); + + check_safearray(buffer, lpsa); + + lpsa2 = NULL; + if (LPSAFEARRAY_UNMARSHAL_WORKS) + { + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); + p = LPSAFEARRAY_UserUnmarshal(&umcb.Flags, buffer, &lpsa2); + trace("LPSAFEARRAY_UserUnmarshal processed %ld bytes\n", p ? (long) (p - buffer) : 0); + ok(lpsa2 != NULL, "LPSAFEARRAY didn't unmarshal, result %p\n", p); + } + + for (i = 0; i < sizeof(values) / sizeof(values[0]); i++) + { + BSTR gotvalue = NULL; + + if (lpsa2) + { + indices[0] = i + sab.lLbound; + hr = SafeArrayGetElement(lpsa2, indices, &gotvalue); + ok(hr == S_OK, "Failed to get bstr element at hres 0x%x\n", hr); + if (hr == S_OK) + ok(VarBstrCmp(values[i], gotvalue, 0, 0) == VARCMP_EQ, "String %d does not match\n", i); + } + + SysFreeString(values[i]); + } + + if (LPSAFEARRAY_UNMARSHAL_WORKS) + { + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + LPSAFEARRAY_UserFree(&umcb.Flags, &lpsa2); + } + + HeapFree(GetProcessHeap(), 0, buffer); + SafeArrayDestroy(lpsa); + + /* VARTYPE-less arrays with FADF_VARIANT */ hr = SafeArrayAllocDescriptor(1, &lpsa); ok(hr == S_OK, "saad failed %08x\n", hr);

1 0

Henri Verbeet : ddraw: Avoid enumerating display modes for formats that arent't supported anyway.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: ddddc60eb9a2a03083fda1d844044c90ebe5715c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddddc60eb9a2a03083fda1d84… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 9 20:32:06 2009 +0100 ddraw: Avoid enumerating display modes for formats that arent't supported anyway. Some of these formats can't even be translated by ddraw. --- dlls/ddraw/ddraw.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index aeaffbd..46fd729 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1291,21 +1291,8 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, WINED3DFORMAT checkFormatList[] = { - WINED3DFMT_B8G8R8_UNORM, - WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B5G6R5_UNORM, - WINED3DFMT_B5G5R5X1_UNORM, - WINED3DFMT_B5G5R5A1_UNORM, - WINED3DFMT_B4G4R4A4_UNORM, - WINED3DFMT_B2G3R3_UNORM, - WINED3DFMT_B2G3R3A8_UNORM, - WINED3DFMT_B4G4R4X4_UNORM, - WINED3DFMT_R10G10B10A2_UNORM, - WINED3DFMT_R8G8B8A8_UNORM, - WINED3DFMT_R8G8B8X8_UNORM, - WINED3DFMT_B10G10R10A2_UNORM, - WINED3DFMT_P8_UINT_A8_UNORM, WINED3DFMT_P8_UINT, };

1 0

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

10 Dec '09

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

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

10 Dec '09

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: Add a test for modifying read-only substorage objects.
by Alexandre Julliard 10 Dec '09

10 Dec '09

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

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

10 Dec '09

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

Vincent Povirk : ole32: Make findElement take a StorageBaseImpl.
by Alexandre Julliard 10 Dec '09

10 Dec '09

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: Make IEnumSTATSTGImpl reference the parent storage.
by Alexandre Julliard 10 Dec '09

10 Dec '09

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

Alexandre Julliard : winedbg: Use the explicit name for all A/W function.
by Alexandre Julliard 10 Dec '09

10 Dec '09

Module: wine Branch: master Commit: c09ac7a41fb3be425d869b560feb784d7d38762e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09ac7a41fb3be425d869b560… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 18:14:07 2009 +0100 winedbg: Use the explicit name for all A/W function. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/dbg.y | 6 +++--- programs/winedbg/debugger.h | 2 +- programs/winedbg/gdbproxy.c | 8 ++++---- programs/winedbg/info.c | 34 +++++++++++++++++----------------- programs/winedbg/source.c | 10 +++++----- programs/winedbg/tgt_active.c | 8 ++++---- programs/winedbg/tgt_minidump.c | 4 ++-- programs/winedbg/winedbg.c | 12 ++++++------ 9 files changed, 43 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c09ac7a41fb3be425d869…

1 0