From 76a82f09959c3d69d25dda7fb3317614c82fa909 Mon Sep 17 00:00:00 2001 From: Gregor Schneider Date: Wed, 14 Apr 2010 20:43:23 +0000 Subject: [PATCH] [NOTEPAD] Convert NULL characters to spaces when reading binary files See issue #3573 for more details. svn path=/trunk/; revision=46873 --- reactos/base/applications/notepad/text.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/reactos/base/applications/notepad/text.c b/reactos/base/applications/notepad/text.c index 6ca1907dbd6..ed1015d04e9 100644 --- a/reactos/base/applications/notepad/text.c +++ b/reactos/base/applications/notepad/text.c @@ -51,7 +51,7 @@ BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding { DWORD dwSize; LPBYTE pBytes = NULL; - LPCWSTR pszText; + LPWSTR pszText; LPWSTR pszAllocText = NULL; DWORD dwPos, i; DWORD dwCharCount; @@ -110,7 +110,7 @@ BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding /* fall through */ case ENCODING_UNICODE: - pszText = (LPCWSTR) &pBytes[dwPos]; + pszText = (LPWSTR) &pBytes[dwPos]; dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); break; @@ -174,6 +174,10 @@ BOOL ReadText(HANDLE hFile, LPWSTR *ppszText, DWORD *pdwTextLen, int *piEncoding else adwEolnCount[EOLN_LF]++; break; + + case '\0': + pszText[i] = ' '; + break; } }