-Wpointer-sign fixes.
diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c
index 4926e3a..c7603e3 100644
--- a/dlls/shell32/autocomplete.c
+++ b/dlls/shell32/autocomplete.c
@@ -64,7 +64,7 @@
{
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 334b2ac..a360bee 100644
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -49,7 +49,7 @@
#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 @@
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 6f55c4c..3b9dcfe 100644
--- a/dlls/shell32/cpanelfolder.c
+++ b/dlls/shell32/cpanelfolder.c
@@ -59,7 +59,7 @@
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 c8d4c11..3fc4e42 100644
--- a/dlls/shell32/dataobject.c
+++ b/dlls/shell32/dataobject.c
@@ -43,7 +43,7 @@
{
/* IUnknown fields */
const IEnumFORMATETCVtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
/* IEnumFORMATETC fields */
UINT posFmt;
UINT countFmt;
@@ -205,7 +205,7 @@
{
/* 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 849f4a3..270ebaf 100644
--- a/dlls/shell32/dde.c
+++ b/dlls/shell32/dde.c
@@ -73,7 +73,7 @@
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 356bff2..bd58da0 100644
--- a/dlls/shell32/dragdrophelper.c
+++ b/dlls/shell32/dragdrophelper.c
@@ -49,7 +49,7 @@
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 17cda2c..9a0f41b 100644
--- a/dlls/shell32/enumidlist.c
+++ b/dlls/shell32/enumidlist.c
@@ -46,7 +46,7 @@
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 863930a..443262a 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -50,7 +50,7 @@
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 97632bc..544158d 100644
--- a/dlls/shell32/pidl.c
+++ b/dlls/shell32/pidl.c
@@ -1336,7 +1336,7 @@
*
*************************************************************************
*/
-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 d7da55a..df3d1f2 100644
--- a/dlls/shell32/pidl.h
+++ b/dlls/shell32/pidl.h
@@ -206,7 +206,7 @@
* - 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 ea8383a..2d8750c 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -56,14 +56,14 @@
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 87aa255..878e297 100644
--- a/dlls/shell32/shelllink.c
+++ b/dlls/shell32/shelllink.c
@@ -133,7 +133,7 @@
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 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 ae413a2..2002359 100644
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -502,11 +502,11 @@
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 8c05fa2..3c06122 100644
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -61,7 +61,7 @@
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 c99a343..6fba781 100644
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -61,7 +61,7 @@
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 1181030..642f659 100644
--- a/dlls/shell32/shfldr_mycomp.c
+++ b/dlls/shell32/shfldr_mycomp.c
@@ -56,7 +56,7 @@
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 3a39d6e..9aaf219 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -98,7 +98,7 @@
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 @@
*/
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 1660a58..e2bbfcc 100644
--- a/dlls/shell32/shlfsbind.c
+++ b/dlls/shell32/shlfsbind.c
@@ -43,7 +43,7 @@
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 3514bb7..6ca1198 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -77,7 +77,7 @@
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 54dd9e8..885b560 100644
--- a/dlls/shell32/shv_bg_cmenu.c
+++ b/dlls/shell32/shv_bg_cmenu.c
@@ -45,7 +45,7 @@
{
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 160e972..985150d 100644
--- a/dlls/shell32/shv_item_cmenu.c
+++ b/dlls/shell32/shv_item_cmenu.c
@@ -44,7 +44,7 @@
*/
typedef struct
{ const IContextMenu2Vtbl *lpVtbl;
- DWORD ref;
+ LONG ref;
IShellFolder* pSFParent;
LPITEMIDLIST pidl; /* root pidl */
LPITEMIDLIST *apidl; /* array of child pidls */
