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

Nikolay Sivov : shlwapi: Implement SKGetValueW over SHGetShellKey.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 31da90fd9d4437f76271066c8cd0ddbf055997e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31da90fd9d4437f76271066c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 29 10:03:29 2010 +0400 shlwapi: Implement SKGetValueW over SHGetShellKey. --- dlls/shlwapi/ordinal.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 3e47af6..3edb116 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4505,12 +4505,22 @@ HRESULT WINAPI IUnknown_OnFocusChangeIS(LPUNKNOWN lpUnknown, LPUNKNOWN pFocusObj } /*********************************************************************** - * SHGetValueW (SHLWAPI.@) + * SKGetValueW (SHLWAPI.516) */ -HRESULT WINAPI SKGetValueW(DWORD a, LPWSTR b, LPWSTR c, DWORD d, DWORD e, DWORD f) +HRESULT WINAPI SKGetValueW(DWORD flags, LPCWSTR subkey, LPCWSTR value, DWORD *type, + void *data, DWORD *count) { - FIXME("(%x, %s, %s, %x, %x, %x): stub\n", a, debugstr_w(b), debugstr_w(c), d, e, f); - return E_FAIL; + DWORD ret; + HKEY hkey; + + TRACE("(0x%x, %s, %s, %p, %p, %p)\n", flags, debugstr_w(subkey), + debugstr_w(value), type, data, count); + + hkey = SHGetShellKey(flags, subkey, FALSE); + ret = SHQueryValueExW(hkey, value, NULL, type, data, count); + RegCloseKey(hkey); + + return HRESULT_FROM_WIN32(ret); } typedef HRESULT (WINAPI *DllGetVersion_func)(DLLVERSIONINFO *);

1 0

