ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

notepad: Refactor DoOpenFile to simplify next patch.

This commit is contained in:
Alexander Scott-Johns 2009-07-03 00:34:45 +01:00 committed by Alexandre Julliard
parent ea5a6f2db5
commit 93b99e0af3
1 changed files with 25 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
programs/notepad/dialog.c
View File

@ -337,24 +337,6 @@ static inline ENCODING detect_encoding_of_buffer(const void* buffer, int size)
} }
} }
/* Similar to SetWindowTextA, but uses a CP_UTF8 encoded input, not CP_ACP.
* lpTextInUtf8 should be NUL-terminated and not include the BOM.
*
* Returns FALSE on failure, TRUE on success, like SetWindowTextA/W.
*/
static BOOL SetWindowTextUtf8(HWND hwnd, LPCSTR lpTextInUtf8)
{
BOOL ret;
int lenW = MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, NULL, 0);
LPWSTR textW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR));
if (!textW)
return FALSE;
MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, textW, lenW);
ret = SetWindowTextW(hwnd, textW);
HeapFree(GetProcessHeap(), 0, textW);
return ret;
}
void DoOpenFile(LPCWSTR szFileName, ENCODING enc) void DoOpenFile(LPCWSTR szFileName, ENCODING enc)
{ {
static const WCHAR dotlog[] = { '.','L','O','G',0 }; static const WCHAR dotlog[] = { '.','L','O','G',0 };
@ -362,7 +344,8 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc)
LPSTR pTemp; LPSTR pTemp;
DWORD size; DWORD size;
DWORD dwNumRead; DWORD dwNumRead;
BOOL succeeded; int lenW;
WCHAR* textW;
WCHAR log[5]; WCHAR log[5];
/* Close any files and prompt to save changes */ /* Close any files and prompt to save changes */
@ -405,8 +388,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc)
CloseHandle(hFile); CloseHandle(hFile);
size = dwNumRead; size = dwNumRead;
pTemp[size] = 0; /* make sure it's (char)'\0'-terminated */
pTemp[size+1] = 0; /* make sure it's (WCHAR)'\0'-terminated */
if (enc == ENCODING_AUTO) if (enc == ENCODING_AUTO)
enc = detect_encoding_of_buffer(pTemp, size); enc = detect_encoding_of_buffer(pTemp, size);
@ -421,9 +402,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc)
enc = ENCODING_UTF16BE; enc = ENCODING_UTF16BE;
} }
/* SetWindowTextUtf8 and SetWindowTextA try to allocate memory, so we
* check if they succeed.
*/
switch (enc) switch (enc)
{ {
case ENCODING_UTF16BE: case ENCODING_UTF16BE:
@ -434,33 +412,35 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc)
/* fall through */ /* fall through */
case ENCODING_UTF16LE: case ENCODING_UTF16LE:
if (size >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) textW = (LPWSTR)pTemp;
succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); lenW = size/sizeof(WCHAR);
else
succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp);
break;
case ENCODING_UTF8:
if (size >= 3 && (BYTE)pTemp[0] == 0xef && (BYTE)pTemp[1] == 0xbb &&
(BYTE)pTemp[2] == 0xbf)
succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp+3);
else
succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp);
break; break;
default: default:
succeeded = SetWindowTextA(Globals.hEdit, pTemp); {
break; int cp = (enc==ENCODING_UTF8) ? CP_UTF8 : CP_ACP;
lenW = MultiByteToWideChar(cp, 0, pTemp, size, NULL, 0);
textW = HeapAlloc(GetProcessHeap(), 0, (lenW+1) * sizeof(WCHAR));
if (!textW)
{
ShowLastError();
HeapFree(GetProcessHeap(), 0, pTemp);
return;
}
MultiByteToWideChar(cp, 0, pTemp, size, textW, lenW);
HeapFree(GetProcessHeap(), 0, pTemp);
break;
}
} }
if (!succeeded) textW[lenW] = '\0';
{
ShowLastError();
HeapFree(GetProcessHeap(), 0, pTemp);
return;
}
HeapFree(GetProcessHeap(), 0, pTemp); if (lenW >= 1 && textW[0] == 0xfeff)
SetWindowTextW(Globals.hEdit, textW+1);
else
SetWindowTextW(Globals.hEdit, textW);
HeapFree(GetProcessHeap(), 0, textW);
SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0);
SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0);