March 2006 - Wine-commits - list.winehq.org

Mike McCormack : msi: Implement custom action type 17.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: cf4f79e87739e6ced68d023228c7f0e62d3e98ce URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cf4f79e87739e6ced68d023… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:42:52 2006 +0900 msi: Implement custom action type 17. --- dlls/msi/custom.c | 56 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 13 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 2ed4b81..bab2a4e 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -67,6 +67,8 @@ static UINT HANDLE_CustomType1(MSIPACKAG LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); +static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType19(MSIPACKAGE *package, LPCWSTR source, @@ -207,6 +209,9 @@ UINT ACTION_CustomAction(MSIPACKAGE *pac case 19: /* Error that halts install */ rc = HANDLE_CustomType19(package,source,target,type,action); break; + case 17: + rc = HANDLE_CustomType17(package,source,target,type,action); + break; case 50: /*EXE file specified by a property value */ rc = HANDLE_CustomType50(package,source,target,type,action); break; @@ -437,13 +442,13 @@ static DWORD WINAPI ACTION_CallDllFuncti ERR("Handle for object %p not found\n", package ); } else - ERR("Cannot load functon\n"); + ERR("failed to resolve functon %s\n", debugstr_a(proc)); msi_free(proc); FreeLibrary(hModule); } else - ERR("Unable to load library\n"); + ERR("failed to load dll %s\n", debugstr_w(stuff->source)); msiobj_release( &stuff->package->hdr ); msi_free(stuff->source); msi_free(stuff->target); @@ -468,15 +473,26 @@ static DWORD WINAPI DllThread(LPVOID inf return rc; } +static HANDLE do_msidbCustomActionTypeDll(MSIPACKAGE *package, LPCWSTR dll, LPCWSTR target) +{ + thread_struct *info; + + info = msi_alloc( sizeof(*info) ); + msiobj_addref( &package->hdr ); + info->package = package; + info->target = strdupW(target); + info->source = strdupW(dll); + + return CreateThread(NULL, 0, DllThread, info, 0, NULL); +} + static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { WCHAR tmp_file[MAX_PATH]; - thread_struct *info; - DWORD ThreadId; - HANDLE ThreadHandle; UINT rc = ERROR_SUCCESS; BOOL finished = FALSE; + HANDLE ThreadHandle; store_binary_to_temp(package, source, tmp_file); @@ -489,13 +505,7 @@ static UINT HANDLE_CustomType1(MSIPACKAG strcatW(tmp_file,dot); } - info = msi_alloc( sizeof(*info) ); - msiobj_addref( &package->hdr ); - info->package = package; - info->target = strdupW(target); - info->source = strdupW(tmp_file); - - ThreadHandle = CreateThread(NULL,0,DllThread,(LPVOID)info,0,&ThreadId); + ThreadHandle = do_msidbCustomActionTypeDll( package, tmp_file, target ); rc = process_handle(package, type, ThreadHandle, NULL, action, &finished ); @@ -503,7 +513,7 @@ static UINT HANDLE_CustomType1(MSIPACKAG track_tempfile(package, tmp_file, tmp_file); else DeleteFileW(tmp_file); - + return rc; } @@ -568,6 +578,26 @@ static UINT HANDLE_CustomType2(MSIPACKAG return prc; } +static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + HANDLE hThread; + MSIFILE *file; + + TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); + + file = get_loaded_file( package, source ); + if (!file) + { + ERR("invalid file key %s\n", debugstr_w( source )); + return ERROR_FUNCTION_FAILED; + } + + hThread = do_msidbCustomActionTypeDll( package, file->TargetPath, target ); + + return process_handle(package, type, hThread, NULL, action, NULL ); +} + static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) {

1 0

Mike McCormack : riched20: Add a version resource.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: fedd5250e362421c5df5edf7d8a9056f5613e199 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fedd5250e362421c5df5edf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:46:20 2006 +0900 riched20: Add a version resource. --- dlls/riched20/.gitignore | 1 + dlls/riched20/Makefile.in | 2 ++ dlls/riched20/version.rc | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 dlls/riched20/version.rc diff --git a/dlls/riched20/.gitignore b/dlls/riched20/.gitignore index aa58e05..d74aa87 100644 --- a/dlls/riched20/.gitignore +++ b/dlls/riched20/.gitignore @@ -1,2 +1,3 @@ Makefile libriched20.def +version.res diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index c4deaf8..b089f89 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -28,6 +28,8 @@ C_SRCS = \ SUBDIRS = tests +RC_SRCS = version.rc + @MAKE_DLL_RULES@ ### Dependencies: diff --git a/dlls/riched20/version.rc b/dlls/riched20/version.rc new file mode 100644 index 0000000..bc907c9 --- /dev/null +++ b/dlls/riched20/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2006 Mike McCormack + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Richedit dll" +#define WINE_FILENAME_STR "riched20.dll" +#define WINE_FILEVERSION 5,30,23,1215 +#define WINE_FILEVERSION_STR "5,30,23,1215" +#define WINE_PRODUCTVERSION 5,30,23,1215 +#define WINE_PRODUCTVERSION_STR "5,30,23,1215" + +#include "wine/wine_common_ver.rc"

1 0

Mike McCormack : wintrust: Use the definition of WINTRUST_ACTION_GENERIC_VERIFY_V2 in softpub.h.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: ee069f24ba2182a7447044834b4c08c1a8eea601 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee069f24ba2182a74470448… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:46:02 2006 +0900 wintrust: Use the definition of WINTRUST_ACTION_GENERIC_VERIFY_V2 in softpub.h. --- dlls/wintrust/wintrust_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 09ddfed..044722c 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -25,6 +25,7 @@ #include "winerror.h" #include "guiddef.h" #include "wintrust.h" +#include "softpub.h" #include "mscat.h" #include "objbase.h" @@ -86,8 +87,7 @@ BOOL WINAPI CryptCATAdminReleaseContext( */ LONG WINAPI WinVerifyTrust( HWND hwnd, GUID *ActionID, WINTRUST_DATA* ActionData ) { - static const GUID WINTRUST_ACTION_GENERIC_VERIFY_V2 = { 0xaac56b, 0xcd44, 0x11d0, - { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }}; + static const GUID gen_verify_v2 = WINTRUST_ACTION_GENERIC_VERIFY_V2; FIXME("%p %s %p\n", hwnd, debugstr_guid(ActionID), ActionData); @@ -104,7 +104,7 @@ LONG WINAPI WinVerifyTrust( HWND hwnd, G * */ - if (IsEqualCLSID(ActionID, &WINTRUST_ACTION_GENERIC_VERIFY_V2)) + if (IsEqualCLSID(ActionID, &gen_verify_v2)) return TRUST_E_PROVIDER_UNKNOWN; return ERROR_SUCCESS;

1 0

Mike McCormack : include: Add softpub.h.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: cfef0fee01f19dd1117d1bf794eb6eddf6157fd1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfef0fee01f19dd1117d1bf… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 22 13:45:35 2006 +0900 include: Add softpub.h. --- include/Makefile.in | 1 + include/softpub.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) create mode 100644 include/softpub.h diff --git a/include/Makefile.in b/include/Makefile.in index 033ad99..c40e5f9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -244,6 +244,7 @@ WINDOWS_INCLUDES = \ shlwapi.h \ sipbase.h \ snmp.h \ + softpub.h \ sql.h \ sqlext.h \ sqltypes.h \ diff --git a/include/softpub.h b/include/softpub.h new file mode 100644 index 0000000..b5836b0 --- /dev/null +++ b/include/softpub.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2006 Mike McCormack + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINE_SOFTPUB_H +#define __WINE_SOFTPUB_H + +#include <wintrust.h> + +#define WINTRUST_ACTION_GENERIC_CERT_VERIFY \ + { 0x189a3842, 0x3041, 0x11d1, { 0x85,0xe1,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#define WINTRUST_ACTION_GENERIC_CHAIN_VERIFY \ + { 0xfc451c16, 0xac75, 0x11d1, { 0xb4,0xb8,0x00,0xc0,0x4f,0xb6,0x6e,0xa0 }} + +#define WINTRUST_ACTION_GENERIC_VERIFY_V2 \ + { 0xaac56b, 0xcd44, 0x11d0, { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }} +#define WINTRUST_ACTION_TRUSTPROVIDER_TEST \ + { 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} + +#endif /* __WINE_SOFTPUB_H */

