Fix some types problems.
This commit is contained in:
parent
ea1b58b560
commit
4eeae1adb3
@ -306,7 +306,7 @@ struct memory_access
|
|||||||
extern struct memory_access mem_access;
|
extern struct memory_access mem_access;
|
||||||
#define read_mem(p,a,b,l) (mem_access.read_mem)((p),(a),(b),(l))
|
#define read_mem(p,a,b,l) (mem_access.read_mem)((p),(a),(b),(l))
|
||||||
#define write_mem(p,a,b,l) (mem_access.write_mem)((p),(a),(b),(l))
|
#define write_mem(p,a,b,l) (mem_access.write_mem)((p),(a),(b),(l))
|
||||||
extern unsigned long WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr);
|
extern DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr);
|
||||||
|
|
||||||
/* module.c */
|
/* module.c */
|
||||||
extern struct module*
|
extern struct module*
|
||||||
|
@ -46,7 +46,7 @@ struct memory_access mem_access = {win32_read_mem, win32_write_mem};
|
|||||||
*
|
*
|
||||||
* converts an address into its linear value
|
* converts an address into its linear value
|
||||||
*/
|
*/
|
||||||
unsigned long WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr)
|
DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr)
|
||||||
{
|
{
|
||||||
LDT_ENTRY le;
|
LDT_ENTRY le;
|
||||||
|
|
||||||
|
@ -279,7 +279,7 @@ static HRESULT WINAPI DataCache_Draw(
|
|||||||
LPCRECTL lprcBounds,
|
LPCRECTL lprcBounds,
|
||||||
LPCRECTL lprcWBounds,
|
LPCRECTL lprcWBounds,
|
||||||
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
|
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
|
||||||
DWORD dwContinue);
|
ULONG_PTR dwContinue);
|
||||||
static HRESULT WINAPI DataCache_GetColorSet(
|
static HRESULT WINAPI DataCache_GetColorSet(
|
||||||
IViewObject2* iface,
|
IViewObject2* iface,
|
||||||
DWORD dwDrawAspect,
|
DWORD dwDrawAspect,
|
||||||
@ -1558,7 +1558,7 @@ static HRESULT WINAPI DataCache_Draw(
|
|||||||
LPCRECTL lprcBounds,
|
LPCRECTL lprcBounds,
|
||||||
LPCRECTL lprcWBounds,
|
LPCRECTL lprcWBounds,
|
||||||
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
|
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
|
||||||
DWORD dwContinue)
|
ULONG_PTR dwContinue)
|
||||||
{
|
{
|
||||||
PresentationDataHeader presData;
|
PresentationDataHeader presData;
|
||||||
HMETAFILE presMetafile = 0;
|
HMETAFILE presMetafile = 0;
|
||||||
|
@ -139,7 +139,7 @@ static HRESULT WINAPI OLEFontImpl_put_Charset(IFont* iface, short charset);
|
|||||||
static HRESULT WINAPI OLEFontImpl_get_hFont(IFont* iface, HFONT* phfont);
|
static HRESULT WINAPI OLEFontImpl_get_hFont(IFont* iface, HFONT* phfont);
|
||||||
static HRESULT WINAPI OLEFontImpl_Clone(IFont* iface, IFont** ppfont);
|
static HRESULT WINAPI OLEFontImpl_Clone(IFont* iface, IFont** ppfont);
|
||||||
static HRESULT WINAPI OLEFontImpl_IsEqual(IFont* iface, IFont* pFontOther);
|
static HRESULT WINAPI OLEFontImpl_IsEqual(IFont* iface, IFont* pFontOther);
|
||||||
static HRESULT WINAPI OLEFontImpl_SetRatio(IFont* iface, long cyLogical, long cyHimetric);
|
static HRESULT WINAPI OLEFontImpl_SetRatio(IFont* iface, LONG cyLogical, LONG cyHimetric);
|
||||||
static HRESULT WINAPI OLEFontImpl_QueryTextMetrics(IFont* iface, TEXTMETRICOLE* ptm);
|
static HRESULT WINAPI OLEFontImpl_QueryTextMetrics(IFont* iface, TEXTMETRICOLE* ptm);
|
||||||
static HRESULT WINAPI OLEFontImpl_AddRefHfont(IFont* iface, HFONT hfont);
|
static HRESULT WINAPI OLEFontImpl_AddRefHfont(IFont* iface, HFONT hfont);
|
||||||
static HRESULT WINAPI OLEFontImpl_ReleaseHfont(IFont* iface, HFONT hfont);
|
static HRESULT WINAPI OLEFontImpl_ReleaseHfont(IFont* iface, HFONT hfont);
|
||||||
@ -1048,8 +1048,8 @@ static HRESULT WINAPI OLEFontImpl_IsEqual(
|
|||||||
*/
|
*/
|
||||||
static HRESULT WINAPI OLEFontImpl_SetRatio(
|
static HRESULT WINAPI OLEFontImpl_SetRatio(
|
||||||
IFont* iface,
|
IFont* iface,
|
||||||
long cyLogical,
|
LONG cyLogical,
|
||||||
long cyHimetric)
|
LONG cyHimetric)
|
||||||
{
|
{
|
||||||
OLEFontImpl *this = (OLEFontImpl *)iface;
|
OLEFontImpl *this = (OLEFontImpl *)iface;
|
||||||
TRACE("(%p)->(%ld, %ld)\n", this, cyLogical, cyHimetric);
|
TRACE("(%p)->(%ld, %ld)\n", this, cyLogical, cyHimetric);
|
||||||
|
@ -519,7 +519,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
|
|||||||
* OLEPictureImpl_Render
|
* OLEPictureImpl_Render
|
||||||
*/
|
*/
|
||||||
static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
|
static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
|
||||||
long x, long y, long cx, long cy,
|
LONG x, LONG y, LONG cx, LONG cy,
|
||||||
OLE_XPOS_HIMETRIC xSrc,
|
OLE_XPOS_HIMETRIC xSrc,
|
||||||
OLE_YPOS_HIMETRIC ySrc,
|
OLE_YPOS_HIMETRIC ySrc,
|
||||||
OLE_XSIZE_HIMETRIC cxSrc,
|
OLE_XSIZE_HIMETRIC cxSrc,
|
||||||
|
@ -3997,8 +3997,8 @@ static ULONG WINAPI ITypeLibComp_fnRelease(ITypeComp * iface)
|
|||||||
static HRESULT WINAPI ITypeLibComp_fnBind(
|
static HRESULT WINAPI ITypeLibComp_fnBind(
|
||||||
ITypeComp * iface,
|
ITypeComp * iface,
|
||||||
OLECHAR * szName,
|
OLECHAR * szName,
|
||||||
unsigned long lHash,
|
ULONG lHash,
|
||||||
unsigned short wFlags,
|
WORD wFlags,
|
||||||
ITypeInfo ** ppTInfo,
|
ITypeInfo ** ppTInfo,
|
||||||
DESCKIND * pDescKind,
|
DESCKIND * pDescKind,
|
||||||
BINDPTR * pBindPtr)
|
BINDPTR * pBindPtr)
|
||||||
@ -4010,7 +4010,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind(
|
|||||||
static HRESULT WINAPI ITypeLibComp_fnBindType(
|
static HRESULT WINAPI ITypeLibComp_fnBindType(
|
||||||
ITypeComp * iface,
|
ITypeComp * iface,
|
||||||
OLECHAR * szName,
|
OLECHAR * szName,
|
||||||
unsigned long lHash,
|
ULONG lHash,
|
||||||
ITypeInfo ** ppTInfo,
|
ITypeInfo ** ppTInfo,
|
||||||
ITypeComp ** ppTComp)
|
ITypeComp ** ppTComp)
|
||||||
{
|
{
|
||||||
@ -5834,8 +5834,8 @@ static ULONG WINAPI ITypeComp_fnRelease(ITypeComp * iface)
|
|||||||
static HRESULT WINAPI ITypeComp_fnBind(
|
static HRESULT WINAPI ITypeComp_fnBind(
|
||||||
ITypeComp * iface,
|
ITypeComp * iface,
|
||||||
OLECHAR * szName,
|
OLECHAR * szName,
|
||||||
unsigned long lHash,
|
ULONG lHash,
|
||||||
unsigned short wFlags,
|
WORD wFlags,
|
||||||
ITypeInfo ** ppTInfo,
|
ITypeInfo ** ppTInfo,
|
||||||
DESCKIND * pDescKind,
|
DESCKIND * pDescKind,
|
||||||
BINDPTR * pBindPtr)
|
BINDPTR * pBindPtr)
|
||||||
@ -5902,7 +5902,7 @@ static HRESULT WINAPI ITypeComp_fnBind(
|
|||||||
static HRESULT WINAPI ITypeComp_fnBindType(
|
static HRESULT WINAPI ITypeComp_fnBindType(
|
||||||
ITypeComp * iface,
|
ITypeComp * iface,
|
||||||
OLECHAR * szName,
|
OLECHAR * szName,
|
||||||
unsigned long lHash,
|
ULONG lHash,
|
||||||
ITypeInfo ** ppTInfo,
|
ITypeInfo ** ppTInfo,
|
||||||
ITypeComp ** ppTComp)
|
ITypeComp ** ppTComp)
|
||||||
{
|
{
|
||||||
|
@ -2314,7 +2314,7 @@ static HRESULT WINAPI ISVViewObject_Draw(
|
|||||||
LPCRECTL lprcBounds,
|
LPCRECTL lprcBounds,
|
||||||
LPCRECTL lprcWBounds,
|
LPCRECTL lprcWBounds,
|
||||||
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
|
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
|
||||||
DWORD dwContinue)
|
ULONG_PTR dwContinue)
|
||||||
{
|
{
|
||||||
|
|
||||||
_ICOM_THIS_From_IViewObject(IShellViewImpl, iface);
|
_ICOM_THIS_From_IViewObject(IShellViewImpl, iface);
|
||||||
|
@ -386,9 +386,9 @@ interface IMediaSample : IUnknown
|
|||||||
|
|
||||||
HRESULT SetPreroll(BOOL bIsPreroll);
|
HRESULT SetPreroll(BOOL bIsPreroll);
|
||||||
|
|
||||||
long GetActualDataLength(void);
|
LONG GetActualDataLength(void);
|
||||||
|
|
||||||
HRESULT SetActualDataLength(long length);
|
HRESULT SetActualDataLength(LONG length);
|
||||||
|
|
||||||
HRESULT GetMediaType(AM_MEDIA_TYPE **ppMediaType);
|
HRESULT GetMediaType(AM_MEDIA_TYPE **ppMediaType);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user