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

Dylan Smith : richedit: Remove redundant commit and repaint in ME_StreamInText.
by Alexandre Julliard 29 Jul '10

29 Jul '10

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

Dylan Smith : richedit: Invalidate without calling UpdateWindow in many cases.
by Alexandre Julliard 29 Jul '10

29 Jul '10

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: Removed redundant variable ptLastSplittableRun.
by Alexandre Julliard 29 Jul '10

29 Jul '10

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

Dylan Smith : richedit: Removed unused run flags values.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 4c174fc84507ba1641fff263d4feece61ffb2bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c174fc84507ba1641fff263d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Jul 28 21:18:03 2010 -0400 richedit: Removed unused run flags values. The only place MERF_SKIPPED was in debug code, and MERF_CALCBYWRAP was only used to clear this unused flag value, so I got rid of both of them. --- dlls/riched20/editstr.h | 4 ---- dlls/riched20/paint.c | 5 +---- dlls/riched20/wrap.c | 3 --- 3 files changed, 1 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index c9c55da..5b5afae 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -118,10 +118,6 @@ typedef enum { #define MERF_ENDWHITE 0x004000 /* run is completely made of whitespaces */ #define MERF_WHITESPACE 0x008000 -/* run is a last (dummy) run in the paragraph */ -#define MERF_SKIPPED 0x010000 -/* flags that are calculated during text wrapping */ -#define MERF_CALCBYWRAP 0x0F0000 /* the "end of paragraph" run, contains 1 character */ #define MERF_ENDPARA 0x100000 /* forcing the "end of row" run, contains 1 character */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 5e52e51..2be034b 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -959,10 +959,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.top = c->pt.y + para->pt.y + run->pt.y; rc.bottom = rc.bottom + height; TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom); - if (run->nFlags & MERF_SKIPPED) - DrawFocusRect(c->hDC, &rc); - else - FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); + FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); } if (visible) ME_DrawRun(c, c->pt.x + run->pt.x, diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index d2ebd94..a7c7fd3 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -349,7 +349,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) return p->next; if (run->nFlags & MERF_WHITESPACE) { - p->member.run.nFlags |= MERF_SKIPPED; wc->pt.x += run->nWidth; /* skip runs consisting of only whitespaces */ return p->next; @@ -362,7 +361,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) if (black) { wc->bOverflown = FALSE; pp = ME_SplitRun(wc, p, black); - p->member.run.nFlags |= MERF_SKIPPED; ME_InsertRowStart(wc, pp); return pp; } @@ -588,7 +586,6 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { else break; } - p->member.run.nFlags &= ~MERF_CALCBYWRAP; break; default: break;

1 0

Nikolay Sivov : shlwapi/tests: Fix some test failures on Win2000.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: b684c60a10c058d5e9d13dfc57d480978b54744d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b684c60a10c058d5e9d13dfc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 29 09:59:58 2010 +0400 shlwapi/tests: Fix some test failures on Win2000. --- dlls/shlwapi/tests/ordinal.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index d60effd..c3c59c4 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -590,6 +590,7 @@ static void test_GetShellSecurityDescriptor(void) }; SECURITY_DESCRIPTOR* psd; SECURITY_DESCRIPTOR* (WINAPI*pGetShellSecurityDescriptor)(PSHELL_USER_PERMISSION*,int); + void *pChrCmpIW = GetProcAddress(hShlwapi, "ChrCmpIW"); pGetShellSecurityDescriptor=(void*)GetProcAddress(hShlwapi,(char*)475); @@ -599,12 +600,18 @@ static void test_GetShellSecurityDescriptor(void) return; } + if(pChrCmpIW && pChrCmpIW == pGetShellSecurityDescriptor) /* win2k */ + { + win_skip("Skipping for GetShellSecurityDescriptor, same ordinal used for ChrCmpIW\n"); + return; + } + psd = pGetShellSecurityDescriptor(NULL, 2); ok(psd==NULL || broken(psd==INVALID_HANDLE_VALUE), /* IE5 */ "GetShellSecurityDescriptor should fail\n"); psd = pGetShellSecurityDescriptor(rgsup, 0); - ok(psd==NULL, "GetShellSecurityDescriptor should fail\n"); + ok(psd==NULL, "GetShellSecurityDescriptor should fail, got %p\n", psd); SetLastError(0xdeadbeef); psd = pGetShellSecurityDescriptor(rgsup, 2); @@ -614,7 +621,7 @@ static void test_GetShellSecurityDescriptor(void) win_skip("GetShellSecurityDescriptor is not implemented\n"); return; } - if (psd==INVALID_HANDLE_VALUE) + if (psd == INVALID_HANDLE_VALUE) { win_skip("GetShellSecurityDescriptor is broken on IE5\n"); return; @@ -1910,6 +1917,7 @@ static void test_SHGetObjectCompatFlags(void) }; static const char compat_path[] = "Software\\Microsoft\\Windows\\CurrentVersion\\ShellCompatibility\\Objects"; + void *pColorAdjustLuma = GetProcAddress(hShlwapi, "ColorAdjustLuma"); CHAR keyA[39]; /* {CLSID} */ HKEY root; DWORD ret; @@ -1921,6 +1929,12 @@ static void test_SHGetObjectCompatFlags(void) return; } + if (pColorAdjustLuma && pColorAdjustLuma == pSHGetObjectCompatFlags) /* win2k */ + { + win_skip("Skipping SHGetObjectCompatFlags, same ordinal used for ColorAdjustLuma\n"); + return; + } + /* null args */ ret = pSHGetObjectCompatFlags(NULL, NULL); ok(ret == 0, "got %d\n", ret);

