January 2014 - Wine-Commits

Huw Davies : riched20: Correctly handle the cursor at the end of a run case.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 86ea91f4243fcef2370cfc523a86c59bc9d202b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86ea91f4243fcef2370cfc523… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 7 12:44:22 2014 +0000 riched20: Correctly handle the cursor at the end of a run case. --- dlls/riched20/run.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 176f7c9..204431e 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -310,23 +310,52 @@ ME_DisplayItem * ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags) { - ME_DisplayItem *pDI; + ME_DisplayItem *pDI, *insert_before = cursor->pRun, *prev; if (cursor->nOffset) - ME_SplitRunSimple(editor, cursor); + { + if (cursor->nOffset == cursor->pRun->member.run.len) + { + insert_before = ME_FindItemFwd( cursor->pRun, diRun ); + if (!insert_before) insert_before = cursor->pRun; /* Always insert before the final eop run */ + } + else + { + ME_SplitRunSimple( editor, cursor ); + insert_before = cursor->pRun; + } + } - add_undo_delete_run( editor, cursor->pPara->member.para.nCharOfs + - cursor->pRun->member.run.nCharOfs, len ); + add_undo_delete_run( editor, insert_before->member.run.para->nCharOfs + + insert_before->member.run.nCharOfs, len ); pDI = ME_MakeRun(style, flags); - pDI->member.run.nCharOfs = cursor->pRun->member.run.nCharOfs; + pDI->member.run.nCharOfs = insert_before->member.run.nCharOfs; pDI->member.run.len = len; - pDI->member.run.para = cursor->pRun->member.run.para; + pDI->member.run.para = insert_before->member.run.para; ME_InsertString( pDI->member.run.para->text, pDI->member.run.nCharOfs, str, len ); - ME_InsertBefore(cursor->pRun, pDI); + ME_InsertBefore( insert_before, pDI ); TRACE("Shift length:%d\n", len); - ME_PropagateCharOffset(cursor->pRun, len); - cursor->pPara->member.para.nFlags |= MEPF_REWRAP; + ME_PropagateCharOffset( insert_before, len ); + insert_before->member.run.para->nFlags |= MEPF_REWRAP; + + /* Move any cursors that were at the end of the previous run to the end of the inserted run */ + prev = ME_FindItemBack( pDI, diRun ); + if (prev) + { + int i; + + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pRun == prev && + editor->pCursors[i].nOffset == prev->member.run.len) + { + editor->pCursors[i].pRun = pDI; + editor->pCursors[i].nOffset = len; + } + } + } + return pDI; }

