November 2009 - Wine-Commits

Eric Pouech : dbghelp: Beef up SymRefreshModuleList.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 68cc7d58757e0a2003350a1759c4970da712a8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68cc7d58757e0a2003350a175… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 16 21:27:08 2009 +0100 dbghelp: Beef up SymRefreshModuleList. --- dlls/dbghelp/module.c | 22 +++++++++++++++++----- include/dbghelp.h | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 7d2ad7f..a6778e7 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -455,6 +455,15 @@ enum module_type module_get_type_by_name(const WCHAR* name) return DMT_PE; } +/****************************************************************** + * refresh_module_list + */ +static BOOL refresh_module_list(struct process* pcs) +{ + /* force transparent ELF and Mach-O loading / unloading */ + return elf_synchronize_module_list(pcs) || macho_synchronize_module_list(pcs); +} + /*********************************************************************** * SymLoadModule (DBGHELP.@) */ @@ -536,9 +545,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam if (Flags & ~(SLMFLAG_VIRTUAL)) FIXME("Unsupported Flags %08x for %s\n", Flags, debugstr_w(wImageName)); - /* force transparent ELF and Mach-O loading / unloading */ - elf_synchronize_module_list(pcs); - macho_synchronize_module_list(pcs); + refresh_module_list(pcs); /* this is a Wine extension to the API just to redo the synchronisation */ if (!wImageName && !hFile) return 0; @@ -1058,6 +1065,11 @@ void module_reset_debug_info(struct module* module) */ BOOL WINAPI SymRefreshModuleList(HANDLE hProcess) { - FIXME("(%p) stub\n", hProcess); - return FALSE; + struct process* pcs; + + TRACE("(%p)\n", hProcess); + + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + + return refresh_module_list(pcs); } diff --git a/include/dbghelp.h b/include/dbghelp.h index 98695b2..34805f4 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1461,6 +1461,7 @@ BOOL WINAPI SymGetSymPrevW(HANDLE, PIMAGEHLP_SYMBOLW); DWORD WINAPI SymLoadModule(HANDLE, HANDLE, PCSTR, PCSTR, DWORD, DWORD); BOOL WINAPI SymRegisterCallback(HANDLE, PSYMBOL_REGISTERED_CALLBACK, PVOID); BOOL WINAPI SymRegisterFunctionEntryCallback(HANDLE, PSYMBOL_FUNCENTRY_CALLBACK, PVOID); +BOOL WINAPI SymRefreshModuleList(HANDLE); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); BOOL WINAPI SymUnloadModule(HANDLE, DWORD);

1 0

Jacek Caban : jscript: Use CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER to create ActiveX object.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: d168f71912ed9f024dba6ffc51c6f19c89781a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d168f71912ed9f024dba6ffc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 17 00:03:06 2009 +0100 jscript: Use CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER to create ActiveX object. --- dlls/jscript/activex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 60e33e0..947e4cf 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -86,7 +86,7 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid) if(FAILED(hres) || policy != URLPOLICY_ALLOW) return NULL; - hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, &IID_IClassFactory, (void**)&cf); + hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER, NULL, &IID_IClassFactory, (void**)&cf); if(FAILED(hres)) return NULL;

1 0

Rob Shearman : ole32: OleInitialize should return S_OK if it is called for the first time on a thread independently of CoInitializeEx .
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 932544d34c24ee3e69dbd9c80a343b29ef96ebbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=932544d34c24ee3e69dbd9c80… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 23:41:48 2009 +0000 ole32: OleInitialize should return S_OK if it is called for the first time on a thread independently of CoInitializeEx. --- dlls/ole32/ole2.c | 3 +++ dlls/ole32/tests/compobj.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index c612f33..6bf79fd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -190,6 +190,9 @@ HRESULT WINAPI OleInitialize(LPVOID reserved) if (FAILED(hr)) return hr; + if (!COM_CurrentInfo()->ole_inits) + hr = S_OK; + /* * Then, it has to initialize the OLE specific modules. * This includes: diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 442e7b0..5ddfc11 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1415,7 +1415,7 @@ static void test_CoInitializeEx(void) /* Calling OleInitialize for the first time should yield S_OK even with * apartment already initialized by previous CoInitialize(Ex) calls. */ hr = OleInitialize(NULL); - todo_wine ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); /* Subsequent calls to OleInitialize should return S_FALSE */ hr = OleInitialize(NULL);

1 0

