From a52e274d1292849214835dc149a9f340cab3f44e Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sat, 28 Jun 2003 05:34:47 +0000 Subject: [PATCH] 2003-06-28 Steven Edwards * include/shlwapi.h (UrlGetLocationA, UrlGetLocationW, PathFindSuffixArrayA, PathFindSuffixArrayW, PathFindExtensionA, PathFindExtensionW, StrStrW StrStrA): Change unicode-macro'd LP[C]TSTR return values to explicit type. --- winsup/w32api/ChangeLog | 8 ++++++++ winsup/w32api/include/shlwapi.h | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 5078b60eb..5d01ad617 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,11 @@ +2003-06-28 Steven Edwards + + * include/shlwapi.h (UrlGetLocationA, UrlGetLocationW, + PathFindSuffixArrayA, PathFindSuffixArrayW, + PathFindExtensionA, PathFindExtensionW, StrStrW + StrStrA): Change unicode-macro'd LP[C]TSTR return values to + explicit type. + 2003-06-26 Mattia Barbon * include/richedit.h (PARAFORMAT2): Add definition. diff --git a/winsup/w32api/include/shlwapi.h b/winsup/w32api/include/shlwapi.h index 03a83ada0..b28b88490 100644 --- a/winsup/w32api/include/shlwapi.h +++ b/winsup/w32api/include/shlwapi.h @@ -176,10 +176,10 @@ WINSHLWAPI LPSTR WINAPI StrRStrIA(LPCSTR,LPCSTR,LPCSTR); WINSHLWAPI LPWSTR WINAPI StrRStrIW(LPCWSTR,LPCWSTR,LPCWSTR); WINSHLWAPI int WINAPI StrSpnA(LPCSTR,LPCSTR); WINSHLWAPI int WINAPI StrSpnW(LPCWSTR,LPCWSTR); -WINSHLWAPI LPTSTR WINAPI StrStrA(LPCSTR,LPCSTR); +WINSHLWAPI LPSTR WINAPI StrStrA(LPCSTR, LPCSTR); WINSHLWAPI LPSTR WINAPI StrStrIA(LPCSTR,LPCSTR); WINSHLWAPI LPWSTR WINAPI StrStrIW(LPCWSTR,LPCWSTR); -WINSHLWAPI LPTSTR WINAPI StrStrW(LPCWSTR,LPCWSTR); +WINSHLWAPI LPWSTR WINAPI StrStrW(LPCWSTR,LPCWSTR); WINSHLWAPI int WINAPI StrToIntA(LPCSTR); WINSHLWAPI int WINAPI StrToIntW(LPCWSTR); WINSHLWAPI BOOL WINAPI StrToIntExA(LPCSTR,DWORD,int*); @@ -208,16 +208,16 @@ WINSHLWAPI HRESULT WINAPI PathCreateFromUrlA(LPCSTR,LPSTR,LPDWORD,DWORD); WINSHLWAPI HRESULT WINAPI PathCreateFromUrlW(LPCWSTR,LPWSTR,LPDWORD,DWORD); WINSHLWAPI BOOL WINAPI PathFileExistsA(LPCSTR); WINSHLWAPI BOOL WINAPI PathFileExistsW(LPCWSTR); -WINSHLWAPI LPTSTR WINAPI PathFindExtensionA(LPCWSTR); -WINSHLWAPI LPTSTR WINAPI PathFindExtensionW(LPCSTR); +WINSHLWAPI LPSTR WINAPI PathFindExtensionA(LPCSTR); +WINSHLWAPI LPWSTR WINAPI PathFindExtensionW(LPCWSTR); WINSHLWAPI LPSTR WINAPI PathFindFileNameA(LPCSTR); WINSHLWAPI LPWSTR WINAPI PathFindFileNameW(LPCWSTR); WINSHLWAPI LPSTR WINAPI PathFindNextComponentA(LPCSTR); WINSHLWAPI LPWSTR WINAPI PathFindNextComponentW(LPCWSTR); WINSHLWAPI BOOL WINAPI PathFindOnPathA(LPSTR,LPCSTR*); WINSHLWAPI BOOL WINAPI PathFindOnPathW(LPWSTR,LPCWSTR*); -WINSHLWAPI LPCTSTR WINAPI PathFindSuffixArrayA(LPCSTR,LPCSTR*,int); -WINSHLWAPI LPCTSTR WINAPI PathFindSuffixArrayW(LPCWSTR,LPCWSTR*,int); +WINSHLWAPI LPCSTR WINAPI PathFindSuffixArrayA(LPCSTR,LPCSTR*,int); +WINSHLWAPI LPCWSTR WINAPI PathFindSuffixArrayW(LPCWSTR,LPCWSTR*,int); WINSHLWAPI LPSTR WINAPI PathGetArgsA(LPCSTR); WINSHLWAPI LPWSTR WINAPI PathGetArgsW(LPCWSTR); WINSHLWAPI UINT WINAPI PathGetCharTypeA(UCHAR); @@ -351,8 +351,8 @@ WINSHLWAPI HRESULT WINAPI UrlCreateFromPathA(LPCSTR,LPSTR,LPDWORD,DWORD); WINSHLWAPI HRESULT WINAPI UrlCreateFromPathW(LPCWSTR,LPWSTR,LPDWORD,DWORD); WINSHLWAPI HRESULT WINAPI UrlEscapeA(LPCSTR,LPSTR,LPDWORD,DWORD); WINSHLWAPI HRESULT WINAPI UrlEscapeW(LPCWSTR,LPWSTR,LPDWORD,DWORD); -WINSHLWAPI LPCTSTR WINAPI UrlGetLocationA(LPCSTR); -WINSHLWAPI LPCTSTR WINAPI UrlGetLocationW(LPCWSTR); +WINSHLWAPI LPCSTR WINAPI UrlGetLocationA(LPCSTR); +WINSHLWAPI LPCWSTR WINAPI UrlGetLocationW(LPCWSTR); WINSHLWAPI HRESULT WINAPI UrlGetPartA(LPCSTR,LPSTR,LPDWORD,DWORD,DWORD); WINSHLWAPI HRESULT WINAPI UrlGetPartW(LPCWSTR,LPWSTR,LPDWORD,DWORD,DWORD); WINSHLWAPI HRESULT WINAPI UrlHashA(LPCSTR,LPBYTE,DWORD);