May 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : winex11: Make sure that all fontconfig support is properly #ifdef'ed.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: b81d08e31c512e66c33779935e9668a648e38409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81d08e31c512e66c33779935… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:26:44 2010 +0200 winex11: Make sure that all fontconfig support is properly #ifdef'ed. --- dlls/winex11.drv/xrender.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 9678def..b7e0c2f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -194,6 +194,7 @@ MAKE_FUNCPTR(FcPatternDestroy) MAKE_FUNCPTR(FcPatternAddInteger) MAKE_FUNCPTR(FcPatternAddString) MAKE_FUNCPTR(FcPatternGetInteger) +static void *fontconfig_handle; static BOOL fontconfig_installed; #endif @@ -341,7 +342,6 @@ static int load_xrender_formats(void) void X11DRV_XRender_Init(void) { int event_base, i; - void *fontconfig_handle; if (client_side_with_render && wine_dlopen(SONAME_LIBX11, RTLD_NOW|RTLD_GLOBAL, NULL, 0) && @@ -395,6 +395,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) } } +#ifdef SONAME_LIBFONTCONFIG if ((fontconfig_handle = wine_dlopen(SONAME_LIBFONTCONFIG, RTLD_NOW, NULL, 0))) { #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(fontconfig_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} @@ -411,6 +412,7 @@ LOAD_OPTIONAL_FUNCPTR(XRenderSetPictureTransform) fontconfig_installed = pFcInit(); } else TRACE( "cannot find the fontconfig library " SONAME_LIBFONTCONFIG "\n" ); +#endif sym_not_found: if(X11DRV_XRender_Installed || client_side_with_core)

1 0

