Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NOTEPAD] Fix and improve DoSaveFile (#5066)

Browse source 
- Use EM_GETHANDLE to get the text.
- Check zero size and handle it elegantly.
CORE-18832
This commit is contained in:
Katayama Hirofumi MZ 2023-02-13 08:32:09 +09:00 committed by GitHub
parent a050be0895
commit 97db8a258d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
base/applications/notepad/dialog.c
View file

@ -4,6 +4,7 @@
* Copyright 1998,99 Marcel Baur <mbaur@g26.ethz.ch>
* Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
* Copyright 2002 Andriy Palamarchuk
* Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -332,48 +333,46 @@ GetPrintingRect(HDC hdc, RECT margins)
static BOOL DoSaveFile(VOID)
{
BOOL bRet = TRUE;
BOOL bRet = FALSE;
HANDLE hFile;
LPTSTR pTemp;
DWORD size;
DWORD cchText;
hFile = CreateFile(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE,
NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if(hFile == INVALID_HANDLE_VALUE)
hFile = CreateFileW(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE,
NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hFile == INVALID_HANDLE_VALUE)
{
ShowLastError();
return FALSE;
}
size = GetWindowTextLength(Globals.hEdit) + 1;
pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(*pTemp));
if (!pTemp)
cchText = GetWindowTextLengthW(Globals.hEdit);
if (cchText <= 0)
{
CloseHandle(hFile);
ShowLastError();
return FALSE;
bRet = TRUE;
}
size = GetWindowText(Globals.hEdit, pTemp, size);
if (size)
else
{
if (!WriteText(hFile, (LPWSTR)pTemp, size, Globals.encFile, Globals.iEoln))
HLOCAL hLocal = (HLOCAL)SendMessageW(Globals.hEdit, EM_GETHANDLE, 0, 0);
LPWSTR pszText = LocalLock(hLocal);
if (pszText)
{
ShowLastError();
bRet = FALSE;
bRet = WriteText(hFile, pszText, cchText, Globals.encFile, Globals.iEoln);
if (!bRet)
ShowLastError();
LocalUnlock(hLocal);
}
else
{
SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0);
bRet = TRUE;
ShowLastError();
}
}
CloseHandle(hFile);
HeapFree(GetProcessHeap(), 0, pTemp);
if (bRet)
{
SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0);
SetFileName(Globals.szFileName);
}