Alexandre Julliard : gdi32: Fix text positioning in mirrored DCs.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 1da826a1498e68169a2f4f8e80470cb451e8f8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da826a1498e68169a2f4f8e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 13:37:20 2010 +0200 gdi32: Fix text positioning in mirrored DCs. --- dlls/gdi32/font.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1b36374..29281f9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1715,6 +1715,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, LPWSTR reordered_str = (LPWSTR)str; WORD *glyphs = NULL; UINT align = GetTextAlign( hdc ); + DWORD layout = GetLayout( hdc ); POINT pt; TEXTMETRICW tm; LOGFONTW lf; @@ -1755,17 +1756,23 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if (!lprect) flags &= ~ETO_CLIPPED; - + + if (flags & ETO_RTLREADING) align |= TA_RTLREADING; + if (layout & LAYOUT_RTL) + { + if ((align & TA_CENTER) != TA_CENTER) align ^= TA_RIGHT; + align ^= TA_RTLREADING; + } + if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { INT cGlyphs; reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); BIDI_Reorder( hdc, str, count, GCP_REORDER, - ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)? - WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR, + (align & TA_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, reordered_str, count, NULL, &glyphs, &cGlyphs); - + flags |= ETO_IGNORELANGUAGE; if (glyphs) { @@ -1901,6 +1908,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, LPtoDP(hdc, desired, 2); desired[1].x -= desired[0].x; desired[1].y -= desired[0].y; + if (layout & LAYOUT_RTL) desired[1].x = -desired[1].x; deltas[i].x = desired[1].x - width.x; deltas[i].y = desired[1].y - width.y;

1 0

Alexandre Julliard : gdi32: Fix offset for mirrored devices that have a non-zero viewport offset.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 1019579fd4f3d4b3f179fa094f5aa59bdbe7907b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1019579fd4f3d4b3f179fa094… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 29 17:33:27 2010 +0200 gdi32: Fix offset for mirrored devices that have a non-zero viewport offset. --- dlls/gdi32/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 3aa2480..b0002f3 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -296,7 +296,7 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) xform->eM22 = scaleY; xform->eDx = (double)dc->vportOrgX - scaleX * (double)dc->wndOrgX; xform->eDy = (double)dc->vportOrgY - scaleY * (double)dc->wndOrgY; - if (dc->layout & LAYOUT_RTL) xform->eDx += dc->vis_rect.right - dc->vis_rect.left - 1; + if (dc->layout & LAYOUT_RTL) xform->eDx = dc->vis_rect.right - dc->vis_rect.left - 1 - xform->eDx; } /***********************************************************************

1 0

Nikolay Sivov : shlwapi: Partially implement SHGetShellKey.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: e7395e09e175ac635fa655ca9abb7c66bb549ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7395e09e175ac635fa655ca9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 29 10:02:02 2010 +0400 shlwapi: Partially implement SHGetShellKey. --- dlls/shlwapi/ordinal.c | 36 ++++++++++++++++++++++-- dlls/shlwapi/tests/ordinal.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 2bf0e79..3e47af6 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4401,12 +4401,42 @@ BOOL WINAPI SHSkipJunction(IBindCtx *pbc, const CLSID *pclsid) } /*********************************************************************** - * SHGetShellKey (SHLWAPI.@) + * SHGetShellKey (SHLWAPI.491) */ HKEY WINAPI SHGetShellKey(DWORD flags, LPCWSTR sub_key, BOOL create) { - FIXME("(0x%08x, %s, %d): stub\n", flags, debugstr_w(sub_key), create); - return (HKEY)0x50; + enum _shellkey_flags { + SHKEY_Explorer = 0x00, + SHKEY_Root_HKCU = 0x01 + }; + + static const WCHAR explorerW[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r',0}; + HKEY hroot, hkey = NULL; + + TRACE("(0x%08x, %s, %d)\n", flags, debugstr_w(sub_key), create); + + switch (flags) + { + case SHKEY_Explorer | SHKEY_Root_HKCU: + RegOpenKeyExW(HKEY_CURRENT_USER, explorerW, 0, MAXIMUM_ALLOWED, &hroot); + break; + case 0: + return NULL; + default: + FIXME("unsupported flags (0x%08x)\n", flags); + return (HKEY)0xdeadbeef; + } + + if (create) + RegCreateKeyExW(hroot, sub_key, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &hkey, NULL); + else + RegOpenKeyExW(hroot, sub_key, 0, MAXIMUM_ALLOWED, &hkey); + + RegCloseKey(hroot); + return hkey; } /*********************************************************************** diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index c3c59c4..0089a43 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -36,6 +36,7 @@ /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; static BOOL is_win2k_and_lower; +static BOOL is_win9x; static int (WINAPI *pSHSearchMapInt)(const int*,const int*,int,int); static HRESULT (WINAPI *pGetAcceptLanguagesA)(LPSTR,LPDWORD); @@ -60,6 +61,7 @@ static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONTF, IEnumIDList**); static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); +static HKEY (WINAPI *pSHGetShellKey)(DWORD, LPWSTR, BOOL); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2675,6 +2677,62 @@ static void test_SHSetIniString(void) DeleteFileW(TestIniW); } +enum _shellkey_flags { + SHKEY_Explorer = 0x00, + SHKEY_Root_HKCU = 0x01 +}; + +static void test_SHGetShellKey(void) +{ + void *pPathBuildRootW = GetProcAddress(hShlwapi, "PathBuildRootW"); + HKEY hkey, hkey2; + DWORD ret; + + if (!pSHGetShellKey) + { + win_skip("SHGetShellKey(ordinal 491) isn't available\n"); + return; + } + + /* some win2k */ + if (pPathBuildRootW && pPathBuildRootW == pSHGetShellKey) + { + win_skip("SHGetShellKey(ordinal 491) used for PathBuildRootW\n"); + return; + } + + if (is_win9x || is_win2k_and_lower) + { + win_skip("Ordinal 491 used for another call, skipping SHGetShellKey tests\n"); + return; + } + + /* marking broken cause latest Vista+ versions fail here */ + SetLastError(0xdeadbeef); + hkey = pSHGetShellKey(SHKEY_Explorer, NULL, FALSE); + ok(hkey == NULL || broken(hkey != NULL), "got %p\n", hkey); + if (hkey) + { + hkey2 = 0; + ret = RegOpenKeyExA(hkey, "Shell Folders", 0, KEY_READ, &hkey2); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(hkey2 != NULL, "got %p\n", hkey2); + RegCloseKey( hkey2 ); + RegCloseKey( hkey ); + } + + hkey = pSHGetShellKey(SHKEY_Explorer | SHKEY_Root_HKCU, NULL, FALSE); + ok(hkey != NULL, "got %p\n", hkey); + + hkey2 = 0; + ret = RegOpenKeyExA(hkey, "Shell Folders", 0, KEY_READ, &hkey2); + ok(ret == ERROR_SUCCESS, "got %d\n", ret); + ok(hkey2 != NULL, "got %p\n", hkey2); + RegCloseKey( hkey2 ); + + RegCloseKey( hkey ); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2698,6 +2756,7 @@ static void init_pointers(void) MAKEFUNC(SHIShellFolder_EnumObjects, 404); MAKEFUNC(SHGetObjectCompatFlags, 476); MAKEFUNC(IUnknown_QueryServiceExec, 484); + MAKEFUNC(SHGetShellKey, 491); MAKEFUNC(SHPropertyBag_ReadLONG, 496); MAKEFUNC(IUnknown_ProfferService, 514); #undef MAKEFUNC @@ -2707,6 +2766,7 @@ START_TEST(ordinal) { hShlwapi = GetModuleHandleA("shlwapi.dll"); is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; + is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ init_pointers(); @@ -2734,6 +2794,7 @@ START_TEST(ordinal) test_SHIShellFolder_EnumObjects(); test_SHGetIniString(); test_SHSetIniString(); + test_SHGetShellKey(); FreeLibrary(hshell32); FreeLibrary(hmlang);

1 0

Dylan Smith : richedit: Invalidate without calling UpdateWindow in many cases.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: dfa80b35b04692624378876a8fe0fe0fee3b7671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa80b35b04692624378876a8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 28 21:17:40 2010 -0400 richedit: Invalidate without calling UpdateWindow in many cases. --- dlls/riched20/editor.c | 32 ++++++++++++++++---------------- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 5 +++-- dlls/riched20/richole.c | 2 +- dlls/riched20/txtsrv.c | 2 +- dlls/riched20/undo.c | 4 ++-- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 959585a..0ed1959 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1583,7 +1583,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_ReleaseStyle(style); editor->nEventMask = nEventMask; - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); if (!(format & SFF_SELECTION)) { ME_ClearTempStyle(editor); } @@ -2137,7 +2137,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) return TRUE; ME_MoveCursorFromTableRowStartParagraph(editor); ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); ME_SendRequestResize(editor, FALSE); return TRUE; case VK_RETURN: @@ -2193,7 +2193,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[1] = editor->pCursors[0]; ME_CommitUndo(editor); ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return TRUE; } else if (para == editor->pCursors[1].pPara && @@ -2218,7 +2218,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) para->member.para.next_para->member.para.nFlags |= MEPF_ROWSTART; ME_CommitCoalescingUndo(editor); ME_CheckTablesForCorruption(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return TRUE; } } else { /* v1.0 - 3.0 */ @@ -2235,7 +2235,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return TRUE; } } else { @@ -2262,7 +2262,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) editor->pCursors[1] = editor->pCursors[0]; } ME_CommitCoalescingUndo(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return TRUE; } } @@ -2280,7 +2280,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) SetCursor(NULL); ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); } return TRUE; } @@ -2319,7 +2319,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) { ME_InternalDeleteText(editor, selStart, nChars, FALSE); ME_CommitUndo(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, TRUE); } return result; } @@ -2449,7 +2449,7 @@ static LRESULT ME_Char(ME_TextEditor *editor, WPARAM charCode, } ME_UpdateSelectionLinkAttribute(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); } return 0; } @@ -3299,7 +3299,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->nModifyStep = oldModify; ME_EmptyUndoStack(editor); } - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return len; } case EM_SETBKGNDCOLOR: @@ -3460,7 +3460,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, int nStartCursor = ME_GetSelectionOfs(editor, &from, &to); ME_InternalDeleteText(editor, &editor->pCursors[nStartCursor], to-from, FALSE); ME_CommitUndo(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, TRUE); return 0; } case EM_REPLACESEL: @@ -3488,7 +3488,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_UpdateSelectionLinkAttribute(editor); if (!wParam) ME_EmptyUndoStack(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return len; } case EM_SCROLLCARET: @@ -3566,7 +3566,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->nModifyStep = 0; ME_CommitUndo(editor); ME_EmptyUndoStack(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return 1; } case EM_CANPASTE: @@ -3592,7 +3592,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { ME_InternalDeleteText(editor, selStart, nChars, FALSE); ME_CommitUndo(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, TRUE); } return 0; } @@ -4246,7 +4246,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); ME_CommitUndo(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return 0; } case WM_IME_COMPOSITION: @@ -4278,7 +4278,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_ReleaseStyle(style); ME_CommitUndo(editor); - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return 0; } case WM_IME_ENDCOMPOSITION: diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 9739eea..10a1f2c 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -210,7 +210,7 @@ void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt); void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate); void ME_Repaint(ME_TextEditor *editor); void ME_RewrapRepaint(ME_TextEditor *editor); -void ME_UpdateRepaint(ME_TextEditor *editor); +void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now); void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor); void ME_InvalidateSelection(ME_TextEditor *editor); BOOL ME_SetZoom(ME_TextEditor *editor, int numerator, int denominator); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0a32601..5e52e51 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -132,7 +132,7 @@ void ME_Repaint(ME_TextEditor *editor) ITextHost_TxViewChange(editor->texthost, TRUE); } -void ME_UpdateRepaint(ME_TextEditor *editor) +void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) { /* Should be called whenever the contents of the control have changed */ BOOL wrappedParagraphs; @@ -144,6 +144,8 @@ void ME_UpdateRepaint(ME_TextEditor *editor) /* Ensure that the cursor is visible */ ME_EnsureVisible(editor, &editor->pCursors[0]); + ITextHost_TxViewChange(editor->texthost, update_now); + ME_SendSelChange(editor); /* send EN_CHANGE if the event mask asks for it */ @@ -153,7 +155,6 @@ void ME_UpdateRepaint(ME_TextEditor *editor) ME_SendOldNotify(editor, EN_CHANGE); editor->nEventMask |= ENM_CHANGE; } - ME_Repaint(editor); } void diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5b6b2b6..0f7db26 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -391,7 +391,7 @@ IRichEditOle_fnInsertObject(IRichEditOle *me, REOBJECT *reo) ME_InsertOLEFromCursor(This->editor, reo, 0); ME_CommitUndo(This->editor); - ME_UpdateRepaint(This->editor); + ME_UpdateRepaint(This->editor, FALSE); return S_OK; } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 7ab2af4..b4625ad 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -325,7 +325,7 @@ HRESULT WINAPI fnTextSrv_TxSetText(ITextServices *iface, This->editor->nModifyStep = 0; OleFlushClipboard(); ME_EmptyUndoStack(This->editor); - ME_UpdateRepaint(This->editor); + ME_UpdateRepaint(This->editor, FALSE); return S_OK; } diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 8dab8fe..be7f0e1 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -402,7 +402,7 @@ BOOL ME_Undo(ME_TextEditor *editor) { ME_CheckTablesForCorruption(editor); editor->nUndoStackSize--; editor->nUndoMode = nMode; - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return TRUE; } @@ -438,6 +438,6 @@ BOOL ME_Redo(ME_TextEditor *editor) { ME_AddUndoItem(editor, diUndoEndTransaction, NULL); ME_CheckTablesForCorruption(editor); editor->nUndoMode = nMode; - ME_UpdateRepaint(editor); + ME_UpdateRepaint(editor, FALSE); return TRUE; }