1 0

Alexandre Julliard : gdi32: Make the top right corner the DC origin for RTL layouts.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: e4b76dfd88b8991da903a83a8b8cde319cd265db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b76dfd88b8991da903a83a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 15:25:54 2010 +0200 gdi32: Make the top right corner the DC origin for RTL layouts. --- dlls/gdi32/dc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d122aae..3aa2480 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -296,6 +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; } /*********************************************************************** @@ -550,6 +551,7 @@ BOOL restore_dc_state( HDC hdc, INT level ) if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); dc->hMetaRgn = 0; } + DC_UpdateXforms( dc ); CLIPPING_UpdateGCRegion( dc ); SelectObject( hdc, dcs->hBitmap );

1 0

Alexandre Julliard : gdi32/tests: Make function pointers global in the mapping test.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: d100153e5c286ad418ef53ce63860553a3296db2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d100153e5c286ad418ef53ce6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 20:34:20 2010 +0200 gdi32/tests: Make function pointers global in the mapping test. --- dlls/gdi32/tests/mapping.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 7193a0f..7968c2f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -29,6 +29,11 @@ #include "winuser.h" #include "winerror.h" +static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); +static DWORD (WINAPI *pGetLayout)(HDC hdc); +static BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); +static DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); + #define rough_match(got, expected) (abs( MulDiv( (got) - (expected), 1000, (expected) )) <= 5) #define expect_LPtoDP(_hdc, _x, _y) \ @@ -221,12 +226,8 @@ static void test_dc_layout(void) { INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; SIZE size; - DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); - DWORD (WINAPI *pGetLayout)(HDC hdc); HDC hdc; - pGetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetLayout"); - pSetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetLayout"); if (!pGetLayout || !pSetLayout) { win_skip( "Don't have SetLayout\n" ); @@ -421,14 +422,11 @@ static void test_setvirtualresolution(void) { HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); DWORD r; - DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); INT horz_res = GetDeviceCaps(hdc, HORZRES); INT horz_size = GetDeviceCaps(hdc, HORZSIZE); INT log_pixels_x = GetDeviceCaps(hdc, LOGPIXELSX); SIZE orig_lometric_vp, orig_lometric_wnd; - pSetVirtualResolution = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetVirtualResolution"); - if(!pSetVirtualResolution) { win_skip("Don't have SetVirtualResolution\n"); @@ -533,13 +531,10 @@ static inline void xform_near_match(int line, XFORM *got, XFORM *expect) static void test_gettransform(void) { HDC hdc = CreateICA("DISPLAY", NULL, NULL, NULL); - BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); XFORM xform, expect; BOOL r; SIZE lometric_vp, lometric_wnd; - pGetTransform = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetTransform"); - if(!pGetTransform) { win_skip("Don't have GetTransform\n"); @@ -635,6 +630,12 @@ static void test_gettransform(void) START_TEST(mapping) { + HMODULE mod = GetModuleHandleA("gdi32.dll"); + pGetLayout = (void *)GetProcAddress( mod, "GetLayout" ); + pSetLayout = (void *)GetProcAddress( mod, "SetLayout" ); + pGetTransform = (void *)GetProcAddress( mod, "GetTransform" ); + pSetVirtualResolution = (void *)GetProcAddress( mod, "SetVirtualResolution" ); + test_modify_world_transform(); test_world_transform(); test_dc_layout();

1 0

Alexandre Julliard : gdi32/tests: Add some tests for the DC origin in RTL layouts.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 2773ae181e78363cdc2b0d904da7f013281f0876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2773ae181e78363cdc2b0d904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 20:35:09 2010 +0200 gdi32/tests: Add some tests for the DC origin in RTL layouts. --- dlls/gdi32/tests/mapping.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 7968c2f..0b823a7 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -226,6 +226,8 @@ static void test_dc_layout(void) { INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; SIZE size; + POINT pt; + HBITMAP bitmap; HDC hdc; if (!pGetLayout || !pSetLayout) @@ -235,6 +237,8 @@ static void test_dc_layout(void) } hdc = CreateCompatibleDC(0); + bitmap = CreateCompatibleBitmap( hdc, 100, 100 ); + SelectObject( hdc, bitmap ); size_cx = GetDeviceCaps(hdc, HORZSIZE); size_cy = GetDeviceCaps(hdc, VERTSIZE); @@ -263,7 +267,25 @@ static void test_dc_layout(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); expect_world_transform(hdc, 1.0, 1.0); - expect_LPtoDP(hdc, -1000, 1000); + expect_LPtoDP(hdc, -1000 + 99, 1000); + GetViewportOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + GetWindowOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + GetDCOrgEx( hdc, &pt ); + ok( pt.x == 0 && pt.y == 0, "wrong origin %d,%d\n", pt.x, pt.y ); + if (pGetTransform) + { + XFORM xform; + BOOL ret = pGetTransform( hdc, 0x204, &xform ); /* World -> Device */ + ok( ret, "got %d\n", ret ); + ok( xform.eM11 == -1.0, "got %f\n", xform.eM11 ); + ok( xform.eM12 == 0.0, "got %f\n", xform.eM12 ); + ok( xform.eM21 == 0.0, "got %f\n", xform.eM21 ); + ok( xform.eM22 == 1.0, "got %f\n", xform.eM22 ); + ok( xform.eDx == 99.0, "got %f\n", xform.eDx ); + ok( xform.eDy == 0.0, "got %f\n", xform.eDy ); + } SetMapMode(hdc, MM_LOMETRIC); ret = GetMapMode( hdc ); @@ -278,7 +300,7 @@ static void test_dc_layout(void) rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); expect_world_transform(hdc, 1.0, 1.0); - expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); + expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx) + 99, -MulDiv(1000 / 10, res_y, size_cy)); SetMapMode(hdc, MM_TEXT); ret = GetMapMode( hdc ); @@ -291,6 +313,7 @@ static void test_dc_layout(void) ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); DeleteDC(hdc); + DeleteObject( bitmap ); } static void test_modify_world_transform(void)

