-Wpointer-sign fixes.
This commit is contained in:
parent
126af8653e
commit
e28c014a84
@ -64,7 +64,7 @@ typedef struct
|
|||||||
{
|
{
|
||||||
const IAutoCompleteVtbl *lpVtbl;
|
const IAutoCompleteVtbl *lpVtbl;
|
||||||
const IAutoComplete2Vtbl *lpvtblAutoComplete2;
|
const IAutoComplete2Vtbl *lpvtblAutoComplete2;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
BOOL enabled;
|
BOOL enabled;
|
||||||
HWND hwndEdit;
|
HWND hwndEdit;
|
||||||
HWND hwndListBox;
|
HWND hwndListBox;
|
||||||
|
@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
|||||||
|
|
||||||
#define MAX_EXTENSION_LENGTH 20
|
#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;
|
HKEY hkey;
|
||||||
WCHAR szTemp[MAX_EXTENSION_LENGTH + 2];
|
WCHAR szTemp[MAX_EXTENSION_LENGTH + 2];
|
||||||
@ -83,7 +83,7 @@ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, DWORD len, BOOL
|
|||||||
return TRUE;
|
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;
|
HKEY hkey;
|
||||||
char szTemp[MAX_EXTENSION_LENGTH + 2];
|
char szTemp[MAX_EXTENSION_LENGTH + 2];
|
||||||
|
@ -59,7 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const IShellFolder2Vtbl *lpVtbl;
|
const IShellFolder2Vtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
const IPersistFolder2Vtbl *lpVtblPersistFolder2;
|
const IPersistFolder2Vtbl *lpVtblPersistFolder2;
|
||||||
const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW;
|
const IShellExecuteHookWVtbl *lpVtblShellExecuteHookW;
|
||||||
const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA;
|
const IShellExecuteHookAVtbl *lpVtblShellExecuteHookA;
|
||||||
|
@ -43,7 +43,7 @@ typedef struct
|
|||||||
{
|
{
|
||||||
/* IUnknown fields */
|
/* IUnknown fields */
|
||||||
const IEnumFORMATETCVtbl *lpVtbl;
|
const IEnumFORMATETCVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
/* IEnumFORMATETC fields */
|
/* IEnumFORMATETC fields */
|
||||||
UINT posFmt;
|
UINT posFmt;
|
||||||
UINT countFmt;
|
UINT countFmt;
|
||||||
@ -205,7 +205,7 @@ typedef struct
|
|||||||
{
|
{
|
||||||
/* IUnknown fields */
|
/* IUnknown fields */
|
||||||
const IDataObjectVtbl *lpVtbl;
|
const IDataObjectVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
|
|
||||||
/* IDataObject fields */
|
/* IDataObject fields */
|
||||||
LPITEMIDLIST pidl;
|
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)
|
static inline DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
|
||||||
{
|
{
|
||||||
char * pszCommand;
|
BYTE * pszCommand;
|
||||||
|
|
||||||
pszCommand = DdeAccessData(hdata, NULL);
|
pszCommand = DdeAccessData(hdata, NULL);
|
||||||
if (!pszCommand)
|
if (!pszCommand)
|
||||||
|
@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const IDropTargetHelperVtbl *lpVtbl;
|
const IDropTargetHelperVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
} IDropTargetHelperImpl;
|
} IDropTargetHelperImpl;
|
||||||
|
|
||||||
static const IDropTargetHelperVtbl vt_IDropTargetHelper;
|
static const IDropTargetHelperVtbl vt_IDropTargetHelper;
|
||||||
|
@ -46,7 +46,7 @@ typedef struct tagENUMLIST
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const IEnumIDListVtbl *lpVtbl;
|
const IEnumIDListVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
LPENUMLIST mpFirst;
|
LPENUMLIST mpFirst;
|
||||||
LPENUMLIST mpLast;
|
LPENUMLIST mpLast;
|
||||||
LPENUMLIST mpCurrent;
|
LPENUMLIST mpCurrent;
|
||||||
|
@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const IExtractIconWVtbl *lpVtbl;
|
const IExtractIconWVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
const IPersistFileVtbl *lpvtblPersistFile;
|
const IPersistFileVtbl *lpvtblPersistFile;
|
||||||
const IExtractIconAVtbl *lpvtblExtractIconA;
|
const IExtractIconAVtbl *lpvtblExtractIconA;
|
||||||
LPITEMIDLIST pidl;
|
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;
|
LPITEMIDLIST pidlOut = NULL;
|
||||||
|
|
||||||
|
@ -206,7 +206,7 @@ BOOL _ILIsCPanelStruct (LPCITEMIDLIST pidl);
|
|||||||
* - two bytes are the NULL PIDL terminator
|
* - two bytes are the NULL PIDL terminator
|
||||||
* Sets type of the returned PIDL to type.
|
* 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,
|
/* Creates a PIDL with guid format and type type, which must be one of PT_GUID,
|
||||||
* PT_SHELLEXT, or PT_YAGUID.
|
* 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 );
|
INT SIC_GetIconIndex (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags );
|
||||||
|
|
||||||
/* Classes Root */
|
/* 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_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len );
|
||||||
BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, LPDWORD dwNr);
|
BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, LPDWORD dwNr);
|
||||||
BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, 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);
|
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 */
|
/* 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_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, LPDWORD dwNr);
|
||||||
BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len);
|
BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len);
|
||||||
|
|
||||||
|
@ -133,7 +133,7 @@ typedef struct
|
|||||||
const IShellExtInitVtbl *lpvtblShellExtInit;
|
const IShellExtInitVtbl *lpvtblShellExtInit;
|
||||||
const IContextMenuVtbl *lpvtblContextMenu;
|
const IContextMenuVtbl *lpvtblContextMenu;
|
||||||
|
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
|
|
||||||
/* data structures according to the informations in the link */
|
/* data structures according to the informations in the link */
|
||||||
LPITEMIDLIST pPidl;
|
LPITEMIDLIST pPidl;
|
||||||
@ -660,7 +660,7 @@ static LPWSTR Stream_LoadPath( LPSTR p, DWORD maxlen )
|
|||||||
static HRESULT Stream_LoadLocation( IStream *stm,
|
static HRESULT Stream_LoadLocation( IStream *stm,
|
||||||
volume_info *volume, LPWSTR *path )
|
volume_info *volume, LPWSTR *path )
|
||||||
{
|
{
|
||||||
unsigned char *p = NULL;
|
char *p = NULL;
|
||||||
LOCATION_INFO *loc;
|
LOCATION_INFO *loc;
|
||||||
HRESULT r;
|
HRESULT r;
|
||||||
int n;
|
int n;
|
||||||
|
@ -502,11 +502,11 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const IClassFactoryVtbl *lpVtbl;
|
const IClassFactoryVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
CLSID *rclsid;
|
CLSID *rclsid;
|
||||||
LPFNCREATEINSTANCE lpfnCI;
|
LPFNCREATEINSTANCE lpfnCI;
|
||||||
const IID * riidInst;
|
const IID * riidInst;
|
||||||
ULONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */
|
LONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */
|
||||||
} IDefClFImpl;
|
} IDefClFImpl;
|
||||||
|
|
||||||
static const IClassFactoryVtbl dclfvt;
|
static const IClassFactoryVtbl dclfvt;
|
||||||
|
@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const IShellFolder2Vtbl *lpVtbl;
|
const IShellFolder2Vtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
|
|
||||||
CLSID *pclsid;
|
CLSID *pclsid;
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const IUnknownVtbl *lpVtbl;
|
const IUnknownVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
const IShellFolder2Vtbl *lpvtblShellFolder;
|
const IShellFolder2Vtbl *lpvtblShellFolder;
|
||||||
const IPersistFolder3Vtbl *lpvtblPersistFolder3;
|
const IPersistFolder3Vtbl *lpvtblPersistFolder3;
|
||||||
const IDropTargetVtbl *lpvtblDropTarget;
|
const IDropTargetVtbl *lpvtblDropTarget;
|
||||||
|
@ -56,7 +56,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell);
|
|||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const IShellFolder2Vtbl *lpVtbl;
|
const IShellFolder2Vtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
const IPersistFolder2Vtbl *lpVtblPersistFolder2;
|
const IPersistFolder2Vtbl *lpVtblPersistFolder2;
|
||||||
|
|
||||||
/* both paths are parsible from the desktop */
|
/* both paths are parsible from the desktop */
|
||||||
|
@ -98,7 +98,7 @@ typedef struct tagStatStruct {
|
|||||||
typedef struct _UnixFolder {
|
typedef struct _UnixFolder {
|
||||||
const IShellFolder2Vtbl *lpIShellFolder2Vtbl;
|
const IShellFolder2Vtbl *lpIShellFolder2Vtbl;
|
||||||
const IPersistFolder2Vtbl *lpIPersistFolder2Vtbl;
|
const IPersistFolder2Vtbl *lpIPersistFolder2Vtbl;
|
||||||
ULONG m_cRef;
|
LONG m_cRef;
|
||||||
CHAR *m_pszPath;
|
CHAR *m_pszPath;
|
||||||
LPITEMIDLIST m_pidlLocation;
|
LPITEMIDLIST m_pidlLocation;
|
||||||
LPITEMIDLIST *m_apidlSubDirs;
|
LPITEMIDLIST *m_apidlSubDirs;
|
||||||
@ -1306,7 +1306,7 @@ HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOI
|
|||||||
*/
|
*/
|
||||||
typedef struct _UnixSubFolderIterator {
|
typedef struct _UnixSubFolderIterator {
|
||||||
const IEnumIDListVtbl *lpIEnumIDListVtbl;
|
const IEnumIDListVtbl *lpIEnumIDListVtbl;
|
||||||
ULONG m_cRef;
|
LONG m_cRef;
|
||||||
UnixFolder *m_pUnixFolder;
|
UnixFolder *m_pUnixFolder;
|
||||||
ULONG m_cIdx;
|
ULONG m_cIdx;
|
||||||
SHCONTF m_fFilter;
|
SHCONTF m_fFilter;
|
||||||
|
@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl);
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const IFileSystemBindDataVtbl *lpVtbl;
|
const IFileSystemBindDataVtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
WIN32_FIND_DATAW findFile;
|
WIN32_FIND_DATAW findFile;
|
||||||
} IFileSystemBindDataImpl;
|
} IFileSystemBindDataImpl;
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ typedef struct
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
const IShellViewVtbl* lpVtbl;
|
const IShellViewVtbl* lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
const IOleCommandTargetVtbl* lpvtblOleCommandTarget;
|
const IOleCommandTargetVtbl* lpvtblOleCommandTarget;
|
||||||
const IDropTargetVtbl* lpvtblDropTarget;
|
const IDropTargetVtbl* lpvtblDropTarget;
|
||||||
const IDropSourceVtbl* lpvtblDropSource;
|
const IDropSourceVtbl* lpvtblDropSource;
|
||||||
|
@ -45,7 +45,7 @@ typedef struct
|
|||||||
{
|
{
|
||||||
const IContextMenu2Vtbl *lpVtbl;
|
const IContextMenu2Vtbl *lpVtbl;
|
||||||
IShellFolder* pSFParent;
|
IShellFolder* pSFParent;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
BOOL bDesktop;
|
BOOL bDesktop;
|
||||||
} BgCmImpl;
|
} BgCmImpl;
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell);
|
|||||||
*/
|
*/
|
||||||
typedef struct
|
typedef struct
|
||||||
{ const IContextMenu2Vtbl *lpVtbl;
|
{ const IContextMenu2Vtbl *lpVtbl;
|
||||||
DWORD ref;
|
LONG ref;
|
||||||
IShellFolder* pSFParent;
|
IShellFolder* pSFParent;
|
||||||
LPITEMIDLIST pidl; /* root pidl */
|
LPITEMIDLIST pidl; /* root pidl */
|
||||||
LPITEMIDLIST *apidl; /* array of child pidls */
|
LPITEMIDLIST *apidl; /* array of child pidls */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user