From da9720c726c484bc46120d7f5ed9c0f51d9d5e37 Mon Sep 17 00:00:00 2001 From: Vitaliy Margolen Date: Sun, 30 Mar 2003 03:05:55 +0000 Subject: [PATCH] Unicode strings termination fixes. --- dlls/commdlg/filetitle.c | 2 +- dlls/shlwapi/path.c | 14 +++++++------- dlls/shlwapi/reg.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/commdlg/filetitle.c b/dlls/commdlg/filetitle.c index 193638171ac..b543cd772c8 100644 --- a/dlls/commdlg/filetitle.c +++ b/dlls/commdlg/filetitle.c @@ -58,7 +58,7 @@ short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf) short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf) { int i, len; - static const WCHAR brkpoint[] = {'*','[',']'}; + static const WCHAR brkpoint[] = {'*','[',']',0}; TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf); if(lpFile == NULL || lpTitle == NULL) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index 62c03c303fc..b5a06a8409b 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -1052,13 +1052,13 @@ int WINAPI PathParseIconLocationW(LPWSTR lpszPath) */ BOOL WINAPI SHLWAPI_4(LPWSTR lpszPath,DWORD dwWhich) { - static const WCHAR pszExts[7][5] = { { '.', 'p', 'i', 'f', '0'}, - { '.', 'c', 'o', 'm', '0'}, - { '.', 'e', 'x', 'e', '0'}, - { '.', 'b', 'a', 't', '0'}, - { '.', 'l', 'n', 'k', '0'}, - { '.', 'c', 'm', 'd', '0'}, - { '0', '0', '0', '0', '0'} }; + static const WCHAR pszExts[7][5] = { { '.', 'p', 'i', 'f', 0}, + { '.', 'c', 'o', 'm', 0}, + { '.', 'e', 'x', 'e', 0}, + { '.', 'b', 'a', 't', 0}, + { '.', 'l', 'n', 'k', 0}, + { '.', 'c', 'm', 'd', 0}, + { 0, 0, 0, 0, 0} }; TRACE("(%s,%ld)\n", debugstr_w(lpszPath), dwWhich); diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 42077f47d21..943232c0377 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -41,7 +41,7 @@ static const WCHAR lpszContentTypeW[] = { 'C','o','n','t','e','n','t',' ','T','y static const char *szMimeDbContentA = "MIME\\Database\\Content Type\\"; static const WCHAR szMimeDbContentW[] = { 'M', 'I', 'M','E','\\', 'D','a','t','a','b','a','s','e','\\','C','o','n','t','e','n','t', - ' ','T','y','p','e','\\', '0' }; + ' ','T','y','p','e','\\', 0 }; static const DWORD dwLenMimeDbContent = 27; /* strlen of szMimeDbContentA/W */ static const char *szExtensionA = "Extension";