system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 19:37:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ANSI compabillity.

Browse source
This commit is contained in:
Patrik Stridvall 1999-04-25 19:01:52 +00:00 committed by Alexandre Julliard
parent d1895a776c
commit a9a671d7ca
45 changed files with 525 additions and 422 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debugger/registers.c
View file

@ -160,7 +160,7 @@ void DEBUG_SetSigContext( const SIGCONTEXT *sigcontext )
GS_reg(&DEBUG_context) &= 0xffff;
#endif
if (ISV86(&DEBUG_context))
(char*)V86BASE(&DEBUG_context) = DOSMEM_MemoryBase(0);
V86BASE(&DEBUG_context) = (DWORD) DOSMEM_MemoryBase(0);
}

2
debugger/stabs.c
View file

@ -21,7 +21,7 @@
#include "debugger.h"
#ifdef __svr4__
#if defined(__svr4__) || defined(__sun)
#define __ELF__
#endif

18
dlls/comctl32/comctl32undoc.c
View file

@ -588,7 +588,7 @@ DSA_GetItem (const HDSA hdsa, INT nIndex, LPVOID pDest)
if ((nIndex < 0) || (nIndex >= hdsa->nItemCount))
return FALSE;
pSrc = hdsa->pData + (hdsa->nItemSize * nIndex);
pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
memmove (pDest, pSrc, hdsa->nItemSize);
return TRUE;
@ -621,7 +621,7 @@ DSA_GetItemPtr (const HDSA hdsa, INT nIndex)
if ((nIndex < 0) || (nIndex >= hdsa->nItemCount))
return NULL;
pSrc = hdsa->pData + (hdsa->nItemSize * nIndex);
pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
TRACE (commctrl, "-- ret=%p\n", pSrc);
@ -677,7 +677,7 @@ DSA_SetItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
}
/* put the new entry in */
pDest = hdsa->pData + (hdsa->nItemSize * nIndex);
pDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
pDest, pSrc, hdsa->nItemSize);
memmove (pDest, pSrc, hdsa->nItemSize);
@ -712,7 +712,7 @@ DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
return -1;
for (i = 0; i < hdsa->nItemSize; i += 4) {
p = *(DWORD**)(pSrc + i);
p = *(DWORD**)((char *) pSrc + i);
if (IsBadStringPtrA ((char*)p, 256))
TRACE (commctrl, "-- %d=%p\n", i, (DWORD*)p);
else
@ -738,8 +738,8 @@ DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
/* do we need to move elements ? */
if (nIndex < hdsa->nItemCount) {
lpTemp = hdsa->pData + (hdsa->nItemSize * nIndex);
lpDest = lpTemp + hdsa->nItemSize;
lpTemp = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
lpDest = (char *) lpTemp + hdsa->nItemSize;
nSize = (hdsa->nItemCount - nIndex) * hdsa->nItemSize;
TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
lpDest, lpTemp, nSize);
@ -748,7 +748,7 @@ DSA_InsertItem (const HDSA hdsa, INT nIndex, LPVOID pSrc)
/* ok, we can put the new Item in */
hdsa->nItemCount++;
lpDest = hdsa->pData + (hdsa->nItemSize * nIndex);
lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
lpDest, pSrc, hdsa->nItemSize);
memmove (lpDest, pSrc, hdsa->nItemSize);
@ -784,8 +784,8 @@ DSA_DeleteItem (const HDSA hdsa, INT nIndex)
/* do we need to move ? */
if (nIndex < hdsa->nItemCount - 1) {
lpDest = hdsa->pData + (hdsa->nItemSize * nIndex);
lpSrc = lpDest + hdsa->nItemSize;
lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
lpSrc = (char *) lpDest + hdsa->nItemSize;
nSize = hdsa->nItemSize * (hdsa->nItemCount - nIndex - 1);
TRACE (commctrl, "-- move dest=%p src=%p size=%d\n",
lpDest, lpSrc, nSize);

22
dlls/comctl32/treeview.c
View file

@ -766,12 +766,16 @@ TREEVIEW_DrawItem (HWND hwnd, HDC hdc, TREEVIEW_ITEM *wineItem)
{
HPEN hnewPen = CreatePen(PS_DOT, 0, GetSysColor(COLOR_WINDOWTEXT) );
HPEN hOldPen = SelectObject( hdc, hnewPen );
POINT points[4] = {
{ wineItem->text.left-1, wineItem->text.top+1 },
{ wineItem->text.right, wineItem->text.top+1 },
{ wineItem->text.right, wineItem->text.bottom },
{ wineItem->text.left-1, wineItem->text.bottom }
};
POINT points[4];
points[0].x = wineItem->text.left-1;
points[0].y = wineItem->text.top+1;
points[1].x = wineItem->text.right;
points[1].y = wineItem->text.top+1;
points[2].x = wineItem->text.right;
points[2].y = wineItem->text.bottom;
points[3].x = wineItem->text.left-1;
points[3].y = wineItem->text.bottom;
Polyline (hdc,points,4);
@ -1598,7 +1602,7 @@ TREEVIEW_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
prevsib=NULL;
switch ((INT)ptdi->hInsertAfter) {
case TVI_FIRST:
case (DWORD) TVI_FIRST:
if (wineItem->parent) {
wineItem->sibling=parentItem->firstChild;
parentItem->firstChild=(HTREEITEM)iItem;
@ -1609,7 +1613,7 @@ TREEVIEW_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
sibItem->upsibling=(HTREEITEM)iItem;
break;
case TVI_SORT:
case (DWORD) TVI_SORT:
if (sibItem==wineItem)
/*
* This item is the first child of the level and it
@ -1667,7 +1671,7 @@ TREEVIEW_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
}
case TVI_LAST:
case (DWORD) TVI_LAST:
if (sibItem==wineItem) break;
while (sibItem->sibling) {
prevsib=sibItem;

5
dlls/ntdll/nt.c
View file

@ -262,7 +262,8 @@ NTSTATUS WINAPI NtQueryInformationToken(
switch (tokeninfoclass)
{ case TokenGroups: /* 2 */
*retlen = sizeof (TOKEN_GROUPS);
*retlen = sizeof (TOKEN_GROUPS);
#if 0
case TokenUser: /* 1 */
case TokenPrivileges:
case TokenOwner:
@ -272,7 +273,7 @@ NTSTATUS WINAPI NtQueryInformationToken(
case TokenType:
case TokenImpersonationLevel:
case TokenStatistics:
#endif /* 0 */
}
return 0;

6
dlls/ver/ver16.c
View file

@ -126,15 +126,15 @@ DWORD WINAPI VerQueryValue16( SEGPTR spvBlock, LPCSTR lpszSubBlock,
retv = VerQueryValueA( lpvBlock, lpszSubBlock, &buffer, &buflen );
if ( !retv ) return FALSE;
if ( OFFSETOF( spvBlock ) + (buffer - lpvBlock) >= 0x10000 )
if ( OFFSETOF( spvBlock ) + ((char *) buffer - (char *) lpvBlock) >= 0x10000 )
{
FIXME( ver, "offset %08X too large relative to %04X:%04X\n",
buffer - lpvBlock, SELECTOROF( spvBlock ), OFFSETOF( spvBlock ) );
(char *) buffer - (char *) lpvBlock, SELECTOROF( spvBlock ), OFFSETOF( spvBlock ) );
return FALSE;
}
*lpcb = buflen;
*lpspBuffer = spvBlock + (buffer - lpvBlock);
*lpspBuffer = (SEGPTR) ((char *) spvBlock + ((char *) buffer - (char *) lpvBlock));
return retv;
}

16
graphics/ddraw.c
View file

@ -210,7 +210,7 @@ HRESULT WINAPI DirectDrawEnumerateExW(
LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags)
{
DirectDrawEnumerateProcData epd;
epd.lpCallback = lpCallback;
epd.lpCallback = (LPVOID) lpCallback;
epd.lpContext = lpContext;
return DirectDrawEnumerateExA(DirectDrawEnumerateExProcW,
@ -238,7 +238,7 @@ HRESULT WINAPI DirectDrawEnumerateA(
LPDDENUMCALLBACKA lpCallback, LPVOID lpContext)
{
DirectDrawEnumerateProcData epd;
epd.lpCallback = lpCallback;
epd.lpCallback = (LPVOID) lpCallback;
epd.lpContext = lpContext;
return DirectDrawEnumerateExA(DirectDrawEnumerateProcA,
@ -267,7 +267,7 @@ HRESULT WINAPI DirectDrawEnumerateW(
LPDDENUMCALLBACKW lpCallback, LPVOID lpContext)
{
DirectDrawEnumerateProcData epd;
epd.lpCallback = lpCallback;
epd.lpCallback = (LPVOID) lpCallback;
epd.lpContext = lpContext;
return DirectDrawEnumerateExW(DirectDrawEnumerateProcW,
@ -554,7 +554,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Lock(
FIXME(ddraw," lprect: %dx%d-%dx%d\n",
lprect->top,lprect->left,lprect->bottom,lprect->right
);
lpddsd->y.lpSurface = This->s.surface_desc.y.lpSurface +
lpddsd->y.lpSurface = (char *) This->s.surface_desc.y.lpSurface +
(lprect->top*This->s.surface_desc.lPitch) +
(lprect->left*(This->s.surface_desc.ddpfPixelFormat.x.dwRGBBitCount / 8));
} else {
@ -911,7 +911,7 @@ static HRESULT WINAPI IDirectDrawSurface4Impl_Blt(
glDepthMask(ztest);
dwFlags &= ~(DDBLT_DEPTHFILL);
#endif HAVE_MESAGL
#endif /* defined(HAVE_MESAGL) */
}
if (dwFlags & DDBLT_ROP) {
@ -4067,10 +4067,10 @@ static HRESULT WINAPI IDirectDraw2Impl_Initialize(LPDIRECTDRAW2 iface,
}
/* Note: Hack so we can reuse the old functions without compiler warnings */
#ifdef __GNUC__
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
# define XCAST(fun) (typeof(dga_ddvt.fn##fun))
#else
# define XCAST(fun) (void*)
# define XCAST(fun) (void *)
#endif
static ICOM_VTABLE(IDirectDraw) dga_ddvt = {
@ -4260,7 +4260,7 @@ static HRESULT WINAPI IDirectDraw4Impl_GetDeviceIdentifier(LPDIRECTDRAW4 iface,
return DD_OK;
}
#ifdef __GNUC__
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
# define XCAST(fun) (typeof(dga_dd4vt.fn##fun))
#else
# define XCAST(fun) (void*)

2
graphics/win16drv/prtdrv.c
View file

@ -99,7 +99,7 @@ static LOADED_PRINTER_DRIVER *FindPrinterDriverFromPDEVICE(SEGPTR segptrPDEVICE)
if (segptrPDEVICE != (SEGPTR)NULL)
{
PDEVICE_HEADER *pPDH = (PDEVICE_HEADER *)
(PTR_SEG_TO_LIN(segptrPDEVICE) - sizeof(PDEVICE_HEADER));
((char *) PTR_SEG_TO_LIN(segptrPDEVICE) - sizeof(PDEVICE_HEADER));
pLPD = pPDH->pLPD;
}
return pLPD;

11
graphics/x11drv/palette.c
View file

@ -565,11 +565,12 @@ static void X11DRV_PALETTE_FillDefaultColors(void)
}
else if( !(X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_FIXED) )
{
XColor color = { color.pixel = (X11DRV_PALETTE_PaletteToXPixel)? X11DRV_PALETTE_PaletteToXPixel[idx] : idx ,
COLOR_sysPal[idx].peRed << 8,
COLOR_sysPal[idx].peGreen << 8,
COLOR_sysPal[idx].peBlue << 8,
(DoRed | DoGreen | DoBlue) };
XColor color;
color.pixel = (X11DRV_PALETTE_PaletteToXPixel)? X11DRV_PALETTE_PaletteToXPixel[idx] : idx;
color.red = COLOR_sysPal[idx].peRed << 8;
color.green = COLOR_sysPal[idx].peGreen << 8;
color.blue = COLOR_sysPal[idx].peBlue << 8;
color.flags = DoRed | DoGreen | DoBlue;
TSXStoreColor(display, X11DRV_PALETTE_PaletteXColormap, &color);
}
idx = X11DRV_PALETTE_freeList[idx];

17
if1632/thunk.c
View file

@ -129,10 +129,15 @@ typedef struct tagTHUNK
#include "poppack.h"
#define DECL_THUNK(name,proc,relay) \
THUNK name = { 0x58, 0x68, (FARPROC)(proc), 0x50, 0xe9, \
(RELAY)((char *)(relay) - (char *)(&(name).next)), NULL }
#define DECL_THUNK(aname,aproc,arelay) \
THUNK aname; \
aname.popl_eax = 0x58; \
aname.pushl_func = 0x68; \
aname.proc = (FARPROC) (aproc); \
aname.pushl_eax = 0x50; \
aname.jmp = 0xe9; \
aname.relay = (RELAY)((char *)(arelay) - (char *)(&(aname).next)); \
aname.next = NULL;
static THUNK *firstThunk = NULL;
@ -729,7 +734,7 @@ VOID WINAPI THUNK_MOUSE_Enable( FARPROC16 proc )
lastProc = proc;
}
return MOUSE_Enable( (LPMOUSE_EVENT_PROC)lastThunk );
MOUSE_Enable( (LPMOUSE_EVENT_PROC)lastThunk );
}
/***********************************************************************
@ -791,7 +796,7 @@ VOID WINAPI THUNK_KEYBOARD_Enable( FARPROC16 proc, LPBYTE lpKeyState )
lastProc = proc;
}
return KEYBOARD_Enable( (LPKEYBD_EVENT_PROC)lastThunk, lpKeyState );
KEYBOARD_Enable( (LPKEYBD_EVENT_PROC)lastThunk, lpKeyState );
}
/***********************************************************************

2
include/oleauto.h
View file

@ -465,7 +465,7 @@ HRESULT WINAPI VarDecFromDisp32(IDispatch*pdispIn, LCID lcid, DECIMAL*pdecOut);
#define VarUintFromInt VarUI4FromI4
#ifdef __cplusplus
} // extern "C"
} /* extern "C" */
#endif
typedef struct tagPARAMDATA {

2
include/tchar.h
View file

@ -266,7 +266,7 @@ DECL_WINELIB_TYPE_AW (PTSTR)
DECL_WINELIB_TYPE_AW (LPTSTR)
#ifdef __cplusplus
} // extern "C"
} /* extern "C" */
#endif
#endif /* __WINE_TCHAR_H */

14
include/wine/obj_base.h
View file

@ -98,12 +98,12 @@ inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
*
* #define ICOM_INTERFACE IDirect3D
* #define IDirect3D_METHODS \
* ICOM_METHOD1(HRESULT,Initialize, REFIID,); \
* ICOM_METHOD2(HRESULT,EnumDevices, LPD3DENUMDEVICESCALLBACK,, LPVOID,); \
* ICOM_METHOD2(HRESULT,CreateLight, LPDIRECT3DLIGHT*,, IUnknown*,); \
* ICOM_METHOD2(HRESULT,CreateMaterial,LPDIRECT3DMATERIAL*,, IUnknown*,); \
* ICOM_METHOD2(HRESULT,CreateViewport,LPDIRECT3DVIEWPORT*,, IUnknown*,); \
* ICOM_METHOD2(HRESULT,FindDevice, LPD3DFINDDEVICESEARCH,, LPD3DFINDDEVICERESULT,);
* ICOM_METHOD1(HRESULT,Initialize, REFIID,) \
* ICOM_METHOD2(HRESULT,EnumDevices, LPD3DENUMDEVICESCALLBACK,, LPVOID,) \
* ICOM_METHOD2(HRESULT,CreateLight, LPDIRECT3DLIGHT*,, IUnknown*,) \
* ICOM_METHOD2(HRESULT,CreateMaterial,LPDIRECT3DMATERIAL*,, IUnknown*,) \
* ICOM_METHOD2(HRESULT,CreateViewport,LPDIRECT3DVIEWPORT*,, IUnknown*,) \
* ICOM_METHOD2(HRESULT,FindDevice, LPD3DFINDDEVICESEARCH,, LPD3DFINDDEVICERESULT,)
* #define IDirect3D_IMETHODS \
* IUnknown_IMETHODS \
* IDirect3D_METHODS
@ -798,7 +798,7 @@ struct IUnknown {
ICOM_VTABLE(IUnknown)* lpvtbl;
};
struct ICOM_VTABLE(IUnknown) {
ICOM_METHOD2(HRESULT,QueryInterface,REFIID,riid, LPVOID*,ppvObj);
ICOM_METHOD2(HRESULT,QueryInterface,REFIID,riid, LPVOID*,ppvObj)
#else /* ICOM_CINTERFACE */
struct IUnknown {
#ifndef ICOM_VIRTUAL_METHODS

18
include/wine/obj_cache.h
View file

@ -34,11 +34,11 @@ typedef struct IOleCacheControl IOleCacheControl, *LPOLECACHECONTROL;
*/
#define ICOM_INTERFACE IOleCache
#define IOleCache_METHODS \
ICOM_METHOD3(HRESULT,Cache, FORMATETC*,pformatetc, DWORD,advf, DWORD*, pdwConnection); \
ICOM_METHOD1(HRESULT,Uncache, DWORD,dwConnection); \
ICOM_METHOD1(HRESULT,EnumCache, IEnumSTATDATA**,ppenumSTATDATA); \
ICOM_METHOD1(HRESULT,InitCache, IDataObject*,pDataObject); \
ICOM_METHOD3(HRESULT,SetData, FORMATETC*,pformatetc, STGMEDIUM*,pmedium, BOOL,fRelease);
ICOM_METHOD3(HRESULT,Cache, FORMATETC*,pformatetc, DWORD,advf, DWORD*, pdwConnection) \
ICOM_METHOD1(HRESULT,Uncache, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumCache, IEnumSTATDATA**,ppenumSTATDATA) \
ICOM_METHOD1(HRESULT,InitCache, IDataObject*,pDataObject) \
ICOM_METHOD3(HRESULT,SetData, FORMATETC*,pformatetc, STGMEDIUM*,pmedium, BOOL,fRelease)
#define IOleCache_IMETHODS \
IUnknown_IMETHODS \
IOleCache_METHODS
@ -64,8 +64,8 @@ ICOM_DEFINE(IOleCache,IUnknown)
*/
#define ICOM_INTERFACE IOleCache2
#define IOleCache2_METHODS \
ICOM_METHOD3(HRESULT,UpdateCache, LPDATAOBJECT,pDataObject, DWORD,grfUpdf, LPVOID,pReserved); \
ICOM_METHOD1(HRESULT,DiscardCache, DWORD,dwDiscardOptions);
ICOM_METHOD3(HRESULT,UpdateCache, LPDATAOBJECT,pDataObject, DWORD,grfUpdf, LPVOID,pReserved) \
ICOM_METHOD1(HRESULT,DiscardCache, DWORD,dwDiscardOptions)
#define IOleCache2_IMETHODS \
IOleCache_IMETHODS \
IOleCache2_METHODS
@ -94,8 +94,8 @@ ICOM_DEFINE(IOleCache2,IOleCache)
*/
#define ICOM_INTERFACE IOleCacheControl
#define IOleCacheControl_METHODS \
ICOM_METHOD1(HRESULT,OnRun, LPDATAOBJECT,pDataObject); \
ICOM_METHOD (HRESULT,OnStop);
ICOM_METHOD1(HRESULT,OnRun, LPDATAOBJECT,pDataObject) \
ICOM_METHOD (HRESULT,OnStop)
#define IOleCacheControl_IMETHODS \
IUnknown_IMETHODS \
IOleCacheControl_METHODS

44
include/wine/obj_channel.h
View file

@ -31,12 +31,12 @@ typedef struct IRpcStubBuffer IRpcStubBuffer,*LPRPCSTUBBUFFER;
*/
#define ICOM_INTERFACE IChannelHook
#define IChannelHook_METHODS \
ICOM_VMETHOD3(ClientGetSize, REFGUID,uExtent, REFIID,riid, ULONG*,pDataSize); \
ICOM_VMETHOD4(ClientFillBuffer, REFGUID,uExtent, REFIID,riid, ULONG*,pDataSize, void*,pDataBuffer); \
ICOM_VMETHOD6(ClientNotify, REFGUID,uExtent, REFIID,riid, ULONG,cbDataSize, void*,pDataBuffer, DWORD,lDataRep, HRESULT,hrFault); \
ICOM_VMETHOD5(ServerNotify, REFGUID,uExtent, REFIID,riid, ULONG,cbDataSize, void*,pDataBuffer, DWORD,lDataRep); \
ICOM_VMETHOD4(ServerGetSize, REFGUID,uExtent, REFIID,riid, HRESULT,hrFault, ULONG*,pDataSize); \
ICOM_VMETHOD5(ServerFillBuffer, REFGUID,uExtent, REFIID,riid, ULONG*,pDataSize, void*,pDataBuffer, HRESULT,hrFault);
ICOM_VMETHOD3(ClientGetSize, REFGUID,uExtent, REFIID,riid, ULONG*,pDataSize) \
ICOM_VMETHOD4(ClientFillBuffer, REFGUID,uExtent, REFIID,riid, ULONG*,pDataSize, void*,pDataBuffer) \
ICOM_VMETHOD6(ClientNotify, REFGUID,uExtent, REFIID,riid, ULONG,cbDataSize, void*,pDataBuffer, DWORD,lDataRep, HRESULT,hrFault) \
ICOM_VMETHOD5(ServerNotify, REFGUID,uExtent, REFIID,riid, ULONG,cbDataSize, void*,pDataBuffer, DWORD,lDataRep) \
ICOM_VMETHOD4(ServerGetSize, REFGUID,uExtent, REFIID,riid, HRESULT,hrFault, ULONG*,pDataSize) \
ICOM_VMETHOD5(ServerFillBuffer, REFGUID,uExtent, REFIID,riid, ULONG*,pDataSize, void*,pDataBuffer, HRESULT,hrFault)
#define IChannelHook_IMETHODS \
IUnknown_IMETHODS \
IChannelHook_METHODS
@ -63,8 +63,8 @@ ICOM_DEFINE(IChannelHook,IUnknown)
*/
#define ICOM_INTERFACE IPSFactoryBuffer
#define IPSFactoryBuffer_METHODS \
ICOM_METHOD4(HRESULT,CreateProxy, IUnknown*,pUnkOuter, REFIID,riid, IRpcProxyBuffer**,ppProxy, void**,ppv); \
ICOM_METHOD3(HRESULT,CreateStub, REFIID,riid, IUnknown*,pUnkServer, IRpcStubBuffer**,ppStub);
ICOM_METHOD4(HRESULT,CreateProxy, IUnknown*,pUnkOuter, REFIID,riid, IRpcProxyBuffer**,ppProxy, void**,ppv) \
ICOM_METHOD3(HRESULT,CreateStub, REFIID,riid, IUnknown*,pUnkServer, IRpcStubBuffer**,ppStub)
#define IPSFactoryBuffer_IMETHODS \
IUnknown_IMETHODS \
IPSFactoryBuffer_METHODS
@ -100,11 +100,11 @@ typedef struct tagRPCOLEMESSAGE
#define ICOM_INTERFACE IRpcChannelBuffer
#define IRpcChannelBuffer_METHODS \
ICOM_METHOD2(HRESULT,GetBuffer, RPCOLEMESSAGE*,pMessage, REFIID,riid); \
ICOM_METHOD2(HRESULT,SendReceive, RPCOLEMESSAGE*,pMessage, ULONG*,pStatus); \
ICOM_METHOD1(HRESULT,FreeBuffer, RPCOLEMESSAGE*,pMessage); \
ICOM_METHOD2(HRESULT,GetDestCtx, DWORD*,pdwDestContext, void**,ppvDestContext); \
ICOM_METHOD (HRESULT,IsConnected);
ICOM_METHOD2(HRESULT,GetBuffer, RPCOLEMESSAGE*,pMessage, REFIID,riid) \
ICOM_METHOD2(HRESULT,SendReceive, RPCOLEMESSAGE*,pMessage, ULONG*,pStatus) \
ICOM_METHOD1(HRESULT,FreeBuffer, RPCOLEMESSAGE*,pMessage) \
ICOM_METHOD2(HRESULT,GetDestCtx, DWORD*,pdwDestContext, void**,ppvDestContext) \
ICOM_METHOD (HRESULT,IsConnected)
#define IRpcChannelBuffer_IMETHODS \
IUnknown_IMETHODS \
IRpcChannelBuffer_METHODS
@ -130,8 +130,8 @@ ICOM_DEFINE(IRpcChannelBuffer,IUnknown)
*/
#define ICOM_INTERFACE IRpcProxyBuffer
#define IRpcProxyBuffer_METHODS \
ICOM_METHOD1(HRESULT,Connect, IRpcChannelBuffer*,pRpcChannelBuffer); \
ICOM_VMETHOD( Disconnect);
ICOM_METHOD1(HRESULT,Connect, IRpcChannelBuffer*,pRpcChannelBuffer) \
ICOM_VMETHOD( Disconnect)
#define IRpcProxyBuffer_IMETHODS \
IUnknown_IMETHODS \
IRpcProxyBuffer_METHODS
@ -154,13 +154,13 @@ ICOM_DEFINE(IRpcProxyBuffer,IUnknown)
*/
#define ICOM_INTERFACE IRpcStubBuffer
#define IRpcStubBuffer_METHODS \
ICOM_METHOD1 (HRESULT, Connect, IUnknown*,pUnkServer); \
ICOM_VMETHOD ( Disconnect); \
ICOM_METHOD2 (HRESULT, Invoke, RPCOLEMESSAGE*,_prpcmsg, IRpcChannelBuffer*,_pRpcChannelBuffer); \
ICOM_METHOD1 (IRpcStubBuffer*,IsIIDSupported, REFIID,riid); \
ICOM_METHOD (ULONG, CountRefs); \
ICOM_METHOD1 (HRESULT, DebugServerQueryInterface, void**,ppv); \
ICOM_VMETHOD1( DebugServerRelease, void*,pv);
ICOM_METHOD1 (HRESULT, Connect, IUnknown*,pUnkServer) \
ICOM_VMETHOD ( Disconnect) \
ICOM_METHOD2 (HRESULT, Invoke, RPCOLEMESSAGE*,_prpcmsg, IRpcChannelBuffer*,_pRpcChannelBuffer) \
ICOM_METHOD1 (IRpcStubBuffer*,IsIIDSupported, REFIID,riid) \
ICOM_METHOD (ULONG, CountRefs) \
ICOM_METHOD1 (HRESULT, DebugServerQueryInterface, void**,ppv) \
ICOM_VMETHOD1( DebugServerRelease, void*,pv)
#define IRpcStubBuffer_IMETHODS \
IUnknown_IMETHODS \
IRpcStubBuffer_METHODS

24
include/wine/obj_clientserver.h
View file

@ -44,9 +44,9 @@ typedef enum tagEOLE_AUTHENTICATION_CAPABILITIES
#define ICOM_INTERFACE IClientSecurity
#define IClientSecurity_METHODS \
ICOM_METHOD8(HRESULT,QueryBlanket, IUnknown*,pProxy, DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pAuthInfo, DWORD*,pCapabilites); \
ICOM_METHOD8(HRESULT,SetBlanket, IUnknown*,pProxy, DWORD,pAuthnSvc, DWORD,pAuthzSvc, OLECHAR*,pServerPrincName, DWORD,pAuthnLevel, DWORD,pImpLevel, void*,pAuthInfo, DWORD,pCapabilites); \
ICOM_METHOD2(HRESULT,CopyProxy, IUnknown*,pProxy, IUnknown**,ppCopy);
ICOM_METHOD8(HRESULT,QueryBlanket, IUnknown*,pProxy, DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pAuthInfo, DWORD*,pCapabilites) \
ICOM_METHOD8(HRESULT,SetBlanket, IUnknown*,pProxy, DWORD,pAuthnSvc, DWORD,pAuthzSvc, OLECHAR*,pServerPrincName, DWORD,pAuthnLevel, DWORD,pImpLevel, void*,pAuthInfo, DWORD,pCapabilites) \
ICOM_METHOD2(HRESULT,CopyProxy, IUnknown*,pProxy, IUnknown**,ppCopy)
#define IClientSecurity_IMETHODS \
IUnknown_IMETHODS \
IClientSecurity_METHODS
@ -77,8 +77,8 @@ typedef enum tagEXTCONN
#define ICOM_INTERFACE IExternalConnection
#define IExternalConnection_METHODS \
ICOM_METHOD2(DWORD,AddConnection, DWORD,extconn, DWORD,reserved); \
ICOM_METHOD3(DWORD,ReleaseConnection, DWORD,extconn, DWORD,reserved, BOOL,fLastReleaseCloses);
ICOM_METHOD2(DWORD,AddConnection, DWORD,extconn, DWORD,reserved) \
ICOM_METHOD3(DWORD,ReleaseConnection, DWORD,extconn, DWORD,reserved, BOOL,fLastReleaseCloses)
#define IExternalConnection_IMETHODS \
IUnknown_IMETHODS \
IExternalConnection_METHODS
@ -140,9 +140,9 @@ typedef struct tagINTERFACEINFO
#define ICOM_INTERFACE IMessageFilter
#define IMessageFilter_METHODS \
ICOM_METHOD4(DWORD,HandleInComingCall, DWORD,dwCallType, HTASK,htaskCaller, DWORD,dwTickCount, LPINTERFACEINFO,lpInterfaceInfo); \
ICOM_METHOD3(DWORD,RetryRejectedCall, HTASK,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType); \
ICOM_METHOD3(DWORD,MessagePending, HTASK,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType);
ICOM_METHOD4(DWORD,HandleInComingCall, DWORD,dwCallType, HTASK,htaskCaller, DWORD,dwTickCount, LPINTERFACEINFO,lpInterfaceInfo) \
ICOM_METHOD3(DWORD,RetryRejectedCall, HTASK,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType) \
ICOM_METHOD3(DWORD,MessagePending, HTASK,htaskCallee, DWORD,dwTickCount, DWORD,dwRejectType)
#define IMessageFilter_IMETHODS \
IUnknown_IMETHODS \
IMessageFilter_METHODS
@ -170,10 +170,10 @@ HRESULT WINAPI CoRegisterMessageFilter(LPMESSAGEFILTER lpMessageFilter,LPMESSAGE
*/
#define ICOM_INTERFACE IServerSecurity
#define IServerSecurity_METHODS \
ICOM_METHOD7(HRESULT,QueryBlanket, DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pPrivs, DWORD*,pCapabilities); \
ICOM_METHOD (HRESULT,ImpersonateClient); \
ICOM_METHOD (HRESULT,RevertToSelf); \
ICOM_METHOD (BOOL, IsImpersonating);
ICOM_METHOD7(HRESULT,QueryBlanket, DWORD*,pAuthnSvc, DWORD*,pAuthzSvc, OLECHAR**,pServerPrincName, DWORD*,pAuthnLevel, DWORD*,pImpLevel, void**,pPrivs, DWORD*,pCapabilities) \
ICOM_METHOD (HRESULT,ImpersonateClient) \
ICOM_METHOD (HRESULT,RevertToSelf) \
ICOM_METHOD (BOOL, IsImpersonating)
#define IServerSecurity_IMETHODS \
IUnknown_IMETHODS \
IServerSecurity_METHODS

30
include/wine/obj_connection.h
View file

@ -41,11 +41,11 @@ typedef struct IEnumConnectionPoints IEnumConnectionPoints, *LPENUMCONNECTIONPOI
*/
#define ICOM_INTERFACE IConnectionPoint
#define IConnectionPoint_METHODS \
ICOM_METHOD1(HRESULT,GetConnectionInterface, IID*,pIID); \
ICOM_METHOD1(HRESULT,GetConnectionPointContainer, IConnectionPointContainer**,ppCPC); \
ICOM_METHOD2(HRESULT,Advise, IUnknown*,pUnkSink, DWORD*,pdwCookie); \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwCookie); \
ICOM_METHOD1(HRESULT,EnumConnections, IEnumConnections**,ppEnum);
ICOM_METHOD1(HRESULT,GetConnectionInterface, IID*,pIID) \
ICOM_METHOD1(HRESULT,GetConnectionPointContainer, IConnectionPointContainer**,ppCPC) \
ICOM_METHOD2(HRESULT,Advise, IUnknown*,pUnkSink, DWORD*,pdwCookie) \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwCookie) \
ICOM_METHOD1(HRESULT,EnumConnections, IEnumConnections**,ppEnum)
#define IConnectionPoint_IMETHODS \
IUnknown_IMETHODS \
IConnectionPoint_METHODS
@ -71,8 +71,8 @@ ICOM_DEFINE(IConnectionPoint,IUnknown)
*/
#define ICOM_INTERFACE IConnectionPointContainer
#define IConnectionPointContainer_METHODS \
ICOM_METHOD1(HRESULT,EnumConnectionPoints, IEnumConnectionPoints**,ppEnum); \
ICOM_METHOD2(HRESULT,FindConnectionPoint, REFIID,riid, IConnectionPoint**,ppCP);
ICOM_METHOD1(HRESULT,EnumConnectionPoints, IEnumConnectionPoints**,ppEnum) \
ICOM_METHOD2(HRESULT,FindConnectionPoint, REFIID,riid, IConnectionPoint**,ppCP)
#define IConnectionPointContainer_IMETHODS \
IUnknown_IMETHODS \
IConnectionPointContainer_METHODS
@ -95,10 +95,10 @@ ICOM_DEFINE(IConnectionPointContainer,IUnknown)
*/
#define ICOM_INTERFACE IEnumConnections
#define IEnumConnections_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTDATA,rgcd, ULONG*,pcFectched); \
ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections); \
ICOM_METHOD (HRESULT,Reset); \
ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum);
ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTDATA,rgcd, ULONG*,pcFectched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum)
#define IEnumConnections_IMETHODS \
IUnknown_IMETHODS \
IEnumConnections_METHODS
@ -122,10 +122,10 @@ ICOM_DEFINE(IEnumConnections,IUnknown)
*/
#define ICOM_INTERFACE IEnumConnectionPoints
#define IEnumConnectionPoints_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTIONPOINT*,ppCP, ULONG*,pcFectched); \
ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections); \
ICOM_METHOD (HRESULT,Reset); \
ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum);
ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTIONPOINT*,ppCP, ULONG*,pcFectched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum)
#define IEnumConnectionPoints_IMETHODS \
IUnknown_IMETHODS \
IEnumConnectionPoints_METHODS

63
include/wine/obj_control.h
View file

@ -97,7 +97,7 @@ typedef enum tagOLEDCFLAGS
typedef enum tagDVASPECT2
{
DVASPECT_OPAQUE = 16,
DVASPECT_TRANSPARENT = 32,
DVASPECT_TRANSPARENT = 32
} DVASPECT2;
typedef enum tagHITRESULT
@ -162,10 +162,10 @@ typedef struct IProvideClassInfo2 IProvideClassInfo2, *LPPROVIDECLASSINFO2;
*/
#define ICOM_INTERFACE IOleControl
#define IOleControl_METHODS \
ICOM_METHOD1(HRESULT,GetControlInfo, CONTROLINFO*,pCI); \
ICOM_METHOD1(HRESULT,OnMnemonic, MSG*,pMsg); \
ICOM_METHOD1(HRESULT,OnAmbientPropertyChange, DISPID,dispID); \
ICOM_METHOD1(HRESULT,FreezeEvents, BOOL,bFreeze);
ICOM_METHOD1(HRESULT,GetControlInfo, CONTROLINFO*,pCI) \
ICOM_METHOD1(HRESULT,OnMnemonic, MSG*,pMsg) \
ICOM_METHOD1(HRESULT,OnAmbientPropertyChange, DISPID,dispID) \
ICOM_METHOD1(HRESULT,FreezeEvents, BOOL,bFreeze)
#define IOleControl_IMETHODS \
IUnknown_IMETHODS \
IOleControl_METHODS
@ -190,13 +190,13 @@ ICOM_DEFINE(IOleControl,IUnknown)
*/
#define ICOM_INTERFACE IOleControlSite
#define IOleControlSite_METHODS \
ICOM_METHOD (HRESULT,OnControlInfoChanged); \
ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL,fLock); \
ICOM_METHOD (HRESULT,OnControlInfoChanged) \
ICOM_METHOD1(HRESULT,LockInPlaceActive, BOOL,fLock) \
ICOM_METHOD1(HRESULT,GetExtendedControl, IDispatch**,ppDisp) \
ICOM_METHOD3(HRESULT,TransformCoords, POINTL*,pPtlHimetric, POINTF*,pPtfContainer, DWORD,dwFlags); \
ICOM_METHOD2(HRESULT,TranslateAccelerator, MSG*,pMsg, DWORD,grfModifiers) ;\
ICOM_METHOD1(HRESULT,OnFocus, BOOL,fGotFocus); \
ICOM_METHOD (HRESULT,ShowPropertyFrame);
ICOM_METHOD3(HRESULT,TransformCoords, POINTL*,pPtlHimetric, POINTF*,pPtfContainer, DWORD,dwFlags) \
ICOM_METHOD2(HRESULT,TranslateAccelerator, MSG*,pMsg, DWORD,grfModifiers) \
ICOM_METHOD1(HRESULT,OnFocus, BOOL,fGotFocus) \
ICOM_METHOD (HRESULT,ShowPropertyFrame)
#define IOleControlSite_IMETHODS \
IUnknown_IMETHODS \
IOleControlSite_METHODS
@ -224,9 +224,9 @@ ICOM_DEFINE(IOleControlSite,IUnknown)
*/
#define ICOM_INTERFACE IOleInPlaceSiteEx
#define IOleInPlaceSiteEx_METHODS \
ICOM_METHOD2(HRESULT,OnInPlaceActivateEx, BOOL*,pfNoRedraw, DWORD,dwFlags); \
ICOM_METHOD1(HRESULT,OnInPlaceDeactivateEx, BOOL,fNoRedraw); \
ICOM_METHOD (HRESULT,RequestUIActivate);
ICOM_METHOD2(HRESULT,OnInPlaceActivateEx, BOOL*,pfNoRedraw, DWORD,dwFlags) \
ICOM_METHOD1(HRESULT,OnInPlaceDeactivateEx, BOOL,fNoRedraw) \
ICOM_METHOD (HRESULT,RequestUIActivate)
#define IOleInPlaceSiteEx_IMETHODS \
IOleInPlaceSite_IMETHODS \
IOleInPlaceSiteEx_METHODS
@ -264,18 +264,18 @@ ICOM_DEFINE(IOleInPlaceSiteEx,IOleInPlaceSite)
*/
#define ICOM_INTERFACE IOleInPlaceSiteWindowless
#define IOleInPlaceSiteWindowless_METHODS \
ICOM_METHOD (HRESULT,CanWindowlessActivate); \
ICOM_METHOD (HRESULT,GetCapture); \
ICOM_METHOD1(HRESULT,SetCapture, BOOL,fCapture); \
ICOM_METHOD (HRESULT,GetFocus); \
ICOM_METHOD1(HRESULT,SetFocus, BOOL,fFocus); \
ICOM_METHOD3(HRESULT,GetDC, LPCRECT,pRect, DWORD,grfFlags, HDC*,phDC); \
ICOM_METHOD1(HRESULT,ReleaseDC, HDC,hDC); \
ICOM_METHOD2(HRESULT,InvalidateRect, LPCRECT,pRect, BOOL,fErase); \
ICOM_METHOD2(HRESULT,InvalidateRgn, HRGN,hRgn, BOOL,fErase); \
ICOM_METHOD4(HRESULT,ScrollRect, INT,dx, INT,dy, LPCRECT,pRectScroll, LPCRECT,pRectClip); \
ICOM_METHOD1(HRESULT,AdjustRect, LPRECT,prc); \
ICOM_METHOD4(HRESULT,OnDefWindowMessage, UINT,msg, WPARAM,wParam, LPARAM,lParam, LRESULT*,plResult);
ICOM_METHOD (HRESULT,CanWindowlessActivate) \
ICOM_METHOD (HRESULT,GetCapture) \
ICOM_METHOD1(HRESULT,SetCapture, BOOL,fCapture) \
ICOM_METHOD (HRESULT,GetFocus) \
ICOM_METHOD1(HRESULT,SetFocus, BOOL,fFocus) \
ICOM_METHOD3(HRESULT,GetDC, LPCRECT,pRect, DWORD,grfFlags, HDC*,phDC) \
ICOM_METHOD1(HRESULT,ReleaseDC, HDC,hDC) \
ICOM_METHOD2(HRESULT,InvalidateRect, LPCRECT,pRect, BOOL,fErase) \
ICOM_METHOD2(HRESULT,InvalidateRgn, HRGN,hRgn, BOOL,fErase) \
ICOM_METHOD4(HRESULT,ScrollRect, INT,dx, INT,dy, LPCRECT,pRectScroll, LPCRECT,pRectClip) \
ICOM_METHOD1(HRESULT,AdjustRect, LPRECT,prc) \
ICOM_METHOD4(HRESULT,OnDefWindowMessage, UINT,msg, WPARAM,wParam, LPARAM,lParam, LRESULT*,plResult)
#define IOleInPlaceSiteWindowless_IMETHODS \
IOleInPlaceSite_IMETHODS \
IOleInPlaceSiteWindowless_METHODS
@ -322,8 +322,8 @@ ICOM_DEFINE(IOleInPlaceSiteWindowless,IOleInPlaceSite)
*/
#define ICOM_INTERFACE IOleInPlaceObjectWindowless
#define IOleInPlaceObjectWindowless_METHODS \
ICOM_METHOD4(HRESULT,OnWindowMessage, UINT,msg, WPARAM,wParam, LPARAM,lParam, LRESULT*,plResult); \
ICOM_METHOD1(HRESULT,GetDropTarget, IDropTarget**,ppDropTarget);
ICOM_METHOD4(HRESULT,OnWindowMessage, UINT,msg, WPARAM,wParam, LPARAM,lParam, LRESULT*,plResult) \
ICOM_METHOD1(HRESULT,GetDropTarget, IDropTarget**,ppDropTarget)
#define IOleInPlaceObjectWindowless_IMETHODS \
IOleInPlaceObject_IMETHODS \
IOleInPlaceObjectWindowless_METHODS
@ -354,9 +354,9 @@ ICOM_DEFINE(IOleInPlaceObjectWindowless,IOleInPlaceObject)
*/
#define ICOM_INTERFACE IClassFactory2
#define IClassFactory2_METHODS \
ICOM_METHOD1(HRESULT,GetLicInfo, LICINFO*,pLicInfo); \
ICOM_METHOD2(HRESULT,RequestLicKey, DWORD,dwReserved, BSTR*,pBstrKey); \
ICOM_METHOD5(HRESULT,CreateInstanceLic, IUnknown*,pUnkOuter, IUnknown*,pUnkReserved, REFIID,riid, BSTR,bstrKey, PVOID*,ppvObj);
ICOM_METHOD1(HRESULT,GetLicInfo, LICINFO*,pLicInfo) \
ICOM_METHOD2(HRESULT,RequestLicKey, DWORD,dwReserved, BSTR*,pBstrKey) \
ICOM_METHOD5(HRESULT,CreateInstanceLic, IUnknown*,pUnkOuter, IUnknown*,pUnkReserved, REFIID,riid, BSTR,bstrKey, PVOID*,ppvObj)
#define IClassFactory2_IMETHODS \
IClassFactory_IMETHODS \
IClassFactory2_METHODS
@ -466,4 +466,3 @@ ICOM_DEFINE(IProvideClassInfo2,IProvideClassInfo)
#endif /* __WINE_WINE_OBJ_CONTROL_H */

12
include/wine/obj_dragdrop.h
View file

@ -39,8 +39,8 @@ typedef struct IDropTarget IDropTarget,*LPDROPTARGET;
*/
#define ICOM_INTERFACE IDropSource
#define IDropSource_METHODS \
ICOM_METHOD2(HRESULT, QueryContinueDrag, BOOL, fEscapePressed, DWORD, grfKeyState); \
ICOM_METHOD1(HRESULT, GiveFeedback, DWORD, dwEffect);
ICOM_METHOD2(HRESULT, QueryContinueDrag, BOOL, fEscapePressed, DWORD, grfKeyState) \
ICOM_METHOD1(HRESULT, GiveFeedback, DWORD, dwEffect)
#define IDropSource_IMETHODS \
ICOM_INHERITS(IDropSource,IUnknown)
ICOM_DEFINE(IDropSource,IUnknown)
@ -61,10 +61,10 @@ ICOM_DEFINE(IDropSource,IUnknown)
*/
#define ICOM_INTERFACE IDropTarget
#define IDropTarget_METHODS \
ICOM_METHOD4(HRESULT, DragEnter, IDataObject*, pDataObject, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect); \
ICOM_METHOD3(HRESULT, DragOver, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect); \
ICOM_METHOD(HRESULT, DragLeave); \
ICOM_METHOD4(HRESULT, Drop, IDataObject*, pDataObject, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect);
ICOM_METHOD4(HRESULT, DragEnter, IDataObject*, pDataObject, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect) \
ICOM_METHOD3(HRESULT, DragOver, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect) \
ICOM_METHOD(HRESULT, DragLeave) \
ICOM_METHOD4(HRESULT, Drop, IDataObject*, pDataObject, DWORD, grfKeyState, POINTL, pt, DWORD*, pdwEffect)
#define IDropTarget_IMETHODS \
ICOM_INHERITS(IDropTarget,IUnknown)
ICOM_DEFINE(IDropTarget,IUnknown)

86
include/wine/obj_inplace.h
View file

@ -139,8 +139,8 @@ typedef struct IOleLink IOleLink, *LPOLELINK;
*/
#define ICOM_INTERFACE IOleWindow
#define IOleWindow_METHODS \
ICOM_METHOD1(HRESULT,GetWindow, HWND*,phwnd); \
ICOM_METHOD1(HRESULT,ContextSensitiveHelp, BOOL,fEnterMode);
ICOM_METHOD1(HRESULT,GetWindow, HWND*,phwnd) \
ICOM_METHOD1(HRESULT,ContextSensitiveHelp, BOOL,fEnterMode)
#define IOleWindow_IMETHODS \
IUnknown_IMETHODS \
IOleWindow_METHODS
@ -163,10 +163,10 @@ ICOM_DEFINE(IOleWindow,IUnknown)
*/
#define ICOM_INTERFACE IOleInPlaceObject
#define IOleInPlaceObject_METHODS \
ICOM_METHOD (HRESULT,InPlaceDeactivate); \
ICOM_METHOD (HRESULT,UIDeactivate); \
ICOM_METHOD2(HRESULT,SetObjectRects, LPCRECT,lprcPosRect, LPCRECT,lprcClipRect); \
ICOM_METHOD (HRESULT,ReactivateAndUndo);
ICOM_METHOD (HRESULT,InPlaceDeactivate) \
ICOM_METHOD (HRESULT,UIDeactivate) \
ICOM_METHOD2(HRESULT,SetObjectRects, LPCRECT,lprcPosRect, LPCRECT,lprcClipRect) \
ICOM_METHOD (HRESULT,ReactivateAndUndo)
#define IOleInPlaceObject_IMETHODS \
IOleWindow_IMETHODS \
IOleInPlaceObject_METHODS
@ -193,11 +193,11 @@ ICOM_DEFINE(IOleInPlaceObject,IOleWindow)
*/
#define ICOM_INTERFACE IOleInPlaceActiveObject
#define IOleInPlaceActiveObject_METHODS \
ICOM_METHOD1(HRESULT,TranslateAccelerator, LPMSG,lpmsg); \
ICOM_METHOD1(HRESULT,OnFrameWindowActivate, BOOL,fActivate); \
ICOM_METHOD1(HRESULT,OnDocWindowActivate, BOOL,fActivate); \
ICOM_METHOD3(HRESULT,ResizeBorder, LPCRECT,prcBorder, IOleInPlaceUIWindow*,pUIWindow, BOOL,fWindowFrame); \
ICOM_METHOD1(HRESULT,EnableModeless, BOOL,fEnable);
ICOM_METHOD1(HRESULT,TranslateAccelerator, LPMSG,lpmsg) \
ICOM_METHOD1(HRESULT,OnFrameWindowActivate, BOOL,fActivate) \
ICOM_METHOD1(HRESULT,OnDocWindowActivate, BOOL,fActivate) \
ICOM_METHOD3(HRESULT,ResizeBorder, LPCRECT,prcBorder, IOleInPlaceUIWindow*,pUIWindow, BOOL,fWindowFrame) \
ICOM_METHOD1(HRESULT,EnableModeless, BOOL,fEnable)
#define IOleInPlaceActiveObject_IMETHODS \
IOleWindow_IMETHODS \
IOleInPlaceActiveObject_METHODS
@ -225,10 +225,10 @@ ICOM_DEFINE(IOleInPlaceActiveObject,IOleWindow)
*/
#define ICOM_INTERFACE IOleInPlaceUIWindow
#define IOleInPlaceUIWindow_METHODS \
ICOM_METHOD1(HRESULT,GetBorder, LPRECT,lprectBorder); \
ICOM_METHOD1(HRESULT,RequestBorderSpace, LPCBORDERWIDTHS,pborderwidths); \
ICOM_METHOD1(HRESULT,SetBorderSpace, LPCBORDERWIDTHS,pborderwidths); \
ICOM_METHOD2(HRESULT,SetActiveObject, IOleInPlaceActiveObject*,pActiveObject, LPCOLESTR,pszObjName);
ICOM_METHOD1(HRESULT,GetBorder, LPRECT,lprectBorder) \
ICOM_METHOD1(HRESULT,RequestBorderSpace, LPCBORDERWIDTHS,pborderwidths) \
ICOM_METHOD1(HRESULT,SetBorderSpace, LPCBORDERWIDTHS,pborderwidths) \
ICOM_METHOD2(HRESULT,SetActiveObject, IOleInPlaceActiveObject*,pActiveObject, LPCOLESTR,pszObjName)
#define IOleInPlaceUIWindow_IMETHODS \
IOleWindow_IMETHODS \
IOleInPlaceUIWindow_METHODS
@ -256,12 +256,12 @@ ICOM_DEFINE(IOleInPlaceUIWindow,IOleWindow)
*/
#define ICOM_INTERFACE IOleInPlaceFrame
#define IOleInPlaceFrame_METHODS \
ICOM_METHOD2 (HRESULT,InsertMenus, HMENU,hemnuShared, LPOLEMENUGROUPWIDTHS,lpMenuWidths); \
ICOM_METHOD3 (HRESULT,SetMenu, HMENU,hemnuShared, HOLEMENU,holemenu, HWND,hwndActiveObject); \
ICOM_METHOD1 (HRESULT,RemoveMenus, HMENU,hemnuShared); \
ICOM_METHOD1 (HRESULT,SetStatusText, LPCOLESTR,pszStatusText); \
ICOM_METHOD1 (HRESULT,EnableModeless, BOOL,fEnable); \
ICOM_METHOD2 (HRESULT,TranslateAccelerator, LPMSG,lpmsg, WORD,wID);
ICOM_METHOD2 (HRESULT,InsertMenus, HMENU,hemnuShared, LPOLEMENUGROUPWIDTHS,lpMenuWidths) \
ICOM_METHOD3 (HRESULT,SetMenu, HMENU,hemnuShared, HOLEMENU,holemenu, HWND,hwndActiveObject) \
ICOM_METHOD1 (HRESULT,RemoveMenus, HMENU,hemnuShared) \
ICOM_METHOD1 (HRESULT,SetStatusText, LPCOLESTR,pszStatusText) \
ICOM_METHOD1 (HRESULT,EnableModeless, BOOL,fEnable) \
ICOM_METHOD2 (HRESULT,TranslateAccelerator, LPMSG,lpmsg, WORD,wID)
#define IOleInPlaceFrame_IMETHODS \
IOleInPlaceUIWindow_IMETHODS \
IOleInPlaceFrame_METHODS
@ -296,16 +296,16 @@ ICOM_DEFINE(IOleInPlaceFrame,IOleInPlaceUIWindow)
*/
#define ICOM_INTERFACE IOleInPlaceSite
#define IOleInPlaceSite_METHODS \
ICOM_METHOD (HRESULT,CanInPlaceActivate); \
ICOM_METHOD (HRESULT,OnInPlaceActivate); \
ICOM_METHOD (HRESULT,OnUIActivate); \
ICOM_METHOD5(HRESULT,GetWindowContext, IOleInPlaceFrame**,ppFrame, IOleInPlaceUIWindow**,ppDoc, LPRECT,lprcPosRect, LPRECT,lprcClipRect, LPOLEINPLACEFRAMEINFO,lpFrameInfo); \
ICOM_METHOD1(HRESULT,Scroll, SIZE,scrollExtant); \
ICOM_METHOD1(HRESULT,OnUIDeactivate, BOOL,fUndoable); \
ICOM_METHOD (HRESULT,OnInPlaceDeactivate); \
ICOM_METHOD (HRESULT,DiscardUndoState); \
ICOM_METHOD (HRESULT,DeactivateAndUndo); \
ICOM_METHOD1(HRESULT,OnPosRectChange, LPCRECT,lprcPosRect);
ICOM_METHOD (HRESULT,CanInPlaceActivate) \
ICOM_METHOD (HRESULT,OnInPlaceActivate) \
ICOM_METHOD (HRESULT,OnUIActivate) \
ICOM_METHOD5(HRESULT,GetWindowContext, IOleInPlaceFrame**,ppFrame, IOleInPlaceUIWindow**,ppDoc, LPRECT,lprcPosRect, LPRECT,lprcClipRect, LPOLEINPLACEFRAMEINFO,lpFrameInfo) \
ICOM_METHOD1(HRESULT,Scroll, SIZE,scrollExtant) \
ICOM_METHOD1(HRESULT,OnUIDeactivate, BOOL,fUndoable) \
ICOM_METHOD (HRESULT,OnInPlaceDeactivate) \
ICOM_METHOD (HRESULT,DiscardUndoState) \
ICOM_METHOD (HRESULT,DeactivateAndUndo) \
ICOM_METHOD1(HRESULT,OnPosRectChange, LPCRECT,lprcPosRect)
#define IOleInPlaceSite_IMETHODS \
IOleWindow_IMETHODS \
IOleInPlaceSite_METHODS
@ -339,12 +339,12 @@ ICOM_DEFINE(IOleInPlaceSite,IOleWindow)
*/
#define ICOM_INTERFACE IOleClientSite
#define IOleClientSite_METHODS \
ICOM_METHOD (HRESULT,SaveObject); \
ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk); \
ICOM_METHOD1(HRESULT,GetContainer, IOleContainer**,ppContainer); \
ICOM_METHOD (HRESULT,ShowObject); \
ICOM_METHOD1(HRESULT,OnShowWindow, BOOL,fShow); \
ICOM_METHOD (HRESULT,RequestNewObjectLayout);
ICOM_METHOD (HRESULT,SaveObject) \
ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk) \
ICOM_METHOD1(HRESULT,GetContainer, IOleContainer**,ppContainer) \
ICOM_METHOD (HRESULT,ShowObject) \
ICOM_METHOD1(HRESULT,OnShowWindow, BOOL,fShow) \
ICOM_METHOD (HRESULT,RequestNewObjectLayout)
#define IOleClientSite_IMETHODS \
IUnknown_IMETHODS \
IOleClientSite_METHODS
@ -371,7 +371,7 @@ ICOM_DEFINE(IOleClientSite,IUnknown)
*/
#define ICOM_INTERFACE IParseDisplayName
#define IParseDisplayName_METHODS \
ICOM_METHOD4(HRESULT,ParseDisplayName, IBindCtx*,pbc, LPOLESTR,pszDisplayName, ULONG*,pchEaten, IMoniker**,ppmkOut);
ICOM_METHOD4(HRESULT,ParseDisplayName, IBindCtx*,pbc, LPOLESTR,pszDisplayName, ULONG*,pchEaten, IMoniker**,ppmkOut)
#define IParseDisplayName_IMETHODS \
IUnknown_IMETHODS \
IParseDisplayName_METHODS
@ -393,8 +393,8 @@ ICOM_DEFINE(IParseDisplayName,IUnknown)
*/
#define ICOM_INTERFACE IOleContainer
#define IOleContainer_METHODS \
ICOM_METHOD2(HRESULT,EnumObjects, DWORD,grfFlags, IEnumUnknown**,ppenum); \
ICOM_METHOD1(HRESULT,LockContainer, BOOL,fLock);
ICOM_METHOD2(HRESULT,EnumObjects, DWORD,grfFlags, IEnumUnknown**,ppenum) \
ICOM_METHOD1(HRESULT,LockContainer, BOOL,fLock)
#define IOleContainer_IMETHODS \
IParseDisplayName_IMETHODS \
IOleContainer_METHODS
@ -419,9 +419,9 @@ ICOM_DEFINE(IOleContainer,IParseDisplayName)
*/
#define ICOM_INTERFACE IOleItemContainer
#define IOleItemContainer_METHODS \
ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void*,ppvObject); \
ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR,pszItem, IBindCtx*,pbc, REFIID,riid, void*,ppvStorage); \
ICOM_METHOD1(HRESULT,IsRunning, LPOLESTR,pszItem);
ICOM_METHOD5(HRESULT,GetObject, LPOLESTR,pszItem, DWORD,dwSpeedNeeded, IBindCtx*,pbc, REFIID,riid, void*,ppvObject) \
ICOM_METHOD4(HRESULT,GetObjectStorage, LPOLESTR,pszItem, IBindCtx*,pbc, REFIID,riid, void*,ppvStorage) \
ICOM_METHOD1(HRESULT,IsRunning, LPOLESTR,pszItem)
#define IOleItemContainer_IMETHODS \
IOleContainer_IMETHODS \
IOleItemContainer_METHODS

