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

Fix some types problems.

oldstable
Vincent Béron 2004-10-18 22:39:21 +00:00 committed by Alexandre Julliard
parent ea1b58b560
commit 4eeae1adb3
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dbghelp/dbghelp_private.h
View File

@ -306,7 +306,7 @@ struct memory_access
extern struct memory_access mem_access;
#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))
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 */
extern struct module*

2
dlls/dbghelp/memory.c
View File

@ -46,7 +46,7 @@ struct memory_access mem_access = {win32_read_mem, win32_write_mem};
*
* 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;

4
dlls/ole32/datacache.c
View File

@ -279,7 +279,7 @@ static HRESULT WINAPI DataCache_Draw(
LPCRECTL lprcBounds,
LPCRECTL lprcWBounds,
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
DWORD dwContinue);
ULONG_PTR dwContinue);
static HRESULT WINAPI DataCache_GetColorSet(
IViewObject2* iface,
DWORD dwDrawAspect,
@ -1558,7 +1558,7 @@ static HRESULT WINAPI DataCache_Draw(
LPCRECTL lprcBounds,
LPCRECTL lprcWBounds,
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
DWORD dwContinue)
ULONG_PTR dwContinue)
{
PresentationDataHeader presData;
HMETAFILE presMetafile = 0;

6
dlls/oleaut32/olefont.c
View File

@ -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_Clone(IFont* iface, IFont** ppfont);
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_AddRefHfont(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(
IFont* iface,
long cyLogical,
long cyHimetric)
LONG cyLogical,
LONG cyHimetric)
{
OLEFontImpl *this = (OLEFontImpl *)iface;
TRACE("(%p)->(%ld, %ld)\n", this, cyLogical, cyHimetric);

2
dlls/oleaut32/olepicture.c
View File

@ -519,7 +519,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
* OLEPictureImpl_Render
*/
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_YPOS_HIMETRIC ySrc,
OLE_XSIZE_HIMETRIC cxSrc,

12
dlls/oleaut32/typelib.c
View File

@ -3997,8 +3997,8 @@ static ULONG WINAPI ITypeLibComp_fnRelease(ITypeComp * iface)
static HRESULT WINAPI ITypeLibComp_fnBind(
ITypeComp * iface,
OLECHAR * szName,
unsigned long lHash,
unsigned short wFlags,
ULONG lHash,
WORD wFlags,
ITypeInfo ** ppTInfo,
DESCKIND * pDescKind,
BINDPTR * pBindPtr)
@ -4010,7 +4010,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind(
static HRESULT WINAPI ITypeLibComp_fnBindType(
ITypeComp * iface,
OLECHAR * szName,
unsigned long lHash,
ULONG lHash,
ITypeInfo ** ppTInfo,
ITypeComp ** ppTComp)
{
@ -5834,8 +5834,8 @@ static ULONG WINAPI ITypeComp_fnRelease(ITypeComp * iface)
static HRESULT WINAPI ITypeComp_fnBind(
ITypeComp * iface,
OLECHAR * szName,
unsigned long lHash,
unsigned short wFlags,
ULONG lHash,
WORD wFlags,
ITypeInfo ** ppTInfo,
DESCKIND * pDescKind,
BINDPTR * pBindPtr)
@ -5902,7 +5902,7 @@ static HRESULT WINAPI ITypeComp_fnBind(
static HRESULT WINAPI ITypeComp_fnBindType(
ITypeComp * iface,
OLECHAR * szName,
unsigned long lHash,
ULONG lHash,
ITypeInfo ** ppTInfo,
ITypeComp ** ppTComp)
{

2
dlls/shell32/shlview.c
View File

@ -2314,7 +2314,7 @@ static HRESULT WINAPI ISVViewObject_Draw(
LPCRECTL lprcBounds,
LPCRECTL lprcWBounds,
BOOL (CALLBACK *pfnContinue)(ULONG_PTR dwContinue),
DWORD dwContinue)
ULONG_PTR dwContinue)
{
_ICOM_THIS_From_IViewObject(IShellViewImpl, iface);

4
include/axcore.idl
View File

@ -386,9 +386,9 @@ interface IMediaSample : IUnknown
HRESULT SetPreroll(BOOL bIsPreroll);
long GetActualDataLength(void);
LONG GetActualDataLength(void);
HRESULT SetActualDataLength(long length);
HRESULT SetActualDataLength(LONG length);
HRESULT GetMediaType(AM_MEDIA_TYPE **ppMediaType);