1 0

Dylan Smith : richedit: Remove redundant commit and repaint in ME_StreamInText.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 1964e603fd7d8faa787438dae8781b30402a5a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1964e603fd7d8faa787438dae… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 28 21:17:29 2010 -0400 richedit: Remove redundant commit and repaint in ME_StreamInText. ME_StreamInText is only used in one function, ME_StreamIn, which always calls ME_CommitUndo and ME_UpdateRepaint after calling this function. --- dlls/riched20/editor.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7e3dfda..959585a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -317,8 +317,6 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea break; stream->dwSize = 0; } while(1); - ME_CommitUndo(editor); - ME_UpdateRepaint(editor); return 0; }

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetPort.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: d992bab72e0350b0122d867e74c1a79a184ec3b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d992bab72e0350b0122d867e7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 12 18:15:13 2010 -0400 urlmon: Implemented IUri_GetPort. --- dlls/urlmon/tests/uri.c | 122 +++++++++++++++++++++++----------------------- dlls/urlmon/uri.c | 20 +++++--- 2 files changed, 74 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d992bab72e0350b0122d8…

1 0

Thomas Mullaly : urlmon/tests: Restructured invalid URI tests plus added more test data.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 8a51ac06192ede2da72906e5f5884226cb184881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a51ac06192ede2da72906e5f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 11 20:19:53 2010 -0400 urlmon/tests: Restructured invalid URI tests plus added more test data. --- dlls/urlmon/tests/uri.c | 664 ++++++++++++++++------------------------------- 1 files changed, 222 insertions(+), 442 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a51ac06192ede2da7290…