14
include/wine/obj_marshal.h
View file

@ -24,12 +24,12 @@ typedef struct IStdMarshalInfo IStdMarshalInfo,*LPSTDMARSHALINFO;
*/
#define ICOM_INTERFACE IMarshal
#define IMarshal_METHODS \
ICOM_METHOD6(HRESULT,GetUnmarshalClass, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags, CLSID*,pCid); \
ICOM_METHOD6(HRESULT,GetMarshalSizeMax, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags, DWORD*,pSize); \
ICOM_METHOD6(HRESULT,MarshalInterface, IStream*,pStm, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags); \
ICOM_METHOD3(HRESULT,UnmarshalInterface, IStream*,pStm, REFIID,riid, void**,ppv); \
ICOM_METHOD1(HRESULT,ReleaseMarshalData, IStream*,pStm); \
ICOM_METHOD1(HRESULT,DisconnectObject, DWORD,dwReserved);
ICOM_METHOD6(HRESULT,GetUnmarshalClass, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags, CLSID*,pCid) \
ICOM_METHOD6(HRESULT,GetMarshalSizeMax, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags, DWORD*,pSize) \
ICOM_METHOD6(HRESULT,MarshalInterface, IStream*,pStm, REFIID,riid, void*,pv, DWORD,dwDestContext, void*,pvDestContext, DWORD,mshlflags) \
ICOM_METHOD3(HRESULT,UnmarshalInterface, IStream*,pStm, REFIID,riid, void**,ppv) \
ICOM_METHOD1(HRESULT,ReleaseMarshalData, IStream*,pStm) \
ICOM_METHOD1(HRESULT,DisconnectObject, DWORD,dwReserved)
#define IMarshal_IMETHODS \
IUnknown_IMETHODS \
IMarshal_METHODS
@ -56,7 +56,7 @@ ICOM_DEFINE(IMarshal,IUnknown)
*/
#define ICOM_INTERFACE IStdMarshalInfo
#define IStdMarshalInfo_METHODS \
ICOM_METHOD3(HRESULT,GetClassForHandler, DWORD,dwDestContext, void*,pvDestContext, CLSID*,pClsid);
ICOM_METHOD3(HRESULT,GetClassForHandler, DWORD,dwDestContext, void*,pvDestContext, CLSID*,pClsid)
#define IStdMarshalInfo_IMETHODS \
IUnknown_IMETHODS \
IStdMarshalInfo_METHODS

