system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 03:45:57 +00:00
Code Issues Projects Releases Wiki Activity

notepad: Fix uninitialized upper 64-bits of pos in DoFind.

Browse Source 
And get rid of the hacky casts.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
This commit is contained in:
Gabriel Ivăncescu 2023-01-18 18:30:14 +02:00 committed by Alexandre Julliard
parent 8ddf8daa52
commit 929fdbbf55
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
programs/notepad/main.c
View File

@ -441,10 +441,10 @@ static LPWSTR NOTEPAD_StrRStr(LPWSTR pszSource, LPWSTR pszLast, LPWSTR pszSrch)
*/ */
void NOTEPAD_DoFind(FINDREPLACEW *fr) void NOTEPAD_DoFind(FINDREPLACEW *fr)
{ {
LPWSTR content; LPWSTR content, found;
int len = lstrlenW(fr->lpstrFindWhat); int len = lstrlenW(fr->lpstrFindWhat);
int fileLen; int fileLen;
SIZE_T pos; DWORD pos;
fileLen = GetWindowTextLengthW(Globals.hEdit) + 1; fileLen = GetWindowTextLengthW(Globals.hEdit) + 1;
content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); content = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR));
@ -455,27 +455,24 @@ void NOTEPAD_DoFind(FINDREPLACEW *fr)
switch (fr->Flags & (FR_DOWN|FR_MATCHCASE)) switch (fr->Flags & (FR_DOWN|FR_MATCHCASE))
{ {
case 0: case 0:
pos = StrRStrIW(content, content+pos-len, fr->lpstrFindWhat) - content; found = StrRStrIW(content, content+pos-len, fr->lpstrFindWhat);
if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0;
break; break;
case FR_DOWN: case FR_DOWN:
pos = StrStrIW(content+pos, fr->lpstrFindWhat) - content; found = StrStrIW(content+pos, fr->lpstrFindWhat);
if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0;
break; break;
case FR_MATCHCASE: case FR_MATCHCASE:
pos = NOTEPAD_StrRStr(content, content+pos-len, fr->lpstrFindWhat) - content; found = NOTEPAD_StrRStr(content, content+pos-len, fr->lpstrFindWhat);
if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0;
break; break;
case FR_DOWN|FR_MATCHCASE: case FR_DOWN|FR_MATCHCASE:
pos = StrStrW(content+pos, fr->lpstrFindWhat) - content; found = StrStrW(content+pos, fr->lpstrFindWhat);
if (pos == -(SIZE_T)content) pos = ~(SIZE_T)0;
break; break;
default: /* shouldn't happen */ default: /* shouldn't happen */
return; return;
} }
pos = found - content;
HeapFree(GetProcessHeap(), 0, content); HeapFree(GetProcessHeap(), 0, content);
if (pos == ~(SIZE_T)0) if (!found)
{ {
DIALOG_StringMsgBox(Globals.hFindReplaceDlg, STRING_NOTFOUND, fr->lpstrFindWhat, DIALOG_StringMsgBox(Globals.hFindReplaceDlg, STRING_NOTFOUND, fr->lpstrFindWhat,
MB_ICONINFORMATION|MB_OK); MB_ICONINFORMATION|MB_OK);