1 0

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DirectMusicSegment8.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 996b3c87f110f5520dd097c81ec73dbaab6a425f URL: http://source.winehq.org/git/wine.git/?a=commit;h=996b3c87f110f5520dd097c81… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 7 10:56:25 2014 +0100 dmime: Remove the extraneous IUnknown from DirectMusicSegment8. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/dmime_private.h | 2 - dlls/dmime/segment.c | 126 ++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 78 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 2a441db..7060598 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -126,8 +126,6 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { * IDirectMusicSegment8Impl implementation structure */ struct IDirectMusicSegment8Impl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicSegment8 IDirectMusicSegment8_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index deec9c8..fa6a6a9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -31,83 +31,53 @@ static inline IDirectMusicSegment8Impl *impl_from_IDirectMusicSegment8(IDirectMu return CONTAINING_RECORD(iface, IDirectMusicSegment8Impl, IDirectMusicSegment8_iface); } -/* IDirectMusicSegment IUnknown part: */ -static HRESULT WINAPI IDirectMusicSegment8Impl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicSegment) - || IsEqualIID (riid, &IID_IDirectMusicSegment2) - || IsEqualIID (riid, &IID_IDirectMusicSegment8)) { - *ppobj = &This->IDirectMusicSegment8_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicSegment8Impl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicSegment8Impl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMIME_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicSegment8_Unknown_Vtbl = { - IDirectMusicSegment8Impl_IUnknown_QueryInterface, - IDirectMusicSegment8Impl_IUnknown_AddRef, - IDirectMusicSegment8Impl_IUnknown_Release -}; - static HRESULT WINAPI IDirectMusicSegment8Impl_QueryInterface(IDirectMusicSegment8 *iface, - REFIID riid, void **ppobj) + REFIID riid, void **ret_iface) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + + *ret_iface = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IDirectMusicSegment) || + IsEqualIID(riid, &IID_IDirectMusicSegment2) || + IsEqualIID (riid, &IID_IDirectMusicSegment8)) + *ret_iface = iface; + else if (IsEqualIID (riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + else if (IsEqualIID (riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicSegment8Impl_AddRef(IDirectMusicSegment8 *iface) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMIME_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetLength(IDirectMusicSegment8 *iface, @@ -596,17 +566,17 @@ static const IDirectMusicSegment8Vtbl dmsegment8_vtbl = { /* IDirectMusicSegment8Impl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, ObjectVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicSegment8_QueryInterface(&This->IDirectMusicSegment8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, ObjectVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_AddRef(&This->IDirectMusicSegment8_iface); } static ULONG WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, ObjectVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_Release(&This->IDirectMusicSegment8_iface); } static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -834,17 +804,17 @@ static const IDirectMusicObjectVtbl DirectMusicSegment8_Object_Vtbl = { /* IDirectMusicSegment8Impl IPersistStream part: */ static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicSegment8_QueryInterface(&This->IDirectMusicSegment8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSegment8Impl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_AddRef(&This->IDirectMusicSegment8_iface); } static ULONG WINAPI IDirectMusicSegment8Impl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicSegment8_Release(&This->IDirectMusicSegment8_iface); } static HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -1366,6 +1336,7 @@ static const IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicSegment8Impl* obj; + HRESULT hr; if (pUnkOuter) { *ppobj = NULL; @@ -1377,7 +1348,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicSegment8_Unknown_Vtbl; obj->IDirectMusicSegment8_iface.lpVtbl = &dmsegment8_vtbl; obj->ObjectVtbl = &DirectMusicSegment8_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicSegment8_PersistStream_Vtbl; @@ -1385,8 +1355,12 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppo DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicSegment; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Tracks); - return IDirectMusicSegment8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DMIME_LockModule(); + hr = IDirectMusicSegment8_QueryInterface(&obj->IDirectMusicSegment8_iface, lpcGUID, ppobj); + IDirectMusicSegment8_Release(&obj->IDirectMusicSegment8_iface); + + return hr; }

1 0

Huw Davies : riched20: Correctly handle the cursor at the end of run case while splitting paragraphs.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: c59c582c9a3bb607334ad44d0909f46bb2b52a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59c582c9a3bb607334ad44d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 7 12:44:23 2014 +0000 riched20: Correctly handle the cursor at the end of run case while splitting paragraphs. --- dlls/riched20/caret.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1225c03..ef768c4 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -539,7 +539,7 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, ME_InternalInsertTextFromCursor(editor, nCursor, &tab, 1, style, MERF_TAB); pos++; } else { /* handle EOLs */ - ME_DisplayItem *tp, *end_run; + ME_DisplayItem *tp, *end_run, *run, *prev; ME_Style *tmp_style; int eol_len = 0; @@ -573,17 +573,43 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, } p = &editor->pCursors[nCursor]; - if (p->nOffset) - ME_SplitRunSimple(editor, p); + + if (p->nOffset == p->pRun->member.run.len) + { + run = ME_FindItemFwd( p->pRun, diRun ); + if (!run) run = p->pRun; + } + else + { + if (p->nOffset) ME_SplitRunSimple(editor, p); + run = p->pRun; + } + tmp_style = ME_GetInsertStyle(editor, nCursor); /* ME_SplitParagraph increases style refcount */ - tp = ME_SplitParagraph(editor, p->pRun, p->pRun->member.run.style, eol_str, eol_len, 0); - p->pRun = ME_FindItemFwd(tp, diRun); - p->pPara = tp; + tp = ME_SplitParagraph(editor, run, run->member.run.style, eol_str, eol_len, 0); + end_run = ME_FindItemBack(tp, diRun); ME_ReleaseStyle(end_run->member.run.style); end_run->member.run.style = tmp_style; - p->nOffset = 0; + + /* Move any cursors that were at the end of the previous run to the beginning of the new para */ + prev = ME_FindItemBack( end_run, diRun ); + if (prev) + { + int i; + for (i = 0; i < editor->nCursors; i++) + { + if (editor->pCursors[i].pRun == prev && + editor->pCursors[i].nOffset == prev->member.run.len) + { + editor->pCursors[i].pPara = tp; + editor->pCursors[i].pRun = run; + editor->pCursors[i].nOffset = 0; + } + } + } + } } len -= pos - str;

