notepad: Fix opening Unicode files.
This commit is contained in:
parent
d1e02c169d
commit
d50e2df17b
|
@ -249,13 +249,8 @@ void DoOpenFile(LPCWSTR szFileName)
|
||||||
CloseHandle(hFile);
|
CloseHandle(hFile);
|
||||||
pTemp[dwNumRead] = 0;
|
pTemp[dwNumRead] = 0;
|
||||||
|
|
||||||
if (IsTextUnicode(pTemp, dwNumRead, NULL))
|
if((size -1) >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe)
|
||||||
{
|
SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1);
|
||||||
LPWSTR p = (LPWSTR)pTemp;
|
|
||||||
/* We need to strip BOM Unicode character, SetWindowTextW won't do it for us. */
|
|
||||||
if (*p == 0xFEFF || *p == 0xFFFE) p++;
|
|
||||||
SetWindowTextW(Globals.hEdit, p);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
SetWindowTextA(Globals.hEdit, pTemp);
|
SetWindowTextA(Globals.hEdit, pTemp);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue