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

David Hedberg : richedit: GTL_PRECISE to GETTEXTLENGTHEX implies GTL_NUMBYTES.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 534398a57ea0920efc109a8c963ef1723fe2a79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=534398a57ea0920efc109a8c9… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sat Feb 27 17:58:16 2010 +0100 richedit: GTL_PRECISE to GETTEXTLENGTHEX implies GTL_NUMBYTES. If GTL_PRECISE is passed without specifying either GTL_NUMCHARS or GTL_NUMBYTES, behave as if GTL_NUMBYTES was passed. --- dlls/riched20/caret.c | 6 ++++-- dlls/riched20/tests/editor.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index abcc73e..a72a42b 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -91,8 +91,10 @@ int ME_GetTextLengthEx(ME_TextEditor *editor, const GETTEXTLENGTHEX *how) && (how->flags & GTL_USECRLF) && !editor->bEmulateVersion10) /* Ignore GTL_USECRLF flag in 1.0 emulation */ length += editor->nParagraphs - 1; - - if (how->flags & GTL_NUMBYTES) + + if (how->flags & GTL_NUMBYTES || + (how->flags & GTL_PRECISE && /* GTL_PRECISE seems to imply GTL_NUMBYTES */ + !(how->flags & GTL_NUMCHARS))) /* unless GTL_NUMCHARS is given */ { CPINFO cpinfo; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 1fbdaa5..ee26683 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5540,6 +5540,45 @@ static void test_EM_GETTEXTLENGTHEX(void) ret = SendMessageA(hwnd, EM_GETTEXTLENGTHEX, (WPARAM)&gtl, 0); ok(ret == 6, "ret %d\n",ret); + /* Unicode/NUMCHARS/NUMBYTES */ + SendMessage(hwnd, WM_SETTEXT, 0, (LPARAM) test_string_2); + + gtl.flags = GTL_DEFAULT; + gtl.codepage = 1200; + ret = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) &gtl, 0); + ok(ret == lstrlen(test_string_2), + "GTL_DEFAULT gave %i, expected %i\n", ret, lstrlen(test_string_2)); + + gtl.flags = GTL_NUMCHARS; + gtl.codepage = 1200; + ret = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) &gtl, 0); + ok(ret == lstrlen(test_string_2), + "GTL_NUMCHARS gave %i, expected %i\n", ret, lstrlen(test_string_2)); + + gtl.flags = GTL_NUMBYTES; + gtl.codepage = 1200; + ret = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) &gtl, 0); + ok(ret == lstrlen(test_string_2)*2, + "GTL_NUMBYTES gave %i, expected %i\n", ret, lstrlen(test_string_2)*2); + + gtl.flags = GTL_PRECISE; + gtl.codepage = 1200; + ret = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) &gtl, 0); + ok(ret == lstrlen(test_string_2)*2, + "GTL_PRECISE gave %i, expected %i\n", ret, lstrlen(test_string_2)*2); + + gtl.flags = GTL_NUMCHARS | GTL_PRECISE; + gtl.codepage = 1200; + ret = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) &gtl, 0); + ok(ret == lstrlen(test_string_2), + "GTL_NUMCHAR | GTL_PRECISE gave %i, expected %i\n", ret, lstrlen(test_string_2)); + + gtl.flags = GTL_NUMCHARS | GTL_NUMBYTES; + gtl.codepage = 1200; + ret = SendMessage(hwnd, EM_GETTEXTLENGTHEX, (WPARAM) &gtl, 0); + ok(ret == E_INVALIDARG, + "GTL_NUMCHARS | GTL_NUMBYTES gave %i, expected %i\n", ret, E_INVALIDARG); + DestroyWindow(hwnd); }

1 0

Austin English : ntdll: Add initial support for OpenBSD to fill_cpu_info.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: b4173d7d40496069b5fc617d2f7c48aa01f64f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4173d7d40496069b5fc617d2… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Feb 27 22:07:10 2010 -0600 ntdll: Add initial support for OpenBSD to fill_cpu_info. --- dlls/ntdll/nt.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index fdcc163..2444fed 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1152,6 +1152,18 @@ void fill_cpu_info(void) get_cpuinfo( &cached_sci ); NtCurrentTeb()->Peb->NumberOfProcessors = num; } +#elif defined (__OpenBSD__) + { + int mib[2], num; + size_t len; + + mib[0] = CTL_HW; + mib[1] = HW_NCPU; + len = sizeof(num); + + num = sysctl(mib, 2, &num, &len, NULL, 0); + NtCurrentTeb()->Peb->NumberOfProcessors = num; + } #elif defined (__APPLE__) { size_t valSize;