1 0

Huw Davies : riched20: Ensure the cursors are equal after deleting the selection.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: a53179dadd5779cfcdb1ebcdb85a1b93632449ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53179dadd5779cfcdb1ebcdb… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 7 12:44:24 2014 +0000 riched20: Ensure the cursors are equal after deleting the selection. --- dlls/riched20/caret.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index ef768c4..e510033 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1485,7 +1485,9 @@ void ME_DeleteSelection(ME_TextEditor *editor) { int from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); + int nEndCursor = nStartCursor ^ 1; ME_DeleteTextAtCursor(editor, nStartCursor, to - from); + editor->pCursors[nEndCursor] = editor->pCursors[nStartCursor]; } ME_Style *ME_GetSelectionInsertStyle(ME_TextEditor *editor)

1 0

Dmitry Timoshkov : wbemdisp: Remove unused IUnknown *outer parameter from object constructor.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: fb9e8bc94e84ce278d7467e21bc33d401d6eeb8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb9e8bc94e84ce278d7467e21… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:21:31 2013 +0900 wbemdisp: Remove unused IUnknown *outer parameter from object constructor. --- dlls/wbemdisp/locator.c | 4 ++-- dlls/wbemdisp/main.c | 9 +++------ dlls/wbemdisp/wbemdisp_private.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 68c24f7..e95b673 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -250,11 +250,11 @@ static const ISWbemLocatorVtbl locator_vtbl = locator_get_Security_ }; -HRESULT SWbemLocator_create( IUnknown *unk, void **obj ) +HRESULT SWbemLocator_create( void **obj ) { struct locator *locator; - TRACE( "%p, %p\n", unk, obj ); + TRACE( "%p\n", obj ); if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 8582cf1..af99975 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -80,7 +80,7 @@ static const IParseDisplayNameVtbl WinMGMTSVtbl = { static IParseDisplayName winmgmts = { &WinMGMTSVtbl }; -static HRESULT WinMGMTS_create(IUnknown *outer, void **ppv) +static HRESULT WinMGMTS_create(void **ppv) { *ppv = &winmgmts; return S_OK; @@ -89,7 +89,7 @@ static HRESULT WinMGMTS_create(IUnknown *outer, void **ppv) struct factory { IClassFactory IClassFactory_iface; - HRESULT (*fnCreateInstance)( IUnknown *, LPVOID * ); + HRESULT (*fnCreateInstance)( LPVOID * ); }; static inline struct factory *impl_from_IClassFactory( IClassFactory *iface ) @@ -131,14 +131,11 @@ static HRESULT WINAPI factory_CreateInstance( IClassFactory *iface, LPUNKNOWN ou *obj = NULL; if (outer) return CLASS_E_NOAGGREGATION; - hr = factory->fnCreateInstance( outer, (LPVOID *)&unk ); + hr = factory->fnCreateInstance( (LPVOID *)&unk ); if (FAILED( hr )) return hr; hr = IUnknown_QueryInterface( unk, riid, obj ); - if (FAILED( hr )) - return hr; - IUnknown_Release( unk ); return hr; } diff --git a/dlls/wbemdisp/wbemdisp_private.h b/dlls/wbemdisp/wbemdisp_private.h index 549cb28..cc84d72 100644 --- a/dlls/wbemdisp/wbemdisp_private.h +++ b/dlls/wbemdisp/wbemdisp_private.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT SWbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len )

1 0

Huw Davies : riched20: Don' t split a run if the cursor is at the end of it.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 2429e8b10b12d624aa58a2432f746d2c61ddfc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2429e8b10b12d624aa58a2432… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 7 12:44:21 2014 +0000 riched20: Don't split a run if the cursor is at the end of it. --- dlls/riched20/run.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 245a031..176f7c9 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -658,17 +658,20 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) */ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, CHARFORMAT2W *pFmt) { - ME_DisplayItem *run, *end_run = NULL; + ME_DisplayItem *run, *start_run = start->pRun, *end_run = NULL; if (end && start->pRun == end->pRun && start->nOffset == end->nOffset) return; - if (start->nOffset) + if (start->nOffset == start->pRun->member.run.len) + start_run = ME_FindItemFwd( start->pRun, diRun ); + else if (start->nOffset) { /* SplitRunSimple may or may not update the cursors, depending on whether they * are selection cursors, but we need to make sure they are valid. */ int split_offset = start->nOffset; ME_DisplayItem *split_run = ME_SplitRunSimple(editor, start); + start_run = start->pRun; if (end && end->pRun == split_run) { end->pRun = start->pRun; @@ -676,11 +679,18 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C } } - if (end && end->nOffset) - ME_SplitRunSimple(editor, end); - end_run = end ? end->pRun : NULL; + if (end) + { + if (end->nOffset == end->pRun->member.run.len) + end_run = ME_FindItemFwd( end->pRun, diRun ); + else + { + if (end->nOffset) ME_SplitRunSimple(editor, end); + end_run = end->pRun; + } + } - for (run = start->pRun; run != end_run; run = ME_FindItemFwd( run, diRun )) + for (run = start_run; run != end_run; run = ME_FindItemFwd( run, diRun )) { ME_Style *new_style = ME_ApplyStyle(run->member.run.style, pFmt);

1 0

Dmitry Timoshkov : qmgr: Remove unused IUnknown *outer parameter from object constructor.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: da0c40326a691f914e061fce771038f613a1ff6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0c40326a691f914e061fce7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:20:33 2013 +0900 qmgr: Remove unused IUnknown *outer parameter from object constructor. --- dlls/qmgr/factory.c | 2 +- dlls/qmgr/qmgr.c | 4 ++-- dlls/qmgr/qmgr.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/qmgr/factory.c b/dlls/qmgr/factory.c index 222f5df..f120dae 100644 --- a/dlls/qmgr/factory.c +++ b/dlls/qmgr/factory.c @@ -62,7 +62,7 @@ BITS_IClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REF if (pUnkOuter) return CLASS_E_NOAGGREGATION; - res = BackgroundCopyManagerConstructor(pUnkOuter, (LPVOID*) &punk); + res = BackgroundCopyManagerConstructor((LPVOID*) &punk); if (FAILED(res)) return res; diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 17b374b..c3c6dbe 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -138,9 +138,9 @@ BackgroundCopyManagerImpl globalMgr = { }; /* Constructor for instances of background copy manager */ -HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT BackgroundCopyManagerConstructor(LPVOID *ppObj) { - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); *ppObj = &globalMgr; return S_OK; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 4a9bb15..8f2281d 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -84,7 +84,7 @@ extern HANDLE stop_event DECLSPEC_HIDDEN; extern ClassFactoryImpl BITS_ClassFactory DECLSPEC_HIDDEN; extern BackgroundCopyManagerImpl globalMgr DECLSPEC_HIDDEN; -HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT BackgroundCopyManagerConstructor(LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *pJobId, BackgroundCopyJobImpl **job) DECLSPEC_HIDDEN; HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr,

1 0

Dmitry Timoshkov : wiaservc: Remove unused IUnknown *outer parameter from object constructor.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: ab8237c8c58721c72c6169c12e72d1e8edefc7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8237c8c58721c72c6169c12… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:20:54 2013 +0900 wiaservc: Remove unused IUnknown *outer parameter from object constructor. --- dlls/wiaservc/factory.c | 2 +- dlls/wiaservc/wiadevmgr.c | 4 ++-- dlls/wiaservc/wiaservc_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wiaservc/factory.c b/dlls/wiaservc/factory.c index a80b830..c76a363 100644 --- a/dlls/wiaservc/factory.c +++ b/dlls/wiaservc/factory.c @@ -77,7 +77,7 @@ WIASERVC_IClassFactory_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnkOuter, if (pUnkOuter) return CLASS_E_NOAGGREGATION; - res = wiadevmgr_Constructor(pUnkOuter, (LPVOID*) &punk); + res = wiadevmgr_Constructor((LPVOID*) &punk); if (FAILED(res)) return res; diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index fea4e94..2f0907b 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -164,10 +164,10 @@ static const IWiaDevMgrVtbl WIASERVC_IWiaDevMgr_Vtbl = wiadevmgr_AddDeviceDlg }; -HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT wiadevmgr_Constructor(LPVOID *ppObj) { wiadevmgr *This; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); This = HeapAlloc(GetProcessHeap(), 0, sizeof(wiadevmgr)); if (This) { diff --git a/dlls/wiaservc/wiaservc_private.h b/dlls/wiaservc/wiaservc_private.h index 5125937..b7faf89 100644 --- a/dlls/wiaservc/wiaservc_private.h +++ b/dlls/wiaservc/wiaservc_private.h @@ -34,7 +34,7 @@ typedef struct LONG ref; } wiadevmgr; -HRESULT wiadevmgr_Constructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT wiadevmgr_Constructor(LPVOID *ppObj) DECLSPEC_HIDDEN; /* Little helper functions */ static inline char *

1 0

Dmitry Timoshkov : wuapi: Remove unused IUnknown *outer parameter from object constructors.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 5cf3c1f4a64a0c9ec2fe97e738819f2d894eee98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf3c1f4a64a0c9ec2fe97e73… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 30 18:21:15 2013 +0900 wuapi: Remove unused IUnknown *outer parameter from object constructors. --- dlls/wuapi/main.c | 7 ++----- dlls/wuapi/session.c | 10 +++++----- dlls/wuapi/wuapi_private.h | 12 ++++++------ 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index b6490eb..0527ee5 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wuapi); -typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); +typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct _wucf { @@ -85,14 +85,11 @@ static HRESULT WINAPI wucf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOute if (pOuter) return CLASS_E_NOAGGREGATION; - r = This->pfnCreateInstance( pOuter, (LPVOID *)&punk ); + r = This->pfnCreateInstance( (LPVOID *)&punk ); if (FAILED(r)) return r; r = IUnknown_QueryInterface( punk, riid, ppobj ); - if (FAILED(r)) - return r; - IUnknown_Release( punk ); return r; } diff --git a/dlls/wuapi/session.c b/dlls/wuapi/session.c index a6abbc6..acc7cb0 100644 --- a/dlls/wuapi/session.c +++ b/dlls/wuapi/session.c @@ -179,7 +179,7 @@ static HRESULT WINAPI update_session_CreateUpdateSearcher( IUpdateSearcher **retval ) { TRACE("%p\n", This); - return UpdateSearcher_create( NULL, (LPVOID *)retval ); + return UpdateSearcher_create( (LPVOID *)retval ); } static HRESULT WINAPI update_session_CreateUpdateDownloader( @@ -187,7 +187,7 @@ static HRESULT WINAPI update_session_CreateUpdateDownloader( IUpdateDownloader **retval ) { TRACE("%p\n", This); - return UpdateDownloader_create( NULL, (LPVOID *)retval ); + return UpdateDownloader_create( (LPVOID *)retval ); } static HRESULT WINAPI update_session_CreateUpdateInstaller( @@ -195,7 +195,7 @@ static HRESULT WINAPI update_session_CreateUpdateInstaller( IUpdateInstaller **retval ) { TRACE("%p\n", This); - return UpdateInstaller_create( NULL, (LPVOID *)retval ); + return UpdateInstaller_create( (LPVOID *)retval ); } static const struct IUpdateSessionVtbl update_session_vtbl = @@ -217,11 +217,11 @@ static const struct IUpdateSessionVtbl update_session_vtbl = update_session_CreateUpdateInstaller }; -HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) +HRESULT UpdateSession_create( LPVOID *ppObj ) { update_session *session; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p)\n", ppObj); session = HeapAlloc( GetProcessHeap(), 0, sizeof(*session) ); if (!session) return E_OUTOFMEMORY; diff --git a/dlls/wuapi/wuapi_private.h b/dlls/wuapi/wuapi_private.h index 444722b..62b6dec 100644 --- a/dlls/wuapi/wuapi_private.h +++ b/dlls/wuapi/wuapi_private.h @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; -extern HRESULT SystemInformation_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT AutomaticUpdates_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSession_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSearcher_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateDownloader_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateInstaller_create( LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT SystemInformation_create( LPVOID *ppObj ) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcr110: Add __libm_sse2_sqrt_precise implementation.
by Alexandre Julliard Jan. 7, 2014