Ilya Shpigor : shdocvw: Added IDataObject stub implementation.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: cc784e277f7300638aa4ab5d993e518e9043ffdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc784e277f7300638aa4ab5d9… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Tue May 18 17:17:29 2010 +0400 shdocvw: Added IDataObject stub implementation. --- dlls/shdocvw/shdocvw.h | 3 + dlls/shdocvw/view.c | 114 +++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/webbrowser.c | 4 ++ 3 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 1184298..2dce575 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -127,6 +127,7 @@ struct WebBrowser { const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; const IServiceProviderVtbl *lpServiceProviderVtbl; + const IDataObjectVtbl *lpDataObjectVtbl; LONG ref; @@ -184,6 +185,7 @@ struct InternetExplorer { #define ACTIVEOBJ(x) ((IOleInPlaceActiveObject*) &(x)->lpOleInPlaceActiveObjectVtbl) #define OLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define HLINKFRAME(x) ((IHlinkFrame*) &(x)->lpHlinkFrameVtbl) +#define DATAOBJECT(x) ((IDataObject*) &(x)->lpDataObjectVtbl) #define CLIENTSITE(x) ((IOleClientSite*) &(x)->lpOleClientSiteVtbl) #define INPLACESITE(x) ((IOleInPlaceSite*) &(x)->lpOleInPlaceSiteVtbl) @@ -198,6 +200,7 @@ struct InternetExplorer { void WebBrowser_OleObject_Init(WebBrowser*); void WebBrowser_ViewObject_Init(WebBrowser*); +void WebBrowser_DataObject_Init(WebBrowser*); void WebBrowser_Persist_Init(WebBrowser*); void WebBrowser_ClassInfo_Init(WebBrowser*); void WebBrowser_HlinkFrame_Init(WebBrowser*); diff --git a/dlls/shdocvw/view.c b/dlls/shdocvw/view.c index d2e5857..9ee7c06 100644 --- a/dlls/shdocvw/view.c +++ b/dlls/shdocvw/view.c @@ -1,5 +1,6 @@ /* * Copyright 2005 Jacek Caban + * Copyright 2010 Ilya Shpigor * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); +/********************************************************************** + * Implement the IViewObject interface + */ + #define VIEWOBJ_THIS(iface) DEFINE_THIS(WebBrowser, ViewObject, iface) static HRESULT WINAPI ViewObject_QueryInterface(IViewObject2 *iface, REFIID riid, void **ppv) @@ -122,3 +127,112 @@ void WebBrowser_ViewObject_Init(WebBrowser *This) { This->lpViewObjectVtbl = &ViewObjectVtbl; } + +/********************************************************************** + * Implement the IDataObject interface + */ + +#define DATAOBJ_THIS(iface) DEFINE_THIS(WebBrowser, DataObject, iface) + +static HRESULT WINAPI DataObject_QueryInterface(LPDATAOBJECT iface, REFIID riid, LPVOID * ppvObj) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppvObj); +} + +static ULONG WINAPI DataObject_AddRef(LPDATAOBJECT iface) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + return IWebBrowser2_AddRef(WEBBROWSER(This)); +} + +static ULONG WINAPI DataObject_Release(LPDATAOBJECT iface) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + return IWebBrowser2_Release(WEBBROWSER(This)); +} + +static HRESULT WINAPI DataObject_GetData(LPDATAOBJECT iface, LPFORMATETC pformatetcIn, STGMEDIUM *pmedium) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetDataHere(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_QueryGetData(LPDATAOBJECT iface, LPFORMATETC pformatetc) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_GetCanonicalFormatEtc(LPDATAOBJECT iface, LPFORMATETC pformatectIn, LPFORMATETC pformatetcOut) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_SetData(LPDATAOBJECT iface, LPFORMATETC pformatetc, STGMEDIUM *pmedium, BOOL fRelease) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumFormatEtc(LPDATAOBJECT iface, DWORD dwDirection, IEnumFORMATETC **ppenumFormatEtc) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DAdvise(LPDATAOBJECT iface, FORMATETC *pformatetc, DWORD advf, IAdviseSink *pAdvSink, DWORD *pdwConnection) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_DUnadvise(LPDATAOBJECT iface, DWORD dwConnection) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DataObject_EnumDAdvise(LPDATAOBJECT iface, IEnumSTATDATA **ppenumAdvise) +{ + WebBrowser *This = DATAOBJ_THIS(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static const IDataObjectVtbl DataObjectVtbl = { + DataObject_QueryInterface, + DataObject_AddRef, + DataObject_Release, + DataObject_GetData, + DataObject_GetDataHere, + DataObject_QueryGetData, + DataObject_GetCanonicalFormatEtc, + DataObject_SetData, + DataObject_EnumFormatEtc, + DataObject_DAdvise, + DataObject_DUnadvise, + DataObject_EnumDAdvise +}; + +#undef DATAOBJ_THIS + +void WebBrowser_DataObject_Init(WebBrowser *This) +{ + This->lpDataObjectVtbl = &DataObjectVtbl; +} diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 2ac9b99..b2fce6a 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -105,6 +105,9 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { *ppv = SERVPROV(This); TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); + }else if(IsEqualGUID(&IID_IDataObject, riid)) { + *ppv = DATAOBJECT(This); + TRACE("(%p)->(IID_IDataObject %p)\n", This, ppv); }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { TRACE("(%p)->(IID_IQuickActivate %p) returning NULL\n", This, ppv); return E_NOINTERFACE; @@ -1132,6 +1135,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret); + WebBrowser_DataObject_Init(ret); WebBrowser_Persist_Init(ret); WebBrowser_ClassInfo_Init(ret); WebBrowser_HlinkFrame_Init(ret);

1 0

Dylan Smith : richedit: Send EN_SELCHANGE after wrapping but before EN_CHANGE.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: dcbc22b98530857266ff950007b29b7a2fbcea1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcbc22b98530857266ff95000… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 19 02:33:02 2010 -0400 richedit: Send EN_SELCHANGE after wrapping but before EN_CHANGE. The call to ME_SendSelChange cannot be done in ME_CommitUndo like it was before, because it must be done after wrapping. Native richedit controls send EN_CHANGE first, which is sent in ME_UpdateRepaint, so ME_SendSelChange must be before this notification in ME_UpdateRepaint. --- dlls/riched20/paint.c | 3 ++- dlls/riched20/undo.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 2b01e3c..fc52afb 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -146,6 +146,8 @@ void ME_UpdateRepaint(ME_TextEditor *editor) /* Ensure that the cursor is visible */ ME_EnsureVisible(editor, &editor->pCursors[0]); + ME_SendSelChange(editor); + /* send EN_CHANGE if the event mask asks for it */ if(editor->nEventMask & ENM_CHANGE) { @@ -154,7 +156,6 @@ void ME_UpdateRepaint(ME_TextEditor *editor) editor->nEventMask |= ENM_CHANGE; } ME_Repaint(editor); - ME_SendSelChange(editor); } void diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 8db9711..8dab8fe 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -203,7 +203,6 @@ void ME_CommitUndo(ME_TextEditor *editor) { } ME_AddUndoItem(editor, diUndoEndTransaction, NULL); - ME_SendSelChange(editor); } /** @@ -269,7 +268,6 @@ void ME_CommitCoalescingUndo(ME_TextEditor *editor) return; ME_AddUndoItem(editor, diUndoPotentialEndTransaction, NULL); - ME_SendSelChange(editor); } static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem)

1 0

Andrew Eikum : Revert "user32: Don't use DLGTEMPLATE' s ExStyle when creating dialogs.".
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: 17789c16369c06f4d740d80c868d13a90c7164dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=17789c16369c06f4d740d80c8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 18 16:02:41 2010 -0500 Revert "user32: Don't use DLGTEMPLATE's ExStyle when creating dialogs.". This reverts commit 897f11d33178f1c5b591ba1a516e79ec8834055e. --- dlls/user32/dialog.c | 1 - dlls/user32/tests/dialog.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index af241a2..79f5182 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -498,7 +498,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (!dlgTemplate) return 0; dlgTemplate = DIALOG_ParseTemplate32( dlgTemplate, &template ); - template.exStyle = 0; /* exstyle is ignored */ /* Load menu */ diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b5d6271..d18ba0e 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1061,7 +1061,7 @@ static void test_MessageBoxFontTest(void) 0x01,0x00, /* Version */ 0xff,0xff, /* Extended template marker */ 0x00,0x00,0x00,0x00, /* Context Help ID */ - 0x40,0x00,0x00,0x00, /* Extended style (WM_EX_MDICHILD) */ + 0x00,0x00,0x00,0x00, /* Extended style */ 0xc0,0x00,0xc8,0x80, /* Style (WS_SYSMENU|WS_CAPTION|WS_POPUP|DS_SETFONT|DS_MODALFRAME) */ 0x01,0x00, /* Control count */ 0x00,0x00, /* X */