1 0

Alexandre Julliard : winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case.
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: b01be941d0b017a9e65ea85f15d0a9e8a5b34060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b01be941d0b017a9e65ea85f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 23:10:49 2010 +0200 winex11: Fix handling of the lpDx array in ExtTextOut for the non-Xrender case. --- dlls/winex11.drv/text.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/text.c b/dlls/winex11.drv/text.c index 7773588..1431bc1 100644 --- a/dlls/winex11.drv/text.c +++ b/dlls/winex11.drv/text.c @@ -62,14 +62,10 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, if (pfo->lf.lfEscapement && pfo->lpX11Trans) rotated = TRUE; - TRACE("hdc=%p df=%04x %d,%d %s, %d flags=%d lpDx=%p\n", - physDev->hdc, (UINT16)(physDev->font), x, y, + TRACE("hdc=%p df=%04x %d,%d rc %s %s, %d flags=%d lpDx=%p\n", + physDev->hdc, (UINT16)physDev->font, x, y, wine_dbgstr_rect(lprect), debugstr_wn (wstr, count), count, flags, lpDx); - if (lprect != NULL) TRACE("\trect=(%d,%d - %d,%d)\n", - lprect->left, lprect->top, - lprect->right, lprect->bottom ); - /* Draw the rectangle */ if (flags & ETO_OPAQUE) @@ -126,24 +122,26 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, } else { - XTextItem16 *items, *pitem; + XTextItem16 *items; - pitem = items = HeapAlloc( GetProcessHeap(), 0, - count * sizeof(XTextItem16) ); + items = HeapAlloc( GetProcessHeap(), 0, count * sizeof(XTextItem16) ); if(items == NULL) goto FAIL; - for(i = 0; i < count; i++) + items[0].chars = str2b; + items[0].delta = 0; + items[0].nchars = 1; + items[0].font = None; + for(i = 1; i < count; i++) { - pitem->chars = str2b + i; - pitem->delta = lpDx[i]; - pitem->nchars = 1; - pitem->font = None; - pitem++; + items[i].chars = str2b + i; + items[i].delta = (flags & ETO_PDY) ? lpDx[(i - 1) * 2] : lpDx[i - 1]; + items[i].delta -= X11DRV_cptable[pfo->fi->cptable].pTextWidth( pfo, str2b + i - 1, 1 ); + items[i].nchars = 1; + items[i].font = None; } - X11DRV_cptable[pfo->fi->cptable].pDrawText( pfo, gdi_display, physDev->drawable, physDev->gc, - physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, pitem - items ); + physDev->dc_rect.left + x, physDev->dc_rect.top + y, items, count ); HeapFree( GetProcessHeap(), 0, items ); } } @@ -167,7 +165,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags, x_i, y_i, &str2b[i], 1); if (lpDx) { - offset += lpDx[i]; + offset += (flags & ETO_PDY) ? lpDx[i * 2] : lpDx[i]; } else {

1 0

Alexandre Julliard : gdi32: Make sure the text dimensions are always positive in the ExtTextOut normal case .
by Alexandre Julliard 29 Jul '10

29 Jul '10

Module: wine Branch: master Commit: 7c1124e49a80514ee4e40cc16584f89cd4081006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c1124e49a80514ee4e40cc16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 23:15:01 2010 +0200 gdi32: Make sure the text dimensions are always positive in the ExtTextOut normal case. --- dlls/gdi32/font.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2d51445..1b36374 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1777,12 +1777,8 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; - TRACE("%p, %d, %d, %08x, %p, %s, %d, %p)\n", hdc, x, y, flags, - lprect, debugstr_wn(str, count), count, lpDx); - - if(lprect) - TRACE("rect: %d,%d - %d,%d\n", lprect->left, lprect->top, lprect->right, - lprect->bottom); + TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, + wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx); TRACE("align = %x bkmode = %x mapmode = %x\n", align, GetBkMode(hdc), GetMapMode(hdc)); if(align & TA_UPDATECP) @@ -1923,7 +1919,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, GetTextExtentPointW(hdc, reordered_str, count, &sz); done_extents = TRUE; } - width.x = INTERNAL_XWSTODS(dc, sz.cx); + width.x = abs(INTERNAL_XWSTODS(dc, sz.cx)); width.y = 0; } @@ -2018,7 +2014,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, for(j = 1; j < count; j++) { GetTextExtentPointW(hdc, reordered_str + j - 1, 1, &tmpsz); - offsets[j].x = offsets[j - 1].x + INTERNAL_XWSTODS(dc, tmpsz.cx); + offsets[j].x = offsets[j - 1].x + abs(INTERNAL_XWSTODS(dc, tmpsz.cx)); offsets[j].y = 0; } }

1 0