42
include/wine/obj_misc.h
View file

@ -31,10 +31,10 @@ typedef struct IMultiQI IMultiQI,*LPMULTIQI;
*/
#define ICOM_INTERFACE IEnumString
#define IEnumString_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,celt, LPOLESTR*,rgelt, ULONG*,pceltFethed); \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt); \
ICOM_METHOD (HRESULT,Reset); \
ICOM_METHOD1 (HRESULT, Clone, IEnumString**, ppenum);
ICOM_METHOD3(HRESULT,Next, ULONG,celt, LPOLESTR*,rgelt, ULONG*,pceltFethed) \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT, Clone, IEnumString**, ppenum)
#define IEnumString_IMETHODS \
IUnknown_IMETHODS \
IEnumString_METHODS
@ -60,10 +60,10 @@ ICOM_DEFINE(IEnumString,IUnknown)
*/
#define ICOM_INTERFACE IEnumUnknown
#define IEnumUnknown_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,celt, IUnknown**,rgelt, ULONG*,pceltFethed); \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt); \
ICOM_METHOD (HRESULT,Reset); \
ICOM_METHOD1(HRESULT,Clone, IEnumUnknown**,ppenum);
ICOM_METHOD3(HRESULT,Next, ULONG,celt, IUnknown**,rgelt, ULONG*,pceltFethed) \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumUnknown**,ppenum)
#define IEnumUnknown_IMETHODS \
IUnknown_IMETHODS \
IEnumUnknown_METHODS
@ -88,18 +88,18 @@ ICOM_DEFINE(IEnumUnknown,IUnknown)
*/
#define ICOM_INTERFACE IMallocSpy
#define IMallocSpy_METHODS \
ICOM_METHOD1 (ULONG,PreAlloc, ULONG,cbRequest); \
ICOM_VMETHOD1( PostAlloc, void*,pActual); \
ICOM_METHOD2 (void*,PreFree, void*,pRequest, BOOL,fSpyed); \
ICOM_VMETHOD1( PostFree, BOOL,fSpyed); \
ICOM_METHOD4 (ULONG,PreRealloc, void*,pRequest, ULONG,cbRequest, void**,ppNewRequest, BOOL,fSpyed); \
ICOM_METHOD2 (void*,PostRealloc, void*,pActual, BOOL,fSpyed); \
ICOM_METHOD2 (void*,PreGetSize, void*,pRequest, BOOL,fSpyed); \
ICOM_METHOD2 (ULONG,PostGetSize, ULONG,cbActual, BOOL,fSpyed); \
ICOM_METHOD2 (void*,PreDidAlloc, void*,pRequest, BOOL,fSpyed); \
ICOM_METHOD3 (int, PostDidAlloc, void*,pRequest, BOOL,fSpyed, int,fActual); \
ICOM_METHOD (int, PreHeapMinimize); \
ICOM_METHOD (int, PostHeapMinimize);
ICOM_METHOD1 (ULONG,PreAlloc, ULONG,cbRequest) \
ICOM_VMETHOD1( PostAlloc, void*,pActual) \
ICOM_METHOD2 (void*,PreFree, void*,pRequest, BOOL,fSpyed) \
ICOM_VMETHOD1( PostFree, BOOL,fSpyed) \
ICOM_METHOD4 (ULONG,PreRealloc, void*,pRequest, ULONG,cbRequest, void**,ppNewRequest, BOOL,fSpyed) \
ICOM_METHOD2 (void*,PostRealloc, void*,pActual, BOOL,fSpyed) \
ICOM_METHOD2 (void*,PreGetSize, void*,pRequest, BOOL,fSpyed) \
ICOM_METHOD2 (ULONG,PostGetSize, ULONG,cbActual, BOOL,fSpyed) \
ICOM_METHOD2 (void*,PreDidAlloc, void*,pRequest, BOOL,fSpyed) \
ICOM_METHOD3 (int, PostDidAlloc, void*,pRequest, BOOL,fSpyed, int,fActual) \
ICOM_METHOD (int, PreHeapMinimize) \
ICOM_METHOD (int, PostHeapMinimize)
#define IMallocSpy_IMETHODS \
IUnknown_IMETHODS \
IMallocSpy_METHODS
@ -147,7 +147,7 @@ typedef struct tagMULTI_QI
#define ICOM_INTERFACE IMultiQI
#define IMultiQI_METHODS \
ICOM_METHOD2(HRESULT,QueryMultipleInterfaces, ULONG,cMQIs, MULTI_QI*,pMQIs);
ICOM_METHOD2(HRESULT,QueryMultipleInterfaces, ULONG,cMQIs, MULTI_QI*,pMQIs)
#define IMultiQI_IMETHODS \
IUnknown_IMETHODS \
IMultiQI_METHODS