1 0

Dylan Smith : richedit: Revert commit that caused a regression. (Bug 22758) .
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: d312d4e33caafd00e4f276d313a8422922c7950c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d312d4e33caafd00e4f276d31… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed May 19 02:32:23 2010 -0400 richedit: Revert commit that caused a regression. (Bug 22758). Revert commit 049cf5aca0a2daafe0ce078757ad60f1a1cadc9e richedit: Avoid notifying parent window in improper state. The commit was meant to fix a problem caused by ME_SendSelChange being called in ME_SendSelChange, but moving the calls to ME_CommitUndo caused a regression. So this patch reverts the previous commit, and my following patch will instead fix the bug by moving the call to ME_SendSelChange out of ME_CommitUndo. --- dlls/riched20/editor.c | 50 +++++++++++++++++----------------------------- dlls/riched20/richole.c | 2 +- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fcbab6e..85e8f14 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -317,8 +317,8 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea break; stream->dwSize = 0; } while(1); - ME_UpdateRepaint(editor); ME_CommitUndo(editor); + ME_UpdateRepaint(editor); return 0; } @@ -2105,16 +2105,10 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; case VK_BACK: case VK_DELETE: - { - int saved_nEventMask; editor->nUDArrowX = -1; /* FIXME backspace and delete aren't the same, they act different wrt paragraph style of the merged paragraph */ if (editor->styleFlags & ES_READONLY) return FALSE; - /* Prevent calling ME_SendSelChange until after wrapping the - * text due to text deletion. */ - saved_nEventMask = editor->nEventMask; - editor->nEventMask = 0; if (ME_IsSelection(editor)) { ME_DeleteSelection(editor); @@ -2142,18 +2136,12 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) ME_CommitCoalescingUndo(editor); } else - { - editor->nEventMask = saved_nEventMask; return TRUE; - } - editor->nEventMask = saved_nEventMask; ME_MoveCursorFromTableRowStartParagraph(editor); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); - ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); return TRUE; - } case VK_RETURN: if (editor->bDialogMode) { @@ -2205,9 +2193,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; + ME_CommitUndo(editor); ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor); - ME_CommitUndo(editor); return TRUE; } else if (para == editor->pCursors[1].pPara && @@ -2230,9 +2218,9 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[1] = editor->pCursors[0]; para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; + ME_CommitCoalescingUndo(editor); ME_CheckTablesForCorruption(editor); ME_UpdateRepaint(editor); - ME_CommitCoalescingUndo(editor); return TRUE; } } else { /* v1.0 - 3.0 */ @@ -2248,8 +2236,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].pRun = ME_FindItemFwd(para, diRun); editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_UpdateRepaint(editor); ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor); return TRUE; } } else { @@ -2275,8 +2263,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; } - ME_UpdateRepaint(editor); ME_CommitCoalescingUndo(editor); + ME_UpdateRepaint(editor); return TRUE; } } @@ -2290,11 +2278,11 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) else ME_InsertTextFromCursor(editor, 0, &endl, 1, style); ME_ReleaseStyle(style); + ME_CommitCoalescingUndo(editor); SetCursor(NULL); ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); - ME_CommitCoalescingUndo(editor); } return TRUE; } @@ -2332,8 +2320,8 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (result && nKey == 'X') { ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_UpdateRepaint(editor); ME_CommitUndo(editor); + ME_UpdateRepaint(editor); } return result; } @@ -2458,12 +2446,12 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, ME_ContinueCoalescingTransaction(editor); ME_InsertTextFromCursor(editor, 0, &wstr, 1, style); ME_ReleaseStyle(style); + ME_CommitCoalescingUndo(editor); ITextHost_TxSetCursor(editor->texthost, NULL, FALSE); } ME_UpdateSelectionLinkAttribute(editor); ME_UpdateRepaint(editor); - ME_CommitCoalescingUndo(editor); } return 0; } @@ -3307,13 +3295,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetCursorToStart(editor, &cursor); ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); } - ME_UpdateRepaint(editor); ME_CommitUndo(editor); if (!(pStruct->flags & ST_KEEPUNDO)) { editor->nModifyStep = oldModify; ME_EmptyUndoStack(editor); } + ME_UpdateRepaint(editor); return len; } case EM_SETBKGNDCOLOR: @@ -3394,13 +3382,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetSelectionCharFormat(editor, p); if (bRepaint) editor->nModifyStep = 1; } + ME_CommitUndo(editor); if (bRepaint) { ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); ME_Repaint(editor); } - ME_CommitUndo(editor); return 1; } case EM_GETCHARFORMAT: @@ -3473,8 +3461,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int from, to; int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); - ME_UpdateRepaint(editor); ME_CommitUndo(editor); + ME_UpdateRepaint(editor); return 0; } case EM_REPLACESEL: @@ -3498,11 +3486,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (len>0 && wszText[len-1] == '\n') ME_ClearTempStyle(editor); ME_EndToUnicode(unicode, wszText); - ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor); ME_CommitUndo(editor); + ME_UpdateSelectionLinkAttribute(editor); if (!wParam) ME_EmptyUndoStack(editor); + ME_UpdateRepaint(editor); return len; } case EM_SCROLLCARET: @@ -3526,10 +3514,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_SetCharFormat(editor, &start, NULL, &fmt); ME_SetDefaultCharFormat(editor, &fmt); + ME_CommitUndo(editor); ME_MarkAllForWrapping(editor); ME_WrapMarkedParagraphs(editor); ME_UpdateScrollBar(editor); - ME_CommitUndo(editor); if (bRepaint) ME_Repaint(editor); return 0; @@ -3576,9 +3564,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_UpdateLinkAttribute(editor, &cursor, INT_MAX); ME_SetSelection(editor, 0, 0); editor->nModifyStep = 0; - ME_UpdateRepaint(editor); ME_CommitUndo(editor); ME_EmptyUndoStack(editor); + ME_UpdateRepaint(editor); return 1; } case EM_CANPASTE: @@ -3603,8 +3591,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (ME_Copy(editor, selStart, nChars) && msg == WM_CUT) { ME_InternalDeleteText(editor, selStart, nChars, FALSE); - ME_UpdateRepaint(editor); ME_CommitUndo(editor); + ME_UpdateRepaint(editor); } return 0; } @@ -3939,9 +3927,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } + ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); ME_MoveCaret(editor); - ME_CommitUndo(editor); return 0; } case WM_DESTROY: @@ -4257,8 +4245,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); - ME_UpdateRepaint(editor); ME_CommitUndo(editor); + ME_UpdateRepaint(editor); return 0; } case WM_IME_COMPOSITION: @@ -4268,6 +4256,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = ME_GetInsertStyle(editor, 0); hIMC = ITextHost_TxImmGetContext(editor->texthost); ME_DeleteSelection(editor); + ME_CommitUndo(editor); ME_SaveTempStyle(editor); if (lParam & GCS_RESULTSTR) { @@ -4296,7 +4285,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_ReleaseStyle(style); ME_UpdateRepaint(editor); - ME_CommitUndo(editor); return 0; } case WM_IME_ENDCOMPOSITION: diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index e9712b6..5b6b2b6 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -390,8 +390,8 @@ IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) if (reo->cbStruct < sizeof(*reo)) return STG_E_INVALIDPARAMETER; ME_InsertOLEFromCursor(This->editor, reo, 0); - ME_UpdateRepaint(This->editor); ME_CommitUndo(This->editor); + ME_UpdateRepaint(This->editor); return S_OK; }