Paul Vriens : advapi32/tests: Skip some tests on Win9x and WinMe.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 3912286aad5aa0531c586de885f0a6f85032d65a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3912286aad5aa0531c586de88… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 17 08:51:02 2009 +0100 advapi32/tests: Skip some tests on Win9x and WinMe. --- dlls/advapi32/tests/security.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2986ef5..94be18a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3284,6 +3284,11 @@ static void test_EqualSid(void) SetLastError(0xdeadbeef); ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &sid1); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("AllocateAndInitializeSid is not implemented\n"); + return; + } ok(ret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); ok(GetLastError() == 0xdeadbeef, "AllocateAndInitializeSid shouldn't have set last error to %d\n",

1 0

Owen Rudge : comctl32/tests: Add test of IImageList_Merge function.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 9adc1b8fd67a3ac44fc515de41c4bbe75225f28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adc1b8fd67a3ac44fc515de4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Nov 16 13:27:20 2009 -0600 comctl32/tests: Add test of IImageList_Merge function. --- dlls/comctl32/tests/imagelist.c | 77 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 77 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b97ca9a..f35a641 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1451,6 +1451,82 @@ static void DoTest3_v6(void) DestroyWindow(hwndfortest); } +static void testMerge_v6(void) +{ + HIMAGELIST himl1, himl2; + IImageList *imgl1, *imgl2, *merge; + HICON hicon1; + HWND hwnd = create_a_window(); + HRESULT hr; + int ret; + + himl1 = ImageList_Create(32,32,0,0,3); + ok(himl1 != NULL,"failed to create himl1\n"); + + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to create himl2\n"); + + hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); + ok(hicon1 != NULL, "failed to create hicon1\n"); + + if (!himl1 || !himl2 || !hicon1) + return; + + /* cast to IImageList */ + imgl1 = (IImageList *) himl1; + imgl2 = (IImageList *) himl2; + + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl2, -1, hicon1, &ret)) && (ret == 0),"add icon1 to himl2 failed\n"); + + /* If himl1 has no images, merge still succeeds */ + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1,-1 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1,0 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Same happens if himl2 is empty */ + IImageList_Release(imgl2); + himl2 = ImageList_Create(32,32,0,0,3); + ok(himl2 != NULL,"failed to recreate himl2\n"); + + imgl2 = (IImageList *) himl2; + + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, -1, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2,-1 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, -1, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2,0 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Now try merging an image with itself */ + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl2, -1, hicon1, &ret)) && (ret == 0),"re-add icon1 to himl2 failed\n"); + + hr = IImageList_Merge(imgl2, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl2 with itself failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + /* Try merging 2 different image lists */ + ok(SUCCEEDED(IImageList_ReplaceIcon(imgl1, -1, hicon1, &ret)) && (ret == 0),"add icon1 to himl1 failed\n"); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 0, 0, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1 with himl2 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + hr = IImageList_Merge(imgl1, 0, (IUnknown *) imgl2, 0, 8, 16, &IID_IImageList, (void **) &merge); + ok(SUCCEEDED(hr), "merge himl1 with himl2 8,16 failed\n"); + if (SUCCEEDED(hr)) IImageList_Release(merge); + + IImageList_Release(imgl1); + IImageList_Release(imgl2); + + DestroyIcon(hicon1); + DestroyWindow(hwnd); +} + START_TEST(imagelist) { ULONG_PTR ctx_cookie; @@ -1497,6 +1573,7 @@ START_TEST(imagelist) test_iimagelist(); DoTest1_v6(); DoTest3_v6(); + testMerge_v6(); CoUninitialize();

1 0

Jacek Caban : mshtml: Improved IHTMLStyle3::put_zoom stub.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 6be475d0fe1d1eba6b39b6c23b5a69b186e49695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be475d0fe1d1eba6b39b6c23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 16 23:55:10 2009 +0100 mshtml: Improved IHTMLStyle3::put_zoom stub. --- dlls/mshtml/htmlstyle3.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 505e91e..56fd3df 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -103,7 +103,15 @@ static HRESULT WINAPI HTMLStyle3_get_layoutFlow(IHTMLStyle3 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle3_put_zoom(IHTMLStyle3 *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE3_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + /* zoom property is IE CSS extension that is mostly used as a hack to workaround IE bugs. + * The value is set to 1 then. We can safely ignore setting zoom to 1. */ + if(V_VT(&v) == VT_I4 && V_I4(&v) == 1) + return S_OK; + + FIXME("stub for %s\n", debugstr_variant(&v)); return E_NOTIMPL; }

1 0

Roderick Colenbrander : wgl: The GLX context creation code isn' t needed anymore in wglCopyContext because we always have a GLX context now .
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 50a8b2a633bcdd313353d40df7d96da76843e8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a8b2a633bcdd313353d40df… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Nov 16 20:46:01 2009 +0100 wgl: The GLX context creation code isn't needed anymore in wglCopyContext because we always have a GLX context now. --- dlls/winex11.drv/opengl.c | 36 +----------------------------------- 1 files changed, 1 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 395e2a4..6277e8a 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1630,41 +1630,7 @@ BOOL CDECL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { TRACE("hglrcSrc: (%p), hglrcDst: (%p), mask: %#x\n", hglrcSrc, hglrcDst, mask); - /* There is a slight difference in the way GL contexts share display lists in WGL and GLX. - * In case of GLX you need to specify this at context creation time but in case of WGL you - * do this using wglShareLists which you can call after creating the context. - * To emulate WGL we try to delay the creation of the context until wglShareLists or wglMakeCurrent. - * Up to now that works fine. - * - * The delayed GLX context creation could cause issues for wglCopyContext as it might get called - * when there is no GLX context yet. The chance this will cause problems is small as at the time of - * writing Wine has had OpenGL support for more than 7 years and this function has remained a stub - * ever since then. - */ - if(!src->ctx || !dst->ctx) { - /* NOTE: As a special case, if both GLX contexts are NULL, that means - * neither WGL context was made current. In that case, both contexts - * are in a default state, so any copy would no-op. - */ - if(!src->ctx && !dst->ctx) { - TRACE("No source or destination contexts set. No-op.\n"); - return TRUE; - } - - if (!src->ctx) { - wine_tsx11_lock(); - src->ctx = create_glxcontext(gdi_display, src, NULL); - TRACE(" created a delayed OpenGL context (%p)\n", src->ctx); - } - else if (!dst->ctx) { - wine_tsx11_lock(); - dst->ctx = create_glxcontext(gdi_display, dst, NULL); - TRACE(" created a delayed OpenGL context (%p)\n", dst->ctx); - } - } - else - wine_tsx11_lock(); - + wine_tsx11_lock(); pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); wine_tsx11_unlock();

1 0

Vincent Povirk : ole32: Rename property variables in block chain conversion functions.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 54781b657f253512f289ca70cc3214b6d71584d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54781b657f253512f289ca70c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:59:09 2009 -0600 ole32: Rename property variables in block chain conversion functions. --- dlls/ole32/storage32.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index f975ca3..c2460e1 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3298,17 +3298,17 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( ULARGE_INTEGER size, offset; ULONG cbRead, cbWritten; ULARGE_INTEGER cbTotalRead; - ULONG propertyIndex; + ULONG streamEntryRef; HRESULT resWrite = S_OK; HRESULT resRead; - DirEntry chainProperty; + DirEntry streamEntry; BYTE *buffer; BlockChainStream *bbTempChain = NULL; BlockChainStream *bigBlockChain = NULL; /* * Create a temporary big block chain that doesn't have - * an associated property. This temporary chain will be + * an associated directory entry. This temporary chain will be * used to copy data from small blocks to big blocks. */ bbTempChain = BlockChainStream_Construct(This, @@ -3372,29 +3372,29 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks( /* * Destroy the small block chain. */ - propertyIndex = (*ppsbChain)->ownerDirEntry; + streamEntryRef = (*ppsbChain)->ownerDirEntry; SmallBlockChainStream_SetSize(*ppsbChain, size); SmallBlockChainStream_Destroy(*ppsbChain); *ppsbChain = 0; /* - * Change the property information. This chain is now a big block chain + * Change the directory entry. This chain is now a big block chain * and it doesn't reside in the small blocks chain anymore. */ - StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty); + StorageImpl_ReadDirEntry(This, streamEntryRef, &streamEntry); - chainProperty.startingBlock = bbHeadOfChain; + streamEntry.startingBlock = bbHeadOfChain; - StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); + StorageImpl_WriteDirEntry(This, streamEntryRef, &streamEntry); /* - * Destroy the temporary propertyless big block chain. - * Create a new big block chain associated with this property. + * Destroy the temporary entryless big block chain. + * Create a new big block chain associated with this entry. */ BlockChainStream_Destroy(bbTempChain); bigBlockChain = BlockChainStream_Construct(This, NULL, - propertyIndex); + streamEntryRef); return bigBlockChain; } @@ -3410,9 +3410,9 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( BlockChainStream** ppbbChain) { ULARGE_INTEGER size, offset, cbTotalRead; - ULONG cbRead, cbWritten, propertyIndex, sbHeadOfChain = BLOCK_END_OF_CHAIN; + ULONG cbRead, cbWritten, streamEntryRef, sbHeadOfChain = BLOCK_END_OF_CHAIN; HRESULT resWrite = S_OK, resRead; - DirEntry chainProperty; + DirEntry streamEntry; BYTE* buffer; SmallBlockChainStream* sbTempChain; @@ -3467,17 +3467,17 @@ SmallBlockChainStream* Storage32Impl_BigBlocksToSmallBlocks( } /* destroy the original big block chain */ - propertyIndex = (*ppbbChain)->ownerDirEntry; + streamEntryRef = (*ppbbChain)->ownerDirEntry; BlockChainStream_SetSize(*ppbbChain, size); BlockChainStream_Destroy(*ppbbChain); *ppbbChain = NULL; - StorageImpl_ReadDirEntry(This, propertyIndex, &chainProperty); - chainProperty.startingBlock = sbHeadOfChain; - StorageImpl_WriteDirEntry(This, propertyIndex, &chainProperty); + StorageImpl_ReadDirEntry(This, streamEntryRef, &streamEntry); + streamEntry.startingBlock = sbHeadOfChain; + StorageImpl_WriteDirEntry(This, streamEntryRef, &streamEntry); SmallBlockChainStream_Destroy(sbTempChain); - return SmallBlockChainStream_Construct(This, NULL, propertyIndex); + return SmallBlockChainStream_Construct(This, NULL, streamEntryRef); } static void StorageInternalImpl_Destroy( StorageBaseImpl *iface)

1 0

Vincent Povirk : ole32: Rename property variables in StorageInternalImpl_Construct.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 3aa8cdec7b7ea4c6d9717cc8a772f5dd0a502a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aa8cdec7b7ea4c6d9717cc8a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:03:09 2009 -0600 ole32: Rename property variables in StorageInternalImpl_Construct. --- 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 fc5872c..3210f55 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3933,7 +3933,7 @@ static const IStorageVtbl Storage32InternalImpl_Vtbl = static StorageInternalImpl* StorageInternalImpl_Construct( StorageImpl* ancestorStorage, DWORD openFlags, - ULONG rootPropertyIndex) + ULONG storageDirEntry) { StorageInternalImpl* newStorage; @@ -3959,9 +3959,9 @@ static StorageInternalImpl* StorageInternalImpl_Construct( newStorage->base.ancestorStorage = ancestorStorage; /* - * Keep the index of the root property set for this storage, + * Keep a reference to the directory entry of this storage */ - newStorage->base.storageDirEntry = rootPropertyIndex; + newStorage->base.storageDirEntry = storageDirEntry; return newStorage; }

1 0

Vincent Povirk : ole32: Rename property variables in BlockChainStream methods.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 8f2d0f888768c66b42c410f067f0f60a883edd9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2d0f888768c66b42c410f06… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 15:05:51 2009 -0600 ole32: Rename property variables in BlockChainStream methods. --- dlls/ole32/storage32.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3210f55..5e828a6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -4146,13 +4146,13 @@ void BlockChainStream_Destroy(BlockChainStream* This) * BlockChainStream_GetHeadOfChain * * Returns the head of this stream chain. - * Some special chains don't have properties, their heads are kept in + * Some special chains don't have directory entries, their heads are kept in * This->headOfStreamPlaceHolder. * */ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) { - DirEntry chainProperty; + DirEntry chainEntry; BOOL readSuccessful; if (This->headOfStreamPlaceHolder != 0) @@ -4163,11 +4163,11 @@ static ULONG BlockChainStream_GetHeadOfChain(BlockChainStream* This) readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProperty); + &chainEntry); if (readSuccessful) { - return chainProperty.startingBlock; + return chainEntry.startingBlock; } } @@ -4494,20 +4494,20 @@ static BOOL BlockChainStream_Enlarge(BlockChainStream* This, } else { - DirEntry chainProp; + DirEntry chainEntry; assert(This->ownerDirEntry != DIRENTRY_NULL); StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); - chainProp.startingBlock = blockIndex; + chainEntry.startingBlock = blockIndex; StorageImpl_WriteDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProp); + &chainEntry); } This->tailIndex = blockIndex; @@ -4610,29 +4610,28 @@ BOOL BlockChainStream_SetSize( * BlockChainStream_GetSize * * Returns the size of this chain. - * Will return the block count if this chain doesn't have a property. + * Will return the block count if this chain doesn't have a directory entry. */ static ULARGE_INTEGER BlockChainStream_GetSize(BlockChainStream* This) { - DirEntry chainProperty; + DirEntry chainEntry; if(This->headOfStreamPlaceHolder == NULL) { /* - * This chain is a data stream read the property and return - * the appropriate size + * This chain has a directory entry so use the size value from there. */ StorageImpl_ReadDirEntry( This->parentStorage, This->ownerDirEntry, - &chainProperty); + &chainEntry); - return chainProperty.size; + return chainEntry.size; } else { /* - * this chain is a chain that does not have a property, figure out the + * this chain is a chain that does not have a directory entry, figure out the * size by making the product number of used blocks times the * size of them */

1 0