marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

itss: Win64 printf format warning fixes.

oldstable
Hans Leidekker 2006-10-12 20:56:50 +02:00 committed by Alexandre Julliard
parent 577d1e1f89
commit 2492abbbd3
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/itss/Makefile.in
View File

@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = itss.dll MODULE = itss.dll
IMPORTS = ole32 user32 advapi32 kernel32 ntdll IMPORTS = ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = -luuid EXTRALIBS = -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H -DWINE_NO_LONG_AS_INT EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \ C_SRCS = \
chm_lib.c \ chm_lib.c \

32
dlls/itss/chm_lib.c
View File

@ -99,7 +99,7 @@ typedef ULONGLONG UInt64;
/* utilities for unmarshalling data */ /* utilities for unmarshalling data */
static int _unmarshal_char_array(unsigned char **pData, static int _unmarshal_char_array(unsigned char **pData,
unsigned long *pLenRemain, unsigned int *pLenRemain,
char *dest, char *dest,
int count) int count)
{ {
@ -112,7 +112,7 @@ static int _unmarshal_char_array(unsigned char **pData,
} }
static int _unmarshal_uchar_array(unsigned char **pData, static int _unmarshal_uchar_array(unsigned char **pData,
unsigned long *pLenRemain, unsigned int *pLenRemain,
unsigned char *dest, unsigned char *dest,
int count) int count)
{ {
@ -125,7 +125,7 @@ static int _unmarshal_uchar_array(unsigned char **pData,
} }
static int _unmarshal_int32(unsigned char **pData, static int _unmarshal_int32(unsigned char **pData,
unsigned long *pLenRemain, unsigned int *pLenRemain,
Int32 *dest) Int32 *dest)
{ {
if (4 > *pLenRemain) if (4 > *pLenRemain)
@ -137,7 +137,7 @@ static int _unmarshal_int32(unsigned char **pData,
} }
static int _unmarshal_uint32(unsigned char **pData, static int _unmarshal_uint32(unsigned char **pData,
unsigned long *pLenRemain, unsigned int *pLenRemain,
UInt32 *dest) UInt32 *dest)
{ {
if (4 > *pLenRemain) if (4 > *pLenRemain)
@ -149,7 +149,7 @@ static int _unmarshal_uint32(unsigned char **pData,
} }
static int _unmarshal_int64(unsigned char **pData, static int _unmarshal_int64(unsigned char **pData,
unsigned long *pLenRemain, unsigned int *pLenRemain,
Int64 *dest) Int64 *dest)
{ {
Int64 temp; Int64 temp;
@ -169,7 +169,7 @@ static int _unmarshal_int64(unsigned char **pData,
} }
static int _unmarshal_uint64(unsigned char **pData, static int _unmarshal_uint64(unsigned char **pData,
unsigned long *pLenRemain, unsigned int *pLenRemain,
UInt64 *dest) UInt64 *dest)
{ {
UInt64 temp; UInt64 temp;
@ -189,7 +189,7 @@ static int _unmarshal_uint64(unsigned char **pData,
} }
static int _unmarshal_uuid(unsigned char **pData, static int _unmarshal_uuid(unsigned char **pData,
unsigned long *pDataLen, unsigned int *pDataLen,
unsigned char *dest) unsigned char *dest)
{ {
return _unmarshal_uchar_array(pData, pDataLen, dest, 16); return _unmarshal_uchar_array(pData, pDataLen, dest, 16);
@ -251,7 +251,7 @@ struct chmItsfHeader
}; /* __attribute__ ((aligned (1))); */ }; /* __attribute__ ((aligned (1))); */
static int _unmarshal_itsf_header(unsigned char **pData, static int _unmarshal_itsf_header(unsigned char **pData,
unsigned long *pDataLen, unsigned int *pDataLen,
struct chmItsfHeader *dest) struct chmItsfHeader *dest)
{ {
/* we only know how to deal with the 0x58 and 0x60 byte structures */ /* we only know how to deal with the 0x58 and 0x60 byte structures */
@ -329,7 +329,7 @@ struct chmItspHeader
}; /* __attribute__ ((aligned (1))); */ }; /* __attribute__ ((aligned (1))); */
static int _unmarshal_itsp_header(unsigned char **pData, static int _unmarshal_itsp_header(unsigned char **pData,
unsigned long *pDataLen, unsigned int *pDataLen,
struct chmItspHeader *dest) struct chmItspHeader *dest)
{ {
/* we only know how to deal with a 0x54 byte structures */ /* we only know how to deal with a 0x54 byte structures */
@ -377,7 +377,7 @@ struct chmPmglHeader
}; /* __attribute__ ((aligned (1))); */ }; /* __attribute__ ((aligned (1))); */
static int _unmarshal_pmgl_header(unsigned char **pData, static int _unmarshal_pmgl_header(unsigned char **pData,
unsigned long *pDataLen, unsigned int *pDataLen,
struct chmPmglHeader *dest) struct chmPmglHeader *dest)
{ {
/* we only know how to deal with a 0x14 byte structures */ /* we only know how to deal with a 0x14 byte structures */
@ -408,7 +408,7 @@ struct chmPmgiHeader
}; /* __attribute__ ((aligned (1))); */ }; /* __attribute__ ((aligned (1))); */
static int _unmarshal_pmgi_header(unsigned char **pData, static int _unmarshal_pmgi_header(unsigned char **pData,
unsigned long *pDataLen, unsigned int *pDataLen,
struct chmPmgiHeader *dest) struct chmPmgiHeader *dest)
{ {
/* we only know how to deal with a 0x8 byte structures */ /* we only know how to deal with a 0x8 byte structures */
@ -440,7 +440,7 @@ struct chmLzxcResetTable
}; /* __attribute__ ((aligned (1))); */ }; /* __attribute__ ((aligned (1))); */
static int _unmarshal_lzxc_reset_table(unsigned char **pData, static int _unmarshal_lzxc_reset_table(unsigned char **pData,
unsigned long *pDataLen, unsigned int *pDataLen,
struct chmLzxcResetTable *dest) struct chmLzxcResetTable *dest)
{ {
/* we only know how to deal with a 0x28 byte structures */ /* we only know how to deal with a 0x28 byte structures */
@ -478,7 +478,7 @@ struct chmLzxcControlData
}; };
static int _unmarshal_lzxc_control_data(unsigned char **pData, static int _unmarshal_lzxc_control_data(unsigned char **pData,
unsigned long *pDataLen, unsigned int *pDataLen,
struct chmLzxcControlData *dest) struct chmLzxcControlData *dest)
{ {
/* we want at least 0x18 bytes */ /* we want at least 0x18 bytes */
@ -603,7 +603,7 @@ static Int64 _chm_fetch_bytes(struct chmFile *h,
struct chmFile *chm_openW(const WCHAR *filename) struct chmFile *chm_openW(const WCHAR *filename)
{ {
unsigned char sbuffer[256]; unsigned char sbuffer[256];
unsigned long sremain; unsigned int sremain;
unsigned char *sbufpos; unsigned char *sbufpos;
struct chmFile *newHandle=NULL; struct chmFile *newHandle=NULL;
struct chmItsfHeader itsfHeader; struct chmItsfHeader itsfHeader;
@ -1401,7 +1401,7 @@ int chm_enumerate(struct chmFile *h,
struct chmPmglHeader header; struct chmPmglHeader header;
UChar *end; UChar *end;
UChar *cur; UChar *cur;
unsigned long lenRemain; unsigned int lenRemain;
UInt64 ui_path_len; UInt64 ui_path_len;
/* the current ui */ /* the current ui */
@ -1514,7 +1514,7 @@ int chm_enumerate_dir(struct chmFile *h,
struct chmPmglHeader header; struct chmPmglHeader header;
UChar *end; UChar *end;
UChar *cur; UChar *cur;
unsigned long lenRemain; unsigned int lenRemain;
/* set to 1 once we've started */ /* set to 1 once we've started */
int it_has_begun=0; int it_has_begun=0;

6
dlls/itss/itss.c
View File

@ -222,7 +222,7 @@ static HRESULT WINAPI ITStorageImpl_StgCreateDocfile(
{ {
ITStorageImpl *This = (ITStorageImpl *)iface; ITStorageImpl *This = (ITStorageImpl *)iface;
TRACE("%p %s %lu %lu %p\n", This, TRACE("%p %s %u %u %p\n", This,
debugstr_w(pwcsName), grfMode, reserved, ppstgOpen ); debugstr_w(pwcsName), grfMode, reserved, ppstgOpen );
return ITSS_StgOpenStorage( pwcsName, NULL, grfMode, return ITSS_StgOpenStorage( pwcsName, NULL, grfMode,
@ -270,7 +270,7 @@ static HRESULT WINAPI ITStorageImpl_StgOpenStorage(
{ {
ITStorageImpl *This = (ITStorageImpl *)iface; ITStorageImpl *This = (ITStorageImpl *)iface;
TRACE("%p %s %p %ld %p\n", This, debugstr_w( pwcsName ), TRACE("%p %s %p %d %p\n", This, debugstr_w( pwcsName ),
pstgPriority, grfMode, snbExclude ); pstgPriority, grfMode, snbExclude );
return ITSS_StgOpenStorage( pwcsName, pstgPriority, grfMode, return ITSS_StgOpenStorage( pwcsName, pstgPriority, grfMode,
@ -370,6 +370,6 @@ static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj)
HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
TRACE("dll_count = %lu\n", dll_count); TRACE("dll_count = %u\n", dll_count);
return dll_count ? S_FALSE : S_OK; return dll_count ? S_FALSE : S_OK;
} }

16
dlls/itss/storage.c
View File

@ -144,7 +144,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Next(
DWORD len, n; DWORD len, n;
struct enum_info *cur; struct enum_info *cur;
TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched ); TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched );
cur = This->current; cur = This->current;
n = 0; n = 0;
@ -196,7 +196,7 @@ static HRESULT WINAPI ITSS_IEnumSTATSTG_Skip(
DWORD n; DWORD n;
struct enum_info *cur; struct enum_info *cur;
TRACE("%p %lu\n", This, celt ); TRACE("%p %u\n", This, celt );
cur = This->current; cur = This->current;
n = 0; n = 0;
@ -332,7 +332,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStream(
int r; int r;
WCHAR *path; WCHAR *path;
TRACE("%p %s %p %lu %lu %p\n", This, debugstr_w(pwcsName), TRACE("%p %s %p %u %u %p\n", This, debugstr_w(pwcsName),
reserved1, grfMode, reserved2, ppstm ); reserved1, grfMode, reserved2, ppstm );
len = strlenW( This->dir ) + strlenW( pwcsName ) + 1; len = strlenW( This->dir ) + strlenW( pwcsName ) + 1;
@ -386,7 +386,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_OpenStorage(
{ {
ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface;
FIXME("%p %s %p %lu %p %lu %p\n", This, debugstr_w(pwcsName), FIXME("%p %s %p %u %p %u %p\n", This, debugstr_w(pwcsName),
pstgPriority, grfMode, snbExclude, reserved, ppstg); pstgPriority, grfMode, snbExclude, reserved, ppstg);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -462,7 +462,7 @@ static HRESULT WINAPI ITSS_IStorageImpl_EnumElements(
ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface; ITSS_IStorageImpl *This = (ITSS_IStorageImpl *)iface;
IEnumSTATSTG_Impl* stgenum; IEnumSTATSTG_Impl* stgenum;
TRACE("%p %ld %p %ld %p\n", This, reserved1, reserved2, reserved3, ppenum ); TRACE("%p %d %p %d %p\n", This, reserved1, reserved2, reserved3, ppenum );
stgenum = ITSS_create_enum(); stgenum = ITSS_create_enum();
if( !stgenum ) if( !stgenum )
@ -654,7 +654,7 @@ static HRESULT WINAPI ITSS_IStream_Read(
IStream_Impl *This = (IStream_Impl *)iface; IStream_Impl *This = (IStream_Impl *)iface;
ULONG count; ULONG count;
TRACE("%p %p %lu %p\n", This, pv, cb, pcbRead); TRACE("%p %p %u %p\n", This, pv, cb, pcbRead);
count = chm_retrieve_object(This->stg->chmfile, count = chm_retrieve_object(This->stg->chmfile,
&This->ui, pv, This->addr, cb); &This->ui, pv, This->addr, cb);
@ -684,7 +684,7 @@ static HRESULT WINAPI ITSS_IStream_Seek(
IStream_Impl *This = (IStream_Impl *)iface; IStream_Impl *This = (IStream_Impl *)iface;
LONGLONG newpos; LONGLONG newpos;
TRACE("%p %s %lu %p\n", This, TRACE("%p %s %u %p\n", This,
wine_dbgstr_longlong( dlibMove.QuadPart ), dwOrigin, plibNewPosition ); wine_dbgstr_longlong( dlibMove.QuadPart ), dwOrigin, plibNewPosition );
newpos = This->addr; newpos = This->addr;
@ -772,7 +772,7 @@ static HRESULT WINAPI ITSS_IStream_Stat(
{ {
IStream_Impl *This = (IStream_Impl *)iface; IStream_Impl *This = (IStream_Impl *)iface;
TRACE("%p %p %ld\n", This, pstatstg, grfStatFlag); TRACE("%p %p %d\n", This, pstatstg, grfStatFlag);
memset( pstatstg, 0, sizeof *pstatstg ); memset( pstatstg, 0, sizeof *pstatstg );
if( !( grfStatFlag & STATFLAG_NONAME ) ) if( !( grfStatFlag & STATFLAG_NONAME ) )