Unicode strings termination cleanup
Vitaliy Margolen
wine-patch at kievinfo.com
Sat Mar 29 12:12:52 CST 2003
Debugging ACDSee I stumble upon several improperly terminated unicode strings.
Vitaliy Margolen
changelog:
dlls/commdlg/filetitle.c
dlls/shlwapi/path.c
dlls/shlwapi/reg.c
- unicode strings termination cleanup
Index: dlls/commdlg/filetitle.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filetitle.c,v
retrieving revision 1.13
diff -u -r1.13 filetitle.c
--- dlls/commdlg/filetitle.c 21 Jan 2003 19:32:21 -0000 1.13
+++ dlls/commdlg/filetitle.c 29 Mar 2003 17:59:17 -0000
@@ -58,7 +58,7 @@
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)
Index: dlls/shlwapi/path.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/path.c,v
retrieving revision 1.29
diff -u -r1.29 path.c
--- dlls/shlwapi/path.c 18 Mar 2003 18:35:49 -0000 1.29
+++ dlls/shlwapi/path.c 29 Mar 2003 17:59:18 -0000
@@ -1052,13 +1052,13 @@
*/
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);
Index: dlls/shlwapi/reg.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/reg.c,v
retrieving revision 1.37
diff -u -r1.37 reg.c
--- dlls/shlwapi/reg.c 18 Mar 2003 18:35:49 -0000 1.37
+++ dlls/shlwapi/reg.c 29 Mar 2003 17:59:19 -0000
@@ -41,7 +41,7 @@
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";
More information about the wine-patches
mailing list