Commit e28c014a authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard

-Wpointer-sign fixes.

parent 126af865
......@@ -64,7 +64,7 @@ typedef struct
{
const IAutoCompleteVtbl *lpVtbl;
const IAutoComplete2Vtbl *lpvtblAutoComplete2;
DWORD ref;
LONG ref;
BOOL enabled;
HWND hwndEdit;
HWND hwndListBox;
......
......@@ -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];
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)
......
......@@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
typedef struct {
const IDropTargetHelperVtbl *lpVtbl;
DWORD ref;
LONG ref;
} IDropTargetHelperImpl;
static const IDropTargetHelperVtbl vt_IDropTargetHelper;
......
......@@ -46,7 +46,7 @@ typedef struct tagENUMLIST
typedef struct
{
const IEnumIDListVtbl *lpVtbl;
DWORD ref;
LONG ref;
LPENUMLIST mpFirst;
LPENUMLIST mpLast;
LPENUMLIST mpCurrent;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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.
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
typedef struct {
const IShellFolder2Vtbl *lpVtbl;
DWORD ref;
LONG ref;
CLSID *pclsid;
......
......@@ -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;
......
......@@ -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 */
......
......@@ -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;
......
......@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl);
typedef struct
{
const IFileSystemBindDataVtbl *lpVtbl;
DWORD ref;
LONG ref;
WIN32_FIND_DATAW findFile;
} IFileSystemBindDataImpl;
......
......@@ -77,7 +77,7 @@ typedef struct
typedef struct
{
const IShellViewVtbl* lpVtbl;
DWORD ref;
LONG ref;
const IOleCommandTargetVtbl* lpvtblOleCommandTarget;
const IDropTargetVtbl* lpvtblDropTarget;
const IDropSourceVtbl* lpvtblDropSource;
......
......@@ -45,7 +45,7 @@ typedef struct
{
const IContextMenu2Vtbl *lpVtbl;
IShellFolder* pSFParent;
DWORD ref;
LONG ref;
BOOL bDesktop;
} BgCmImpl;
......
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment