February 2008 - Wine-commits

Alistair Leslie-Hughes : gdiplus: Add GdipSetStringFormatFlags stub.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 277817aad34670bc8481bf1caaebcbf35e361a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277817aad34670bc8481bf1ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 30 15:47:38 2008 +1100 gdiplus: Add GdipSetStringFormatFlags stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2421b6a..33b474d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -587,7 +587,7 @@ @ stdcall GdipSetSolidFillColor(ptr ptr) @ stdcall GdipSetStringFormatAlign(ptr long) @ stub GdipSetStringFormatDigitSubstitution -@ stub GdipSetStringFormatFlags +@ stdcall GdipSetStringFormatFlags(ptr long) @ stdcall GdipSetStringFormatHotkeyPrefix(ptr long) @ stdcall GdipSetStringFormatLineAlign(ptr long) @ stub GdipSetStringFormatMeasurableCharacterRanges diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index e328ffb..7de1c2c 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -28,6 +28,9 @@ #include "gdiplus.h" #include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format) @@ -142,3 +145,10 @@ GpStatus WINGDIPAPI GdipSetStringFormatTrimming(GpStringFormat *format, return Ok; } + +GpStatus WINGDIPAPI GdipSetStringFormatFlags(GDIPCONST GpStringFormat *format, INT flags) +{ + FIXME("format (%p) flags (%d)\n", format, flags); + + return Ok; +}

1 0

Alistair Leslie-Hughes : kernel32: Add RegisterApplicationRestart stub.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 9d36b416a73487d9ba567be38cdf96ef8dc24d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d36b416a73487d9ba567be38… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 30 13:37:17 2008 +1100 kernel32: Add RegisterApplicationRestart stub. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 51eec84..6bc867f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -878,6 +878,7 @@ @ stdcall ReadFileEx(long ptr long ptr ptr) @ stub ReadFileScatter @ stdcall ReadProcessMemory(long ptr ptr long ptr) +@ stdcall RegisterApplicationRestart(wstr long) @ stub RegisterConsoleIME @ stub RegisterConsoleOS2 @ stub RegisterConsoleVDM diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6156203..8e7e675 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2968,3 +2968,14 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) FIXME("%d\n", bBatchRunning); return FALSE; } + + +/*********************************************************************** + * RegisterApplicationRestart (KERNEL32.@) + */ +HRESULT WINAPI RegisterApplicationRestart(PCWSTR pwzCommandLine, DWORD dwFlags) +{ + FIXME("(%s,%d)\n", debugstr_w(pwzCommandLine), dwFlags); + + return S_OK; +}

1 0

Gerald Pfeifer : configure: Use GCC's -Wtype-limits if possible.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 701ef1d8829a0f479705e3d7f432e105dbabe432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=701ef1d8829a0f479705e3d7f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Jan 28 01:28:59 2008 +0100 configure: Use GCC's -Wtype-limits if possible. --- configure | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 39b320a..47f55fc 100755 --- a/configure +++ b/configure @@ -16077,6 +16077,64 @@ if test $ac_cv_cflags__Wwrite_strings = yes; then EXTRACFLAGS="$EXTRACFLAGS -Wwrite-strings" fi + { echo "$as_me:$LINENO: checking whether the compiler supports -Wtype-limits" >&5 +echo $ECHO_N "checking whether the compiler supports -Wtype-limits... $ECHO_C" >&6; } +if test "${ac_cv_cflags__Wtype_limits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wtype-limits" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_cflags__Wtype_limits=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_cflags__Wtype_limits=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ echo "$as_me:$LINENO: result: $ac_cv_cflags__Wtype_limits" >&5 +echo "${ECHO_T}$ac_cv_cflags__Wtype_limits" >&6; } +if test $ac_cv_cflags__Wtype_limits = yes; then + EXTRACFLAGS="$EXTRACFLAGS -Wtype-limits" +fi + saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wpointer-arith -Werror" diff --git a/configure.ac b/configure.ac index 2de5293..21f07c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1211,6 +1211,7 @@ then WINE_TRY_CFLAGS([-fno-strict-aliasing]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wwrite-strings]) + WINE_TRY_CFLAGS([-Wtype-limits]) dnl Check for noisy string.h saved_CFLAGS="$CFLAGS"

