SHELL32: -Wpointer-sign fixes
Mike McCormack
mike at codeweavers.com
Sun Jul 3 10:12:02 CDT 2005
ChangeLog:
* -Wpointer-sign fixes
-------------- next part --------------
? dlls/shell32/tests/cabinet.c
? dlls/shell32/tests/pidl.c
Index: dlls/shell32/autocomplete.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/autocomplete.c,v
retrieving revision 1.16
diff -u -p -r1.16 autocomplete.c
--- dlls/shell32/autocomplete.c 6 Jun 2005 19:50:36 -0000 1.16
+++ dlls/shell32/autocomplete.c 3 Jul 2005 06:13:35 -0000
@@ -64,7 +64,7 @@ typedef struct
{
const IAutoCompleteVtbl *lpVtbl;
const IAutoComplete2Vtbl *lpvtblAutoComplete2;
- DWORD ref;
+ LONG ref;
BOOL enabled;
HWND hwndEdit;
HWND hwndListBox;
Index: dlls/shell32/classes.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/classes.c,v
retrieving revision 1.39
diff -u -p -r1.39 classes.c
--- dlls/shell32/classes.c 25 Jun 2005 17:55:53 -0000 1.39
+++ dlls/shell32/classes.c 3 Jul 2005 06:13:35 -0000
@@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
#define MAX_EXTENSION_LENGTH 20
-BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, DWORD len, BOOL bPrependDot)
+BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot)
{
HKEY hkey;
WCHAR szTemp[MAX_EXTENSION_LENGTH + 2];
@@ -83,7 +83,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExten
return TRUE;
}
-BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, DWORD len, BOOL bPrependDot)
+BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot)
{
HKEY hkey;
char szTemp[MAX_EXTENSION_LENGTH + 2];
Index: dlls/shell32/cpanelfolder.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/cpanelfolder.c,v
retrieving revision 1.18
diff -u -p -r1.18 cpanelfolder.c
--- dlls/shell32/cpanelfolder.c 6 Jun 2005 19:50:36 -0000 1.18
+++ dlls/shell32/cpanelfolder.c 3 Jul 2005 06:13:35 -0000
@@ -59,7 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct {
const IShellFolder2Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
const IPersistFolder2Vtbl *lpVtblPersistFolder2;
const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW;
const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA;
Index: dlls/shell32/dataobject.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/dataobject.c,v
retrieving revision 1.48
diff -u -p -r1.48 dataobject.c
--- dlls/shell32/dataobject.c 6 Jun 2005 19:50:36 -0000 1.48
+++ dlls/shell32/dataobject.c 3 Jul 2005 06:13:35 -0000
@@ -43,7 +43,7 @@ typedef struct
{
/* IUnknown fields */
const IEnumFORMATETCVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IEnumFORMATETC fields */
UINT posFmt;
UINT countFmt;
@@ -205,7 +205,7 @@ typedef struct
{
/* IUnknown fields */
const IDataObjectVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IDataObject fields */
LPITEMIDLIST pidl;
Index: dlls/shell32/dde.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/dde.c,v
retrieving revision 1.1
diff -u -p -r1.1 dde.c
--- dlls/shell32/dde.c 30 Jun 2005 20:45:57 -0000 1.1
+++ dlls/shell32/dde.c 3 Jul 2005 06:13:35 -0000
@@ -73,7 +73,7 @@ static inline HDDEDATA Dde_OnRequest(UIN
static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
{
- char * pszCommand;
+ BYTE * pszCommand;
pszCommand = DdeAccessData(hdata, NULL);
if (!pszCommand)
Index: dlls/shell32/dragdrophelper.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/dragdrophelper.c,v
retrieving revision 1.16
diff -u -p -r1.16 dragdrophelper.c
--- dlls/shell32/dragdrophelper.c 6 Jun 2005 19:50:36 -0000 1.16
+++ dlls/shell32/dragdrophelper.c 3 Jul 2005 06:13:35 -0000
@@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
typedef struct {
const IDropTargetHelperVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
} IDropTargetHelperImpl;
static const IDropTargetHelperVtbl vt_IDropTargetHelper;
Index: dlls/shell32/enumidlist.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/enumidlist.c,v
retrieving revision 1.45
diff -u -p -r1.45 enumidlist.c
--- dlls/shell32/enumidlist.c 6 Jun 2005 19:50:36 -0000 1.45
+++ dlls/shell32/enumidlist.c 3 Jul 2005 06:13:35 -0000
@@ -46,7 +46,7 @@ typedef struct tagENUMLIST
typedef struct
{
const IEnumIDListVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
LPENUMLIST mpFirst;
LPENUMLIST mpLast;
LPENUMLIST mpCurrent;
Index: dlls/shell32/folders.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/folders.c,v
retrieving revision 1.63
diff -u -p -r1.63 folders.c
--- dlls/shell32/folders.c 6 Jun 2005 19:50:36 -0000 1.63
+++ dlls/shell32/folders.c 3 Jul 2005 06:13:35 -0000
@@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
typedef struct
{
const IExtractIconWVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
const IPersistFileVtbl *lpvtblPersistFile;
const IExtractIconAVtbl *lpvtblExtractIconA;
LPITEMIDLIST pidl;
Index: dlls/shell32/pidl.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/pidl.c,v
retrieving revision 1.131
diff -u -p -r1.131 pidl.c
--- dlls/shell32/pidl.c 15 Jun 2005 10:20:00 -0000 1.131
+++ dlls/shell32/pidl.c 3 Jul 2005 06:13:36 -0000
@@ -1336,7 +1336,7 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDL
*
*************************************************************************
*/
-LPITEMIDLIST _ILAlloc(PIDLTYPE type, size_t size)
+LPITEMIDLIST _ILAlloc(PIDLTYPE type, int size)
{
LPITEMIDLIST pidlOut = NULL;
Index: dlls/shell32/pidl.h
===================================================================
RCS file: /home/wine/wine/dlls/shell32/pidl.h,v
retrieving revision 1.48
diff -u -p -r1.48 pidl.h
--- dlls/shell32/pidl.h 15 Jun 2005 10:20:00 -0000 1.48
+++ dlls/shell32/pidl.h 3 Jul 2005 06:13:36 -0000
@@ -206,7 +206,7 @@ BOOL _ILIsCPanelStruct (LPCITEMIDLIST pi
* - two bytes are the NULL PIDL terminator
* Sets type of the returned PIDL to type.
*/
-LPITEMIDLIST _ILAlloc(PIDLTYPE type, size_t size);
+LPITEMIDLIST _ILAlloc(PIDLTYPE type, int size);
/* Creates a PIDL with guid format and type type, which must be one of PT_GUID,
* PT_SHELLEXT, or PT_YAGUID.
Index: dlls/shell32/shell32_main.h
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shell32_main.h,v
retrieving revision 1.101
diff -u -p -r1.101 shell32_main.h
--- dlls/shell32/shell32_main.h 29 Jun 2005 11:17:33 -0000 1.101
+++ dlls/shell32/shell32_main.h 3 Jul 2005 06:13:36 -0000
@@ -56,14 +56,14 @@ BOOL PidlToSicIndex (IShellFolder * sh,
INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags );
/* Classes Root */
-BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, DWORD len, BOOL bPrependDot);
+BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot);
BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len );
BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, LPDWORD dwNr);
BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, LPDWORD dwNr);
BOOL HCR_GetClassNameW(REFIID riid, LPWSTR szDest, DWORD len);
/* ANSI versions of above functions, supposed to go away as soon as they are not used anymore */
-BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, DWORD len, BOOL bPrependDot);
+BOOL HCR_MapTypeToValueA(LPCSTR szExtension, LPSTR szFileType, LONG len, BOOL bPrependDot);
BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);
BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len);
Index: dlls/shell32/shelllink.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shelllink.c,v
retrieving revision 1.101
diff -u -p -r1.101 shelllink.c
--- dlls/shell32/shelllink.c 16 Jun 2005 10:43:50 -0000 1.101
+++ dlls/shell32/shelllink.c 3 Jul 2005 06:13:36 -0000
@@ -133,7 +133,7 @@ typedef struct
const IShellExtInitVtbl *lpvtblShellExtInit;
const IContextMenuVtbl *lpvtblContextMenu;
- DWORD ref;
+ LONG ref;
/* data structures according to the informations in the link */
LPITEMIDLIST pPidl;
@@ -660,7 +660,7 @@ static LPWSTR Stream_LoadPath( LPSTR p,
static HRESULT Stream_LoadLocation( IStream *stm,
volume_info *volume, LPWSTR *path )
{
- unsigned char *p = NULL;
+ char *p = NULL;
LOCATION_INFO *loc;
HRESULT r;
int n;
Index: dlls/shell32/shellole.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellole.c,v
retrieving revision 1.81
diff -u -p -r1.81 shellole.c
--- dlls/shell32/shellole.c 6 Jun 2005 19:50:36 -0000 1.81
+++ dlls/shell32/shellole.c 3 Jul 2005 06:13:36 -0000
@@ -502,11 +502,11 @@ HRESULT WINAPI SHGetDesktopFolder(IShell
typedef struct
{
const IClassFactoryVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
CLSID *rclsid;
LPFNCREATEINSTANCE lpfnCI;
const IID * riidInst;
- ULONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */
+ LONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */
} IDefClFImpl;
static const IClassFactoryVtbl dclfvt;
Index: dlls/shell32/shfldr_desktop.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shfldr_desktop.c,v
retrieving revision 1.43
diff -u -p -r1.43 shfldr_desktop.c
--- dlls/shell32/shfldr_desktop.c 29 Jun 2005 11:17:33 -0000 1.43
+++ dlls/shell32/shfldr_desktop.c 3 Jul 2005 06:13:36 -0000
@@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
typedef struct {
const IShellFolder2Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
CLSID *pclsid;
Index: dlls/shell32/shfldr_fs.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shfldr_fs.c,v
retrieving revision 1.43
diff -u -p -r1.43 shfldr_fs.c
--- dlls/shell32/shfldr_fs.c 7 Jun 2005 20:30:30 -0000 1.43
+++ dlls/shell32/shfldr_fs.c 3 Jul 2005 06:13:36 -0000
@@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
typedef struct {
const IUnknownVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
const IShellFolder2Vtbl *lpvtblShellFolder;
const IPersistFolder3Vtbl *lpvtblPersistFolder3;
const IDropTargetVtbl *lpvtblDropTarget;
Index: dlls/shell32/shfldr_mycomp.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shfldr_mycomp.c,v
retrieving revision 1.39
diff -u -p -r1.39 shfldr_mycomp.c
--- dlls/shell32/shfldr_mycomp.c 6 Jun 2005 19:50:36 -0000 1.39
+++ dlls/shell32/shfldr_mycomp.c 3 Jul 2005 06:13:36 -0000
@@ -56,7 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
typedef struct {
const IShellFolder2Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
const IPersistFolder2Vtbl *lpVtblPersistFolder2;
/* both paths are parsible from the desktop */
Index: dlls/shell32/shfldr_unixfs.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shfldr_unixfs.c,v
retrieving revision 1.27
diff -u -p -r1.27 shfldr_unixfs.c
--- dlls/shell32/shfldr_unixfs.c 30 Jun 2005 10:59:51 -0000 1.27
+++ dlls/shell32/shfldr_unixfs.c 3 Jul 2005 06:13:37 -0000
@@ -98,7 +98,7 @@ typedef struct tagStatStruct {
typedef struct _UnixFolder {
const IShellFolder2Vtbl *lpIShellFolder2Vtbl;
const IPersistFolder2Vtbl *lpIPersistFolder2Vtbl;
- ULONG m_cRef;
+ LONG m_cRef;
CHAR *m_pszPath;
LPITEMIDLIST m_pidlLocation;
LPITEMIDLIST *m_apidlSubDirs;
@@ -1306,7 +1306,7 @@ HRESULT WINAPI UnixDosFolder_Constructor
*/
typedef struct _UnixSubFolderIterator {
const IEnumIDListVtbl *lpIEnumIDListVtbl;
- ULONG m_cRef;
+ LONG m_cRef;
UnixFolder *m_pUnixFolder;
ULONG m_cIdx;
SHCONTF m_fFilter;
Index: dlls/shell32/shlfsbind.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlfsbind.c,v
retrieving revision 1.14
diff -u -p -r1.14 shlfsbind.c
--- dlls/shell32/shlfsbind.c 6 Jun 2005 19:50:36 -0000 1.14
+++ dlls/shell32/shlfsbind.c 3 Jul 2005 06:13:37 -0000
@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl);
typedef struct
{
const IFileSystemBindDataVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
WIN32_FIND_DATAW findFile;
} IFileSystemBindDataImpl;
Index: dlls/shell32/shlview.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shlview.c,v
retrieving revision 1.116
diff -u -p -r1.116 shlview.c
--- dlls/shell32/shlview.c 7 Jun 2005 20:30:30 -0000 1.116
+++ dlls/shell32/shlview.c 3 Jul 2005 06:13:37 -0000
@@ -77,7 +77,7 @@ typedef struct
typedef struct
{
const IShellViewVtbl* lpVtbl;
- DWORD ref;
+ LONG ref;
const IOleCommandTargetVtbl* lpvtblOleCommandTarget;
const IDropTargetVtbl* lpvtblDropTarget;
const IDropSourceVtbl* lpvtblDropSource;
Index: dlls/shell32/shv_bg_cmenu.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shv_bg_cmenu.c,v
retrieving revision 1.40
diff -u -p -r1.40 shv_bg_cmenu.c
--- dlls/shell32/shv_bg_cmenu.c 6 Jun 2005 19:50:36 -0000 1.40
+++ dlls/shell32/shv_bg_cmenu.c 3 Jul 2005 06:13:37 -0000
@@ -45,7 +45,7 @@ typedef struct
{
const IContextMenu2Vtbl *lpVtbl;
IShellFolder* pSFParent;
- DWORD ref;
+ LONG ref;
BOOL bDesktop;
} BgCmImpl;
Index: dlls/shell32/shv_item_cmenu.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shv_item_cmenu.c,v
retrieving revision 1.33
diff -u -p -r1.33 shv_item_cmenu.c
--- dlls/shell32/shv_item_cmenu.c 9 Jun 2005 09:46:23 -0000 1.33
+++ dlls/shell32/shv_item_cmenu.c 3 Jul 2005 06:13:37 -0000
@@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
*/
typedef struct
{ const IContextMenu2Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
IShellFolder* pSFParent;
LPITEMIDLIST pidl; /* root pidl */
LPITEMIDLIST *apidl; /* array of child pidls */
More information about the wine-patches
mailing list