2
include/wine/obj_moniker.h
View file

@ -275,7 +275,7 @@ ICOM_DEFINE(IROTData,IUnknown)
#define IROTData_GetComparisonData(p,a,b,c) ICOM_CALL3(GetComparisonData,p,a,b,c)
#endif
#define ICOM_THIS_From_IROTData(class, name) class* This = (class*)(((void*)name)-sizeof(void*))
#define ICOM_THIS_From_IROTData(class, name) class* This = (class*)(((char*)name)-sizeof(void*))
/*****************************************************************************
* IRunnableObject interface

8
include/wine/obj_oleaut.h
View file

@ -503,10 +503,10 @@ enum VARENUM {
*/
#define ICOM_INTERFACE IDispatch
#define IDispatch_METHODS \
ICOM_METHOD1(HRESULT, GetTypeInfoCount, UINT*, pctinfo); \
ICOM_METHOD3(HRESULT, GetTypeInfo, UINT, iTInfo, LCID, lcid, ITypeInfo**, ppTInfo); \
ICOM_METHOD5(HRESULT, GetIDsOfNames, REFIID, riid, LPOLESTR*, rgszNames, UINT, cNames, LCID, lcid, DISPID*, rgDispId); \
ICOM_METHOD8(HRESULT, Invoke, DISPID, dispIdMember, REFIID, riid, LCID, lcid, WORD, wFlags, DISPPARAMS*, pDispParams, VARIANT*, pVarResult, EXCEPINFO*, pExepInfo, UINT*, puArgErr);
ICOM_METHOD1(HRESULT, GetTypeInfoCount, UINT*, pctinfo) \
ICOM_METHOD3(HRESULT, GetTypeInfo, UINT, iTInfo, LCID, lcid, ITypeInfo**, ppTInfo) \
ICOM_METHOD5(HRESULT, GetIDsOfNames, REFIID, riid, LPOLESTR*, rgszNames, UINT, cNames, LCID, lcid, DISPID*, rgDispId) \
ICOM_METHOD8(HRESULT, Invoke, DISPID, dispIdMember, REFIID, riid, LCID, lcid, WORD, wFlags, DISPPARAMS*, pDispParams, VARIANT*, pVarResult, EXCEPINFO*, pExepInfo, UINT*, puArgErr)
#define IDispatch_IMETHODS \
IUnknown_IMETHODS \
IDispatch_METHODS