1 0

Vincent Povirk : shlwapi: Implement SHRegEnumUSValue.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: bea0daa281dd184c3f3e5fc5ac93a3723b4b3707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea0daa281dd184c3f3e5fc5a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 18 15:45:17 2010 -0500 shlwapi: Implement SHRegEnumUSValue. --- dlls/shlwapi/reg.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index d641955..09fce55 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -331,8 +331,25 @@ LONG WINAPI SHRegEnumUSValueA(HUSKEY hUSKey, DWORD dwIndex, LPSTR pszValueName, LPDWORD pcchValueNameLen, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData, SHREGENUM_FLAGS enumRegFlags) { - FIXME("(%p, 0x%08x, %s, %p, %p, %p, %p, 0x%08x) stub\n", hUSKey, dwIndex, - debugstr_a(pszValueName), pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); + HKEY dokey; + + TRACE("(%p, 0x%08x, %p, %p, %p, %p, %p, 0x%08x)\n", hUSKey, dwIndex, + pszValueName, pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); + + if (((enumRegFlags == SHREGENUM_HKCU) || + (enumRegFlags == SHREGENUM_DEFAULT)) && + (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKCU))) { + return RegEnumValueA(dokey, dwIndex, pszValueName, pcchValueNameLen, + NULL, pdwType, pvData, pcbData); + } + + if (((enumRegFlags == SHREGENUM_HKLM) || + (enumRegFlags == SHREGENUM_DEFAULT)) && + (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKLM))) { + return RegEnumValueA(dokey, dwIndex, pszValueName, pcchValueNameLen, + NULL, pdwType, pvData, pcbData); + } + FIXME("no support for SHREGENUM_BOTH\n"); return ERROR_INVALID_FUNCTION; } @@ -345,8 +362,25 @@ LONG WINAPI SHRegEnumUSValueW(HUSKEY hUSKey, DWORD dwIndex, LPWSTR pszValueName, LPDWORD pcchValueNameLen, LPDWORD pdwType, LPVOID pvData, LPDWORD pcbData, SHREGENUM_FLAGS enumRegFlags) { - FIXME("(%p, 0x%08x, %s, %p, %p, %p, %p, 0x%08x) stub\n", hUSKey, dwIndex, - debugstr_w(pszValueName), pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); + HKEY dokey; + + TRACE("(%p, 0x%08x, %p, %p, %p, %p, %p, 0x%08x)\n", hUSKey, dwIndex, + pszValueName, pcchValueNameLen, pdwType, pvData, pcbData, enumRegFlags); + + if (((enumRegFlags == SHREGENUM_HKCU) || + (enumRegFlags == SHREGENUM_DEFAULT)) && + (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKCU))) { + return RegEnumValueW(dokey, dwIndex, pszValueName, pcchValueNameLen, + NULL, pdwType, pvData, pcbData); + } + + if (((enumRegFlags == SHREGENUM_HKLM) || + (enumRegFlags == SHREGENUM_DEFAULT)) && + (dokey = REG_GetHKEYFromHUSKEY(hUSKey,REG_HKLM))) { + return RegEnumValueW(dokey, dwIndex, pszValueName, pcchValueNameLen, + NULL, pdwType, pvData, pcbData); + } + FIXME("no support for SHREGENUM_BOTH\n"); return ERROR_INVALID_FUNCTION; }

