August 2009 - Wine-commits - list.winehq.org

Owen Rudge : comctl32: Add stubs for image list functions introduced in Vista.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 956a52bd7feaf3f1f9e279e6ddee586ac2bb5cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=956a52bd7feaf3f1f9e279e6d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 12 21:51:36 2009 +0100 comctl32: Add stubs for image list functions introduced in Vista. --- dlls/comctl32/comctl32.spec | 2 + dlls/comctl32/imagelist.c | 45 +++++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 1 + include/commoncontrols.idl | 2 + 4 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 6b8f662..e852916 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -139,10 +139,12 @@ @ stdcall FlatSB_SetScrollRange (long long long long long) @ stdcall FlatSB_ShowScrollBar (long long long) @ stdcall GetMUILanguage() +@ stdcall HIMAGELIST_QueryInterface(ptr ptr ptr) @ stdcall ImageList_Add(ptr long long) @ stdcall ImageList_AddIcon(ptr long) @ stdcall ImageList_AddMasked(ptr long long) @ stdcall ImageList_BeginDrag(ptr long long long) +@ stdcall ImageList_CoCreateInstance(ptr ptr ptr ptr) @ stdcall ImageList_Copy(ptr long ptr long long) @ stdcall ImageList_Create(long long long long long) @ stdcall ImageList_Destroy(ptr) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 84971f7..d3f0b36 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -6,6 +6,7 @@ * Copyright 2001, 2004 Michael Stefaniuc * Copyright 2001 Charles Loep for CodeWeavers * Copyright 2002 Dimitrie O. Paun + * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2906,3 +2907,47 @@ ImageList_SetColorTable (HIMAGELIST himl, UINT uStartIndex, UINT cEntries, CONST { return SetDIBColorTable(himl->hdcImage, uStartIndex, cEntries, prgb); } + +/************************************************************************* + * ImageList_CoCreateInstance [COMCTL32.@] + * + * Creates a new imagelist instance and returns an interface pointer to it. + * + * PARAMS + * rclsid [I] A reference to the CLSID (CLSID_ImageList). + * punkOuter [I] Pointer to IUnknown interface for aggregation, if desired + * riid [I] Identifier of the requested interface. + * ppv [O] Returns the address of the pointer requested, or NULL. + * + * RETURNS + * Success: S_OK. + * Failure: Error value. + */ +HRESULT WINAPI +ImageList_CoCreateInstance (REFCLSID rclsid, const IUnknown *punkOuter, REFIID riid, void **ppv) +{ + FIXME("STUB: %s %p %s %p\n", debugstr_guid(rclsid), punkOuter, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +/************************************************************************* + * HIMAGELIST_QueryInterface [COMCTL32.@] + * + * Returns a pointer to an IImageList or IImageList2 object for the given + * HIMAGELIST. + * + * PARAMS + * himl [I] Image list handle. + * riid [I] Identifier of the requested interface. + * ppv [O] Returns the address of the pointer requested, or NULL. + * + * RETURNS + * Success: S_OK. + * Failure: Error value. + */ +HRESULT WINAPI +HIMAGELIST_QueryInterface (HIMAGELIST himl, REFIID riid, void **ppv) +{ + FIXME("STUB: %p %s %p\n", himl, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} diff --git a/include/commctrl.h b/include/commctrl.h index 8673ba9..17d8b86 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -584,6 +584,7 @@ typedef struct _IMAGELISTDRAWPARAMS } IMAGELISTDRAWPARAMS, *LPIMAGELISTDRAWPARAMS; +HRESULT WINAPI HIMAGELIST_QueryInterface(HIMAGELIST,REFIID,void **); INT WINAPI ImageList_Add(HIMAGELIST,HBITMAP,HBITMAP); INT WINAPI ImageList_AddMasked(HIMAGELIST,HBITMAP,COLORREF); BOOL WINAPI ImageList_BeginDrag(HIMAGELIST,INT,INT,INT); diff --git a/include/commoncontrols.idl b/include/commoncontrols.idl index a162b38..6e00837 100644 --- a/include/commoncontrols.idl +++ b/include/commoncontrols.idl @@ -61,6 +61,8 @@ typedef struct typedef IMAGELISTDRAWPARAMS* LPIMAGELISTDRAWPARAMS; cpp_quote("#endif") +cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, REFIID,void **);") + const UINT ILIF_ALPHA = 1; [

1 0

Owen Rudge : comctl32/tests: Add basic test for IImageList using SHGetImageList.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 1556fbf86c6dace66a6dbc7e49e6d4d1395aa933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1556fbf86c6dace66a6dbc7e4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 12 21:51:28 2009 +0100 comctl32/tests: Add basic test for IImageList using SHGetImageList. --- dlls/comctl32/tests/imagelist.c | 58 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3fe249f..e1ad8da 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -4,6 +4,7 @@ * Copyright 2004 Michael Stefaniuc * Copyright 2002 Mike McCormack for CodeWeavers * Copyright 2007 Dmitry Timoshkov + * Copyright 2009 Owen Rudge for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,8 +34,12 @@ #include "winuser.h" #include "objbase.h" #include "commctrl.h" /* must be included after objbase.h to get ImageList_Write */ +#include "initguid.h" +#include "commoncontrols.h" +#include "shellapi.h" #include "wine/test.h" +#include "v6util.h" #undef VISIBLE @@ -981,8 +986,52 @@ static void test_imagelist_storage(void) iml_clear_stream_data(); } +static void test_shell_imagelist(void) +{ + BOOL (WINAPI *pSHGetImageList)(INT, REFIID, void**); + IImageList *iml = NULL; + HMODULE hShell32; + HRESULT hr; + int out = 0; + RECT rect; + + /* Try to load function from shell32 */ + hShell32 = LoadLibrary("shell32.dll"); + pSHGetImageList = (void*)GetProcAddress(hShell32, (LPCSTR) 727); + + if (!pSHGetImageList) + { + win_skip("SHGetImageList not available, skipping test\n"); + return; + } + + /* Get system image list */ + hr = (pSHGetImageList)(SHIL_LARGE, &IID_IImageList, (void**)&iml); + + todo_wine ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); + + if (hr != S_OK) + return; + + IImageList_GetImageCount(iml, &out); + todo_wine ok(out > 0, "IImageList_GetImageCount returned out <= 0"); + + /* right and bottom should be 32x32 for large icons, or 48x48 if larger + icons enabled in control panel */ + IImageList_GetImageRect(iml, 0, &rect); + todo_wine ok((((rect.right == 32) && (rect.bottom == 32)) || + ((rect.right == 48) && (rect.bottom == 48))), + "IImageList_GetImageRect returned r:%d,b:%d", + rect.right, rect.bottom); + + IImageList_Release(iml); + FreeLibrary(hShell32); +} + START_TEST(imagelist) { + ULONG_PTR ctx_cookie; + HMODULE hComCtl32 = GetModuleHandle("comctl32.dll"); pImageList_DrawIndirect = (void*)GetProcAddress(hComCtl32, "ImageList_DrawIndirect"); pImageList_SetImageCount = (void*)GetProcAddress(hComCtl32, "ImageList_SetImageCount"); @@ -998,4 +1047,13 @@ START_TEST(imagelist) DoTest3(); testMerge(); test_imagelist_storage(); + + /* Now perform v6 tests */ + + if (!load_v6_module(&ctx_cookie)) + return; + + test_shell_imagelist(); + + unload_v6_module(ctx_cookie); }

1 0

Owen Rudge : uuid: Add IImageList (commoncontrols.h).
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: cfd1703e47e8a9edc70d2c5533f8c7390ac5302f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd1703e47e8a9edc70d2c553… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 12 21:51:20 2009 +0100 uuid: Add IImageList (commoncontrols.h). --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index afb9abd..34ba4dd 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -81,6 +81,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "msctf.h" #include "sensevts.h" #include "ocmm.h" +#include "commoncontrols.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Owen Rudge : include: Add SHGetImageList and its flags to shellapi.h.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 11bc43926d21673c006088c416a7277a229699ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bc43926d21673c006088c41… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 12 21:51:13 2009 +0100 include: Add SHGetImageList and its flags to shellapi.h. --- include/shellapi.h | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index 930f261..9866b5e 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -145,6 +145,19 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT); #define SHGetFileInfo WINELIB_NAME_AW(SHGetFileInfo) /****************************************** + * SHGetImageList + */ + +HRESULT WINAPI SHGetImageList(INT, REFIID, void **); + +#define SHIL_LARGE 0x0 +#define SHIL_SMALL 0x1 +#define SHIL_EXTRALARGE 0x2 +#define SHIL_SYSSMALL 0x3 +#define SHIL_JUMBO 0x4 +#define SHIL_LAST SHIL_JUMBO + +/****************************************** * SHSetFileInfo */

1 0

Owen Rudge : include: Define interface for comctl32 v6 (IImageList).
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 2e40be8ab4bcfd49d82af5b809c2ba5775175e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e40be8ab4bcfd49d82af5b80… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 12 21:51:06 2009 +0100 include: Define interface for comctl32 v6 (IImageList). --- .gitignore | 1 + include/Makefile.in | 1 + include/commoncontrols.idl | 212 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 1e9d216..305cd7b 100644 --- a/.gitignore +++ b/.gitignore @@ -110,6 +110,7 @@ include/austream.h include/bits.h include/bits1_5.h include/comcat.h +include/commoncontrols.h include/config.h include/control.h include/ctxtcall.h diff --git a/include/Makefile.in b/include/Makefile.in index aee348f..fafdf8e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -18,6 +18,7 @@ PUBLIC_IDL_H_SRCS = \ bits.idl \ bits1_5.idl \ comcat.idl \ + commoncontrols.idl \ control.idl \ ctxtcall.idl \ d3d10.idl \ diff --git a/include/commoncontrols.idl b/include/commoncontrols.idl new file mode 100644 index 0000000..a162b38 --- /dev/null +++ b/include/commoncontrols.idl @@ -0,0 +1,212 @@ +/* + * Common controls v6 interface definitions + * + * Copyright 2009 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +/* Definitions required for widl, but already defined in commctrl.h for C */ +cpp_quote("#if 0") +typedef DWORD RGBQUAD; +typedef IUnknown* HIMAGELIST; + +typedef struct +{ + HBITMAP hbmImage; + HBITMAP hbmMask; + int Unused1; + int Unused2; + RECT rcImage; +} IMAGEINFO; + +typedef IMAGEINFO* LPIMAGEINFO; + +typedef struct +{ + DWORD cbSize; + HIMAGELIST himl; + int i; + HDC hdcDst; + int x; + int y; + int cx; + int cy; + int xBitmap; + int yBitmap; + COLORREF rgbBk; + COLORREF rgbFg; + UINT fStyle; + DWORD dwRop; + DWORD fState; + DWORD Frame; + COLORREF crEffect; +} IMAGELISTDRAWPARAMS; + +typedef IMAGELISTDRAWPARAMS* LPIMAGELISTDRAWPARAMS; +cpp_quote("#endif") + +const UINT ILIF_ALPHA = 1; + +[ + object, + uuid(46EB5926-582E-4017-9FDF-E8998DAA0950), + helpstring("Image List"), + local +] +interface IImageList : IUnknown +{ + HRESULT Add( + [in] HBITMAP hbmImage, + [in] HBITMAP hbmMask, + [out] int* pi); + + HRESULT ReplaceIcon( + [in] int i, + [in] HICON hicon, + [out] int* pi); + + HRESULT SetOverlayImage( + [in] int iImage, + [in] int iOverlay); + + HRESULT Replace( + [in] int i, + [in] HBITMAP hbmImage, + [in] HBITMAP hbmMask); + + HRESULT AddMasked( + [in] HBITMAP hbmImage, + [in] COLORREF crMask, + [out] int* pi); + + HRESULT Draw( + [in] IMAGELISTDRAWPARAMS* pimldp); + + HRESULT Remove( + [in] int i); + + HRESULT GetIcon( + [in] int i, + [in] UINT flags, + [out] HICON* picon); + + HRESULT GetImageInfo( + [in] int i, + [out] IMAGEINFO* pImageInfo); + + HRESULT Copy( + [in] int iDst, + [in] IUnknown* punkSrc, + [in] int iSrc, + [in] UINT uFlags); + + HRESULT Merge( + [in] int i1, + [in] IUnknown* punk2, + [in] int i2, + [in] int dx, + [in] int dy, + [out] REFIID riid, + [out] PVOID* ppv); + + HRESULT Clone( + [in] REFIID riid, + [out] PVOID* ppv); + + HRESULT GetImageRect( + [in] int i, + [out] RECT* prc); + + HRESULT GetIconSize( + [out] int* cx, + [out] int* cy); + + HRESULT SetIconSize( + [in] int cx, + [in] int cy); + + HRESULT GetImageCount( + [out] int* pi); + + HRESULT SetImageCount( + [in] UINT uNewCount); + + HRESULT SetBkColor( + [in] COLORREF clrBk, + [out] COLORREF* pclr); + + HRESULT GetBkColor( + [out] COLORREF* pclr); + + HRESULT BeginDrag( + [in] int iTrack, + [in] int dxHotspot, + [in] int dyHotspot); + + HRESULT EndDrag(); + + HRESULT DragEnter( + [in] HWND hwndLock, + [in] int x, + [in] int y); + + HRESULT DragLeave( + [in] HWND hwndLock); + + HRESULT DragMove( + [in] int x, + [in] int y); + + HRESULT SetDragCursorImage( + [in] IUnknown* punk, + [in] int iDrag, + [in] int dxHotspot, + [in] int dyHotspot); + + HRESULT DragShowNolock( + [in] BOOL fShow); + + HRESULT GetDragImage( + [out] POINT * ppt, + [out] POINT * pptHotspot, + [out] REFIID riid, + [out] PVOID* ppv); + + HRESULT GetItemFlags( + [in] int i, + [out] DWORD *dwFlags); + + HRESULT GetOverlayImage( + [in] int iOverlay, + [out] int* piIndex); +} + +[ + uuid(BCADA15B-B428-420c-8D28-023590924C9F) +] +library CommonControlObjects +{ + [ + uuid(7C476BA2-02B1-48f4-8048-B24619DDC058) + ] + coclass ImageList + { + interface IImageList; + } +}

1 0

Owen Rudge : comctl32/tests: Move v6 test initialisation routines into separate file.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: ce638952af81bd5a611021b19176d725db9f83bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce638952af81bd5a611021b19… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Aug 12 21:50:52 2009 +0100 comctl32/tests: Move v6 test initialisation routines into separate file. --- dlls/comctl32/tests/listview.c | 148 ++++----------------------------------- dlls/comctl32/tests/v6util.h | 140 +++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce638952af81bd5a61102…

1 0

Dylan Smith : richedit: Use ME_MoveCursorChars in ME_FindText to find relative offset.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 989bdd15794b5a7b894ab8d9176398c087aea938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=989bdd15794b5a7b894ab8d91… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:44:27 2009 -0400 richedit: Use ME_MoveCursorChars in ME_FindText to find relative offset. When a previous character needed to be found, it is simpler to move existing cursor rather than retravese the linked list to find the offset again. --- dlls/riched20/editor.c | 65 +++++++++++++++++++++++------------------------ 1 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f3753b4..4726d4e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1640,10 +1640,8 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH { const int nLen = lstrlenW(text); const int nTextLen = ME_GetTextLength(editor); - int nStart, nEnd; int nMin, nMax; - ME_DisplayItem *item; - ME_DisplayItem *para; + ME_Cursor cursor; WCHAR wLastChar = ' '; TRACE("flags==0x%08x, chrg->cpMin==%d, chrg->cpMax==%d text==%s\n", @@ -1704,17 +1702,17 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH /* If possible, find the character before where the search starts */ if ((flags & FR_WHOLEWORD) && nMin) { - ME_RunOfsFromCharOfs(editor, nMin - 1, NULL, &item, &nStart); - wLastChar = item->member.run.strText->szData[nStart]; + ME_CursorFromCharOfs(editor, nMin - 1, &cursor); + wLastChar = cursor.pRun->member.run.strText->szData[cursor.nOffset]; + ME_MoveCursorChars(editor, &cursor, 1); + } else { + ME_CursorFromCharOfs(editor, nMin, &cursor); } - ME_RunOfsFromCharOfs(editor, nMin, &para, &item, &nStart); - - while (item - && para->member.para.nCharOfs + item->member.run.nCharOfs + nStart + nLen <= nMax) + while (cursor.pRun && ME_GetCursorOfs(&cursor) + nLen <= nMax) { - ME_DisplayItem *pCurItem = item; - int nCurStart = nStart; + ME_DisplayItem *pCurItem = cursor.pRun; + int nCurStart = cursor.nOffset; int nMatched = 0; while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurStart + nMatched], text[nMatched], (flags & FR_MATCHCASE))) @@ -1747,14 +1745,14 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH break; } - nStart += para->member.para.nCharOfs + item->member.run.nCharOfs; + cursor.nOffset += cursor.pPara->member.para.nCharOfs + cursor.pRun->member.run.nCharOfs; if (chrgText) { - chrgText->cpMin = nStart; - chrgText->cpMax = nStart + nLen; + chrgText->cpMin = cursor.nOffset; + chrgText->cpMax = cursor.nOffset + nLen; } - TRACE("found at %d-%d\n", nStart, nStart + nLen); - return nStart; + TRACE("found at %d-%d\n", cursor.nOffset, cursor.nOffset + nLen); + return cursor.nOffset; } if (nCurStart + nMatched == pCurItem->member.run.strText->nLen) { @@ -1767,11 +1765,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH else wLastChar = ' '; - nStart++; - if (nStart == item->member.run.strText->nLen) + cursor.nOffset++; + if (cursor.nOffset == cursor.pRun->member.run.strText->nLen) { - ME_NextRun(&para, &item); - nStart = 0; + ME_NextRun(&cursor.pPara, &cursor.pRun); + cursor.nOffset = 0; } } } @@ -1780,18 +1778,18 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH /* If possible, find the character after where the search ends */ if ((flags & FR_WHOLEWORD) && nMax < nTextLen - 1) { - ME_RunOfsFromCharOfs(editor, nMax + 1, NULL, &item, &nEnd); - wLastChar = item->member.run.strText->szData[nEnd]; + ME_CursorFromCharOfs(editor, nMax + 1, &cursor); + wLastChar = cursor.pRun->member.run.strText->szData[cursor.nOffset]; + ME_MoveCursorChars(editor, &cursor, -1); + } else { + ME_CursorFromCharOfs(editor, nMax, &cursor); } - ME_RunOfsFromCharOfs(editor, nMax, &para, &item, &nEnd); - - while (item - && para->member.para.nCharOfs + item->member.run.nCharOfs + nEnd - nLen >= nMin) + while (cursor.pRun && ME_GetCursorOfs(&cursor) - nLen >= nMin) { - ME_DisplayItem *pCurItem = item; - ME_DisplayItem *pCurPara = para; - int nCurEnd = nEnd; + ME_DisplayItem *pCurItem = cursor.pRun; + ME_DisplayItem *pCurPara = cursor.pPara; + int nCurEnd = cursor.nOffset; int nMatched = 0; if (nCurEnd == 0) @@ -1811,6 +1809,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH ME_DisplayItem *pPrevItem = pCurItem; int nPrevEnd = nCurEnd; WCHAR wPrevChar; + int nStart; /* Check to see if previous character is a whitespace */ if (flags & FR_WHOLEWORD) @@ -1854,11 +1853,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH else wLastChar = ' '; - nEnd--; - if (nEnd < 0) + cursor.nOffset--; + if (cursor.nOffset < 0) { - ME_PrevRun(&para, &item); - nEnd = item->member.run.strText->nLen; + ME_PrevRun(&cursor.pPara, &cursor.pRun); + cursor.nOffset = cursor.pRun->member.run.strText->nLen; } } }