1 0

Eric Pouech : dbghelp: Fixed the types we want to load at first.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 8b7039d8948b419e3f5010c9b737bee460839207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7039d8948b419e3f5010c9b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:04:26 2008 +0100 dbghelp: Fixed the types we want to load at first. --- dlls/dbghelp/msc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5e6f8a8..66a2570 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1068,8 +1068,8 @@ static int codeview_parse_type_table(struct codeview_type_parse* ctp) * X 1500-150d for V3 types * 8000-8010 for numeric leafes */ - if (type->generic.id & 0x8600) continue; - codeview_parse_one_type(ctp, curr_type, type, TRUE); + if (!(type->generic.id & 0x8600) || (type->generic.id & 0x0100)) + codeview_parse_one_type(ctp, curr_type, type, TRUE); } return TRUE;

1 0

Eric Pouech : riched20: Make use of the size info in REOBJECT if present.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 9c20cdfea8c4db041066363424f6fde018374dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c20cdfea8c4db04106636342… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:02:34 2008 +0100 riched20: Make use of the size info in REOBJECT if present. --- dlls/riched20/editor.h | 2 +- dlls/riched20/richole.c | 54 ++++++++++++++++++++++++++++++++++++---------- dlls/riched20/run.c | 22 ++++++++++-------- 3 files changed, 55 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index dde2efc..8b97a55 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -260,7 +260,7 @@ int ME_GetParaLineSpace(ME_Context *c, ME_Paragraph*); /* richole.c */ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *); void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected); -void ME_GetOLEObjectSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize); +void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize); void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src); void ME_DeleteReObject(REOBJECT* reo); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c7fc2c8..1509d4e 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -550,12 +550,19 @@ LRESULT CreateIRichEditOle(ME_TextEditor *editor, LPVOID *ppObj) return 1; } +static void convert_sizel(ME_Context *c, const SIZEL* szl, SIZE* sz) +{ + /* sizel is in .01 millimeters, sz in pixels */ + sz->cx = MulDiv(szl->cx, c->dpi.cx, 2540); + sz->cy = MulDiv(szl->cy, c->dpi.cy, 2540); +} + /****************************************************************************** * ME_GetOLEObjectSize * * Sets run extent for OLE objects. */ -void ME_GetOLEObjectSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize) +void ME_GetOLEObjectSize(ME_Context *c, ME_Run *run, SIZE *pSize) { IDataObject* ido; FORMATETC fmt; @@ -565,6 +572,13 @@ void ME_GetOLEObjectSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize) assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); + + if (run->ole_obj->sizel.cx != 0 || run->ole_obj->sizel.cy != 0) + { + convert_sizel(c, &run->ole_obj->sizel, pSize); + return; + } + IOleObject_QueryInterface(run->ole_obj->poleobj, &IID_IDataObject, (void**)&ido); fmt.cfFormat = CF_BITMAP; fmt.ptd = NULL; @@ -603,10 +617,10 @@ void ME_GetOLEObjectSize(ME_TextEditor *editor, ME_Run *run, SIZE *pSize) break; } IDataObject_Release(ido); - if (editor->nZoomNumerator != 0) + if (c->editor->nZoomNumerator != 0) { - pSize->cx = MulDiv(pSize->cx, editor->nZoomNumerator, editor->nZoomDenominator); - pSize->cy = MulDiv(pSize->cy, editor->nZoomNumerator, editor->nZoomDenominator); + pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); + pSize->cy = MulDiv(pSize->cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } } @@ -620,6 +634,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, ENHMETAHEADER emh; HDC hMemDC; SIZE sz; + BOOL has_size; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -628,6 +643,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, FIXME("Couldn't get interface\n"); return; } + has_size = run->ole_obj->sizel.cx != 0 || run->ole_obj->sizel.cy != 0; fmt.cfFormat = CF_BITMAP; fmt.ptd = NULL; fmt.dwAspect = DVASPECT_CONTENT; @@ -650,7 +666,7 @@ 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 (c->editor->nZoomNumerator == 0) + if (!has_size && c->editor->nZoomNumerator == 0) { sz.cx = dibsect.dsBm.bmWidth; sz.cy = dibsect.dsBm.bmHeight; @@ -660,10 +676,17 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, } else { - sz.cy = MulDiv(dibsect.dsBm.bmWidth, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); - sz.cx = MulDiv(dibsect.dsBm.bmHeight, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); + if (has_size) + { + convert_sizel(c, &run->ole_obj->sizel, &sz); + } + else + { + sz.cy = MulDiv(dibsect.dsBm.bmWidth, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + sz.cx = MulDiv(dibsect.dsBm.bmHeight, + c->editor->nZoomNumerator, c->editor->nZoomDenominator); + } StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); } @@ -671,17 +694,24 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); - if (c->editor->nZoomNumerator == 0) + if (!has_size && c->editor->nZoomNumerator == 0) { - sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; - sz.cx = emh.rclBounds.right - emh.rclBounds.left; + sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; + sz.cx = emh.rclBounds.right - emh.rclBounds.left; } else { + 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); + } } { RECT rc; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 9928640..9ed14d3 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -492,7 +492,7 @@ int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetOLEObjectSize(c->editor, run, &sz); + ME_GetOLEObjectSize(c, run, &sz); if (cx < sz.cx) return 0; return 1; @@ -546,21 +546,22 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) return 0; return 1; } + ME_InitContext(&c, editor, GetDC(editor->hWnd)); if (run->nFlags & MERF_GRAPHICS) { SIZE sz; - ME_GetOLEObjectSize(editor, run, &sz); + ME_GetOLEObjectSize(&c, run, &sz); + ReleaseDC(editor->hWnd, c.hDC); if (cx < sz.cx/2) return 0; return 1; } - + if (editor->cPasswordMask) strRunText = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(run->strText)); else strRunText = run->strText; - ME_InitContext(&c, editor, GetDC(editor->hWnd)); hOldFont = ME_SelectStyleFont(&c, run->style); GetTextExtentExPointW(c.hDC, strRunText->szData, strRunText->nLen, cx, &fit, NULL, &sz); @@ -609,19 +610,20 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset) ME_String *strRunText; /* This could point to either the run's real text, or it's masked form in a password control */ + ME_InitContext(&c, editor, GetDC(editor->hWnd)); if (pRun->nFlags & MERF_GRAPHICS) { - if (!nOffset) return 0; - ME_GetOLEObjectSize(editor, pRun, &size); - return 1; + if (nOffset) + ME_GetOLEObjectSize(&c, pRun, &size); + ReleaseDC(editor->hWnd, c.hDC); + return nOffset != 0; } if (editor->cPasswordMask) strRunText = ME_MakeStringR(editor->cPasswordMask,ME_StrVLen(pRun->strText)); else strRunText = pRun->strText; - - ME_InitContext(&c, editor, GetDC(editor->hWnd)); + ME_GetTextExtent(&c, strRunText->szData, nOffset, pRun->style, &size); ReleaseDC(editor->hWnd, c.hDC); if (editor->cPasswordMask) @@ -689,7 +691,7 @@ static SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run } if (run->nFlags & MERF_GRAPHICS) { - ME_GetOLEObjectSize(c->editor, run, &size); + ME_GetOLEObjectSize(c, run, &size); if (size.cy > *pAscent) *pAscent = size.cy; /* descent is unchanged */

1 0

Eric Pouech : riched20: Start implementing object reading out RTF stream.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: bcbf9eeb2d23bba9c664bb2e865e247cdb01f7cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbf9eeb2d23bba9c664bb2e8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:02:28 2008 +0100 riched20: Start implementing object reading out RTF stream. --- dlls/riched20/editor.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 02d5ca8..3584525 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -849,6 +849,47 @@ skip_group: RTFRouteToken(info); /* feed "}" back to router */ } +/* for now, lookup the \result part and use it, whatever the object */ +static void ME_RTFReadObjectGroup(RTF_Info *info) +{ + for (;;) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + if (RTFCheckCM(info, rtfGroup, rtfEndGroup)) + break; + if (RTFCheckCM(info, rtfGroup, rtfBeginGroup)) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + if (RTFCheckCMM(info, rtfControl, rtfDestination, rtfObjResult)) + { + int level = 1; + + while (RTFGetToken (info) != rtfEOF) + { + if (info->rtfClass == rtfGroup) + { + if (info->rtfMajor == rtfBeginGroup) level++; + else if (info->rtfMajor == rtfEndGroup && --level < 0) break; + } + RTFRouteToken(info); + } + } + else RTFSkipGroup(info); + continue; + } + if (!RTFCheckCM (info, rtfControl, rtfObjAttr)) + { + FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); + return; + } + } + RTFRouteToken(info); /* feed "}" back to router */ +} + static void ME_RTFReadHook(RTF_Info *info) { switch(info->rtfClass) { @@ -988,6 +1029,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre RTFInit(&parser); RTFSetReadHook(&parser, ME_RTFReadHook); RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); + RTFSetDestinationCallback(&parser, rtfObject, ME_RTFReadObjectGroup); BeginFile(&parser); /* do the parsing */

1 0

Eric Pouech : riched20: Added support for image reading from RTF stream.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: e5f91bab15607a990f664a136f90a77b83a65aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f91bab15607a990f664a136… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:02:21 2008 +0100 riched20: Added support for image reading from RTF stream. --- dlls/riched20/editor.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/riched20/rtf.h | 1 + 2 files changed, 162 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2df5eb1..02d5ca8 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -692,6 +692,163 @@ static void ME_RTFTblAttrHook(RTF_Info *info) } } +static BOOL ME_RTFInsertOleObject(RTF_Info *info, HENHMETAFILE h, const SIZEL* sz) +{ + LPOLEOBJECT lpObject = NULL; + LPSTORAGE lpStorage = NULL; + LPOLECLIENTSITE lpClientSite = NULL; + LPDATAOBJECT lpDataObject = NULL; + LPOLECACHE lpOleCache = NULL; + STGMEDIUM stgm; + FORMATETC fm; + CLSID clsid; + BOOL ret = FALSE; + DWORD conn; + + stgm.tymed = TYMED_ENHMF; + stgm.u.hEnhMetaFile = h; + stgm.pUnkForRelease = NULL; + + fm.cfFormat = CF_ENHMETAFILE; + fm.ptd = NULL; + fm.dwAspect = DVASPECT_CONTENT; + fm.lindex = -1; + fm.tymed = stgm.tymed; + + if (!info->lpRichEditOle) + { + CreateIRichEditOle(info->editor, (VOID**)&info->lpRichEditOle); + } + + if (OleCreateDefaultHandler(&CLSID_NULL, NULL, &IID_IOleObject, (void**)&lpObject) == S_OK && +#if 0 + /* FIXME: enable it when rich-edit properly implements this method */ + IRichEditOle_GetClientSite(info->lpRichEditOle, &lpClientSite) == S_OK && + IOleObject_SetClientSite(lpObject, lpClientSite) == S_OK && +#endif + IOleObject_GetUserClassID(lpObject, &clsid) == S_OK && + IOleObject_QueryInterface(lpObject, &IID_IOleCache, (void**)&lpOleCache) == S_OK && + IOleCache_Cache(lpOleCache, &fm, 0, &conn) == S_OK && + IOleObject_QueryInterface(lpObject, &IID_IDataObject, (void**)&lpDataObject) == S_OK && + IDataObject_SetData(lpDataObject, &fm, &stgm, TRUE) == S_OK) + { + REOBJECT reobject; + + reobject.cbStruct = sizeof(reobject); + reobject.cp = REO_CP_SELECTION; + reobject.clsid = clsid; + reobject.poleobj = lpObject; + reobject.pstg = lpStorage; + reobject.polesite = lpClientSite; + /* convert from twips to .01 mm */ + reobject.sizel.cx = MulDiv(sz->cx, 254, 144); + reobject.sizel.cy = MulDiv(sz->cy, 254, 144); + reobject.dvaspect = DVASPECT_CONTENT; + reobject.dwFlags = 0; /* FIXME */ + reobject.dwUser = 0; + + /* FIXME: could be simpler */ + ret = IRichEditOle_InsertObject(info->lpRichEditOle, &reobject) == S_OK; + } + + if (lpObject) IOleObject_Release(lpObject); + if (lpClientSite) IOleClientSite_Release(lpClientSite); + if (lpStorage) IStorage_Release(lpStorage); + if (lpDataObject) IDataObject_Release(lpDataObject); + if (lpOleCache) IOleCache_Release(lpOleCache); + + return ret; +} + +static void ME_RTFReadPictGroup(RTF_Info *info) +{ + SIZEL sz; + BYTE* buffer = NULL; + unsigned bufsz, bufidx; + BOOL flip; + BYTE val; + METAFILEPICT mfp; + HENHMETAFILE hemf; + + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + mfp.mm = MM_TEXT; + /* fetch picture type */ + if (RTFCheckMM (info, rtfPictAttr, rtfWinMetafile)) + { + mfp.mm = info->rtfParam; + } + else + { + FIXME("%d %d\n", info->rtfMajor, info->rtfMinor); + goto skip_group; + } + sz.cx = sz.cy = 0; + /* fetch picture attributes */ + for (;;) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + return; + if (info->rtfClass == rtfText) + break; + if (!RTFCheckCM (info, rtfControl, rtfPictAttr)) + { + ERR("Expected picture attribute (%d %d)\n", + info->rtfClass, info->rtfMajor); + goto skip_group; + } + else if (RTFCheckMM (info, rtfPictAttr, rtfPicWid)) + mfp.xExt = info->rtfParam; + else if (RTFCheckMM (info, rtfPictAttr, rtfPicHt)) + mfp.yExt = info->rtfParam; + else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalWid)) + sz.cx = info->rtfParam; + else if (RTFCheckMM (info, rtfPictAttr, rtfPicGoalHt)) + sz.cy = info->rtfParam; + else + FIXME("Non supported attribute: %d %d %d\n", info->rtfClass, info->rtfMajor, info->rtfMinor); + } + /* fetch picture data */ + bufsz = 1024; + bufidx = 0; + buffer = HeapAlloc(GetProcessHeap(), 0, bufsz); + val = info->rtfMajor; + for (flip = TRUE;; flip = !flip) + { + RTFGetToken (info); + if (info->rtfClass == rtfEOF) + { + HeapFree(GetProcessHeap(), 0, buffer); + return; /* Warn ?? */ + } + if (RTFCheckCM(info, rtfGroup, rtfEndGroup)) + break; + if (info->rtfClass != rtfText) goto skip_group; + if (flip) + { + if (bufidx >= bufsz && + !(buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, bufsz += 1024))) + goto skip_group; + buffer[bufidx++] = RTFCharToHex(val) * 16 + RTFCharToHex(info->rtfMajor); + } + else + val = info->rtfMajor; + } + if (flip) FIXME("wrong hex string\n"); + + if ((hemf = SetWinMetaFileBits(bufidx, buffer, NULL, &mfp))) + ME_RTFInsertOleObject(info, hemf, &sz); + HeapFree(GetProcessHeap(), 0, buffer); + RTFRouteToken (info); /* feed "}" back to router */ + return; +skip_group: + HeapFree(GetProcessHeap(), 0, buffer); + RTFSkipGroup(info); + RTFRouteToken(info); /* feed "}" back to router */ +} + static void ME_RTFReadHook(RTF_Info *info) { switch(info->rtfClass) { @@ -830,12 +987,15 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre WriterInit(&parser); RTFInit(&parser); RTFSetReadHook(&parser, ME_RTFReadHook); + RTFSetDestinationCallback(&parser, rtfPict, ME_RTFReadPictGroup); BeginFile(&parser); - + /* do the parsing */ RTFRead(&parser); RTFFlushOutputBuffer(&parser); RTFDestroy(&parser); + if (parser.lpRichEditOle) + IRichEditOle_Release(parser.lpRichEditOle); style = parser.style; } diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 5a12515..3a9c235 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1103,6 +1103,7 @@ struct _RTF_Info { RTFState stack[maxStack]; int stackTop; BOOL styleChanged; + LPRICHEDITOLE lpRichEditOle; };

1 0

Eric Pouech : riched20: Support a couple of paragraphs attributes out of RTF stream reading.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 1e62b0e3b0a50c40d0cbf4d2ff08702062232f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e62b0e3b0a50c40d0cbf4d2f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:02:14 2008 +0100 riched20: Support a couple of paragraphs attributes out of RTF stream reading. --- dlls/riched20/editor.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 143 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 705c5a1..2df5eb1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4,6 +4,7 @@ * Copyright 2004 by Krzysztof Foltman * Copyright 2005 by Cihan Altinay * Copyright 2005 by Phil Krylov + * Copyright 2008 Eric Pouech * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -506,6 +507,148 @@ static void ME_RTFParAttrHook(RTF_Info *info) if (fmt.cTabCount < MAX_TAB_STOPS) fmt.rgxTabs[fmt.cTabCount++] = info->rtfParam; break; + case rtfKeep: + fmt.dwMask = PFM_KEEP; + fmt.wEffects = PFE_KEEP; + break; + case rtfNoWidowControl: + fmt.dwMask = PFM_NOWIDOWCONTROL; + fmt.wEffects = PFE_NOWIDOWCONTROL; + break; + case rtfKeepNext: + fmt.dwMask = PFM_KEEPNEXT; + fmt.wEffects = PFE_KEEPNEXT; + break; + case rtfSpaceAfter: + fmt.dwMask = PFM_SPACEAFTER; + fmt.dySpaceAfter = info->rtfParam; + break; + case rtfSpaceBefore: + fmt.dwMask = PFM_SPACEBEFORE; + fmt.dySpaceBefore = info->rtfParam; + break; + case rtfSpaceBetween: + fmt.dwMask = PFM_LINESPACING; + if ((int)info->rtfParam > 0) + { + fmt.dyLineSpacing = info->rtfParam; + fmt.bLineSpacingRule = 3; + } + else + { + fmt.dyLineSpacing = info->rtfParam; + fmt.bLineSpacingRule = 4; + } + case rtfSpaceMultiply: + fmt.dwMask = PFM_LINESPACING; + fmt.dyLineSpacing = info->rtfParam * 20; + fmt.bLineSpacingRule = 5; + break; + case rtfParBullet: + fmt.dwMask = PFM_NUMBERING; + fmt.wNumbering = PFN_BULLET; + break; + case rtfParSimple: + fmt.dwMask = PFM_NUMBERING; + fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + break; + case rtfParNumDecimal: + fmt.dwMask = PFM_NUMBERING; + fmt.wNumbering = 2; /* FIXME: MSDN says it's not used ?? */ + break; + case rtfParNumIndent: + fmt.dwMask = PFM_NUMBERINGTAB; + fmt.wNumberingTab = info->rtfParam; + break; + case rtfParNumStartAt: + fmt.dwMask = PFM_NUMBERINGSTART; + fmt.wNumberingStart = info->rtfParam; + break; + case rtfBorderLeft: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 1; + break; + case rtfBorderRight: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 2; + break; + case rtfBorderTop: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 4; + break; + case rtfBorderBottom: + ME_GetSelectionParaFormat(info->editor, &fmt); + if (!(fmt.dwMask & PFM_BORDER)) + { + fmt.dwMask |= PFM_BORDER; + fmt.wBorderSpace = 0; + fmt.wBorderWidth = 1; + fmt.wBorders = 0; + } + fmt.wBorders |= 8; + break; + case rtfBorderSingle: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 1 << 8; + break; + case rtfBorderThick: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 2 << 8; + break; + case rtfBorderShadow: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 10 << 8; + break; + case rtfBorderDouble: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 7 << 8; + break; + case rtfBorderDot: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= 11 << 8; + break; + case rtfBorderWidth: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorders &= ~0x70; + fmt.wBorders |= ((info->rtfParam / 15) & 7) << 8; + break; + case rtfBorderSpace: + ME_GetSelectionParaFormat(info->editor, &fmt); + /* we assume that borders have been created before (RTF spec) */ + fmt.wBorderSpace = info->rtfParam; + break; } if (fmt.dwMask) { RTFFlushOutputBuffer(info);

1 0

Eric Pouech : riched20: Invert graphics when they are under the selection.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: 251153806d3d8ebf0ce7d5f29850595cff4b666e URL: http://source.winehq.org/git/wine.git/?a=commit;h=251153806d3d8ebf0ce7d5f29… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:02:05 2008 +0100 riched20: Invert graphics when they are under the selection. --- dlls/riched20/richole.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 2926dd9..c7fc2c8 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -619,7 +619,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, DIBSECTION dibsect; ENHMETAHEADER emh; HDC hMemDC; - RECT rc; + SIZE sz; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -651,43 +651,56 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, hMemDC = CreateCompatibleDC(c->hDC); SelectObject(hMemDC, stgm.u.hBitmap); if (c->editor->nZoomNumerator == 0) + { + 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); + } else { - int w = MulDiv(dibsect.dsBm.bmWidth, + sz.cy = MulDiv(dibsect.dsBm.bmWidth, c->editor->nZoomNumerator, c->editor->nZoomDenominator); - int h = MulDiv(dibsect.dsBm.bmHeight, + sz.cx = MulDiv(dibsect.dsBm.bmHeight, c->editor->nZoomNumerator, c->editor->nZoomDenominator); - StretchBlt(c->hDC, x, y - h, w, h, + StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, 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); - rc.left = x; - rc.bottom = y; if (c->editor->nZoomNumerator == 0) { - rc.top = y - (emh.rclBounds.bottom - emh.rclBounds.top); - rc.right = x + (emh.rclBounds.right - emh.rclBounds.left); + sz.cy = emh.rclBounds.bottom - emh.rclBounds.top; + sz.cx = emh.rclBounds.right - emh.rclBounds.left; } else { - rc.top = y - MulDiv(emh.rclBounds.bottom - emh.rclBounds.top, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); - rc.right = x + MulDiv(emh.rclBounds.right - emh.rclBounds.left, - c->editor->nZoomNumerator, c->editor->nZoomDenominator); + 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); + } + { + RECT rc; + + rc.left = x; + rc.top = y - sz.cy; + rc.right = x + sz.cx; + rc.bottom = y; + PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); } - PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed); + selected = FALSE; break; } + if (selected && !c->editor->bHideSelection) + PatBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, DSTINVERT); IDataObject_Release(ido); }

1 0

Eric Pouech : riched20: Correctly handle the wrapping when graphics are used.
by Alexandre Julliard 05 Feb '08

05 Feb '08

Module: wine Branch: master Commit: d014db68d4948b786a520c828308077c07632f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d014db68d4948b786a520c828… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Jan 27 19:01:58 2008 +0100 riched20: Correctly handle the wrapping when graphics are used. Get rid of infinite loops when run's width was larger than the global available width. --- dlls/riched20/wrap.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 4daf58e..1037cec 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -293,8 +293,13 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p) wc->bOverflown = TRUE; return p; } - /* graphics or TAB - we can split before */ - if (run->nFlags & (MERF_GRAPHICS|MERF_TAB)) { + /* TAB: we can split before */ + if (run->nFlags & MERF_TAB) { + wc->bOverflown = TRUE; + return p; + } + /* graphics: we can split before, if run's width is smaller than row's width */ + if ((run->nFlags & MERF_GRAPHICS) && run->nWidth <= wc->nAvailWidth) { wc->bOverflown = TRUE; return p; }

1 0