From d50e2df17baaf6602db980b19ef4e7f3f5c769a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?= Date: Sun, 13 Jul 2008 14:08:58 +0200 Subject: [PATCH] notepad: Fix opening Unicode files. --- programs/notepad/dialog.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index f326906498f..716abd874d6 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -249,13 +249,8 @@ void DoOpenFile(LPCWSTR szFileName) CloseHandle(hFile); pTemp[dwNumRead] = 0; - if (IsTextUnicode(pTemp, dwNumRead, NULL)) - { - 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); - } + if((size -1) >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) + SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); else SetWindowTextA(Globals.hEdit, pTemp);