1 0

Gerald Pfeifer : comdlg32: Shed unused parameters from CFn_WMInitDialog and CFn_WMDestroy.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 297e559af4afa66a18e515f0e9b2b0c0752506d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=297e559af4afa66a18e515f0e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 28 13:28:08 2010 +0100 comdlg32: Shed unused parameters from CFn_WMInitDialog and CFn_WMDestroy. --- dlls/comdlg32/fontdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 3865d1a..1ad881c 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -610,7 +610,7 @@ static INT WINAPI FontStyleEnumProc( const ENUMLOGFONTEXW *lpElfex, /*********************************************************************** * CFn_WMInitDialog [internal] */ -static LRESULT CFn_WMInitDialog(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf) +static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf) { HDC hdc; int i,j,init=0; @@ -1064,7 +1064,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO return(FALSE); } -static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcfw) +static LRESULT CFn_WMDestroy(HWND hwnd, LPCHOOSEFONTW lpcfw) { LPCHOOSEFONTA lpcfa; LPSTR lpszStyle; @@ -1179,7 +1179,7 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, MultiByteToWideChar(CP_ACP, 0, lpcfa->lpszStyle, -1, lpcfw->lpszStyle, len); } - if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcfw)) + if (!CFn_WMInitDialog(hDlg, lParam, lpcfw)) { TRACE("CFn_WMInitDialog returned FALSE\n"); return FALSE; @@ -1196,7 +1196,7 @@ static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, case WM_COMMAND: return CFn_WMCommand(hDlg, wParam, lParam, lpcfw); case WM_DESTROY: - return CFn_WMDestroy(hDlg, wParam, lParam, lpcfw); + return CFn_WMDestroy(hDlg, lpcfw); case WM_CHOOSEFONT_GETLOGFONT: TRACE("WM_CHOOSEFONT_GETLOGFONT lParam=%08lX\n", lParam); FIXME("current logfont back to caller\n"); @@ -1228,7 +1228,7 @@ static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, else { lpcf=(LPCHOOSEFONTW)lParam; - if (!CFn_WMInitDialog(hDlg, wParam, lParam, lpcf)) + if (!CFn_WMInitDialog(hDlg, lParam, lpcf)) { TRACE("CFn_WMInitDialog returned FALSE\n"); return FALSE;

1 0

Michael Stefaniuc : oleaut32: Remove superfluous NULL check before HeapFree (Smatch).
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 400fb552198335c1314bf49f0ae983a1357029e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=400fb552198335c1314bf49f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Feb 28 21:48:09 2010 +0100 oleaut32: Remove superfluous NULL check before HeapFree (Smatch). --- dlls/oleaut32/typelib2.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index de84e4a..4544317 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3141,8 +3141,7 @@ static void WINAPI ITypeInfo2_fnReleaseTypeAttr( { TRACE("(%p,%p)\n", iface, pTypeAttr); - if(pTypeAttr) - HeapFree(GetProcessHeap(), 0, pTypeAttr); + HeapFree(GetProcessHeap(), 0, pTypeAttr); } /******************************************************************************

1 0

Andrew Eikum : shdocvw: Fix typo in WARN.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: f97fbce8f423a1650d3dae33b8c8c6fa414db83d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f97fbce8f423a1650d3dae33b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Sun Feb 28 12:59:30 2010 -0600 shdocvw: Fix typo in WARN. --- dlls/shdocvw/client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index a351bd1..17fa35f 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -73,7 +73,7 @@ static HRESULT WINAPI ClientSite_QueryInterface(IOleClientSite *iface, REFIID ri return S_OK; } - WARN("Unsupported intrface %s\n", debugstr_guid(riid)); + WARN("Unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; }

1 0

André Hentschel : oleaut32: Fix fractional calculation .
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: a78490bf8a7f4dad58dccfe41bdb84efd1a58ed7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78490bf8a7f4dad58dccfe41… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 28 19:21:47 2010 +0100 oleaut32: Fix fractional calculation. --- dlls/oleaut32/tests/varformat.c | 2 +- dlls/oleaut32/varformat.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 1c476a0..fd598cb 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -390,7 +390,7 @@ static void test_VarFormat(void) VARFMT(VT_R8,V_R8,8.0995,"#.##",S_OK,"8.1"); VARFMT(VT_R8,V_R8,0.0994,"#.##",S_OK,".1"); VARFMT(VT_R8,V_R8,1.00,"#,##0.00",S_OK,"1.00"); - todo_wine VARFMT(VT_R8,V_R8,0.0995,"#.###",S_OK,".1"); + VARFMT(VT_R8,V_R8,0.0995,"#.###",S_OK,".1"); /* 'out' is not cleared */ diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 9db390d..52ea37a 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1296,8 +1296,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, /* Rounding the number */ if (have_frac > need_frac) { - prgbDig = &rgbDig[have_int + need_frac ? need_frac + 1 : 0]; - if (*prgbDig < 5) prgbDig--; + prgbDig = &rgbDig[have_int + need_frac]; have_frac = need_frac; if (*prgbDig >= 5) { @@ -1320,10 +1319,10 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, } else (*prgbDig)++; - /* We converted trailing digits to zeroes => have_frac has changed */ - while (have_frac > 0 && rgbDig[have_int + have_frac - 1] == 0) - have_frac--; } + /* We converted trailing digits to zeroes => have_frac has changed */ + while (have_frac > 0 && rgbDig[have_int + have_frac - 1] == 0) + have_frac--; } TRACE("have_int=%d,need_int=%d,have_frac=%d,need_frac=%d,pad=%d,exp=%d\n", have_int, need_int, have_frac, need_frac, pad, exponent);

1 0

Gerald Pfeifer : comdlg32: Remove unused wParam parameters from PRINTDLG_WMInitDialog and PRINTDLG_WMInitDialogW .
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: f7e292a51efcc7b40ca00d9a0c6b62d882569209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e292a51efcc7b40ca00d9a0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Feb 28 13:22:24 2010 +0100 comdlg32: Remove unused wParam parameters from PRINTDLG_WMInitDialog and PRINTDLG_WMInitDialogW. --- dlls/comdlg32/printdlg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 5bf776f..f653251 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -1283,7 +1283,7 @@ static LRESULT check_printer_setup(HWND hDlg) /*********************************************************************** * PRINTDLG_WMInitDialog [internal] */ -static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, +static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, PRINT_PTRA* PrintStructures) { LPPRINTDLGA lppd = PrintStructures->lpPrintDlg; @@ -1391,7 +1391,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, return TRUE; } -static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, +static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, PRINT_PTRW* PrintStructures) { LPPRINTDLGW lppd = PrintStructures->lpPrintDlg; @@ -1829,7 +1829,7 @@ static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, EndDialog(hDlg,FALSE); return FALSE; } - res = PRINTDLG_WMInitDialog(hDlg, wParam, PrintStructures); + res = PRINTDLG_WMInitDialog(hDlg, PrintStructures); if(PrintStructures->lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) res = PrintStructures->lpPrintDlg->lpfnPrintHook( @@ -1878,7 +1878,7 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, EndDialog(hDlg,FALSE); return FALSE; } - res = PRINTDLG_WMInitDialogW(hDlg, wParam, PrintStructures); + res = PRINTDLG_WMInitDialogW(hDlg, PrintStructures); if(PrintStructures->lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) res = PrintStructures->lpPrintDlg->lpfnPrintHook(hDlg, uMsg, wParam, (LPARAM)PrintStructures->lpPrintDlg);

1 0

Dylan Smith : richedit: Make zooming affect all pictures.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 7ed13120ab62b424bd626d9ed31e73d74963ea10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed13120ab62b424bd626d9ed… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 27 13:31:07 2010 -0500 richedit: Make zooming affect all pictures. --- dlls/riched20/richole.c | 65 ++++++++++++++++++++++------------------------ 1 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c7eb5ff..5b6b2b6 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1729,6 +1729,11 @@ void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize) if (run->ole_obj->sizel.cx != 0 || run->ole_obj->sizel.cy != 0) { convert_sizel(c, &run->ole_obj->sizel, pSize); + if (c->editor->nZoomNumerator != 0) + { + pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + pSize->cy = MulDiv(pSize->cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } return; } @@ -1819,53 +1824,45 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); hMemDC = CreateCompatibleDC(c->hDC); SelectObject(hMemDC, stgm.u.hBitmap); - if (!has_size && c->editor->nZoomNumerator == 0) + if (has_size) { - sz.cx = dibsect.dsBm.bmWidth; - sz.cy = dibsect.dsBm.bmHeight; - BitBlt(c->hDC, x, y - dibsect.dsBm.bmHeight, - dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, - hMemDC, 0, 0, SRCCOPY); + convert_sizel(c, &run->ole_obj->sizel, &sz); + } else { + sz.cx = MulDiv(dibsect.dsBm.bmWidth, c->dpi.cx, 96); + sz.cy = MulDiv(dibsect.dsBm.bmHeight, c->dpi.cy, 96); + } + if (c->editor->nZoomNumerator != 0) + { + sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - else + if (sz.cx == dibsect.dsBm.bmWidth && sz.cy == dibsect.dsBm.bmHeight) { - if (has_size) - { - convert_sizel(c, &run->ole_obj->sizel, &sz); - } - else - { - sz.cx = MulDiv(dibsect.dsBm.bmWidth, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); - sz.cy = MulDiv(dibsect.dsBm.bmHeight, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); - } + BitBlt(c->hDC, x, y - sz.cy, + dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, + hMemDC, 0, 0, SRCCOPY); + } else { StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, - hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); + hMemDC, 0, 0, dibsect.dsBm.bmWidth, + dibsect.dsBm.bmHeight, SRCCOPY); } if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); - if (!has_size && c->editor->nZoomNumerator == 0) + if (has_size) { - sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; - sz.cx = emh.rclBounds.right - emh.rclBounds.left; + convert_sizel(c, &run->ole_obj->sizel, &sz); + } else { + sz.cy = MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, c->dpi.cx, 96); + sz.cx = MulDiv(emh.rclBounds.right - emh.rclBounds.left, c->dpi.cy, 96); } - else + if (c->editor->nZoomNumerator != 0) { - if (has_size) - { - convert_sizel(c, &run->ole_obj->sizel, &sz); - } - else - { - sz.cy = MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); - sz.cx = MulDiv(emh.rclBounds.right - emh.rclBounds.left, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); - } + sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } + { RECT rc;

1 0

Dylan Smith : richedit: Documented paragraph border widths are in points not pixels.
by Alexandre Julliard March 1, 2010

March 1, 2010

Module: wine Branch: master Commit: 1f2575ba7c42b3a467cb4a23765124f94f3a0658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2575ba7c42b3a467cb4a237… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Feb 27 13:31:02 2010 -0500 richedit: Documented paragraph border widths are in points not pixels. The border widths documented by msdn are in points which are 72 dpi, which is not equivalent to pixels (normally 96 dpi). I pre-converted all the border widths to 96 dpi resolution since this avoids needed to store fractions, and often avoids the need for convertion to the displays resolution. --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 57 ++++++++++++++++++++++------------------------- dlls/riched20/wrap.c | 2 +- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 89c18b7..9739eea 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -229,7 +229,7 @@ void ME_ScrollRight(ME_TextEditor *editor, int cx); void ME_UpdateScrollBar(ME_TextEditor *editor); /* other functions in paint.c */ -int ME_GetParaBorderWidth(ME_TextEditor *editor, int); +int ME_GetParaBorderWidth(ME_Context *c, int flags); /* richole.c */ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b0e6c1e..2b01e3c 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -461,19 +461,21 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } } -static const struct {unsigned width_num : 4, width_den : 4, pen_style : 4, dble : 1;} border_details[] = { - /* none */ {0, 1, PS_SOLID, FALSE}, - /* 3/4 */ {3, 4, PS_SOLID, FALSE}, - /* 1 1/2 */ {3, 2, PS_SOLID, FALSE}, - /* 2 1/4 */ {9, 4, PS_SOLID, FALSE}, - /* 3 */ {3, 1, PS_SOLID, FALSE}, - /* 4 1/2 */ {9, 2, PS_SOLID, FALSE}, - /* 6 */ {6, 1, PS_SOLID, FALSE}, - /* 3/4 double */ {3, 4, PS_SOLID, TRUE}, - /* 1 1/2 double */ {3, 2, PS_SOLID, TRUE}, - /* 2 1/4 double */ {9, 4, PS_SOLID, TRUE}, - /* 3/4 gray */ {3, 4, PS_DOT /* FIXME */, FALSE}, - /* 1 1/2 dashed */ {3, 2, PS_DASH, FALSE}, +/* The documented widths are in points (72 dpi), but converting them to + * 96 dpi (standard display resolution) avoids dealing with fractions. */ +static const struct {unsigned width : 8, pen_style : 4, dble : 1;} border_details[] = { + /* none */ {0, PS_SOLID, FALSE}, + /* 3/4 */ {1, PS_SOLID, FALSE}, + /* 1 1/2 */ {2, PS_SOLID, FALSE}, + /* 2 1/4 */ {3, PS_SOLID, FALSE}, + /* 3 */ {4, PS_SOLID, FALSE}, + /* 4 1/2 */ {6, PS_SOLID, FALSE}, + /* 6 */ {8, PS_SOLID, FALSE}, + /* 3/4 double */ {1, PS_SOLID, TRUE}, + /* 1 1/2 double */ {2, PS_SOLID, TRUE}, + /* 2 1/4 double */ {3, PS_SOLID, TRUE}, + /* 3/4 gray */ {1, PS_DOT /* FIXME */, FALSE}, + /* 1 1/2 dashed */ {2, PS_DASH, FALSE}, }; static const COLORREF pen_colors[16] = { @@ -487,25 +489,20 @@ static const COLORREF pen_colors[16] = { /* Dark gray */ RGB(0x80, 0x80, 0x80), /* Light gray */ RGB(0xc0, 0xc0, 0xc0), }; -static int ME_GetBorderPenWidth(ME_TextEditor* editor, int idx) +static int ME_GetBorderPenWidth(ME_Context* c, int idx) { - int width; + int width = border_details[idx].width; + + if (c->dpi.cx != 96) + width = MulDiv(width, c->dpi.cx, 96); + + if (c->editor->nZoomNumerator != 0) + width = MulDiv(width, c->editor->nZoomNumerator, c->editor->nZoomDenominator); - if (editor->nZoomNumerator == 0) - { - width = border_details[idx].width_num + border_details[idx].width_den / 2; - width /= border_details[idx].width_den; - } - else - { - width = border_details[idx].width_num * editor->nZoomNumerator; - width += border_details[idx].width_den * editor->nZoomNumerator / 2; - width /= border_details[idx].width_den * editor->nZoomDenominator; - } return width; } -int ME_GetParaBorderWidth(ME_TextEditor* editor, int flags) +int ME_GetParaBorderWidth(ME_Context* c, int flags) { int idx = (flags >> 8) & 0xF; int width; @@ -515,7 +512,7 @@ int ME_GetParaBorderWidth(ME_TextEditor* editor, int flags) FIXME("Unsupported border value %d\n", idx); return 0; } - width = ME_GetBorderPenWidth(editor, idx); + width = ME_GetBorderPenWidth(c, idx); if (border_details[idx].dble) width = width * 2 + 1; return width; } @@ -565,7 +562,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT */ if (para->pFmt->wBorders & 0x00B0) FIXME("Unsupported border flags %x\n", para->pFmt->wBorders); - border_width = ME_GetParaBorderWidth(c->editor, para->pFmt->wBorders); + border_width = ME_GetParaBorderWidth(c, para->pFmt->wBorders); if (para->pFmt->wBorders & 4) top_border = border_width; if (para->pFmt->wBorders & 8) bottom_border = border_width; } @@ -607,7 +604,7 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT rightEdge = c->pt.x + max(c->editor->sizeWindow.cx, c->editor->nTotalWidth); - pen_width = ME_GetBorderPenWidth(c->editor, idx); + pen_width = ME_GetBorderPenWidth(c, idx); pen = CreatePen(border_details[idx].pen_style, pen_width, pencr); oldpen = SelectObject(c->hDC, pen); MoveToEx(c->hDC, 0, 0, &pt); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index f567d40..3b15490 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -522,7 +522,7 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { if (!(pFmt->dwMask & PFM_TABLE && pFmt->wEffects & PFE_TABLE) && pFmt->dwMask & PFM_BORDER) { - border = ME_GetParaBorderWidth(c->editor, tp->member.para.pFmt->wBorders); + border = ME_GetParaBorderWidth(c, tp->member.para.pFmt->wBorders); if (pFmt->wBorders & 1) { wc.nFirstMargin += border; wc.nLeftMargin += border;

1 0