comctl32 resources
Ge van Geldorp
ge at gse.nl
Thu Jan 22 17:55:38 CST 2004
Changelog:
Sync with ReactOS 0.2
Fix various function prototypes to conform to PSDK
Index: dlls/shlwapi/ordinal.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/ordinal.c,v
retrieving revision 1.75
diff -u -r1.75 ordinal.c
--- dlls/shlwapi/ordinal.c 1 Oct 2003 03:10:42 -0000 1.75
+++ dlls/shlwapi/ordinal.c 22 Jan 2004 23:41:41 -0000
@@ -3414,7 +3414,8 @@
* Success: A handle to the loaded module
* Failure: A NULL handle.
*/
-HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags)
+HMODULE WINAPI MLLoadLibraryA(LPCSTR new_mod, HANDLE inst_hwnd, DWORD dwFlags,
+ LPCSTR component, BOOL cross_code_page)
{
/* FIXME: Native appears to do DPA_Create and a DPA_InsertPtr for
* each call here.
@@ -3453,7 +3454,8 @@
*
* Unicode version of MLLoadLibraryA.
*/
-HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HMODULE inst_hwnd, DWORD dwFlags)
+HMODULE WINAPI MLLoadLibraryW(LPCWSTR new_mod, HANDLE inst_hwnd, DWORD dwFlags,
+ LPCWSTR component, BOOL cross_code_page)
{
WCHAR mod_path[2*MAX_PATH];
LPWSTR ptr;
Index: dlls/shlwapi/path.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/path.c,v
retrieving revision 1.40
diff -u -r1.40 path.c
--- dlls/shlwapi/path.c 19 Jan 2004 21:46:14 -0000 1.40
+++ dlls/shlwapi/path.c 22 Jan 2004 23:41:41 -0000
@@ -3268,7 +3268,7 @@
if (lpszUrl[1] != ':' && lpszUrl[1] != '|' && isalphaW(*lpszUrl))
return E_INVALIDARG;
- hr = UrlUnescapeW(lpszUrl, lpszPath, pcchPath, dwFlags);
+ hr = UrlUnescapeW((LPWSTR) lpszUrl, lpszPath, pcchPath, dwFlags);
if (lpszPath[1] == '|')
lpszPath[1] = ':';
@@ -3745,7 +3745,7 @@
* The match is made against the end of the suffix string, so for example:
* lpszSuffix="fooBAR" matches "BAR", but lpszSuffix="fooBARfoo" does not.
*/
-int WINAPI PathFindSuffixArrayA(LPCSTR lpszSuffix, LPCSTR *lppszArray, int dwCount)
+LPCSTR WINAPI PathFindSuffixArrayA(LPCSTR lpszSuffix, LPCSTR *lppszArray, int dwCount)
{
size_t dwLen;
int dwRet = 0;
@@ -3762,13 +3762,13 @@
if (dwCompareLen < dwLen)
{
if (!strcmp(lpszSuffix + dwLen - dwCompareLen, *lppszArray))
- return dwRet; /* Found */
+ return *lppszArray; /* Found */
}
dwRet++;
lppszArray++;
}
}
- return 0;
+ return NULL;
}
/*************************************************************************
@@ -3776,7 +3776,7 @@
*
* See PathFindSuffixArrayA.
*/
-int WINAPI PathFindSuffixArrayW(LPCWSTR lpszSuffix, LPCWSTR *lppszArray, int dwCount)
+LPCWSTR WINAPI PathFindSuffixArrayW(LPCWSTR lpszSuffix, LPCWSTR *lppszArray, int dwCount)
{
size_t dwLen;
int dwRet = 0;
@@ -3793,13 +3793,13 @@
if (dwCompareLen < dwLen)
{
if (!strcmpW(lpszSuffix + dwLen - dwCompareLen, *lppszArray))
- return dwRet; /* Found */
+ return *lppszArray; /* Found */
}
dwRet++;
lppszArray++;
}
}
- return 0;
+ return NULL;
}
/*************************************************************************
Index: dlls/shlwapi/shlwapi.spec
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/shlwapi.spec,v
retrieving revision 1.83
diff -u -r1.83 shlwapi.spec
--- dlls/shlwapi/shlwapi.spec 19 Jan 2004 21:46:14 -0000 1.83
+++ dlls/shlwapi/shlwapi.spec 22 Jan 2004 23:41:41 -0000
@@ -374,8 +374,8 @@
374 stub -noname SHCheckDiskForMediaA
375 stub -noname SHCheckDiskForMediaW
376 stdcall -noname MLGetUILanguage() # kernel32.GetUserDefaultUILanguage
-377 stdcall MLLoadLibraryA(str long long)
-378 stdcall MLLoadLibraryW(wstr long long)
+377 stdcall MLLoadLibraryA(str long long str long)
+378 stdcall MLLoadLibraryW(wstr long long wstr long)
379 stub -noname Shell_GetCachedImageIndexWrapW
380 stub -noname Shell_GetCachedImageIndexWrapA
381 stub -noname AssocCopyVerbs
Index: dlls/shlwapi/string.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/string.c,v
retrieving revision 1.39
diff -u -r1.39 string.c
--- dlls/shlwapi/string.c 22 Nov 2003 00:00:53 -0000 1.39
+++ dlls/shlwapi/string.c 22 Jan 2004 23:41:41 -0000
@@ -1343,7 +1343,7 @@
* CoTaskMemFree() and its type set to STRRET_CSTRA.
* Failure: E_FAIL, if any parameters are invalid.
*/
-HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len)
+HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, UINT len)
{
/* NOTE:
* This routine is identical to that in dlls/shell32/shellstring.c.
@@ -1392,7 +1392,7 @@
*
* See StrRetToBufA.
*/
-HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len)
+HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, UINT len)
{
TRACE("dest=%p len=0x%lx strret=%p pidl=%p stub\n",dest,len,src,pidl);
Index: dlls/shlwapi/url.c
===================================================================
RCS file: /home/wine/wine/dlls/shlwapi/url.c,v
retrieving revision 1.26
diff -u -r1.26 url.c
--- dlls/shlwapi/url.c 1 Oct 2003 03:10:42 -0000 1.26
+++ dlls/shlwapi/url.c 22 Jan 2004 23:41:41 -0000
@@ -34,7 +34,7 @@
#include "shlwapi.h"
#include "wine/debug.h"
-HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HMODULE,DWORD);
+HMODULE WINAPI MLLoadLibraryW(LPCWSTR,HANDLE,DWORD,LPCWSTR,BOOL);
BOOL WINAPI MLFreeLibrary(HMODULE);
HRESULT WINAPI MLBuildResURLW(LPCWSTR,HMODULE,DWORD,LPCWSTR,LPWSTR,DWORD);
@@ -1130,7 +1130,7 @@
* the first occurrence of either a '?' or '#' character.
*/
HRESULT WINAPI UrlUnescapeA(
- LPCSTR pszUrl,
+ LPSTR pszUrl,
LPSTR pszUnescaped,
LPDWORD pcchUnescaped,
DWORD dwFlags)
@@ -1145,7 +1145,7 @@
pcchUnescaped, dwFlags);
if(dwFlags & URL_UNESCAPE_INPLACE)
- dst = (char*)pszUrl;
+ dst = pszUrl;
else
dst = pszUnescaped;
@@ -1194,7 +1194,7 @@
* See UrlUnescapeA.
*/
HRESULT WINAPI UrlUnescapeW(
- LPCWSTR pszUrl,
+ LPWSTR pszUrl,
LPWSTR pszUnescaped,
LPDWORD pcchUnescaped,
DWORD dwFlags)
@@ -1209,7 +1209,7 @@
pcchUnescaped, dwFlags);
if(dwFlags & URL_UNESCAPE_INPLACE)
- dst = (WCHAR*)pszUrl;
+ dst = pszUrl;
else
dst = pszUnescaped;
@@ -1396,14 +1396,14 @@
* Success: TRUE. lpDest is filled with the computed hash value.
* Failure: FALSE, if any argument is invalid.
*/
-BOOL WINAPI HashData(const unsigned char *lpSrc, INT nSrcLen,
- unsigned char *lpDest, INT nDestLen)
+HRESULT WINAPI HashData(const unsigned char *lpSrc, DWORD nSrcLen,
+ unsigned char *lpDest, DWORD nDestLen)
{
INT srcCount = nSrcLen - 1, destCount = nDestLen - 1;
if (IsBadReadPtr(lpSrc, nSrcLen) ||
IsBadWritePtr(lpDest, nDestLen))
- return FALSE;
+ return E_INVALIDARG;
while (destCount >= 0)
{
@@ -1421,7 +1421,7 @@
}
srcCount--;
}
- return TRUE;
+ return S_OK;
}
/*************************************************************************
@@ -1438,7 +1438,7 @@
* Success: S_OK. lpDest is filled with the computed hash value.
* Failure: E_INVALIDARG, if any argument is invalid.
*/
-HRESULT WINAPI UrlHashA(LPCSTR pszUrl, unsigned char *lpDest, INT nDestLen)
+HRESULT WINAPI UrlHashA(LPCSTR pszUrl, unsigned char *lpDest, DWORD nDestLen)
{
if (IsBadStringPtrA(pszUrl, -1) || IsBadWritePtr(lpDest, nDestLen))
return E_INVALIDARG;
@@ -1452,7 +1452,7 @@
*
* See UrlHashA.
*/
-HRESULT WINAPI UrlHashW(LPCWSTR pszUrl, unsigned char *lpDest, INT nDestLen)
+HRESULT WINAPI UrlHashW(LPCWSTR pszUrl, unsigned char *lpDest, DWORD nDestLen)
{
char szUrl[MAX_PATH];
@@ -1900,9 +1900,9 @@
memset(pl, 0, sizeof(WINE_PARSE_URL));
pl->pScheme = pszUrl;
work = URL_ScanID(pl->pScheme, &pl->szScheme, SCHEME);
- if (!*work || (*work != L':')) goto ERROR;
+ if (!*work || (*work != L':')) goto ErrorExit;
work++;
- if ((*work != L'/') || (*(work+1) != L'/')) goto ERROR;
+ if ((*work != L'/') || (*(work+1) != L'/')) goto ErrorExit;
pl->pUserName = work + 2;
work = URL_ScanID(pl->pUserName, &pl->szUserName, USERPASS);
if (*work == L':' ) {
@@ -1926,7 +1926,7 @@
pl->szUserName = pl->szPassword = 0;
work = pl->pUserName - 1;
pl->pUserName = pl->pPassword = 0;
- } else goto ERROR;
+ } else goto ErrorExit;
/* now start parsing hostname or hostnumber */
work++;
@@ -1951,7 +1951,7 @@
pl->pPort, pl->szPort,
pl->pQuery, pl->szQuery);
return S_OK;
- ERROR:
+ ErrorExit:
FIXME("failed to parse %s\n", debugstr_w(pszUrl));
return E_INVALIDARG;
}
@@ -2433,7 +2433,7 @@
dwDestLen -= (szResLen + 1);
memcpy(lpszDest, szRes, sizeof(szRes));
- hMod = MLLoadLibraryW(lpszLibName, hMod, dwFlags);
+ hMod = MLLoadLibraryW(lpszLibName, hMod, dwFlags, NULL, FALSE);
if (hMod)
{
Index: include/shlwapi.h
===================================================================
RCS file: /home/wine/wine/include/shlwapi.h,v
retrieving revision 1.41
diff -u -r1.41 shlwapi.h
--- include/shlwapi.h 19 Jan 2004 21:46:14 -0000 1.41
+++ include/shlwapi.h 22 Jan 2004 23:41:43 -0000
@@ -500,8 +500,8 @@
BOOL WINAPI PathIsLFNFileSpecW(LPCWSTR);
#define PathIsLFNFileSpec WINELIB_NAME_AW(PathIsLFNFileSpec)
-int WINAPI PathFindSuffixArrayA(LPCSTR,LPCSTR *,int);
-int WINAPI PathFindSuffixArrayW(LPCWSTR,LPCWSTR *,int);
+LPCSTR WINAPI PathFindSuffixArrayA(LPCSTR,LPCSTR *,int);
+LPCWSTR WINAPI PathFindSuffixArrayW(LPCWSTR,LPCWSTR *,int);
#define PathFindSuffixArray WINELIB_NAME_AW(PathFindSuffixArray)
VOID WINAPI PathUndecorateA(LPSTR);
@@ -603,10 +603,10 @@
HRESULT WINAPI UrlGetPartW(LPCWSTR,LPWSTR,LPDWORD,DWORD,DWORD);
#define UrlGetPart WINELIB_NAME_AW(UrlGetPart)
-BOOL WINAPI HashData(const unsigned char *,INT,unsigned char *lpDest,INT);
+HRESULT WINAPI HashData(const unsigned char *,DWORD,unsigned char *lpDest,DWORD);
-HRESULT WINAPI UrlHashA(LPCSTR,unsigned char *,INT);
-HRESULT WINAPI UrlHashW(LPCWSTR,unsigned char *,INT);
+HRESULT WINAPI UrlHashA(LPCSTR,unsigned char *,DWORD);
+HRESULT WINAPI UrlHashW(LPCWSTR,unsigned char *,DWORD);
#define UrlHash WINELIB_NAME_AW(UrlHash)
BOOL WINAPI UrlIsA(LPCSTR,URLIS);
@@ -625,8 +625,8 @@
#define UrlIsFileUrlW(y) UrlIsW(x, URLIS_FILEURL)
#define UrlIsFileUrl WINELIB_NAME_AW(UrlIsFileUrl)
-HRESULT WINAPI UrlUnescapeA(LPCSTR,LPSTR,LPDWORD,DWORD);
-HRESULT WINAPI UrlUnescapeW(LPCWSTR,LPWSTR,LPDWORD,DWORD);
+HRESULT WINAPI UrlUnescapeA(LPSTR,LPSTR,LPDWORD,DWORD);
+HRESULT WINAPI UrlUnescapeW(LPWSTR,LPWSTR,LPDWORD,DWORD);
#define UrlUnescape WINELIB_AW_NAME(UrlUnescape)
#define UrlUnescapeInPlaceA(x,y) UrlUnescapeA(x, NULL, NULL, \
@@ -827,8 +827,8 @@
HRESULT WINAPI StrRetToStrW(struct _STRRET*,const struct _ITEMIDLIST*,LPWSTR*);
#define StrRetToStr WINELIB_NAME_AW(StrRetToStr)
-HRESULT WINAPI StrRetToBufA(struct _STRRET*,const struct _ITEMIDLIST*,LPSTR,DWORD);
-HRESULT WINAPI StrRetToBufW(struct _STRRET*,const struct _ITEMIDLIST*,LPWSTR,DWORD);
+HRESULT WINAPI StrRetToBufA(struct _STRRET*,const struct _ITEMIDLIST*,LPSTR,UINT);
+HRESULT WINAPI StrRetToBufW(struct _STRRET*,const struct _ITEMIDLIST*,LPWSTR,UINT);
#define StrRetToBuf WINELIB_NAME_AW(StrRetToBuf)
#endif /* NO_SHLWAPI_STRFCNS */
More information about the wine-patches
mailing list