December 2006 - Wine-commits

Andrew Talbot : sane.ds: Qualify use of WINE_DEFAULT_DEBUG_CHANNEL.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: ea93e5fb240c3c7eb80820d9ab5bd6f91c982f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea93e5fb240c3c7eb80820d9a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Dec 28 22:03:01 2006 +0000 sane.ds: Qualify use of WINE_DEFAULT_DEBUG_CHANNEL. With grateful acknowledgement to Marcus Meissner. --- dlls/sane.ds/ui.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index befb5cc..da9dfb9 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -37,10 +37,10 @@ #include "wine/debug.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(twain); - #ifdef HAVE_SANE +WINE_DEFAULT_DEBUG_CHANNEL(twain); + #define ID_BASE 0x100 #define ID_EDIT_BASE 0x1000 #define ID_STATIC_BASE 0x2000

1 0

Alexandre Julliard : Revert "wined3d: Where possible, avoid using D3DCOLORTOGLFLOAT4."
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: bbfe120036fb1dcbcb8d8ef6f1ec5a9f7a2736dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfe120036fb1dcbcb8d8ef6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 11:35:57 2006 +0100 Revert "wined3d: Where possible, avoid using D3DCOLORTOGLFLOAT4." This reverts commit 045975b1f439049da9405a8defbad82a39710f49. --- dlls/wined3d/basetexture.c | 6 +++--- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/state.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 6 ------ 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 4b6b0d5..9b9b5d7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -363,11 +363,11 @@ void WINAPI IWineD3DBaseTextureImpl_Appl break; case WINED3DSAMP_BORDERCOLOR: { - GLint col[4]; + float col[4]; *state = samplerStates[textureObjectSamplerStates[i].state]; - D3DCOLORTOGLINT4(*state, col); + D3DCOLORTOGLFLOAT4(*state, col); TRACE("Setting border color for %u to %x\n", textureDimensions, *state); - glTexParameteriv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]); + glTexParameterfv(textureDimensions, GL_TEXTURE_BORDER_COLOR, &col[0]); checkGLcall("glTexParameteri(..., GL_TEXTURE_BORDER_COLOR, ...)"); } break; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4ebca23..63f84f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -321,7 +321,7 @@ static void delete_glsl_shader_list(IWin /* Apply the current values to the specified texture stage */ static void WINAPI IWineD3DDeviceImpl_SetupTextureStates(IWineD3DDevice *iface, DWORD Sampler, DWORD texture_idx, DWORD Flags) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - GLint col[4]; + float col[4]; union { float f; @@ -386,8 +386,8 @@ static void WINAPI IWineD3DDeviceImpl_Se checkGLcall("glTexEnvi GL_TEXTURE_LOD_BIAS_EXT ..."); } - D3DCOLORTOGLINT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); - glTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); + D3DCOLORTOGLFLOAT4(This->stateBlock->renderState[WINED3DRS_TEXTUREFACTOR], col); + glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); /* TODO: NV_POINT_SPRITE */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a842a6f..27fd9f4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -197,11 +197,11 @@ static void state_zfunc(DWORD state, IWi } static void state_ambient(DWORD state, IWineD3DStateBlockImpl *stateblock) { - GLint col[4]; - D3DCOLORTOGLINT4(stateblock->renderState[WINED3DRS_AMBIENT], col); + float col[4]; + D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_AMBIENT], col); - TRACE("Setting ambient to (%d,%d,%d,%d)\n", col[0], col[1], col[2], col[3]); - glLightModeliv(GL_LIGHT_MODEL_AMBIENT, col); + TRACE("Setting ambient to (%f,%f,%f,%f)\n", col[0], col[1], col[2], col[3]); + glLightModelfv(GL_LIGHT_MODEL_AMBIENT, col); checkGLcall("glLightModel for MODEL_AMBIENT"); } @@ -499,8 +499,8 @@ static void state_texfactor(DWORD state, /* Note the texture color applies to all textures whereas * GL_TEXTURE_ENV_COLOR applies to active only */ - GLint col[4]; - D3DCOLORTOGLINT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); + float col[4]; + D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { /* And now the default texture color as well */ @@ -515,11 +515,11 @@ static void state_texfactor(DWORD state, FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); } - glTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); + glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, &col[0]); checkGLcall("glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, color);"); } } else { - GL_EXTCALL(glCombinerParameterivNV(GL_CONSTANT_COLOR0_NV, &col[0])); + GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &col[0])); } } @@ -786,10 +786,10 @@ static void state_fog(DWORD state, IWine } static void state_fogcolor(DWORD state, IWineD3DStateBlockImpl *stateblock) { - GLint col[4]; - D3DCOLORTOGLINT4(stateblock->renderState[WINED3DRS_FOGCOLOR], col); + float col[4]; + D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_FOGCOLOR], col); /* Set the default alpha blend color */ - glFogiv(GL_FOG_COLOR, &col[0]); + glFogfv(GL_FOG_COLOR, &col[0]); checkGLcall("glFog GL_FOG_COLOR"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 14d1b0e..67ccfcb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -228,12 +228,6 @@ extern int num_lock; (vec)[2] = D3DCOLOR_B(dw); \ (vec)[3] = D3DCOLOR_A(dw); -#define D3DCOLORTOGLINT4(src, dst) \ - (dst)[0] = D3DCOLOR_B_R(src); \ - (dst)[1] = D3DCOLOR_B_G(src); \ - (dst)[2] = D3DCOLOR_B_B(src); \ - (dst)[3] = D3DCOLOR_B_A(src); - /* DirectX Device Limits */ /* --------------------- */ #define MAX_LEVELS 256 /* Maximum number of mipmap levels. Guessed at 256 */

1 0

Alexandre Julliard : shdocvw: IDL_TLB_SRCS should contain the source file, not the target.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 8990a7c73b3d83448ff8e3ad704f823af5d92d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8990a7c73b3d83448ff8e3ad7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 29 11:36:53 2006 +0100 shdocvw: IDL_TLB_SRCS should contain the source file, not the target. --- dlls/shdocvw/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 40eeb21..78e8720 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -29,7 +29,7 @@ C_SRCS = \ webbrowser.c RC_SRCS = shdocvw.rc -IDL_TLB_SRCS = shdocvw_v1.tlb +IDL_TLB_SRCS = shdocvw_v1.idl @MAKE_DLL_RULES@

1 0

Colin Pitrat : msxml: nextNode and reset functions.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: f57bf10024169d0944fccd6a06942b4c031e11c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57bf10024169d0944fccd6a0… Author: Colin Pitrat <colin.pitrat(a)bull.net> Date: Thu Dec 28 16:22:31 2006 +0100 msxml: nextNode and reset functions. --- dlls/msxml3/nodemap.c | 37 +++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 0797436..fa17787 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -44,6 +44,7 @@ typedef struct _xmlnodemap const struct ISupportErrorInfoVtbl *lpSEIVtbl; LONG ref; IXMLDOMNode *node; + long iterator; } xmlnodemap; static inline xmlnodemap *impl_from_IXMLDOMNamedNodeMap( IXMLDOMNamedNodeMap *iface ) @@ -297,15 +298,42 @@ static HRESULT WINAPI xmlnodemap_nextNod IXMLDOMNamedNodeMap *iface, IXMLDOMNode** nextItem) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + xmlNodePtr node; + xmlAttrPtr curr; + long attrIndex; + + TRACE("%p %ld\n", This, This->iterator); + + *nextItem = NULL; + + node = xmlNodePtr_from_domnode( This->node, 0 ); + curr = node->properties; + + for (attrIndex = 0; attrIndex < This->iterator; attrIndex++) { + if (curr->next == NULL) + return S_FALSE; + else + curr = curr->next; + } + + This->iterator++; + + *nextItem = create_node( (xmlNodePtr) curr ); + + return S_OK; } static HRESULT WINAPI xmlnodemap_reset( IXMLDOMNamedNodeMap *iface ) { - FIXME("\n"); - return E_NOTIMPL; + xmlnodemap *This = impl_from_IXMLDOMNamedNodeMap( iface ); + + TRACE("%p %ld\n", This, This->iterator); + + This->iterator = 0; + + return S_OK; } static HRESULT WINAPI xmlnodemap__newEnum( @@ -389,6 +417,7 @@ IXMLDOMNamedNodeMap *create_nodemap( IXM nodemap->lpSEIVtbl = &support_error_vtbl; nodemap->node = node; nodemap->ref = 1; + nodemap->iterator = 0; IXMLDOMNode_AddRef( node ); /* Since we AddRef a node here, we don't need to call xmldoc_add_ref() */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4fc139d..ef660ee 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -442,6 +442,23 @@ todo_wine ok ( str != NULL, "str is null\n"); ok( !lstrcmpW( str, szdl ), "incorrect node name\n"); SysFreeString( str ); + + /* test sequential access of attributes */ + node = NULL; + r = IXMLDOMNamedNodeMap_nextNode( map, &node ); + ok ( r == S_OK, "nextNode (first time) wrong code\n"); + ok ( node != NULL, "nextNode, should be attribute\n"); + + r = IXMLDOMNamedNodeMap_nextNode( map, &node ); + ok ( r != S_OK, "nextNode (second time) wrong code\n"); + ok ( node == NULL, "nextNode, there is no attribute\n"); + + r = IXMLDOMNamedNodeMap_reset( map ); + ok ( r == S_OK, "reset should return S_OK\n"); + + r = IXMLDOMNamedNodeMap_nextNode( map, &node ); + ok ( r == S_OK, "nextNode (third time) wrong code\n"); + ok ( node != NULL, "nextNode, should be attribute\n"); } else ok( FALSE, "no map\n");

1 0

Vitaliy Margolen : dinput: Release critical section before warping mouse.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: 685a3e6a6ed623718f640e8906bd44fbca3d8b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=685a3e6a6ed623718f640e890… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Dec 28 12:04:10 2006 -0700 dinput: Release critical section before warping mouse. --- dlls/dinput/mouse.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 935c64b..81e520e 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -511,15 +511,15 @@ static HRESULT WINAPI SysMouseAImpl_GetD if(This->base.acquired == 0) return DIERR_NOTACQUIRED; - EnterCriticalSection(&This->base.crit); TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr); TRACE("(X: %d - Y: %d - Z: %d L: %02x M: %02x R: %02x)\n", This->m_state.lX, This->m_state.lY, This->m_state.lZ, This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]); - + + EnterCriticalSection(&This->base.crit); /* Copy the current mouse state */ fill_DataFormat(ptr, &(This->m_state), &This->base.data_format); - + /* Initialize the buffer when in relative mode */ if (!(This->base.data_format.user_df->dwFlags & DIDF_ABSAXIS)) { @@ -527,23 +527,19 @@ static HRESULT WINAPI SysMouseAImpl_GetD This->m_state.lY = 0; This->m_state.lZ = 0; } + LeaveCriticalSection(&This->base.crit); /* Check if we need to do a mouse warping */ if (This->need_warp && (GetCurrentTime() - This->last_warped > 10)) { if(!dinput_window_check(This)) - { - LeaveCriticalSection(&This->base.crit); return DIERR_GENERIC; - } TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime(); This->need_warp = FALSE; } - - LeaveCriticalSection(&This->base.crit); return DI_OK; }