1 0

Kevin Koltzau : ole32: Initial tests for OLE clipboard functions.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 0c2d2772863e05ec5a1a77b20ecd8355f9dd0384 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c2d2772863e05ec5a1a77b… Author: Kevin Koltzau <kevin(a)plop.org> Date: Wed Mar 22 00:05:14 2006 -0500 ole32: Initial tests for OLE clipboard functions. --- dlls/ole32/tests/.gitignore | 1 dlls/ole32/tests/Makefile.in | 1 dlls/ole32/tests/clipboard.c | 357 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 359 insertions(+), 0 deletions(-) create mode 100644 dlls/ole32/tests/clipboard.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0c2d2772863e05ec5a1…

1 0

Bryan Mayland : kernel: WaitForMultipleObjectsEx should accept up to MAXIMUM_WAIT_OBJECTS.
by Alexandre Julliard 22 Mar '06

22 Mar '06

Module: wine Branch: refs/heads/master Commit: 98fd541de84c71496e773f3990ae1a139feb2e18 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=98fd541de84c71496e773f3… Author: Bryan Mayland <bmayland(a)leoninedev.com> Date: Tue Mar 21 16:45:40 2006 -0500 kernel: WaitForMultipleObjectsEx should accept up to MAXIMUM_WAIT_OBJECTS. --- dlls/kernel/sync.c | 2 +- dlls/kernel/tests/sync.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 5a2535e..cec44f5 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -173,7 +173,7 @@ DWORD WINAPI WaitForMultipleObjectsEx( D HANDLE hloc[MAXIMUM_WAIT_OBJECTS]; unsigned int i; - if (count >= MAXIMUM_WAIT_OBJECTS) + if (count > MAXIMUM_WAIT_OBJECTS) { SetLastError(ERROR_INVALID_PARAMETER); return WAIT_FAILED; diff --git a/dlls/kernel/tests/sync.c b/dlls/kernel/tests/sync.c index 6d7bc88..a7f6408 100644 --- a/dlls/kernel/tests/sync.c +++ b/dlls/kernel/tests/sync.c @@ -31,7 +31,8 @@ static void test_signalandwait(void) DWORD (WINAPI *pSignalObjectAndWait)(HANDLE, HANDLE, DWORD, BOOL); HMODULE kernel32; DWORD r; - HANDLE event[2], semaphore[2], file; + int i; + HANDLE event[2], maxevents[MAXIMUM_WAIT_OBJECTS], semaphore[2], file; kernel32 = GetModuleHandle("kernel32"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); @@ -83,6 +84,18 @@ static void test_signalandwait(void) CloseHandle(event[0]); CloseHandle(event[1]); + /* create the maximum number of events and make sure + * we can wait on that many */ + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + { + maxevents[i] = CreateEvent(NULL, 1, 1, NULL); + ok( maxevents[i] != 0, "should create enough events\n"); + } + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r != WAIT_FAILED && r != WAIT_TIMEOUT, "should succeed\n"); + + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + if (maxevents[i]) CloseHandle(maxevents[i]); /* semaphores */ semaphore[0] = CreateSemaphore( NULL, 0, 1, NULL );

1 0

Lei Zhang : riched20: Implements FR_WHOLEWORD for EM_FINDTEXT.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: b4ee2ad0e4210861df16c30062cbb6af9b406914 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4ee2ad0e4210861df16c30… Author: Lei Zhang <leiz(a)ucla.edu> Date: Tue Mar 21 03:43:56 2006 -0800 riched20: Implements FR_WHOLEWORD for EM_FINDTEXT. Add FR_WHOLEWORD to riched20's EM_FINDTEXT and fix a couple small bugs introduced in earlier patches for EM_FINDTEXT. Additional test cases have been added to check for corner cases. Also improve input validation. --- dlls/riched20/editor.c | 125 ++++++++++++++++++++++++++++++++++++++---- dlls/riched20/tests/editor.c | 10 +++ 2 files changed, 121 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 506c706..bcb2a5c 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -764,34 +764,38 @@ ME_FindItemAtOffset(ME_TextEditor *edito static int ME_FindText(ME_TextEditor *editor, DWORD flags, CHARRANGE *chrg, WCHAR *text, CHARRANGE *chrgText) { + const int nLen = lstrlenW(text); + const int nTextLen = ME_GetTextLength(editor); int nStart, nEnd; - int nLen = lstrlenW(text); int nMin, nMax; ME_DisplayItem *item; ME_DisplayItem *para; + WCHAR wLastChar = ' '; TRACE("flags==0x%08lx, chrg->cpMin==%ld, chrg->cpMax==%ld text==%s\n", flags, chrg->cpMin, chrg->cpMax, debugstr_w(text)); - if (flags & ~(FR_DOWN | FR_MATCHCASE)) - FIXME("Flags 0x%08lx not implemented\n", flags & ~(FR_DOWN | FR_MATCHCASE)); + if (flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)) + FIXME("Flags 0x%08lx not implemented\n", + flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)); nMin = chrg->cpMin; if (chrg->cpMax == -1) - nMax = ME_GetTextLength(editor); + nMax = nTextLen; else - nMax = chrg->cpMax; + nMax = chrg->cpMax > nTextLen ? nTextLen : chrg->cpMax; /* when searching up, if cpMin < cpMax, then instead of searching * on [cpMin,cpMax], we search on [0,cpMin], otherwise, search on - * [cpMax, cpMin] + * [cpMax, cpMin]. The exception is when cpMax is -1, in which + * case, it is always bigger than cpMin. */ if (!(flags & FR_DOWN)) { int nSwap = nMax; - nMax = nMin; - if (nMin < nSwap) + nMax = nMin > nTextLen ? nTextLen : nMin; + if (nMin < nSwap || chrg->cpMax == -1) nMin = 0; else nMin = nSwap; @@ -806,6 +810,20 @@ ME_FindText(ME_TextEditor *editor, DWORD if (flags & FR_DOWN) /* Forward search */ { + /* If possible, find the character before where the search starts */ + if ((flags & FR_WHOLEWORD) && nMin) + { + nStart = nMin - 1; + item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); + if (!item) + { + if (chrgText) + chrgText->cpMin = chrgText->cpMax = -1; + return -1; + } + wLastChar = item->member.run.strText->szData[nStart]; + } + nStart = nMin; item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); if (!item) @@ -825,10 +843,35 @@ ME_FindText(ME_TextEditor *editor, DWORD while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurStart + nMatched], text[nMatched], (flags & FR_MATCHCASE))) { + if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + break; + nMatched++; if (nMatched == nLen) { - nStart += para->member.para.nCharOfs + item->member.run.nCharOfs; + ME_DisplayItem *pNextItem = pCurItem; + int nNextStart = nCurStart; + WCHAR wNextChar; + + /* Check to see if next character is a whitespace */ + if (flags & FR_WHOLEWORD) + { + if (nCurStart + nMatched == ME_StrLen(pCurItem->member.run.strText)) + { + pNextItem = ME_FindItemFwd(pCurItem, diRun); + nNextStart = -nMatched; + } + + if (pNextItem) + wNextChar = pNextItem->member.run.strText->szData[nNextStart + nMatched]; + else + wNextChar = ' '; + + if (isalnumW(wNextChar)) + break; + } + + nStart += para->member.para.nCharOfs + pCurItem->member.run.nCharOfs; if (chrgText) { chrgText->cpMin = nStart; @@ -844,6 +887,11 @@ ME_FindText(ME_TextEditor *editor, DWORD nCurStart = -nMatched; } } + if (pCurItem) + wLastChar = pCurItem->member.run.strText->szData[nCurStart + nMatched]; + else + wLastChar = ' '; + nStart++; if (nStart == ME_StrLen(item->member.run.strText)) { @@ -855,9 +903,24 @@ ME_FindText(ME_TextEditor *editor, DWORD } else /* Backward search */ { + /* If possible, find the character after where the search ends */ + if ((flags & FR_WHOLEWORD) && nMax < nTextLen - 1) + { + nEnd = nMax + 1; + item = ME_FindItemAtOffset(editor, diRun, nEnd, &nEnd); + if (!item) + { + if (chrgText) + chrgText->cpMin = chrgText->cpMax = -1; + return -1; + } + wLastChar = item->member.run.strText->szData[nEnd]; + } + nEnd = nMax; item = ME_FindItemAtOffset(editor, diRun, nEnd, &nEnd); - if (!item) { + if (!item) + { if (chrgText) chrgText->cpMin = chrgText->cpMax = -1; return -1; @@ -872,12 +935,45 @@ ME_FindText(ME_TextEditor *editor, DWORD int nCurEnd = nEnd; int nMatched = 0; - while (ME_CharCompare(pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1], text[nLen - nMatched - 1], (flags & FR_MATCHCASE))) + if (nCurEnd - nMatched == 0) { + pCurItem = ME_FindItemBack(pCurItem, diRun); + para = ME_GetParagraph(pCurItem); + nCurEnd = ME_StrLen(pCurItem->member.run.strText) + nMatched; + } + + while (pCurItem && ME_CharCompare(pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1], text[nLen - nMatched - 1], (flags & FR_MATCHCASE))) + { + if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + break; + nMatched++; if (nMatched == nLen) { - nStart = para->member.para.nCharOfs + item->member.run.nCharOfs + nCurEnd - nMatched; + ME_DisplayItem *pPrevItem = pCurItem; + int nPrevEnd = nCurEnd; + WCHAR wPrevChar; + + /* Check to see if previous character is a whitespace */ + if (flags & FR_WHOLEWORD) + { + if (nPrevEnd - nMatched == 0) + { + pPrevItem = ME_FindItemBack(pCurItem, diRun); + if (pPrevItem) + nPrevEnd = ME_StrLen(pPrevItem->member.run.strText) + nMatched; + } + + if (pPrevItem) + wPrevChar = pPrevItem->member.run.strText->szData[nPrevEnd - nMatched - 1]; + else + wPrevChar = ' '; + + if (isalnumW(wPrevChar)) + break; + } + + nStart = para->member.para.nCharOfs + pCurItem->member.run.nCharOfs + nCurEnd - nMatched; if (chrgText) { chrgText->cpMin = nStart; @@ -895,6 +991,11 @@ ME_FindText(ME_TextEditor *editor, DWORD nCurEnd = ME_StrLen(pCurItem->member.run.strText) + nMatched; } } + if (pCurItem) + wLastChar = pCurItem->member.run.strText->szData[nCurEnd - nMatched - 1]; + else + wLastChar = ' '; + nEnd--; if (nEnd < 0) { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 95cf705..fa5abca 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -92,10 +92,16 @@ struct find_s find_tests2[] = { {10, 5, "", 0, -1, 0}, /* Whole-word search */ - {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 1}, - {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1, 1}, + {0, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, + {0, -1, "win", FR_DOWN | FR_WHOLEWORD, -1, 0}, + {13, -1, "wine", FR_DOWN | FR_WHOLEWORD, 18, 0}, + {0, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 0, 0}, + {10, -1, "winewine", FR_DOWN | FR_WHOLEWORD, 23, 0}, + {11, -1, "winewine", FR_WHOLEWORD, 0, 0}, + {31, -1, "winewine", FR_WHOLEWORD, 23, 0}, /* Bad ranges */ + {5, 200, "XXX", FR_DOWN, -1, 0}, {-20, 20, "Wine", FR_DOWN, -1, 0}, {-20, 20, "Wine", FR_DOWN, -1, 0}, {-15, -20, "Wine", FR_DOWN, -1, 0},

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 6bddeb1cf7c1e5db803c14f9d4fd1e0d1be4971e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6bddeb1cf7c1e5db803c14f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:24:49 2006 +0100 Assorted spelling fixes. --- dlls/ddraw/tests/ddrawmodes.c | 4 ++-- dlls/ole32/datacache.c | 14 +++++++------- dlls/ole32/storage32.c | 24 ++++++++++++------------ dlls/oleaut32/dispatch.c | 18 +++++++++--------- dlls/shell32/shlfolder.c | 10 +++++----- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/path.c | 2 +- dlls/wininet/gopher.c | 2 +- 8 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6bddeb1cf7c1e5db803…

1 0

Francois Gouget : taskmgr: Reorder functions to avoid forward declarations.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: b01a1c6f0e21f0a264083a78c58c7cc6822f0375 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b01a1c6f0e21f0a264083a7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:34:04 2006 +0100 taskmgr: Reorder functions to avoid forward declarations. --- programs/taskmgr/applpage.c | 704 +++++++++++++++++++++---------------------- 1 files changed, 348 insertions(+), 356 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b01a1c6f0e21f0a2640…

1 0

Francois Gouget : taskmgr: Avoid forward declarations and make functions static.
by Alexandre Julliard 21 Mar '06

21 Mar '06

Module: wine Branch: refs/heads/master Commit: 5c14417130de8e024fc4a4034b2bbf425d0c74a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c14417130de8e024fc4a40… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 21 18:35:41 2006 +0100 taskmgr: Avoid forward declarations and make functions static. --- programs/taskmgr/taskmgr.c | 1111 ++++++++++++++++++++++---------------------- programs/taskmgr/taskmgr.h | 16 - 2 files changed, 553 insertions(+), 574 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5c14417130de8e024fc…

1 0