From e28c014a849cc6fe2cc8032f62e541d502b4a834 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Sun, 3 Jul 2005 12:03:35 +0000 Subject: [PATCH] -Wpointer-sign fixes. --- dlls/shell32/autocomplete.c | 2 +- dlls/shell32/classes.c | 4 ++-- dlls/shell32/cpanelfolder.c | 2 +- dlls/shell32/dataobject.c | 4 ++-- dlls/shell32/dde.c | 2 +- dlls/shell32/dragdrophelper.c | 2 +- dlls/shell32/enumidlist.c | 2 +- dlls/shell32/folders.c | 2 +- dlls/shell32/pidl.c | 2 +- dlls/shell32/pidl.h | 2 +- dlls/shell32/shell32_main.h | 4 ++-- dlls/shell32/shelllink.c | 4 ++-- dlls/shell32/shellole.c | 4 ++-- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/shfldr_fs.c | 2 +- dlls/shell32/shfldr_mycomp.c | 2 +- dlls/shell32/shfldr_unixfs.c | 4 ++-- dlls/shell32/shlfsbind.c | 2 +- dlls/shell32/shlview.c | 2 +- dlls/shell32/shv_bg_cmenu.c | 2 +- dlls/shell32/shv_item_cmenu.c | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4926e3ad01f..c7603e30f60 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -64,7 +64,7 @@ typedef struct { const IAutoCompleteVtbl *lpVtbl; const IAutoComplete2Vtbl *lpvtblAutoComplete2; - DWORD ref; + LONG ref; BOOL enabled; HWND hwndEdit; HWND hwndListBox; diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 334b2acb6f1..a360bee7bbe 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -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 szExtension, LPWSTR szFileType, DWORD len, BOOL 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]; diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 6f55c4c5788..3b9dcfe4def 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -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; diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index c8d4c11eea2..3fc4e422fae 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -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; diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 849f4a32ec5..270ebaf921a 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -73,7 +73,7 @@ static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata) { - char * pszCommand; + BYTE * pszCommand; pszCommand = DdeAccessData(hdata, NULL); if (!pszCommand) diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 356bff29d46..bd58da09dca 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { const IDropTargetHelperVtbl *lpVtbl; - DWORD ref; + LONG ref; } IDropTargetHelperImpl; static const IDropTargetHelperVtbl vt_IDropTargetHelper; diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 17cda2c7057..9a0f41b8e5e 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -46,7 +46,7 @@ typedef struct tagENUMLIST typedef struct { const IEnumIDListVtbl *lpVtbl; - DWORD ref; + LONG ref; LPENUMLIST mpFirst; LPENUMLIST mpLast; LPENUMLIST mpCurrent; diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 863930aa934..443262a774c 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -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; diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 97632bcc189..544158db85a 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1336,7 +1336,7 @@ HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCI * ************************************************************************* */ -LPITEMIDLIST _ILAlloc(PIDLTYPE type, size_t size) +LPITEMIDLIST _ILAlloc(PIDLTYPE type, unsigned int size) { LPITEMIDLIST pidlOut = NULL; diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index d7da55a2085..df3d1f25f70 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -206,7 +206,7 @@ BOOL _ILIsCPanelStruct (LPCITEMIDLIST pidl); * - 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, unsigned int size); /* Creates a PIDL with guid format and type type, which must be one of PT_GUID, * PT_SHELLEXT, or PT_YAGUID. diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index ea8383a966d..2d8750c536d 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -56,14 +56,14 @@ BOOL PidlToSicIndex (IShellFolder * sh, LPCITEMIDLIST pidl, BOOL bBigIcon, UINT 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); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 87aa255c55b..878e29759c0 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -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, DWORD maxlen ) 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; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index ae413a2ac23..2002359f680 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -502,11 +502,11 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) 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; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 8c05fa2da07..3c06122af47 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct { const IShellFolder2Vtbl *lpVtbl; - DWORD ref; + LONG ref; CLSID *pclsid; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index c99a34304ff..6fba781069d 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -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; diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 1181030b31f..642f659090d 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -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 */ diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 3a39d6e1570..9aaf219b24a 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -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(IUnknown *pUnkOuter, REFIID riid, LPVOI */ typedef struct _UnixSubFolderIterator { const IEnumIDListVtbl *lpIEnumIDListVtbl; - ULONG m_cRef; + LONG m_cRef; UnixFolder *m_pUnixFolder; ULONG m_cIdx; SHCONTF m_fFilter; diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index 1660a587413..e2bbfcce6c7 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl); typedef struct { const IFileSystemBindDataVtbl *lpVtbl; - DWORD ref; + LONG ref; WIN32_FIND_DATAW findFile; } IFileSystemBindDataImpl; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 3514bb72ee7..6ca119802fa 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -77,7 +77,7 @@ typedef struct typedef struct { const IShellViewVtbl* lpVtbl; - DWORD ref; + LONG ref; const IOleCommandTargetVtbl* lpvtblOleCommandTarget; const IDropTargetVtbl* lpvtblDropTarget; const IDropSourceVtbl* lpvtblDropSource; diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index 54dd9e8532e..885b5604dd4 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -45,7 +45,7 @@ typedef struct { const IContextMenu2Vtbl *lpVtbl; IShellFolder* pSFParent; - DWORD ref; + LONG ref; BOOL bDesktop; } BgCmImpl; diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 160e9724154..985150d49d6 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -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 */ -- 2.11.4.GIT