1 0

Dylan Smith : richedit: Use ME_Cursor instead of offsets for stream out functions.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 54b53b6018da93cf82a4ee60ae5a4d3357cd7cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b53b6018da93cf82a4ee60a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:44:22 2009 -0400 richedit: Use ME_Cursor instead of offsets for stream out functions. --- dlls/riched20/clipboard.c | 9 +- dlls/riched20/editor.h | 2 +- dlls/riched20/writer.c | 269 ++++++++++++++++++++++----------------------- 3 files changed, 133 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54b53b6018da93cf82a4e…

1 0

Dylan Smith : richedit: Replace offsets arg with ME_Cursor for ME_InternalDeleteText.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: bd4704280d2d5d884476c85531c9dfd566ac601e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4704280d2d5d884476c8553… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:44:18 2009 -0400 richedit: Replace offsets arg with ME_Cursor for ME_InternalDeleteText. Offsets are still used within the function, but this patch reduces the use of it at the entry to the function. --- dlls/riched20/caret.c | 15 +++++------ dlls/riched20/editor.c | 65 ++++++++++++++++++++++++++--------------------- dlls/riched20/editor.h | 4 +- dlls/riched20/table.c | 19 +++++++------ dlls/riched20/txtsrv.c | 6 +++- dlls/riched20/undo.c | 4 ++- 6 files changed, 62 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd4704280d2d5d884476c…