1 0

Jörg Höhle : winmm: More MIDI boundary tests & fixes.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: c89853ebe5f135154828fce7a53a317b16262627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89853ebe5f135154828fce7a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 9 22:20:55 2010 +0100 winmm: More MIDI boundary tests & fixes. --- dlls/winmm/tests/midi.c | 94 +++++++++++++++++++++++++++++++++------------- dlls/winmm/winmm.c | 17 ++++++++- 2 files changed, 83 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c89853ebe5f135154828f…

1 0

Michael Stefaniuc : ntdll: Remove superfluous "not NULL" check for the count arg.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: aef5374c8bd43ebcd0dda2438fcd3bc6f4090429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef5374c8bd43ebcd0dda2438… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 19 00:50:08 2010 +0200 ntdll: Remove superfluous "not NULL" check for the count arg. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6fedbf3..a9e25c8 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2630,7 +2630,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T if (!addresses) return STATUS_ACCESS_VIOLATION; TRACE( "%p %x %p-%p %p %lu\n", process, flags, base, (char *)base + size, - addresses, count ? *count : 0 ); + addresses, *count ); server_enter_uninterrupted_section( &csVirtual, &sigset );

1 0

Michael Stefaniuc : user32: Remove superfluous "not NULL" check of the atom variable.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: be6ef9158d514b49ad8d5de6218953501260bf5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be6ef9158d514b49ad8d5de62… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 19 00:50:14 2010 +0200 user32: Remove superfluous "not NULL" check of the atom variable. --- dlls/user32/dde_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_server.c b/dlls/user32/dde_server.c index 52adb9a..3e44e6a 100644 --- a/dlls/user32/dde_server.c +++ b/dlls/user32/dde_server.c @@ -143,7 +143,7 @@ BOOL WINAPI DdePostAdvise(DWORD idInst, HSZ hszTopic, HSZ hszItem) return TRUE; theError: - if (atom) GlobalDeleteAtom(atom); + GlobalDeleteAtom(atom); return FALSE; }

1 0

Jörg Höhle : winmm: A NULL CALLBACK_FUNCTION is acceptable since w2k.
by Alexandre Julliard May 19, 2010

May 19, 2010

Module: wine Branch: master Commit: a311dff763536ae596bbaa7baedcb61b5d5b6081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a311dff763536ae596bbaa7ba… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 9 22:07:22 2010 +0100 winmm: A NULL CALLBACK_FUNCTION is acceptable since w2k. --- dlls/winmm/driver.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c index 48152ab..23338d2 100644 --- a/dlls/winmm/driver.c +++ b/dlls/winmm/driver.c @@ -543,8 +543,6 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: TRACE("Null !\n"); - if (dwCallBack) - WARN("uFlags=%04X has null DCB value, but dwCallBack=%08lX is not null !\n", uFlags, dwCallBack); break; case DCB_WINDOW: TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev); @@ -556,7 +554,8 @@ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, break; case DCB_FUNCTION: TRACE("Function (32 bit) !\n"); - ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); + if (dwCallBack) + ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); break; case DCB_EVENT: TRACE("Event(%08lx) !\n", dwCallBack);

1 0