48
include/wine/obj_olefont.h
View file

@ -26,30 +26,30 @@ typedef TEXTMETRICW TEXTMETRICOLE;
*/
#define ICOM_INTERFACE IFont
#define IFont_METHODS \
ICOM_METHOD1(HRESULT, get_Name, BSTR*, pname); \
ICOM_METHOD1(HRESULT, put_Name, BSTR, name); \
ICOM_METHOD1(HRESULT, get_Size, CY*, psize); \
ICOM_METHOD1(HRESULT, put_Size, CY, size); \
ICOM_METHOD1(HRESULT, get_Bold, BOOL*, pbold); \
ICOM_METHOD1(HRESULT, put_Bold, BOOL, bold); \
ICOM_METHOD1(HRESULT, get_Italic, BOOL*, pitalic); \
ICOM_METHOD1(HRESULT, put_Italic, BOOL, italic); \
ICOM_METHOD1(HRESULT, get_Underline, BOOL*, punderline); \
ICOM_METHOD1(HRESULT, put_Underline, BOOL, underline); \
ICOM_METHOD1(HRESULT, get_Strikethrough, BOOL*, pstrikethrough); \
ICOM_METHOD1(HRESULT, put_Strikethrough, BOOL, strikethrough); \
ICOM_METHOD1(HRESULT, get_Weight, short*, pweight); \
ICOM_METHOD1(HRESULT, put_Weight, short, weight); \
ICOM_METHOD1(HRESULT, get_Charset, short*, pcharset); \
ICOM_METHOD1(HRESULT, put_Charset, short, charset); \
ICOM_METHOD1(HRESULT, get_hFont, HFONT*, phfont); \
ICOM_METHOD1(HRESULT, Clone, IFont**, ppfont); \
ICOM_METHOD1(HRESULT, IsEqual, IFont*, pFontOther); \
ICOM_METHOD2(HRESULT, SetRatio, long, cyLogical, long, cyHimetric); \
ICOM_METHOD1(HRESULT, QueryTextMetrics, TEXTMETRICOLE*, ptm); \
ICOM_METHOD1(HRESULT, AddRefHfont, HFONT, hfont); \
ICOM_METHOD1(HRESULT, ReleaseHfont, HFONT, hfont); \
ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc);
ICOM_METHOD1(HRESULT, get_Name, BSTR*, pname) \
ICOM_METHOD1(HRESULT, put_Name, BSTR, name) \
ICOM_METHOD1(HRESULT, get_Size, CY*, psize) \
ICOM_METHOD1(HRESULT, put_Size, CY, size) \
ICOM_METHOD1(HRESULT, get_Bold, BOOL*, pbold) \
ICOM_METHOD1(HRESULT, put_Bold, BOOL, bold) \
ICOM_METHOD1(HRESULT, get_Italic, BOOL*, pitalic) \
ICOM_METHOD1(HRESULT, put_Italic, BOOL, italic) \
ICOM_METHOD1(HRESULT, get_Underline, BOOL*, punderline) \
ICOM_METHOD1(HRESULT, put_Underline, BOOL, underline) \
ICOM_METHOD1(HRESULT, get_Strikethrough, BOOL*, pstrikethrough) \
ICOM_METHOD1(HRESULT, put_Strikethrough, BOOL, strikethrough) \
ICOM_METHOD1(HRESULT, get_Weight, short*, pweight) \
ICOM_METHOD1(HRESULT, put_Weight, short, weight) \
ICOM_METHOD1(HRESULT, get_Charset, short*, pcharset) \
ICOM_METHOD1(HRESULT, put_Charset, short, charset) \
ICOM_METHOD1(HRESULT, get_hFont, HFONT*, phfont) \
ICOM_METHOD1(HRESULT, Clone, IFont**, ppfont) \
ICOM_METHOD1(HRESULT, IsEqual, IFont*, pFontOther) \
ICOM_METHOD2(HRESULT, SetRatio, long, cyLogical, long, cyHimetric) \
ICOM_METHOD1(HRESULT, QueryTextMetrics, TEXTMETRICOLE*, ptm) \
ICOM_METHOD1(HRESULT, AddRefHfont, HFONT, hfont) \
ICOM_METHOD1(HRESULT, ReleaseHfont, HFONT, hfont) \
ICOM_METHOD1(HRESULT, SetHdc, HDC, hdc)
#define IFont_IMETHODS \
ICOM_INHERITS(IFont,IUnknown)
ICOM_DEFINE(IFont,IUnknown)

62
include/wine/obj_oleobj.h
View file

@ -76,27 +76,27 @@ typedef struct IEnumOLEVERB IEnumOLEVERB, *LPENUMOLEVERB;
*/
#define ICOM_INTERFACE IOleObject
#define IOleObject_METHODS \
ICOM_METHOD1(HRESULT,SetClientSite, IOleClientSite*,pClientSite); \
ICOM_METHOD1(HRESULT,GetClientSite, IOleClientSite**,ppClientSite); \
ICOM_METHOD2(HRESULT,SetHostNames, LPCOLESTR,szContainerApp, LPCOLESTR,szContainerObj); \
ICOM_METHOD1(HRESULT,Close, DWORD,dwSaveOption); \
ICOM_METHOD2(HRESULT,SetMoniker, DWORD,dwWhichMoniker, IMoniker*,pmk); \
ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk); \
ICOM_METHOD3(HRESULT,InitFromData, IDataObject*,pDataObject, BOOL,fCreation, DWORD,dwReserved); \
ICOM_METHOD2(HRESULT,GetClipboardData, DWORD,dwReserved, IDataObject**,ppDataObject); \
ICOM_METHOD6(HRESULT,DoVerb, LONG,iVerb, LPMSG,lpmsg, IOleClientSite*,pActiveSite, LONG,lindex, HWND,hwndParent, LPCRECT,lprcPosRect); \
ICOM_METHOD1(HRESULT,EnumVerbs, IEnumOLEVERB**,ppEnumOleVerb); \
ICOM_METHOD (HRESULT,Update); \
ICOM_METHOD (HRESULT,IsUpToDate); \
ICOM_METHOD1(HRESULT,GetUserClassID, CLSID*,pClsid); \
ICOM_METHOD2(HRESULT,GetUserType, DWORD,dwFormOfType, LPOLESTR*,pszUserType); \
ICOM_METHOD2(HRESULT,SetExtent, DWORD,dwDrawAspect, SIZEL*,psizel); \
ICOM_METHOD2(HRESULT,GetExtent, DWORD,dwDrawAspect, SIZEL*,psizel); \
ICOM_METHOD2(HRESULT,Advise, IAdviseSink*,pAdvSink, DWORD*,pdwConnection); \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection); \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise); \
ICOM_METHOD2(HRESULT,GetMiscStatus, DWORD,dwAspect, DWORD*,pdwStatus); \
ICOM_METHOD1(HRESULT,SetColorScheme, LOGPALETTE*,pLogpal);
ICOM_METHOD1(HRESULT,SetClientSite, IOleClientSite*,pClientSite) \
ICOM_METHOD1(HRESULT,GetClientSite, IOleClientSite**,ppClientSite) \
ICOM_METHOD2(HRESULT,SetHostNames, LPCOLESTR,szContainerApp, LPCOLESTR,szContainerObj) \
ICOM_METHOD1(HRESULT,Close, DWORD,dwSaveOption) \
ICOM_METHOD2(HRESULT,SetMoniker, DWORD,dwWhichMoniker, IMoniker*,pmk) \
ICOM_METHOD3(HRESULT,GetMoniker, DWORD,dwAssign, DWORD,dwWhichMoniker, IMoniker**,ppmk) \
ICOM_METHOD3(HRESULT,InitFromData, IDataObject*,pDataObject, BOOL,fCreation, DWORD,dwReserved) \
ICOM_METHOD2(HRESULT,GetClipboardData, DWORD,dwReserved, IDataObject**,ppDataObject) \
ICOM_METHOD6(HRESULT,DoVerb, LONG,iVerb, LPMSG,lpmsg, IOleClientSite*,pActiveSite, LONG,lindex, HWND,hwndParent, LPCRECT,lprcPosRect) \
ICOM_METHOD1(HRESULT,EnumVerbs, IEnumOLEVERB**,ppEnumOleVerb) \
ICOM_METHOD (HRESULT,Update) \
ICOM_METHOD (HRESULT,IsUpToDate) \
ICOM_METHOD1(HRESULT,GetUserClassID, CLSID*,pClsid) \
ICOM_METHOD2(HRESULT,GetUserType, DWORD,dwFormOfType, LPOLESTR*,pszUserType) \
ICOM_METHOD2(HRESULT,SetExtent, DWORD,dwDrawAspect, SIZEL*,psizel) \
ICOM_METHOD2(HRESULT,GetExtent, DWORD,dwDrawAspect, SIZEL*,psizel) \
ICOM_METHOD2(HRESULT,Advise, IAdviseSink*,pAdvSink, DWORD*,pdwConnection) \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise) \
ICOM_METHOD2(HRESULT,GetMiscStatus, DWORD,dwAspect, DWORD*,pdwStatus) \
ICOM_METHOD1(HRESULT,SetColorScheme, LOGPALETTE*,pLogpal)
#define IOleObject_IMETHODS \
IUnknown_IMETHODS \
IOleObject_METHODS
@ -138,12 +138,12 @@ ICOM_DEFINE(IOleObject,IUnknown)
*/
#define ICOM_INTERFACE IOleAdviseHolder
#define IOleAdviseHolder_METHODS \
ICOM_METHOD2(HRESULT,Advise, IAdviseSink*,pAdvise, DWORD*,pdwConnection); \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection); \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise); \
ICOM_METHOD1(HRESULT,SendOnRename, IMoniker*,pmk); \
ICOM_METHOD (HRESULT,SendOnSave); \
ICOM_METHOD (HRESULT,SendOnClose);
ICOM_METHOD2(HRESULT,Advise, IAdviseSink*,pAdvise, DWORD*,pdwConnection) \
ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwConnection) \
ICOM_METHOD1(HRESULT,EnumAdvise, IEnumSTATDATA**,ppenumAdvise) \
ICOM_METHOD1(HRESULT,SendOnRename, IMoniker*,pmk) \
ICOM_METHOD (HRESULT,SendOnSave) \
ICOM_METHOD (HRESULT,SendOnClose)
#define IOleAdviseHolder_IMETHODS \
IUnknown_IMETHODS \
IOleAdviseHolder_METHODS
@ -170,10 +170,10 @@ ICOM_DEFINE(IOleAdviseHolder,IUnknown)
*/
#define ICOM_INTERFACE IEnumOLEVERB
#define IEnumOLEVERB_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,celt, LPOLEVERB,rgelt, ULONG*,pceltFetched); \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt); \
ICOM_METHOD (HRESULT,Reset); \
ICOM_METHOD1(HRESULT,Clone, IEnumOLEVERB**,ppenum);
ICOM_METHOD3(HRESULT,Next, ULONG,celt, LPOLEVERB,rgelt, ULONG*,pceltFetched) \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumOLEVERB**,ppenum)
#define IEnumOLEVERB_IMETHODS \
IUnknown_IMETHODS \
IEnumOLEVERB_METHODS