1 0

Thomas Mullaly : urlmon: Implemented a port parse for URIs.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: ceddd027971389c708368491e654f99083f23780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceddd027971389c708368491e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Jul 11 19:26:08 2010 -0400 urlmon: Implemented a port parse for URIs. --- dlls/urlmon/uri.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 99 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1140e95..ce27d6d 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -24,6 +24,7 @@ #include "shlwapi.h" #define UINT_MAX 0xffffffff +#define USHORT_MAX 0xffff WINE_DEFAULT_DEBUG_CHANNEL(urlmon); @@ -100,6 +101,10 @@ typedef struct { BOOL has_ipv6; ipv6_address ipv6_address; + + const WCHAR *port; + DWORD port_len; + USHORT port_value; } parse_data; static const CHAR hexDigits[] = "0123456789ABCDEF"; @@ -821,6 +826,44 @@ static void parse_userinfo(const WCHAR **ptr, parse_data *data, DWORD flags) { ++(*ptr); } +/* Attempts to parse a port from the URI. + * + * NOTES: + * Windows seems to have a cap on what the maximum value + * for a port can be. The max value is USHORT_MAX. + * + * port = *DIGIT + */ +static BOOL parse_port(const WCHAR **ptr, parse_data *data, DWORD flags) { + UINT port = 0; + data->port = *ptr; + + while(!is_auth_delim(**ptr, data->scheme_type != URL_SCHEME_UNKNOWN)) { + if(!is_num(**ptr)) { + *ptr = data->port; + data->port = NULL; + return FALSE; + } + + port = port*10 + (**ptr-'0'); + + if(port > USHORT_MAX) { + *ptr = data->port; + data->port = NULL; + return FALSE; + } + + ++(*ptr); + } + + data->port_value = port; + data->port_len = *ptr - data->port; + + TRACE("(%p %p %x): Found port %s len=%d value=%u\n", ptr, data, flags, + debugstr_wn(data->port, data->port_len), data->port_len, data->port_value); + return TRUE; +} + /* Attempts to parse a IPv4 address from the URI. * * NOTES: @@ -853,7 +896,15 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) /* Check if what we found is the only part of the host name (if it isn't * we don't have an IPv4 address). */ - if(!is_auth_delim(**ptr, !is_unknown) && **ptr != ':') { + if(**ptr == ':') { + ++(*ptr); + if(!parse_port(ptr, data, flags)) { + *ptr = data->host; + data->host = NULL; + return FALSE; + } + } else if(!is_auth_delim(**ptr, !is_unknown)) { + /* Found more data which belongs the host, so this isn't an IPv4. */ *ptr = data->host; data->host = NULL; data->has_implicit_ip = FALSE; @@ -862,6 +913,7 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) data->host_len = *ptr - data->host; data->host_type = Uri_HOST_IPV4; + TRACE("(%p %p %x): IPv4 address found. host=%s host_len=%d host_type=%d\n", ptr, data, flags, debugstr_wn(data->host, data->host_len), data->host_len, data->host_type); @@ -870,11 +922,15 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) /* Attempts to parse the reg-name from the URI. * + * Because of the way Windows handles ':' this function also + * handles parsing the port. + * * reg-name = *( unreserved / pct-encoded / sub-delims ) * * NOTE: * Windows allows everything, but, the characters in "auth_delims" and ':' - * to appear in a reg-name. + * to appear in a reg-name, unless it's an unknown scheme type then ':' is + * allowed to appear (even if a valid port isn't after it). * * Windows doesn't like host names which start with '[' and end with ']' * and don't contain a valid IP literal address in between them. @@ -888,6 +944,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { const BOOL has_start_bracket = **ptr == '['; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; BOOL inside_brackets = has_start_bracket; + BOOL ignore_col = FALSE; /* We have to be careful with file schemes. */ if(data->scheme_type == URL_SCHEME_FILE) { @@ -909,10 +966,29 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { data->host = *ptr; while(!is_auth_delim(**ptr, known_scheme)) { - if(**ptr == ':') { + if(**ptr == ':' && !ignore_col) { /* We can ignore ':' if were inside brackets.*/ - if(!inside_brackets) - break; + if(!inside_brackets) { + const WCHAR *tmp = (*ptr)++; + + /* Attempt to parse the port. */ + if(!parse_port(ptr, data, flags)) { + /* Windows expects there to be a valid port for known scheme types. */ + if(data->scheme_type != URL_SCHEME_UNKNOWN) { + *ptr = data->host; + data->host = NULL; + TRACE("(%p %p %x): Expected valid port\n", ptr, data, flags); + return FALSE; + } else + /* Windows gives up on trying to parse a port when it + * encounters 1 invalid port. + */ + ignore_col = TRUE; + } else { + data->host_len = tmp - data->host; + break; + } + } } else if(**ptr == '%' && known_scheme) { /* Has to be a legit % encoded value. */ if(!check_pct_encoded(ptr)) { @@ -940,7 +1016,9 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags) { } } - data->host_len = *ptr - data->host; + /* Don't overwrite our length if we found a port earlier. */ + if(!data->port) + data->host_len = *ptr - data->host; /* If the host is empty, then it's an unknown host type. */ if(data->host_len == 0) @@ -1185,8 +1263,19 @@ static BOOL parse_ip_literal(const WCHAR **ptr, parse_data *data, DWORD flags) { } ++(*ptr); + if(**ptr == ':') { + ++(*ptr); + /* If a valid port is not found, then let it trickle down to + * parse_reg_name. + */ + if(!parse_port(ptr, data, flags)) { + *ptr = data->host; + data->host = NULL; + return FALSE; + } + } else + data->host_len = *ptr - data->host; - data->host_len = *ptr - data->host; return TRUE; } @@ -1215,6 +1304,9 @@ static BOOL parse_host(const WCHAR **ptr, parse_data *data, DWORD flags) { static BOOL parse_authority(const WCHAR **ptr, parse_data *data, DWORD flags) { parse_userinfo(ptr, data, flags); + /* Parsing the port will happen during one of the host parsing + * routines (if the URI has a port). + */ if(!parse_host(ptr, data, flags)) return FALSE;