Jan. 7, 2014

Module: wine Branch: master Commit: 07566faaca053d7b2c9915e9a2bd20fdf51ba81f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07566faaca053d7b2c9915e9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 7 15:47:34 2014 +0100 msvcr110: Add __libm_sse2_sqrt_precise implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcrt/math.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ba588f9..9b3ebe8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1394,7 +1394,7 @@ @ cdecl -arch=i386 _libm_sse2_log_precise() msvcrt.__libm_sse2_log @ cdecl -arch=i386 _libm_sse2_pow_precise() msvcrt.__libm_sse2_pow @ cdecl -arch=i386 _libm_sse2_sin_precise() msvcrt.__libm_sse2_sin -@ stub -arch=i386 _libm_sse2_sqrt_precise +@ cdecl -arch=i386 _libm_sse2_sqrt_precise() msvcrt.__libm_sse2_sqrt_precise @ cdecl -arch=i386 _libm_sse2_tan_precise() msvcrt.__libm_sse2_tan @ cdecl _loaddll(str) msvcrt._loaddll @ cdecl -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6bcc2b7..6af8776 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2185,4 +2185,13 @@ void __cdecl __libm_sse2_tanf(void) __asm__ __volatile__( "movd %0,%%xmm0" : : "g" (f) ); } +/* __libm_sse2_sqrt_precise */ +void __cdecl __libm_sse2_sqrt_precise(void) +{ + double d; + __asm__ __volatile__( "movd %%xmm0,%0" : "=m" (d) ); + d = sqrt( d ); + __asm__ __volatile__( "movd %0,%%xmm0" : : "m" (d) ); +} + #endif /* __i386__ */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e482784..fa458a4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1538,3 +1538,4 @@ @ cdecl _fstat32(long ptr) @ cdecl _fstat64i32(long ptr) @ cdecl _is_exception_typeof(ptr ptr) +@ cdecl -arch=i386 __libm_sse2_sqrt_precise()

1 0