90
include/wine/obj_propertystorage.h
View file

@ -36,7 +36,7 @@ typedef struct tagSTATPROPSTG STATPROPSTG;
* PROPSPEC structure
*/
// Reserved global Property IDs
/* Reserved global Property IDs */
#define PID_DICTIONARY ( 0 )
#define PID_CODEPAGE ( 0x1 )
@ -53,26 +53,26 @@ typedef struct tagSTATPROPSTG STATPROPSTG;
#define PID_ILLEGAL ( 0xffffffff )
// Property IDs for the SummaryInformation Property Set
/* Property IDs for the SummaryInformation Property Set */
#define PIDSI_TITLE 0x00000002L // VT_LPSTR
#define PIDSI_SUBJECT 0x00000003L // VT_LPSTR
#define PIDSI_AUTHOR 0x00000004L // VT_LPSTR
#define PIDSI_KEYWORDS 0x00000005L // VT_LPSTR
#define PIDSI_COMMENTS 0x00000006L // VT_LPSTR
#define PIDSI_TEMPLATE 0x00000007L // VT_LPSTR
#define PIDSI_LASTAUTHOR 0x00000008L // VT_LPSTR
#define PIDSI_REVNUMBER 0x00000009L // VT_LPSTR
#define PIDSI_EDITTIME 0x0000000aL // VT_FILETIME (UTC)
#define PIDSI_LASTPRINTED 0x0000000bL // VT_FILETIME (UTC)
#define PIDSI_CREATE_DTM 0x0000000cL // VT_FILETIME (UTC)
#define PIDSI_LASTSAVE_DTM 0x0000000dL // VT_FILETIME (UTC)
#define PIDSI_PAGECOUNT 0x0000000eL // VT_I4
#define PIDSI_WORDCOUNT 0x0000000fL // VT_I4
#define PIDSI_CHARCOUNT 0x00000010L // VT_I4
#define PIDSI_THUMBNAIL 0x00000011L // VT_CF
#define PIDSI_APPNAME 0x00000012L // VT_LPSTR
#define PIDSI_DOC_SECURITY 0x00000013L // VT_I4
#define PIDSI_TITLE 0x00000002L /* VT_LPSTR */
#define PIDSI_SUBJECT 0x00000003L /* VT_LPSTR */
#define PIDSI_AUTHOR 0x00000004L /* VT_LPSTR */
#define PIDSI_KEYWORDS 0x00000005L /* VT_LPSTR */
#define PIDSI_COMMENTS 0x00000006L /* VT_LPSTR */
#define PIDSI_TEMPLATE 0x00000007L /* VT_LPSTR */
#define PIDSI_LASTAUTHOR 0x00000008L /* VT_LPSTR */
#define PIDSI_REVNUMBER 0x00000009L /* VT_LPSTR */
#define PIDSI_EDITTIME 0x0000000aL /* VT_FILETIME (UTC) */
#define PIDSI_LASTPRINTED 0x0000000bL /* VT_FILETIME (UTC) */
#define PIDSI_CREATE_DTM 0x0000000cL /* VT_FILETIME (UTC) */
#define PIDSI_LASTSAVE_DTM 0x0000000dL /* VT_FILETIME (UTC) */
#define PIDSI_PAGECOUNT 0x0000000eL /* VT_I4 */
#define PIDSI_WORDCOUNT 0x0000000fL /* VT_I4 */
#define PIDSI_CHARCOUNT 0x00000010L /* VT_I4 */
#define PIDSI_THUMBNAIL 0x00000011L /* VT_CF */
#define PIDSI_APPNAME 0x00000012L /* VT_LPSTR */
#define PIDSI_DOC_SECURITY 0x00000013L /* VT_I4 */
#define PRSPEC_INVALID ( 0xffffffff )
@ -127,10 +127,10 @@ struct tagSTATPROPSTG
*/
#define ICOM_INTERFACE IEnumSTATPROPSETSTG
#define IEnumSTATPROPSETSTG_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,celt, STATPROPSETSTG*,rgelt, ULONG*,pceltFethed); \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt); \
ICOM_METHOD (HRESULT,Reset); \
ICOM_METHOD1(HRESULT,Clone, IEnumSTATPROPSETSTG**,ppenum);
ICOM_METHOD3(HRESULT,Next, ULONG,celt, STATPROPSETSTG*,rgelt, ULONG*,pceltFethed) \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumSTATPROPSETSTG**,ppenum)
#define IEnumSTATPROPSETSTG_IMETHODS \
ICOM_INHERITS(IEnumSTATPROPSETSTG,IUnknown)
ICOM_DEFINE(IEnumSTATPROPSETSTG,IUnknown)
@ -154,10 +154,10 @@ ICOM_DEFINE(IEnumSTATPROPSETSTG,IUnknown)
*/
#define ICOM_INTERFACE IEnumSTATPROPSTG
#define IEnumSTATPROPSTG_METHODS \
ICOM_METHOD3(HRESULT,Next, ULONG,celt, STATPROPSTG*,rgelt, ULONG*,pceltFethed); \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt); \
ICOM_METHOD (HRESULT,Reset); \
ICOM_METHOD1(HRESULT,Clone, IEnumSTATPROPSTG**,ppenum);
ICOM_METHOD3(HRESULT,Next, ULONG,celt, STATPROPSTG*,rgelt, ULONG*,pceltFethed) \
ICOM_METHOD1(HRESULT,Skip, ULONG,celt) \
ICOM_METHOD (HRESULT,Reset) \
ICOM_METHOD1(HRESULT,Clone, IEnumSTATPROPSTG**,ppenum)
#define IEnumSTATPROPSTG_IMETHODS \
ICOM_INHERITS(IEnumSTATPROPSTG,IUnknown)
ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
@ -181,10 +181,10 @@ ICOM_DEFINE(IEnumSTATPROPSTG,IUnknown)
*/
#define ICOM_INTERFACE IPropertySetStorage
#define IPropertySetStorage_METHODS \
ICOM_METHOD5(HRESULT,Create, REFFMTID,rfmtid, const CLSID*,pclsid, DWORD,grfFlags, DWORD,grfMode, IPropertyStorage**,ppprstg); \
ICOM_METHOD3(HRESULT,Open, REFFMTID,rfmtid, DWORD,grfMode, IPropertyStorage**,ppprstg); \
ICOM_METHOD1(HRESULT,Delete, REFFMTID,rfmtid); \
ICOM_METHOD1(HRESULT,Enum, IEnumSTATPROPSETSTG**,ppenum);
ICOM_METHOD5(HRESULT,Create, REFFMTID,rfmtid, const CLSID*,pclsid, DWORD,grfFlags, DWORD,grfMode, IPropertyStorage**,ppprstg) \
ICOM_METHOD3(HRESULT,Open, REFFMTID,rfmtid, DWORD,grfMode, IPropertyStorage**,ppprstg) \
ICOM_METHOD1(HRESULT,Delete, REFFMTID,rfmtid) \
ICOM_METHOD1(HRESULT,Enum, IEnumSTATPROPSETSTG**,ppenum)
#define IPropertySetStorage_IMETHODS \
ICOM_INHERITS(IPropertySetStorage,IUnknown)
ICOM_DEFINE(IPropertySetStorage,IUnknown)
@ -208,7 +208,7 @@ ICOM_DEFINE(IPropertySetStorage,IUnknown)
*/
typedef struct tagPROPVARIANT PROPVARIANT,*LPPROPVARIANT;
// Flags for IPropertySetStorage::Create
/* Flags for IPropertySetStorage::Create */
#define PROPSETFLAG_DEFAULT ( 0 )
#define PROPSETFLAG_NONSIMPLE ( 1 )
#define PROPSETFLAG_ANSI ( 2 )
@ -394,18 +394,18 @@ struct tagPROPVARIANT
#define ICOM_INTERFACE IPropertyStorage
#define IPropertyStorage_METHODS \
ICOM_METHOD3(HRESULT,ReadMultiple, ULONG,cpspec, const PROPSPEC*,rgpspec, PROPVARIANT*,rgpropvar); \
ICOM_METHOD4(HRESULT,WriteMultiple, ULONG,cpspec, const PROPSPEC*,rgpspec, const PROPVARIANT*,rgpropvar, PROPID,propidNameFirst); \
ICOM_METHOD2(HRESULT,DeleteMultiple, ULONG,cpspec, const PROPSPEC*,rgpspec); \
ICOM_METHOD2(HRESULT,ReadPropertyNames, const PROPID*,rgpropid, LPOLESTR*,rglpwstrName); \
ICOM_METHOD3(HRESULT,WritePropertyNames, ULONG,cpropid, const PROPID*,rgpropid, LPOLESTR*,rglpwstrName); \
ICOM_METHOD2(HRESULT,DeletePropertyNames, ULONG,cpropid, const PROPID*,rgpropid); \
ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags); \
ICOM_METHOD (HRESULT,Revert); \
ICOM_METHOD1(HRESULT,Enum, IEnumSTATPROPSTG**,ppenum); \
ICOM_METHOD3(HRESULT,SetTimes, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime); \
ICOM_METHOD1(HRESULT,SetClass, REFCLSID,clsid); \
ICOM_METHOD1(HRESULT,Stat, STATPROPSETSTG*,pstatpsstg);
ICOM_METHOD3(HRESULT,ReadMultiple, ULONG,cpspec, const PROPSPEC*,rgpspec, PROPVARIANT*,rgpropvar) \
ICOM_METHOD4(HRESULT,WriteMultiple, ULONG,cpspec, const PROPSPEC*,rgpspec, const PROPVARIANT*,rgpropvar, PROPID,propidNameFirst) \
ICOM_METHOD2(HRESULT,DeleteMultiple, ULONG,cpspec, const PROPSPEC*,rgpspec) \
ICOM_METHOD2(HRESULT,ReadPropertyNames, const PROPID*,rgpropid, LPOLESTR*,rglpwstrName) \
ICOM_METHOD3(HRESULT,WritePropertyNames, ULONG,cpropid, const PROPID*,rgpropid, LPOLESTR*,rglpwstrName) \
ICOM_METHOD2(HRESULT,DeletePropertyNames, ULONG,cpropid, const PROPID*,rgpropid) \
ICOM_METHOD1(HRESULT,Commit, DWORD,grfCommitFlags) \
ICOM_METHOD (HRESULT,Revert) \
ICOM_METHOD1(HRESULT,Enum, IEnumSTATPROPSTG**,ppenum) \
ICOM_METHOD3(HRESULT,SetTimes, const FILETIME*,pctime, const FILETIME*,patime, const FILETIME*,pmtime) \
ICOM_METHOD1(HRESULT,SetClass, REFCLSID,clsid) \
ICOM_METHOD1(HRESULT,Stat, STATPROPSETSTG*,pstatpsstg)
#define IPropertyStorage_IMETHODS \
ICOM_INHERITS(IPropertyStorage,IUnknown)
ICOM_DEFINE(IPropertyStorage,IUnknown)

2
include/wine/obj_storage.h
View file

@ -247,7 +247,7 @@ ICOM_DEFINE(ILayoutStorage,IUnknown)
#define ILockBytes_METHODS \
ICOM_METHOD4(HRESULT,ReadAt, ULARGE_INTEGER,ulOffset, void*,pv, ULONG,cb, ULONG*,pcbRead) \
ICOM_METHOD4(HRESULT,WriteAt, ULARGE_INTEGER,ulOffset, const void*,pv, ULONG,cb, ULONG*,pcbWritten) \
ICOM_METHOD (HRESULT,Flush); \
ICOM_METHOD (HRESULT,Flush) \
ICOM_METHOD1(HRESULT,SetSize, ULARGE_INTEGER,cb) \
ICOM_METHOD3(HRESULT,LockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) \
ICOM_METHOD3(HRESULT,UnlockRegion, ULARGE_INTEGER,libOffset, ULARGE_INTEGER,cb, DWORD,dwLockType) \

2
include/winspool.h
View file

@ -274,7 +274,7 @@ BOOL WINAPI EnumPrintersW(DWORD dwType, LPWSTR lpszName,
BOOL WINAPI PrinterProperties(HWND hWnd, HANDLE hPrinter);
#ifdef __cplusplus
} // extern "C"
} /* extern "C" */
#endif
#endif /* __WINE_WINSPOOL_H */

10
memory/global.c
View file

