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

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

19 May '10

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

Alexandre Julliard : configure: Add a compatibility macro for AS_VAR_IF.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: 4ddfba41af1dbff3eecbaf3def938e151be58e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ddfba41af1dbff3eecbaf3de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 19 11:52:47 2010 +0200 configure: Add a compatibility macro for AS_VAR_IF. --- configure.ac | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 46dca8e..1e5ac7c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,14 @@ AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_AUX_DIR(tools) -dnl autoconf versions before 2.63b don't have AS_VAR_APPEND +dnl autoconf versions before 2.63b don't have AS_VAR_APPEND or AS_VAR_IF m4_ifdef([AS_VAR_APPEND],,[as_fn_append () { eval $[1]=\$$[1]\$[2]; } AC_DEFUN([AS_VAR_APPEND],[as_fn_append $1 $2])])dnl +m4_ifdef([AS_VAR_IF],,[AC_DEFUN([AS_VAR_IF], +[AS_LITERAL_IF([$1], + [AS_IF([test "x$$1" = x""$2], [$3], [$4])], + [eval as_val=\$$1 + AS_IF([test "x$as_val" = x""$2], [$3], [$4])])])])dnl dnl **** Command-line arguments ****

1 0

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

19 May '10

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

Vincent Povirk : shlwapi: Implement SHRegEnumUSValue.
by Alexandre Julliard 19 May '10

19 May '10

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

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

19 May '10

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

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

19 May '10

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

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

19 May '10

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

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

19 May '10

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

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

19 May '10

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

Jörg Höhle : winmm: WAVE/MIDI_MAPPER (-1) is a 32 bit UINT, not 16.
by Alexandre Julliard 19 May '10

19 May '10

Module: wine Branch: master Commit: e3869300b9d92592c6786f4ce8889ee34e95951a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3869300b9d92592c6786f4ce… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 9 21:47:52 2010 +0100 winmm: WAVE/MIDI_MAPPER (-1) is a 32 bit UINT, not 16. --- dlls/winmm/lolvldrv.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 193310f..50fc365 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -94,11 +94,11 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, WINE_MM_DRIVER_PART* part; WINE_LLTYPE* llType = &llTypes[mld->type]; - TRACE("(%s %u %u 0x%08lx 0x%08lx 0x%08lx)\n", + TRACE("(%s %d %u 0x%08lx 0x%08lx 0x%08lx)\n", llTypes[mld->type].typestr, mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); - if (mld->uDeviceID == (UINT16)-1) { + if ((UINT16)mld->uDeviceID == (UINT16)-1) { if (llType->nMapper == -1) { WARN("uDev=-1 requested on non-mapped ll type %s\n", llTypes[mld->type].typestr); @@ -116,7 +116,7 @@ DWORD MMDRV_Message(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, assert(part->fnMessage32); - TRACE("Calling message(dev=%u msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n", + TRACE("Calling message(dev=%d msg=%u usr=0x%08lx p1=0x%08lx p2=0x%08lx)\n", mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); ret = part->fnMessage32(mld->uDeviceID, wMsg, mld->dwDriverInstance, dwParam1, dwParam2); TRACE("=> %s\n", WINMM_ErrorToString(ret)); @@ -202,7 +202,6 @@ DWORD MMDRV_Open(LPWINE_MLD mld, UINT wMsg, DWORD_PTR dwParam1, DWORD dwFlags) WARN("Mapper not supported for type %s\n", llTypes[mld->type].typestr); return MMSYSERR_BADDEVICEID; } - mld->uDeviceID = (UINT16)-1; mld->mmdIndex = llType->lpMlds[-1].mmdIndex; TRACE("Setting mmdIndex to %u\n", mld->mmdIndex); dwRet = MMDRV_Message(mld, wMsg, dwParam1, dwFlags); @@ -403,7 +402,7 @@ static BOOL MMDRV_InitPerType(LPWINE_MM_DRIVER lpDrv, UINT type, UINT wMsg) /* re-build the translation table */ if (lpDrv->bIsMapper) { TRACE("%s:Trans[%d] -> %s\n", llTypes[type].typestr, -1, MMDrvs[llTypes[type].nMapper].drvname); - llTypes[type].lpMlds[-1].uDeviceID = (UINT16)-1; + llTypes[type].lpMlds[-1].uDeviceID = (UINT)-1; llTypes[type].lpMlds[-1].type = type; llTypes[type].lpMlds[-1].mmdIndex = llTypes[type].nMapper; llTypes[type].lpMlds[-1].dwDriverInstance = 0;

1 0