1 0

Robert Reif : winedump: Fix crash on delayed import section.
by Alexandre Julliard 29 Dec '06

29 Dec '06

Module: wine Branch: master Commit: c723ba1b47a59d42ef75bc6306c5523d2bc608fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c723ba1b47a59d42ef75bc630… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Dec 23 02:39:24 2006 -0500 winedump: Fix crash on delayed import section. --- tools/winedump/pe.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index b4eed92..d6a0503 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -563,7 +563,7 @@ static void dump_image_thunk_data64(cons } } -static void dump_image_thunk_data32(const IMAGE_THUNK_DATA32 *il) +static void dump_image_thunk_data32(const IMAGE_THUNK_DATA32 *il, int offset) { const IMAGE_IMPORT_BY_NAME* iibn; for (; il->u1.Ordinal; il++) @@ -572,7 +572,7 @@ static void dump_image_thunk_data32(cons printf(" %4u <by ordinal>\n", IMAGE_ORDINAL32(il->u1.Ordinal)); else { - iibn = RVA((DWORD)il->u1.AddressOfData, sizeof(DWORD)); + iibn = RVA((DWORD)il->u1.AddressOfData - offset, sizeof(DWORD)); if (!iibn) printf("Can't grab import by name info, skipping to next ordinal\n"); else @@ -626,7 +626,7 @@ static void dump_dir_imported_functions( if(PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) dump_image_thunk_data64((const IMAGE_THUNK_DATA64*)il); else - dump_image_thunk_data32(il); + dump_image_thunk_data32(il, 0); printf("\n"); } importDesc++; @@ -665,20 +665,20 @@ static void dump_dir_delay_imported_func for (;;) { - BOOL use_rva = importDesc->grAttrs & 1; const IMAGE_THUNK_DATA32* il; + int offset = (importDesc->grAttrs & 1) ? 0 : PE_nt_headers->OptionalHeader.ImageBase; if (!importDesc->szName || !importDesc->pIAT || !importDesc->pINT) break; printf(" grAttrs %08x offset %08lx %s\n", importDesc->grAttrs, Offset(importDesc), - use_rva ? (const char *)RVA(importDesc->szName, sizeof(DWORD)) : (char *)importDesc->szName); + (const char *)RVA(importDesc->szName - offset, sizeof(DWORD))); printf(" Hint/Name Table: %08x\n", importDesc->pINT); printf(" TimeDateStamp: %08X (%s)\n", importDesc->dwTimeStamp, get_time_str(importDesc->dwTimeStamp)); printf(" Ordn Name\n"); - il = use_rva ? (const IMAGE_THUNK_DATA32 *)RVA(importDesc->pINT, sizeof(DWORD)) : (const IMAGE_THUNK_DATA32 *)importDesc->pINT; + il = (const IMAGE_THUNK_DATA32 *)RVA(importDesc->pINT - offset, sizeof(DWORD)); if (!il) printf("Can't grab thunk data, going to next imported DLL\n"); @@ -687,7 +687,7 @@ static void dump_dir_delay_imported_func if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) dump_image_thunk_data64((const IMAGE_THUNK_DATA64 *)il); else - dump_image_thunk_data32(il); + dump_image_thunk_data32(il, offset); printf("\n"); } importDesc++;

1 0

Rob Shearman : ole32: Contrary to MSDN, IROTData doesn' t need to be implemented for a moniker to be usable with the running object table .
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: bf33f9410ff4e1edea9fa0054d2bf68b84f026f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf33f9410ff4e1edea9fa0054… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:42:01 2006 +0000 ole32: Contrary to MSDN, IROTData doesn't need to be implemented for a moniker to be usable with the running object table. If IROTData isn't available, fall back to a path that uses the display name and the clsid of the moniker to generate the comparison data. --- dlls/ole32/moniker.c | 57 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 46 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 97f8914..22fee9f 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -40,6 +40,7 @@ #include "wine/list.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "compobj_private.h" @@ -143,22 +144,56 @@ static HRESULT get_moniker_comparison_da { HRESULT hr; IROTData *pROTData = NULL; - ULONG size = MAX_COMPARISON_DATA; hr = IMoniker_QueryInterface(pMoniker, &IID_IROTData, (void *)&pROTData); - if (hr != S_OK) + if (SUCCEEDED(hr)) { - ERR("Failed to query moniker for IROTData interface, hr = 0x%08x\n", hr); - return hr; + ULONG size = MAX_COMPARISON_DATA; + *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); + hr = IROTData_GetComparisonData(pROTData, (*moniker_data)->abData, size, &size); + if (hr != S_OK) + { + ERR("Failed to copy comparison data into buffer, hr = 0x%08x\n", hr); + HeapFree(GetProcessHeap(), 0, *moniker_data); + return hr; + } + (*moniker_data)->ulCntData = size; } - *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); - hr = IROTData_GetComparisonData(pROTData, (*moniker_data)->abData, size, &size); - if (hr != S_OK) + else { - ERR("Failed to copy comparison data into buffer, hr = 0x%08x\n", hr); - HeapFree(GetProcessHeap(), 0, *moniker_data); - return hr; + IBindCtx *pbc; + LPOLESTR pszDisplayName; + CLSID clsid; + int len; + + TRACE("generating comparison data from display name\n"); + + hr = CreateBindCtx(0, &pbc); + if (FAILED(hr)) + return hr; + hr = IMoniker_GetDisplayName(pMoniker, pbc, NULL, &pszDisplayName); + IBindCtx_Release(pbc); + if (FAILED(hr)) + return hr; + hr = IMoniker_GetClassID(pMoniker, &clsid); + if (FAILED(hr)) + { + CoTaskMemFree(pszDisplayName); + return hr; + } + + len = strlenW(pszDisplayName); + *moniker_data = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(MInterfacePointer, abData[sizeof(CLSID) + (len+1)*sizeof(WCHAR)])); + if (!*moniker_data) + { + CoTaskMemFree(pszDisplayName); + return E_OUTOFMEMORY; + } + (*moniker_data)->ulCntData = sizeof(CLSID) + (len+1)*sizeof(WCHAR); + + memcpy(&(*moniker_data)->abData[0], &clsid, sizeof(clsid)); + memcpy(&(*moniker_data)->abData[sizeof(clsid)], pszDisplayName, (len+1)*sizeof(WCHAR)); } - (*moniker_data)->ulCntData = size; return S_OK; }

1 0

Rob Shearman : ole32: Add some tests for the running object table.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 2881f919c7c81cce8f8f79152d0811c2d4e606f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2881f919c7c81cce8f8f79152… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:42:06 2006 +0000 ole32: Add some tests for the running object table. The tests show the behaviour when the IROTData interface is not available from the moniker. They also show the flags that are accepted into IRunningObjectTable::Register. --- dlls/ole32/tests/moniker.c | 577 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 577 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2881f919c7c81cce8f8f7…

1 0

Rob Shearman : ole32: Use IMoniker:: GetTimeOfLastChange to attempt to retrieve the last-modified time for the ROT entry .
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 04498ba49a0f62682612a8e0d075502d498c46e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04498ba49a0f62682612a8e0d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:41:52 2006 +0000 ole32: Use IMoniker::GetTimeOfLastChange to attempt to retrieve the last-modified time for the ROT entry. However, fall back to CoFileTimeNow if it fails. --- dlls/ole32/moniker.c | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 9567bf2..49de810 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -159,16 +159,21 @@ static HRESULT get_moniker_comparison_da return S_OK; } -static HRESULT reduce_moniker(IMoniker *pmk, IMoniker **pmkReduced) +static HRESULT reduce_moniker(IMoniker *pmk, IBindCtx *pbc, IMoniker **pmkReduced) { - IBindCtx *pbc; - HRESULT hr = CreateBindCtx(0, &pbc); - if (FAILED(hr)) - return hr; + IBindCtx *pbcNew = NULL; + HRESULT hr; + if (!pbc) + { + hr = CreateBindCtx(0, &pbcNew); + if (FAILED(hr)) + return hr; + pbc = pbcNew; + } hr = IMoniker_Reduce(pmk, pbc, MKRREDUCE_ALL, NULL, pmkReduced); if (FAILED(hr)) ERR("reducing moniker failed with error 0x%08x\n", hr); - IBindCtx_Release(pbc); + if (pbcNew) IBindCtx_Release(pbcNew); return hr; } @@ -292,6 +297,7 @@ RunningObjectTableImpl_Register(IRunning HRESULT hr = S_OK; IStream *pStream = NULL; DWORD mshlflags; + IBindCtx *pbc; TRACE("(%p,%d,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister); @@ -308,8 +314,6 @@ RunningObjectTableImpl_Register(IRunning if (!rot_entry) return E_OUTOFMEMORY; - CoFileTimeNow(&rot_entry->last_modified); - /* marshal object */ hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); if (hr != S_OK) @@ -342,13 +346,30 @@ RunningObjectTableImpl_Register(IRunning return hr; } - hr = reduce_moniker(pmkObjectName, &pmkObjectName); + hr = CreateBindCtx(0, &pbc); if (FAILED(hr)) { rot_entry_delete(rot_entry); return hr; } + hr = reduce_moniker(pmkObjectName, pbc, &pmkObjectName); + if (FAILED(hr)) + { + rot_entry_delete(rot_entry); + IBindCtx_Release(pbc); + return hr; + } + + hr = IMoniker_GetTimeOfLastChange(pmkObjectName, pbc, NULL, + &rot_entry->last_modified); + IBindCtx_Release(pbc); + if (FAILED(hr)) + { + CoFileTimeNow(&rot_entry->last_modified); + hr = S_OK; + } + hr = get_moniker_comparison_data(pmkObjectName, &rot_entry->moniker_data); if (hr != S_OK) @@ -458,7 +479,7 @@ RunningObjectTableImpl_IsRunning( IRunni TRACE("(%p,%p)\n",This,pmkObjectName); - hr = reduce_moniker(pmkObjectName, &pmkObjectName); + hr = reduce_moniker(pmkObjectName, NULL, &pmkObjectName); if (FAILED(hr)) return hr; hr = get_moniker_comparison_data(pmkObjectName, &moniker_data); @@ -509,7 +530,7 @@ RunningObjectTableImpl_GetObject( IRunni *ppunkObject = NULL; - hr = reduce_moniker(pmkObjectName, &pmkObjectName); + hr = reduce_moniker(pmkObjectName, NULL, &pmkObjectName); if (FAILED(hr)) return hr; hr = get_moniker_comparison_data(pmkObjectName, &moniker_data); @@ -602,7 +623,7 @@ RunningObjectTableImpl_GetTimeOfLastChan if (pmkObjectName==NULL || pfiletime==NULL) return E_INVALIDARG; - hr = reduce_moniker(pmkObjectName, &pmkObjectName); + hr = reduce_moniker(pmkObjectName, NULL, &pmkObjectName); if (FAILED(hr)) return hr; hr = get_moniker_comparison_data(pmkObjectName, &moniker_data);

1 0

Rob Shearman : ole32: Only call IROTData::GetComparisonData once, like native does.
by Alexandre Julliard 28 Dec '06

28 Dec '06

Module: wine Branch: master Commit: 341bf7a44ae55978d75cb1b3fc0ca249465a2fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=341bf7a44ae55978d75cb1b3f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 28 02:41:56 2006 +0000 ole32: Only call IROTData::GetComparisonData once, like native does. --- dlls/ole32/moniker.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 49de810..97f8914 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -45,6 +45,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); +/* see MSDN docs for IROTData::GetComparisonData, which states what this + * constant is (http://msdn2.microsoft.com/en-us/library/ms693773.aspx) */ +#define MAX_COMPARISON_DATA 2048 + /* define the structure of the running object table elements */ struct rot_entry { @@ -139,16 +143,14 @@ static HRESULT get_moniker_comparison_da { HRESULT hr; IROTData *pROTData = NULL; - ULONG size = 0; + ULONG size = MAX_COMPARISON_DATA; hr = IMoniker_QueryInterface(pMoniker, &IID_IROTData, (void *)&pROTData); if (hr != S_OK) { ERR("Failed to query moniker for IROTData interface, hr = 0x%08x\n", hr); return hr; } - IROTData_GetComparisonData(pROTData, NULL, 0, &size); *moniker_data = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(MInterfacePointer, abData[size])); - (*moniker_data)->ulCntData = size; hr = IROTData_GetComparisonData(pROTData, (*moniker_data)->abData, size, &size); if (hr != S_OK) { @@ -156,6 +158,7 @@ static HRESULT get_moniker_comparison_da HeapFree(GetProcessHeap(), 0, *moniker_data); return hr; } + (*moniker_data)->ulCntData = size; return S_OK; }

1 0