@ -1100,7 +1100,7 @@ HGLOBAL WINAPI GlobalAlloc(
{
palloc=HeapAlloc(GetProcessHeap(), hpflags, size+sizeof(HGLOBAL));
*(HGLOBAL *)palloc=INTERN_TO_HANDLE(pintern);
pintern->Pointer=palloc+sizeof(HGLOBAL);
pintern->Pointer=(char *) palloc+sizeof(HGLOBAL);
}
else
pintern->Pointer=NULL;
@ -1288,22 +1288,22 @@ HGLOBAL WINAPI GlobalReAlloc(
if(pintern->Pointer)
{
palloc=HeapReAlloc(GetProcessHeap(), 0,
pintern->Pointer-sizeof(HGLOBAL),
(char *) pintern->Pointer-sizeof(HGLOBAL),
size+sizeof(HGLOBAL) );
pintern->Pointer=palloc+sizeof(HGLOBAL);
pintern->Pointer=(char *) palloc+sizeof(HGLOBAL);
}
else
{
palloc=HeapAlloc(GetProcessHeap(), 0, size+sizeof(HGLOBAL));
*(HGLOBAL *)palloc=hmem;
pintern->Pointer=palloc+sizeof(HGLOBAL);
pintern->Pointer=(char *) palloc+sizeof(HGLOBAL);
}
}
else
{
if(pintern->Pointer)
{
HeapFree(GetProcessHeap(), 0, pintern->Pointer-sizeof(HGLOBAL));
HeapFree(GetProcessHeap(), 0, (char *) pintern->Pointer-sizeof(HGLOBAL));
pintern->Pointer=NULL;
}
}

25
msdos/dpmi.c
View file

@ -81,7 +81,7 @@ DPMI_xalloc(int len) {
while (!ret) {
ret=VirtualAlloc(lastvalloced,len,MEM_COMMIT|MEM_RESERVE,PAGE_EXECUTE_READWRITE);
if (!ret)
lastvalloced+=0x10000;
lastvalloced = (char *) lastvalloced + 0x10000;
/* we failed to allocate one in the first round.
* try non-linear
*/
@ -157,7 +157,7 @@ static void INT_GetRealModeContext( REALMODECALL *call, CONTEXT *context )
FS_reg(context) = call->fs;
GS_reg(context) = call->gs;
SS_reg(context) = call->ss;
(char*)V86BASE(context) = DOSMEM_MemoryBase(0);
V86BASE(context) = (DWORD) DOSMEM_MemoryBase(0);
}
@ -215,17 +215,16 @@ static void DPMI_CallRMCBProc( CONTEXT *context, RMCB *rmcb, WORD flag )
if (flag & 1) {
int _clobber;
/* 32-bit DPMI client */
__asm__ __volatile__("
pushl %%es
pushl %%ds
pushfl
movl %5,%%es
movl %4,%%ds
lcall %3
popl %%ds
movl %%es,%0
popl %%es
"
__asm__ __volatile__(
"pushl %%es\n"
"pushl %%ds\n"
"pushfl\n"
"movl %5,%%es\n"
"movl %4,%%ds\n"
"lcall %3\n"
"popl %%ds\n"
"movl %%es,%0\n"
"popl %%es\n"
: "=g" (es), "=D" (edi), "=S" (_clobber)
: "m" (rmcb->proc_ofs),
"g" (ss), "g" (rmcb->regs_sel),

56
objects/cursoricon.c
View file

@ -384,8 +384,9 @@ BOOL CURSORICON_SimulateLoadingFromResourceW( LPWSTR filename, BOOL fCursor,
}
}
if (!(entries = bits->idCount)) goto fail;
(int)_free = size = sizeof(CURSORICONDIR) + sizeof(CURSORICONDIRENTRY) *
(entries - 1);
size = sizeof(CURSORICONDIR) + sizeof(CURSORICONDIRENTRY) * (entries - 1);
_free = (LPBYTE) size;
for (i=0; i < entries; i++)
size += bits->idEntries[i].dwDIBSize + (fCursor ? sizeof(POINT16): 0);
@ -919,10 +920,19 @@ HCURSOR16 WINAPI CreateCursor16( HINSTANCE16 hInstance,
INT16 nWidth, INT16 nHeight,
LPCVOID lpANDbits, LPCVOID lpXORbits )
{
CURSORICONINFO info = { { xHotSpot, yHotSpot }, nWidth, nHeight, 0, 1, 1 };
CURSORICONINFO info;
TRACE(cursor, "%dx%d spot=%d,%d xor=%p and=%p\n",
nWidth, nHeight, xHotSpot, yHotSpot, lpXORbits, lpANDbits);
info.ptHotSpot.x = xHotSpot;
info.ptHotSpot.y = yHotSpot;
info.nWidth = nWidth;
info.nHeight = nHeight;
info.nWidthBytes = 0;
info.bPlanes = 1;
info.bBitsPerPixel = 1;
return CreateCursorIconIndirect16( hInstance, &info, lpANDbits, lpXORbits );
}
@ -935,10 +945,19 @@ HCURSOR WINAPI CreateCursor( HINSTANCE hInstance,
INT nWidth, INT nHeight,
LPCVOID lpANDbits, LPCVOID lpXORbits )
{
CURSORICONINFO info = { { xHotSpot, yHotSpot }, nWidth, nHeight, 0, 1, 1 };
CURSORICONINFO info;
TRACE(cursor, "%dx%d spot=%d,%d xor=%p and=%p\n",
nWidth, nHeight, xHotSpot, yHotSpot, lpXORbits, lpANDbits);
info.ptHotSpot.x = xHotSpot;
info.ptHotSpot.y = yHotSpot;
info.nWidth = nWidth;
info.nHeight = nHeight;
info.nWidthBytes = 0;
info.bPlanes = 1;
info.bBitsPerPixel = 1;
return CreateCursorIconIndirect16( 0, &info, lpANDbits, lpXORbits );
}
@ -950,10 +969,19 @@ HICON16 WINAPI CreateIcon16( HINSTANCE16 hInstance, INT16 nWidth,
INT16 nHeight, BYTE bPlanes, BYTE bBitsPixel,
LPCVOID lpANDbits, LPCVOID lpXORbits )
{
CURSORICONINFO info = { { 0, 0 }, nWidth, nHeight, 0, bPlanes, bBitsPixel};
CURSORICONINFO info;
TRACE(icon, "%dx%dx%d, xor=%p, and=%p\n",
nWidth, nHeight, bPlanes * bBitsPixel, lpXORbits, lpANDbits);
info.ptHotSpot.x = 0;
info.ptHotSpot.y = 0;
info.nWidth = nWidth;
info.nHeight = nHeight;
info.nWidthBytes = 0;
info.bPlanes = bPlanes;
info.bBitsPerPixel = bBitsPixel;
return CreateCursorIconIndirect16( hInstance, &info, lpANDbits, lpXORbits );
}
@ -965,10 +993,19 @@ HICON WINAPI CreateIcon( HINSTANCE hInstance, INT nWidth,
INT nHeight, BYTE bPlanes, BYTE bBitsPixel,
LPCVOID lpANDbits, LPCVOID lpXORbits )
{
CURSORICONINFO info = { { 0, 0 }, nWidth, nHeight, 0, bPlanes, bBitsPixel};
CURSORICONINFO info;
TRACE(icon, "%dx%dx%d, xor=%p, and=%p\n",
nWidth, nHeight, bPlanes * bBitsPixel, lpXORbits, lpANDbits);
info.ptHotSpot.x = 0;
info.ptHotSpot.y = 0;
info.nWidth = nWidth;
info.nHeight = nHeight;
info.nWidthBytes = 0;
info.bPlanes = bPlanes;
info.bBitsPerPixel = bBitsPixel;
return CreateCursorIconIndirect16( 0, &info, lpANDbits, lpXORbits );
}
@ -1736,7 +1773,12 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon,
}
}
if (DoOffscreen) {
RECT r = {0, 0, cxWidth, cxWidth};
RECT r;
r.left = 0;
r.top = 0;
r.right = cxWidth;
r.bottom = cxWidth;
hDC_off = CreateCompatibleDC(hdc);
hB_off = CreateCompatibleBitmap(hdc, cxWidth, cyWidth);

24
objects/enhmetafile.c
View file

@ -113,15 +113,15 @@ UINT WINAPI GetEnhMetaFileDescriptionA(
)
{
LPENHMETAHEADER p = GlobalLock(hmf);
INT first = lstrlenW( (void *)p+p->offDescription);
INT first = lstrlenW( (LPWSTR) ((char *)p+p->offDescription));
if (!buf || !size) return p->nDescription;
lstrcpynWtoA(buf, (void *)p+p->offDescription, size);
lstrcpynWtoA(buf, (LPWSTR) ((char *)p+p->offDescription), size);
buf += first +1;
lstrcpynWtoA(buf, (void *)p+p->offDescription+2*(first+1), size-first-1);
lstrcpynWtoA(buf, (LPWSTR) ((char *)p+p->offDescription+2*(first+1)), size-first-1);
/* memmove(buf, (void *)p+p->offDescription, MIN(size,p->nDescription)); */
/* memmove(buf, (LPWSTR) ((char *)p+p->offDescription), MIN(size,p->nDescription)); */
GlobalUnlock(hmf);
return MIN(size,p->nDescription);
}
@ -145,7 +145,7 @@ UINT WINAPI GetEnhMetaFileDescriptionW(
if (!buf || !size) return p->nDescription;
memmove(buf, (void *)p+p->offDescription, MIN(size,p->nDescription));
memmove(buf, (char *)p+p->offDescription, MIN(size,p->nDescription));
GlobalUnlock(hmf);
return MIN(size,p->nDescription);
}
@ -480,7 +480,7 @@ BOOL WINAPI EnumEnhMetaFile(
while (ret) {
ret = (*callback)(hdc, ht, p, count, data);
if (p->iType == EMR_EOF) break;
p = (void *) p + p->nSize;
p = (LPENHMETARECORD) ((char *) p + p->nSize);
}
GlobalFree((HGLOBAL)ht);
GlobalUnlock(hmf);
@ -514,9 +514,13 @@ BOOL WINAPI PlayEnhMetaFile(
LPENHMETAHEADER h = (LPENHMETAHEADER) p;
FLOAT xscale = (h->rclBounds.right-h->rclBounds.left)/(lpRect->right-lpRect->left);
FLOAT yscale = (h->rclBounds.bottom-h->rclBounds.top)/(lpRect->bottom-lpRect->top);
XFORM xform = {xscale, 0, 0, yscale, 0, 0};
xform.eDx = lpRect->left;
xform.eDy = lpRect->top;
XFORM xform;
xform.eM11 = xscale;
xform.eM12 = 0;
xform.eM21 = 0;
xform.eM22 = yscale;
xform.eDx = lpRect->left;
xform.eDy = lpRect->top;
FIXME(metafile, "play into rect doesn't work\n");
savedMode = SetGraphicsMode(hdc, GM_ADVANCED);
if (!SetWorldTransform(hdc, &xform)) {
@ -528,7 +532,7 @@ BOOL WINAPI PlayEnhMetaFile(
while (1) {
PlayEnhMetaFileRecord(hdc, ht, p, count);
if (p->iType == EMR_EOF) break;
p = (void *) p + p->nSize; /* casted so that arithmetic is in bytes */
p = (LPENHMETARECORD) ((char *) p + p->nSize); /* casted so that arithmetic is in bytes */
}
GlobalUnlock(hmf);
if (savedMode) SetGraphicsMode(hdc, savedMode);

63
objects/font.c
View file

@ -325,15 +325,30 @@ HFONT16 WINAPI CreateFont16(INT16 height, INT16 width, INT16 esc, INT16 orient,
BYTE clippres, BYTE quality, BYTE pitch,
LPCSTR name )
{
LOGFONT16 logfont = { height, width, esc, orient, weight, italic, underline,
strikeout, charset, outpres, clippres, quality, pitch, };
LOGFONT16 logfont;
TRACE(font,"('%s',%d,%d)\n",
(name ? name : "(null)") , height, width);
logfont.lfHeight = height;
logfont.lfWidth = width;
logfont.lfEscapement = esc;
logfont.lfOrientation = orient;
logfont.lfWeight = weight;
logfont.lfItalic = italic;
logfont.lfUnderline = underline;
logfont.lfStrikeOut = strikeout;
logfont.lfCharSet = charset;
logfont.lfOutPrecision = outpres;
logfont.lfClipPrecision = clippres;
logfont.lfQuality = quality;
logfont.lfPitchAndFamily = pitch;
if (name)
lstrcpynA(logfont.lfFaceName,name,sizeof(logfont.lfFaceName));
else
logfont.lfFaceName[0] = '\0';
return CreateFontIndirect16( &logfont );
}
@ -480,8 +495,16 @@ INT16 WINAPI EnumFontFamiliesEx16( HDC16 hDC, LPLOGFONT16 plf,
LPENUMLOGFONTEX16 lplf16 = SEGPTR_ALLOC( sizeof(ENUMLOGFONTEX16) );
if( lplf16 )
{
fontEnum16 fe16 = { plf, efproc, lParam, lptm16, lplf16,
SEGPTR_GET(lptm16), SEGPTR_GET(lplf16) };
fontEnum16 fe16;
fe16.lpLogFontParam = plf;
fe16.lpEnumFunc = efproc;
fe16.lpData = lParam;
fe16.lpTextMetric = lptm16;
fe16.lpLogFont = lplf16;
fe16.segTextMetric = SEGPTR_GET(lptm16);
fe16.segLogFont = SEGPTR_GET(lplf16);
retVal = dc->funcs->pEnumDeviceFonts( dc, plf, FONT_EnumInstance16, (LPARAM)&fe16 );
@ -506,7 +529,15 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro
LOGFONT16 lf16;
NEWTEXTMETRICEXW tm32w;
ENUMLOGFONTEXW lf32w;
fontEnum32 fe32 = { plf, efproc, lParam, &tm32w, &lf32w, dwUnicode };
fontEnum32 fe32;
fe32.lpLogFontParam = plf;
fe32.lpEnumFunc = efproc;
fe32.lpData = lParam;
fe32.lpTextMetric = &tm32w;
fe32.lpLogFont = &lf32w;
fe32.dwFlags = dwUnicode;
/* the only difference between LOGFONT32A and LOGFONT32W is in the lfFaceName */
@ -948,17 +979,17 @@ BOOL WINAPI GetTextMetricsA( HDC hdc, TEXTMETRICA *metrics )
metrics->tmMaxCharWidth = WDPTOLP(metrics->tmMaxCharWidth);
metrics->tmOverhang = WDPTOLP(metrics->tmOverhang);
TRACE(font,"text metrics:
Weight = %03i\t FirstChar = %03i\t AveCharWidth = %i
Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %i
UnderLined = %01i\t DefaultChar = %03i\t Overhang = %i
StruckOut = %01i\t BreakChar = %03i\t CharSet = %i
PitchAndFamily = %02x
--------------------
InternalLeading = %i
Ascent = %i
Descent = %i
Height = %i\n",
TRACE(font, "text metrics:\n"
" Weight = %03i\t FirstChar = %03i\t AveCharWidth = %i\n"
" Italic = % 3i\t LastChar = %03i\t\t MaxCharWidth = %i\n"
" UnderLined = %01i\t DefaultChar = %03i\t Overhang = %i\n"
" StruckOut = %01i\t BreakChar = %03i\t CharSet = %i\n"
" PitchAndFamily = %02x\n"
" --------------------\n"
" InternalLeading = %i\n"
" Ascent = %i\n"
" Descent = %i\n"
" Height = %i\n",
metrics->tmWeight, metrics->tmFirstChar, metrics->tmAveCharWidth,
metrics->tmItalic, metrics->tmLastChar, metrics->tmMaxCharWidth,
metrics->tmUnderlined, metrics->tmDefaultChar, metrics->tmOverhang,

17
ole/compositemoniker.c
View file

@ -301,8 +301,9 @@ HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker* iface,IStream* pStm)
return E_FAIL;
while(1){
//res=OleLoadFromStream(pStm,&IID_IMoniker,(void**)&This->tabMoniker[This->tabLastIndex]);
#if 0
res=OleLoadFromStream(pStm,&IID_IMoniker,(void**)&This->tabMoniker[This->tabLastIndex]);
#endif
res=ReadClassStm(pStm,&clsid);
printf("res=%ld",res);
if (FAILED(res))
@ -345,7 +346,7 @@ HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker* iface,IStream* pStm)
if (++This->tabLastIndex==This->tabSize){
This->tabSize+=BLOCK_TAB_SIZE;
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,sizeof(IMoniker[This->tabSize]));
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
if (This->tabMoniker==NULL)
return E_OUTOFMEMORY;
@ -450,7 +451,7 @@ HRESULT WINAPI CompositeMonikerImpl_Construct(CompositeMonikerImpl* This,LPMONIK
This->tabSize=BLOCK_TAB_SIZE;
This->tabLastIndex=0;
This->tabMoniker=HeapAlloc(GetProcessHeap(),0,sizeof(IMoniker[This->tabSize]));
This->tabMoniker=HeapAlloc(GetProcessHeap(),0,This->tabSize*sizeof(IMoniker));
if (This->tabMoniker==NULL)
return E_OUTOFMEMORY;
@ -472,7 +473,7 @@ HRESULT WINAPI CompositeMonikerImpl_Construct(CompositeMonikerImpl* This,LPMONIK
if (++This->tabLastIndex==This->tabSize){
This->tabSize+=BLOCK_TAB_SIZE;
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,sizeof(IMoniker[This->tabSize]));
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
if (This->tabMoniker==NULL)
return E_OUTOFMEMORY;
@ -522,7 +523,7 @@ HRESULT WINAPI CompositeMonikerImpl_Construct(CompositeMonikerImpl* This,LPMONIK
This->tabSize+=BLOCK_TAB_SIZE;
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,sizeof(IMoniker[This->tabSize]));
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
if (This->tabMoniker==NULL)
return E_OUTOFMEMORY;
@ -559,7 +560,7 @@ HRESULT WINAPI CompositeMonikerImpl_Construct(CompositeMonikerImpl* This,LPMONIK
This->tabSize+=BLOCK_TAB_SIZE;
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,sizeof(IMoniker[This->tabSize]));
This->tabMoniker=HeapReAlloc(GetProcessHeap(),0,This->tabMoniker,This->tabSize*sizeof(IMoniker));
if (This->tabMoniker==NULL)
return E_OUTOFMEMORY;
@ -1613,7 +1614,7 @@ HRESULT WINAPI EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker,
newEnumMoniker->tabSize=tabSize;
newEnumMoniker->currentPos=currentPos;
newEnumMoniker->tabMoniker=HeapAlloc(GetProcessHeap(),0,sizeof(IMoniker[tabSize]));
newEnumMoniker->tabMoniker=HeapAlloc(GetProcessHeap(),0,tabSize*sizeof(IMoniker));
if (newEnumMoniker->tabMoniker==NULL)
return E_OUTOFMEMORY;

2
ole/filemoniker.c
View file

@ -1071,7 +1071,7 @@ int WINAPI FileMonikerImpl_DecomposePath(LPOLESTR str, LPOLESTR** stringTable)
int len=lstrlenW(str);
strgtable =CoTaskMemAlloc(sizeof(LPOLESTR[len]));
strgtable =CoTaskMemAlloc(len*sizeof(LPOLESTR));
if (strgtable==NULL)
return E_OUTOFMEMORY;

10
ole/ole2nls.c
View file

@ -2670,12 +2670,16 @@ static INT OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
int buflen=0;
WCHAR arg0[] = {0}, arg1[] = {'%','d',0};
WCHAR arg2[] = {'%','0','2','d',0};
WCHAR *argarr[] = {arg0, arg1, arg2};
WCHAR *argarr[3];
int datevars=0, timevars=0;
argarr[0] = arg0;
argarr[1] = arg1;
argarr[2] = arg2;
/* make a debug report */
TRACE(ole, "args: 0x%lx, 0x%lx, 0x%lx, time(d=%d,h=%d,m=%d,s=%d), fmt:%s (at %p),
%p with max len %d\n",
TRACE(ole, "args: 0x%lx, 0x%lx, 0x%lx, time(d=%d,h=%d,m=%d,s=%d), fmt:%s (at %p), "
"%p with max len %d\n",
locale, flags, tflags,
xtime->wDay, xtime->wHour, xtime->wMinute, xtime->wSecond,
debugstr_w(format), format, output, outlen);

4
ole/olefont.c
View file

@ -75,8 +75,8 @@ struct OLEFontImpl
* by this object.
*/
#define _ICOM_THIS(class,name) class* this = (class*)name;
#define _ICOM_THIS_From_IDispatch(class, name) class* this = (class*)(((void*)name)-sizeof(void*));
#define _ICOM_THIS_From_IPersistStream(class, name) class* this = (class*)(((void*)name)-2*sizeof(void*));
#define _ICOM_THIS_From_IDispatch(class, name) class* this = (class*)(((char*)name)-sizeof(void*));
#define _ICOM_THIS_From_IPersistStream(class, name) class* this = (class*)(((char*)name)-2*sizeof(void*));
/***********************************************************************
* Prototypes for the implementation functions for the IFont

24
ole/safearray.c
View file

@ -271,7 +271,7 @@ HRESULT WINAPI SafeArrayPutElement(
stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
/* Figure out the number of byte to skip ... */
elementStorageAddress = psa->pvData+(stepCountInSAData*psa->cbElements);
elementStorageAddress = (char *) psa->pvData+(stepCountInSAData*psa->cbElements);
if(isPointer(psa->fFeatures)) { /* increment ref count for this pointer */
@ -327,7 +327,7 @@ HRESULT WINAPI SafeArrayGetElement(
stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
/* Figure out the number of byte to skip ... */
elementStorageAddress = psa->pvData+(stepCountInSAData*psa->cbElements);
elementStorageAddress = (char *) psa->pvData+(stepCountInSAData*psa->cbElements);
if( psa->fFeatures == FADF_BSTR) { /* reallocate the obj */
if( (pbstrReturnedStr =
@ -479,7 +479,7 @@ HRESULT WINAPI SafeArrayPtrOfIndex(
/* Figure out the number of items to skip */
stepCountInSAData = calcDisplacement(rgIndices, psa->rgsabound, psa->cDims);
*ppvData = psa->pvData+(stepCountInSAData*psa->cbElements);
*ppvData = (char *) psa->pvData+(stepCountInSAData*psa->cbElements);
return S_OK;
}
@ -507,7 +507,7 @@ HRESULT WINAPI SafeArrayDestroyData(
if(isPointer(psa->fFeatures)) { /* release the pointers */
for(ulDataIter=0; ulDataIter < ulWholeArraySize; ulDataIter++) {
punk = *(IUnknown**)(psa->pvData+(ulDataIter*(psa->cbElements)));
punk = *(IUnknown**)((char *) psa->pvData+(ulDataIter*(psa->cbElements)));
if( punk != NULL)
IUnknown_Release(punk);
@ -516,7 +516,7 @@ HRESULT WINAPI SafeArrayDestroyData(
} else if(psa->fFeatures & FADF_BSTR) { /* deallocate the obj */
for(ulDataIter=0; ulDataIter < ulWholeArraySize; ulDataIter++) {
bstr = *(BSTR*)(psa->pvData+(ulDataIter*(psa->cbElements)));
bstr = *(BSTR*)((char *) psa->pvData+(ulDataIter*(psa->cbElements)));
if( bstr != NULL)
SysFreeString( bstr );
@ -570,7 +570,7 @@ HRESULT WINAPI SafeArrayCopyData(
that must be released */
for(lDelta=0;lDelta < ulWholeArraySize; lDelta++) {
punk = *(IUnknown**)
((*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
((char *) (*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
if( punk != NULL)
IUnknown_Release(punk);
@ -580,7 +580,7 @@ HRESULT WINAPI SafeArrayCopyData(
that must be freed */
for(lDelta=0;lDelta < ulWholeArraySize; lDelta++) {
bstr =
*(BSTR*)((*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
*(BSTR*)((char *) (*psaTarget)->pvData + (lDelta * (*psaTarget)->cbElements));
if( bstr != NULL)
SysFreeString( bstr );
@ -788,7 +788,7 @@ static BOOL resizeSafeArray(
if( isPointer(psa->fFeatures)) /* ptr that need to be released */
for(;lDelta < 0; lDelta++) {
punk = *(IUnknown**)
(psa->pvData+((ulWholeArraySize+lDelta)*psa->cbElements));
((char *) psa->pvData+((ulWholeArraySize+lDelta)*psa->cbElements));
if( punk != NULL )
IUnknown_Release(punk);
@ -797,7 +797,7 @@ static BOOL resizeSafeArray(
else if(psa->fFeatures & FADF_BSTR) /* BSTR that need to be freed */
for(;lDelta < 0; lDelta++) {
bstr = *(BSTR*)
(psa->pvData+((ulWholeArraySize+lDelta)*psa->cbElements));
((char *) psa->pvData+((ulWholeArraySize+lDelta)*psa->cbElements));
if( bstr != NULL )
SysFreeString( bstr );
@ -960,7 +960,7 @@ static HRESULT duplicateData(
object's reference count */
for(lDelta=0; lDelta < ulWholeArraySize; lDelta++) {
punk = *(IUnknown**)(psa->pvData+(lDelta * psa->cbElements));
punk = *(IUnknown**)((char *) psa->pvData+(lDelta * psa->cbElements));
if( punk != NULL)
IUnknown_AddRef(punk);
@ -975,13 +975,13 @@ static HRESULT duplicateData(
for(lDelta=0; lDelta < ulWholeArraySize; lDelta++) {
if(( pbstrReAllocStr = SysAllocString(
*(BSTR*)(psa->pvData+(lDelta * psa->cbElements)))) == NULL) {
*(BSTR*)((char *) psa->pvData+(lDelta * psa->cbElements)))) == NULL) {
SafeArrayUnlock(*ppsaOut);
return E_OUTOFMEMORY;
}
*((BSTR*)((*ppsaOut)->pvData+(lDelta * psa->cbElements))) =
*((BSTR*)((char *) (*ppsaOut)->pvData+(lDelta * psa->cbElements))) =
pbstrReAllocStr;
}

4
ole/storage.c
View file

@ -1048,7 +1048,7 @@ HRESULT WINAPI IStream16_fnWrite(
if (cc>cb)
cc=cb;
memcpy( ((LPBYTE)block)+(This->offset.LowPart&(SMALLSIZE-1)),
(LPBYTE)(pv+curoffset),
(LPBYTE)((char *) pv+curoffset),
cc
);
if (!STORAGE_put_small_block(hf,blocknr,block))
@ -1076,7 +1076,7 @@ HRESULT WINAPI IStream16_fnWrite(
if (cc>cb)
cc=cb;
memcpy( ((LPBYTE)block)+(This->offset.LowPart&(BIGSIZE-1)),
(LPBYTE)(pv+curoffset),
(LPBYTE)((char *) pv+curoffset),
cc
);
if (!STORAGE_put_big_block(hf,blocknr,block))

1
tools/wrc/parser.y
View file

@ -91,6 +91,7 @@
#include <assert.h>
#include <ctype.h>
#include <string.h>
#include <alloca.h>
#include <config.h>
#include "wrc.h"

4
windows/class.c
View file

@ -423,8 +423,8 @@ ATOM WINAPI RegisterClass16( const WNDCLASS16 *wc )
return 0;
}
TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x
bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
TRACE(class, "atom=%04x wndproc=%08lx hinst=%04x "
"bg=%04x style=%08x clsExt=%d winExt=%d class=%p name='%s'\n",
atom, (DWORD)wc->lpfnWndProc, hInstance,
wc->hbrBackground, wc->style, wc->cbClsExtra,
wc->cbWndExtra, classPtr,

4
windows/dinput.c
View file

@ -380,7 +380,7 @@ static HRESULT WINAPI SysKeyboardAImpl_SetProperty(
ph->dwSize,ph->dwHeaderSize,ph->dwObj,ph->dwHow);
if (!HIWORD(rguid)) {
switch ((DWORD)rguid) {
case DIPROP_BUFFERSIZE: {
case (DWORD) DIPROP_BUFFERSIZE: {
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
TRACE(dinput,"(buffersize=%ld)\n",pd->dwData);
@ -1076,7 +1076,7 @@ static HRESULT WINAPI SysMouseAImpl_SetProperty(LPDIRECTINPUTDEVICE2A iface,
if (!HIWORD(rguid)) {
switch ((DWORD)rguid) {
case DIPROP_BUFFERSIZE: {
case (DWORD) DIPROP_BUFFERSIZE: {
LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph;
TRACE(dinput,"buffersize = %ld\n",pd->dwData);

29
windows/winpos.c
View file

@ -1146,12 +1146,16 @@ UINT WINPOS_MinMaximize( WND* wndPtr, UINT16 cmd, LPRECT16 lpRect )
{
UINT swpFlags = 0;
POINT pt;
POINT size = { wndPtr->rectWindow.left, wndPtr->rectWindow.top };
LPINTERNALPOS lpPos = WINPOS_InitInternalPos( wndPtr, size,
&wndPtr->rectWindow );
POINT size;
LPINTERNALPOS lpPos;
TRACE(win,"0x%04x %u\n", wndPtr->hwndSelf, cmd );
size.x = wndPtr->rectWindow.left;
size.y = wndPtr->rectWindow.top;
lpPos = WINPOS_InitInternalPos( wndPtr, size, &wndPtr->rectWindow );
if (lpPos && !HOOK_CallHooks16(WH_CBT, HCBT_MINMAX, wndPtr->hwndSelf, cmd))
{
if( wndPtr->dwStyle & WS_MINIMIZE )
@ -1540,12 +1544,19 @@ BOOL WINAPI SetWindowPlacement( HWND hwnd, const WINDOWPLACEMENT *pwpl32 )
{
if( pwpl32 )
{
WINDOWPLACEMENT16 wpl = { sizeof(WINDOWPLACEMENT16),
pwpl32->flags, pwpl32->showCmd, { pwpl32->ptMinPosition.x,
pwpl32->ptMinPosition.y }, { pwpl32->ptMaxPosition.x,
pwpl32->ptMaxPosition.y }, { pwpl32->rcNormalPosition.left,
pwpl32->rcNormalPosition.top, pwpl32->rcNormalPosition.right,
pwpl32->rcNormalPosition.bottom } };
WINDOWPLACEMENT16 wpl;
wpl.length = sizeof(WINDOWPLACEMENT16);
wpl.flags = pwpl32->flags;
wpl.showCmd = pwpl32->showCmd;
wpl.ptMinPosition.x = pwpl32->ptMinPosition.x;
wpl.ptMinPosition.y = pwpl32->ptMinPosition.y;
wpl.ptMaxPosition.x = pwpl32->ptMaxPosition.x;
wpl.ptMaxPosition.y = pwpl32->ptMaxPosition.y;
wpl.rcNormalPosition.left = pwpl32->rcNormalPosition.left;
wpl.rcNormalPosition.top = pwpl32->rcNormalPosition.top;
wpl.rcNormalPosition.right = pwpl32->rcNormalPosition.right;
wpl.rcNormalPosition.bottom = pwpl32->rcNormalPosition.bottom;
return WINPOS_SetPlacement( hwnd, &wpl, PLACE_MIN | PLACE_MAX | PLACE_RECT );
}

4
windows/winproc.c
View file

@ -540,7 +540,7 @@ INT WINPROC_MapMsg32ATo32W( HWND hwnd, UINT msg, WPARAM wParam, LPARAM *plparam
LPARAM *ptr = (LPARAM *) HEAP_xalloc( SystemHeap, 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(WCHAR) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
(WORD)*ptr = len; /* Store the lenght */
*((WORD *) ptr) = len; /* Store the length */
*plparam = (LPARAM)ptr;
}
return 1;
@ -761,7 +761,7 @@ INT WINPROC_MapMsg32WTo32A( HWND hwnd, UINT msg, WPARAM wParam, LPARAM *plparam
LPARAM *ptr = (LPARAM *) HEAP_xalloc( SystemHeap, 0, sizeof(LPARAM) + sizeof (WORD) + len*sizeof(CHAR) );
if (!ptr) return -1;
*ptr++ = *plparam; /* Store previous lParam */
(WORD)*ptr = len; /* Store the lenght */
*((WORD *) ptr) = len; /* Store the length */
*plparam = (LPARAM)ptr;
}
return 1;