1 0

Dylan Smith : richedit: Removed ME_InsertRun since it uses character offsets.
by Alexandre Julliard 13 Aug '09

13 Aug '09

Module: wine Branch: master Commit: 8f0dfaba3020d5e660705446fb13b39b71979a22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0dfaba3020d5e660705446f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Aug 13 08:44:13 2009 -0400 richedit: Removed ME_InsertRun since it uses character offsets. The function was used in one place, and was simply a wrapper around a call to ME_InsertRunAtCursor, so I removed it to avoids it use in other parts of the code. --- dlls/riched20/editor.h | 2 -- dlls/riched20/run.c | 21 --------------------- dlls/riched20/undo.c | 7 ++++++- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 1cffe99..6a91639 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -126,8 +126,6 @@ int ME_RowNumberFromCharOfs(ME_TextEditor *editor, int nOfs); /* run.c */ ME_DisplayItem *ME_MakeRun(ME_Style *s, ME_String *strData, int nFlags); -/* note: ME_InsertRun inserts a copy of the specified run - so you need to destroy the original */ -ME_DisplayItem *ME_InsertRun(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem *pItem); ME_DisplayItem *ME_InsertRunAtCursor(ME_TextEditor *editor, ME_Cursor *cursor, ME_Style *style, const WCHAR *str, int len, int flags); void ME_CheckCharOffsets(ME_TextEditor *editor); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 64befb8..90ea831 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -348,27 +348,6 @@ ME_DisplayItem *ME_MakeRun(ME_Style *s, ME_String *strData, int nFlags) } /****************************************************************************** - * ME_InsertRun - * - * Inserts a run at a given character position (offset). - */ -ME_DisplayItem *ME_InsertRun(ME_TextEditor *editor, int nCharOfs, ME_DisplayItem *pItem) -{ - ME_Cursor tmp; - ME_DisplayItem *pDI; - - assert(pItem->type == diRun || pItem->type == diUndoInsertRun); - - ME_CursorFromCharOfs(editor, nCharOfs, &tmp); - pDI = ME_InsertRunAtCursor(editor, &tmp, pItem->member.run.style, - pItem->member.run.strText->szData, - pItem->member.run.strText->nLen, - pItem->member.run.nFlags); - - return pDI; -} - -/****************************************************************************** * ME_InsertRunAtCursor * * Inserts a new run with given style, flags and content at a given position, diff --git a/dlls/riched20/undo.c b/dlls/riched20/undo.c index 908a5ac..e3ebbfb 100644 --- a/dlls/riched20/undo.c +++ b/dlls/riched20/undo.c @@ -307,7 +307,12 @@ static void ME_PlayUndoItem(ME_TextEditor *editor, ME_DisplayItem *pItem) } case diUndoInsertRun: { - ME_InsertRun(editor, pItem->member.run.nCharOfs, pItem); + ME_Cursor tmp; + ME_CursorFromCharOfs(editor, pItem->member.run.nCharOfs, &tmp); + ME_InsertRunAtCursor(editor, &tmp, pItem->member.run.style, + pItem->member.run.strText->szData, + pItem->member.run.strText->nLen, + pItem->member.run.nFlags); break; } case diUndoDeleteRun:

1 0