1 0

Dylan Smith : richedit: Removed redundant variable ptLastSplittableRun.
by Alexandre Julliard July 29, 2010

July 29, 2010

Module: wine Branch: master Commit: 15251ad84b45c7bd51fbb94d9d73a6409b236d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15251ad84b45c7bd51fbb94d9… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 28 21:17:53 2010 -0400 richedit: Removed redundant variable ptLastSplittableRun. --- dlls/riched20/editstr.h | 1 - dlls/riched20/wrap.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 9b8d645..c9c55da 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -414,7 +414,6 @@ typedef struct tagME_WrapContext ME_DisplayItem *pRowStart; ME_DisplayItem *pLastSplittableRun; - POINT ptLastSplittableRun; } ME_WrapContext; #endif diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 8d75b7f..d2ebd94 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -271,7 +271,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem { if (wc->pLastSplittableRun->member.run.nFlags & (MERF_GRAPHICS|MERF_TAB)) { - wc->pt = wc->ptLastSplittableRun; + wc->pt = wc->pLastSplittableRun->member.run.pt; return wc->pLastSplittableRun; } else if (wc->pLastSplittableRun->member.run.nFlags & MERF_SPLITTABLE) @@ -299,7 +299,7 @@ static ME_DisplayItem *ME_SplitByBacktracking(ME_WrapContext *wc, ME_DisplayItem else { /* restart from the first run beginning with spaces */ - wc->pt = wc->ptLastSplittableRun; + wc->pt = wc->pLastSplittableRun->member.run.pt; return wc->pLastSplittableRun; } } @@ -451,7 +451,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) || ((run->nFlags & (MERF_GRAPHICS|MERF_TAB)) && (p != wc->pRowStart))) { wc->pLastSplittableRun = p; - wc->ptLastSplittableRun = wc->pt; } wc->pt.x += run->nWidth; return p->next;

1 0