January 2009 - Wine-Commits

Henri Verbeet : ddraw: Get rid of ICOM_INIT_INTERFACE.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: ad171b143f05721415aae619a88464b9b1e6dadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad171b143f05721415aae619a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 21 09:56:13 2009 +0100 ddraw: Get rid of ICOM_INIT_INTERFACE. --- dlls/ddraw/ddcomimpl.h | 5 ----- dlls/ddraw/ddraw.c | 20 ++++++++++---------- dlls/ddraw/device.c | 3 +-- dlls/ddraw/direct3d.c | 27 +++++++++++++-------------- dlls/ddraw/main.c | 20 ++++++++++---------- 5 files changed, 34 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/ddcomimpl.h b/dlls/ddraw/ddcomimpl.h index 9293849..14d6aba 100644 --- a/dlls/ddraw/ddcomimpl.h +++ b/dlls/ddraw/ddcomimpl.h @@ -42,11 +42,6 @@ #define ICOM_INTERFACE(implobj, iface) \ ((iface *)(implobj == NULL ? NULL :&((implobj)->ICOM_VFIELD_MULTI_NAME(iface)))) -#define ICOM_INIT_INTERFACE(implobj, ifacename, vtblname) \ - do { \ - (implobj)->ICOM_VFIELD_MULTI_NAME(ifacename) = &(vtblname); \ - } while (0) - #define COM_INTERFACE_CAST(impltype, ifnamefrom, ifnameto, ifaceptr) \ ICOM_INTERFACE(ICOM_OBJECT(impltype, ifnamefrom, ifaceptr), ifnameto) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3459bf2..6df1b27 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1728,7 +1728,7 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf, * new surface */ parImpl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parImpl)); - ICOM_INIT_INTERFACE(parImpl, IParent, IParent_Vtbl); + parImpl->IParent_vtbl = &IParent_Vtbl; parImpl->ref = 1; Parent = (IUnknown *) parImpl; @@ -1997,11 +1997,11 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, ERR("(%p) Error allocating memory for a surface\n", This); return DDERR_OUTOFVIDEOMEMORY; } - ICOM_INIT_INTERFACE(*ppSurf, IDirectDrawSurface7, IDirectDrawSurface7_Vtbl); - ICOM_INIT_INTERFACE(*ppSurf, IDirectDrawSurface3, IDirectDrawSurface3_Vtbl); - ICOM_INIT_INTERFACE(*ppSurf, IDirectDrawGammaControl, IDirectDrawGammaControl_Vtbl); - ICOM_INIT_INTERFACE(*ppSurf, IDirect3DTexture2, IDirect3DTexture2_Vtbl); - ICOM_INIT_INTERFACE(*ppSurf, IDirect3DTexture, IDirect3DTexture1_Vtbl); + (*ppSurf)->IDirectDrawSurface7_vtbl = &IDirectDrawSurface7_Vtbl; + (*ppSurf)->IDirectDrawSurface3_vtbl = &IDirectDrawSurface3_Vtbl; + (*ppSurf)->IDirectDrawGammaControl_vtbl = &IDirectDrawGammaControl_Vtbl; + (*ppSurf)->IDirect3DTexture2_vtbl = &IDirect3DTexture2_Vtbl; + (*ppSurf)->IDirect3DTexture_vtbl = &IDirect3DTexture1_Vtbl; (*ppSurf)->ref = 1; (*ppSurf)->version = 7; TRACE("%p->version = %d\n", (*ppSurf), (*ppSurf)->version); @@ -2036,7 +2036,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, return DDERR_OUTOFMEMORY; } parImpl->ref = 1; - ICOM_INIT_INTERFACE(parImpl, IParent, IParent_Vtbl); + parImpl->IParent_vtbl = &IParent_Vtbl; Parent = (IUnknown *) ICOM_INTERFACE(parImpl, IParent); TRACE("Using IParent interface %p as parent\n", parImpl); } @@ -3140,7 +3140,7 @@ DirectDrawCreateClipper(DWORD Flags, return E_OUTOFMEMORY; } - ICOM_INIT_INTERFACE(object, IDirectDrawClipper, IDirectDrawClipper_Vtbl); + object->IDirectDrawClipper_vtbl = &IDirectDrawClipper_Vtbl; object->ref = 1; object->wineD3DClipper = pWineDirect3DCreateClipper((IUnknown *) object); if(!object->wineD3DClipper) @@ -3225,7 +3225,7 @@ IDirectDrawImpl_CreatePalette(IDirectDraw7 *iface, return E_OUTOFMEMORY; } - ICOM_INIT_INTERFACE(object, IDirectDrawPalette, IDirectDrawPalette_Vtbl); + object->IDirectDrawPalette_vtbl = &IDirectDrawPalette_Vtbl; object->ref = 1; object->ddraw_owner = This; @@ -3608,7 +3608,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar return DDERR_OUTOFVIDEOMEMORY; } - ICOM_INIT_INTERFACE(object, IParent, IParent_Vtbl); + object->IParent_vtbl = &IParent_Vtbl; object->ref = 1; hr = IWineD3DDevice_CreateSwapChain(This->wineD3DDevice, present_parameters, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f4d86ac..113a99c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -751,8 +751,7 @@ IDirect3DDeviceImpl_1_CreateExecuteBuffer(IDirect3DDevice *iface, return DDERR_OUTOFMEMORY; } - ICOM_INIT_INTERFACE(object, IDirect3DExecuteBuffer, IDirect3DExecuteBuffer_Vtbl); - + object->IDirect3DExecuteBuffer_vtbl = &IDirect3DExecuteBuffer_Vtbl; object->ref = 1; object->d3ddev = This; diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 60591d6..89300e5 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -442,7 +442,7 @@ IDirect3DImpl_3_CreateLight(IDirect3D3 *iface, if (object == NULL) return DDERR_OUTOFMEMORY; - ICOM_INIT_INTERFACE(object, IDirect3DLight, IDirect3DLight_Vtbl); + object->IDirect3DLight_vtbl = &IDirect3DLight_Vtbl; object->ref = 1; object->ddraw = This; object->next = NULL; @@ -522,9 +522,9 @@ IDirect3DImpl_3_CreateMaterial(IDirect3D3 *iface, if (object == NULL) return DDERR_OUTOFMEMORY; - ICOM_INIT_INTERFACE(object, IDirect3DMaterial3, IDirect3DMaterial3_Vtbl); - ICOM_INIT_INTERFACE(object, IDirect3DMaterial2, IDirect3DMaterial2_Vtbl); - ICOM_INIT_INTERFACE(object, IDirect3DMaterial, IDirect3DMaterial_Vtbl); + object->IDirect3DMaterial3_vtbl = &IDirect3DMaterial3_Vtbl; + object->IDirect3DMaterial2_vtbl = &IDirect3DMaterial2_Vtbl; + object->IDirect3DMaterial_vtbl = &IDirect3DMaterial_Vtbl; object->ref = 1; object->ddraw = This; object->activate = material_activate; @@ -613,7 +613,7 @@ IDirect3DImpl_3_CreateViewport(IDirect3D3 *iface, if (object == NULL) return DDERR_OUTOFMEMORY; - ICOM_INIT_INTERFACE(object, IDirect3DViewport3, IDirect3DViewport3_Vtbl); + object->IDirect3DViewport3_vtbl = &IDirect3DViewport3_Vtbl; object->ref = 1; object->ddraw = This; object->activate = viewport_activate; @@ -806,14 +806,13 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, } if (This->cooperative_level & DDSCL_FPUPRESERVE) - ICOM_INIT_INTERFACE(object, IDirect3DDevice7, IDirect3DDevice7_FPUPreserve_Vtbl); + object->IDirect3DDevice7_vtbl = &IDirect3DDevice7_FPUPreserve_Vtbl; else - ICOM_INIT_INTERFACE(object, IDirect3DDevice7, IDirect3DDevice7_FPUSetup_Vtbl); - - ICOM_INIT_INTERFACE(object, IDirect3DDevice3, IDirect3DDevice3_Vtbl); - ICOM_INIT_INTERFACE(object, IDirect3DDevice2, IDirect3DDevice2_Vtbl); - ICOM_INIT_INTERFACE(object, IDirect3DDevice, IDirect3DDevice1_Vtbl); + object->IDirect3DDevice7_vtbl = &IDirect3DDevice7_FPUSetup_Vtbl; + object->IDirect3DDevice3_vtbl = &IDirect3DDevice3_Vtbl; + object->IDirect3DDevice2_vtbl = &IDirect3DDevice2_Vtbl; + object->IDirect3DDevice_vtbl = &IDirect3DDevice1_Vtbl; object->ref = 1; object->ddraw = This; object->viewport_list = NULL; @@ -838,7 +837,7 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, LeaveCriticalSection(&ddraw_cs); return DDERR_OUTOFMEMORY; } - ICOM_INIT_INTERFACE(IndexBufferParent, IParent, IParent_Vtbl); + IndexBufferParent->IParent_vtbl = &IParent_Vtbl; IndexBufferParent->ref = 1; /* Create an Index Buffer. WineD3D needs one for Drawing indexed primitives @@ -1043,8 +1042,8 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface, } object->ref = 1; - ICOM_INIT_INTERFACE(object, IDirect3DVertexBuffer7, IDirect3DVertexBuffer7_Vtbl); - ICOM_INIT_INTERFACE(object, IDirect3DVertexBuffer, IDirect3DVertexBuffer1_Vtbl); + object->IDirect3DVertexBuffer7_vtbl = &IDirect3DVertexBuffer7_Vtbl; + object->IDirect3DVertexBuffer_vtbl = &IDirect3DVertexBuffer1_Vtbl; object->Caps = Desc->dwCaps; object->ddraw = This; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 67b38e2..10b5969 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -171,15 +171,15 @@ DDRAW_Create(const GUID *guid, * IDirectDraw and IDirect3D are the same object, * QueryInterface is used to get other interfaces. */ - ICOM_INIT_INTERFACE(This, IDirectDraw, IDirectDraw1_Vtbl); - ICOM_INIT_INTERFACE(This, IDirectDraw2, IDirectDraw2_Vtbl); - ICOM_INIT_INTERFACE(This, IDirectDraw3, IDirectDraw3_Vtbl); - ICOM_INIT_INTERFACE(This, IDirectDraw4, IDirectDraw4_Vtbl); - ICOM_INIT_INTERFACE(This, IDirectDraw7, IDirectDraw7_Vtbl); - ICOM_INIT_INTERFACE(This, IDirect3D, IDirect3D1_Vtbl); - ICOM_INIT_INTERFACE(This, IDirect3D2, IDirect3D2_Vtbl); - ICOM_INIT_INTERFACE(This, IDirect3D3, IDirect3D3_Vtbl); - ICOM_INIT_INTERFACE(This, IDirect3D7, IDirect3D7_Vtbl); + This->IDirectDraw_vtbl = &IDirectDraw1_Vtbl; + This->IDirectDraw2_vtbl = &IDirectDraw2_Vtbl; + This->IDirectDraw3_vtbl = &IDirectDraw3_Vtbl; + This->IDirectDraw4_vtbl = &IDirectDraw4_Vtbl; + This->IDirectDraw7_vtbl = &IDirectDraw7_Vtbl; + This->IDirect3D_vtbl = &IDirect3D1_Vtbl; + This->IDirect3D2_vtbl = &IDirect3D2_Vtbl; + This->IDirect3D3_vtbl = &IDirect3D3_Vtbl; + This->IDirect3D7_vtbl = &IDirect3D7_Vtbl; This->device_parent_vtbl = &ddraw_wined3d_device_parent_vtbl; /* See comments in IDirectDrawImpl_CreateNewSurface for a description @@ -700,7 +700,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - ICOM_INIT_INTERFACE(factory, IClassFactory, IClassFactory_Vtbl); + factory->IClassFactory_vtbl = &IClassFactory_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance;

1 0

Henri Verbeet : ddraw: Get rid of ICOM_VFIELD_MULTI.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 4e38c2e943f86251316df2ec4d48b386701f24b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e38c2e943f86251316df2ec4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 21 09:56:13 2009 +0100 ddraw: Get rid of ICOM_VFIELD_MULTI. --- dlls/ddraw/ddcomimpl.h | 8 +---- dlls/ddraw/ddraw_private.h | 60 ++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/ddcomimpl.h b/dlls/ddraw/ddcomimpl.h index 387ee3e..9293849 100644 --- a/dlls/ddraw/ddcomimpl.h +++ b/dlls/ddraw/ddcomimpl.h @@ -26,10 +26,6 @@ /* The canonical name for a single interface is "lpVtbl". */ #define ICOM_VFIELD_MULTI_NAME(iface) iface##_vtbl -/* Declares a vtable pointer field in an implementation. */ -#define ICOM_VFIELD_MULTI(iface) \ - iface ICOM_VFIELD_MULTI_NAME(iface) - /* Returns the offset of a vtable pointer within an implementation object. */ #define ICOM_VFIELD_OFFSET(impltype, iface) \ offsetof(impltype, ICOM_VFIELD_MULTI_NAME(iface)) @@ -44,11 +40,11 @@ /* Given an object and interface name, returns a pointer to that interface. */ #define ICOM_INTERFACE(implobj, iface) \ - (implobj == NULL ? NULL :&((implobj)->ICOM_VFIELD_MULTI_NAME(iface))) + ((iface *)(implobj == NULL ? NULL :&((implobj)->ICOM_VFIELD_MULTI_NAME(iface)))) #define ICOM_INIT_INTERFACE(implobj, ifacename, vtblname) \ do { \ - (implobj)->ICOM_VFIELD_MULTI_NAME(ifacename).lpVtbl = &(vtblname); \ + (implobj)->ICOM_VFIELD_MULTI_NAME(ifacename) = &(vtblname); \ } while (0) #define COM_INTERFACE_CAST(impltype, ifnamefrom, ifnameto, ifaceptr) \ diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 399a5b8..8d463db 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -100,15 +100,15 @@ struct FvfToDecl struct IDirectDrawImpl { /* IUnknown fields */ - ICOM_VFIELD_MULTI(IDirectDraw7); - ICOM_VFIELD_MULTI(IDirectDraw4); - ICOM_VFIELD_MULTI(IDirectDraw3); - ICOM_VFIELD_MULTI(IDirectDraw2); - ICOM_VFIELD_MULTI(IDirectDraw); - ICOM_VFIELD_MULTI(IDirect3D7); - ICOM_VFIELD_MULTI(IDirect3D3); - ICOM_VFIELD_MULTI(IDirect3D2); - ICOM_VFIELD_MULTI(IDirect3D); + const IDirectDraw7Vtbl *IDirectDraw7_vtbl; + const IDirectDraw4Vtbl *IDirectDraw4_vtbl; + const IDirectDraw3Vtbl *IDirectDraw3_vtbl; + const IDirectDraw2Vtbl *IDirectDraw2_vtbl; + const IDirectDrawVtbl *IDirectDraw_vtbl; + const IDirect3D7Vtbl *IDirect3D7_vtbl; + const IDirect3D3Vtbl *IDirect3D3_vtbl; + const IDirect3D2Vtbl *IDirect3D2_vtbl; + const IDirect3DVtbl *IDirect3D_vtbl; const IWineD3DDeviceParentVtbl *device_parent_vtbl; /* See comment in IDirectDraw::AddRef */ @@ -219,11 +219,11 @@ extern WINED3DSURFTYPE DefaultSurfaceType; struct IDirectDrawSurfaceImpl { /* IUnknown fields */ - ICOM_VFIELD_MULTI(IDirectDrawSurface7); - ICOM_VFIELD_MULTI(IDirectDrawSurface3); - ICOM_VFIELD_MULTI(IDirectDrawGammaControl); - ICOM_VFIELD_MULTI(IDirect3DTexture2); - ICOM_VFIELD_MULTI(IDirect3DTexture); + const IDirectDrawSurface7Vtbl *IDirectDrawSurface7_vtbl; + const IDirectDrawSurface3Vtbl *IDirectDrawSurface3_vtbl; + const IDirectDrawGammaControlVtbl *IDirectDrawGammaControl_vtbl; + const IDirect3DTexture2Vtbl *IDirect3DTexture2_vtbl; + const IDirect3DTextureVtbl *IDirect3DTexture_vtbl; LONG ref; IUnknown *ifaceToRelease; @@ -292,7 +292,7 @@ void IDirectDrawSurfaceImpl_Destroy(IDirectDrawSurfaceImpl *This); struct IParentImpl { /* IUnknown fields */ - ICOM_VFIELD_MULTI(IParent); + const IParentVtbl *IParent_vtbl; LONG ref; /* IParentImpl fields */ @@ -323,10 +323,10 @@ struct HandleEntry struct IDirect3DDeviceImpl { /* IUnknown */ - ICOM_VFIELD_MULTI(IDirect3DDevice7); - ICOM_VFIELD_MULTI(IDirect3DDevice3); - ICOM_VFIELD_MULTI(IDirect3DDevice2); - ICOM_VFIELD_MULTI(IDirect3DDevice); + const IDirect3DDevice7Vtbl *IDirect3DDevice7_vtbl; + const IDirect3DDevice3Vtbl *IDirect3DDevice3_vtbl; + const IDirect3DDevice2Vtbl *IDirect3DDevice2_vtbl; + const IDirect3DDeviceVtbl *IDirect3DDevice_vtbl; LONG ref; /* Other object connections */ @@ -410,7 +410,7 @@ struct EnumZBufferFormatsData struct IDirectDrawClipperImpl { /* IUnknown fields */ - ICOM_VFIELD_MULTI(IDirectDrawClipper); + const IDirectDrawClipperVtbl *IDirectDrawClipper_vtbl; LONG ref; IWineD3DClipper *wineD3DClipper; @@ -427,7 +427,7 @@ typeof(WineDirect3DCreateClipper) *pWineDirect3DCreateClipper; struct IDirectDrawPaletteImpl { /* IUnknown fields */ - ICOM_VFIELD_MULTI(IDirectDrawPalette); + const IDirectDrawPaletteVtbl *IDirectDrawPalette_vtbl; LONG ref; /* WineD3D uplink */ @@ -444,7 +444,7 @@ extern const IDirectDrawPaletteVtbl IDirectDrawPalette_Vtbl; ******************************************************************************/ typedef struct { - ICOM_VFIELD_MULTI(IClassFactory); + const IClassFactoryVtbl *IClassFactory_vtbl; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); @@ -463,7 +463,7 @@ struct object_creation_info ******************************************************************************/ struct IDirect3DLightImpl { - ICOM_VFIELD_MULTI(IDirect3DLight); + const IDirect3DLightVtbl *IDirect3DLight_vtbl; LONG ref; /* IDirect3DLight fields */ @@ -499,9 +499,9 @@ void light_desactivate(IDirect3DLightImpl* This); ******************************************************************************/ struct IDirect3DMaterialImpl { - ICOM_VFIELD_MULTI(IDirect3DMaterial3); - ICOM_VFIELD_MULTI(IDirect3DMaterial2); - ICOM_VFIELD_MULTI(IDirect3DMaterial); + const IDirect3DMaterial3Vtbl *IDirect3DMaterial3_vtbl; + const IDirect3DMaterial2Vtbl *IDirect3DMaterial2_vtbl; + const IDirect3DMaterialVtbl *IDirect3DMaterial_vtbl; LONG ref; /* IDirect3DMaterial2 fields */ @@ -527,7 +527,7 @@ void material_activate(IDirect3DMaterialImpl* This); *****************************************************************************/ struct IDirect3DViewportImpl { - ICOM_VFIELD_MULTI(IDirect3DViewport3); + const IDirect3DViewport3Vtbl *IDirect3DViewport3_vtbl; LONG ref; /* IDirect3DViewport fields */ @@ -572,7 +572,7 @@ void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights); struct IDirect3DExecuteBufferImpl { /* IUnknown */ - ICOM_VFIELD_MULTI(IDirect3DExecuteBuffer); + const IDirect3DExecuteBufferVtbl *IDirect3DExecuteBuffer_vtbl; LONG ref; /* IDirect3DExecuteBuffer fields */ @@ -608,8 +608,8 @@ IDirect3DExecuteBufferImpl_Execute(IDirect3DExecuteBufferImpl *This, struct IDirect3DVertexBufferImpl { /*** IUnknown Methods ***/ - ICOM_VFIELD_MULTI(IDirect3DVertexBuffer7); - ICOM_VFIELD_MULTI(IDirect3DVertexBuffer); + const IDirect3DVertexBuffer7Vtbl *IDirect3DVertexBuffer7_vtbl; + const IDirect3DVertexBufferVtbl *IDirect3DVertexBuffer_vtbl; LONG ref; /*** WineD3D and ddraw links ***/

1 0

Henri Verbeet : ddraw: Get rid of ICOM_VFIELD_MULTI_NAME2.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 94c98d069739e651f77504c173547b9238d6a0bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c98d069739e651f77504c17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 21 09:56:12 2009 +0100 ddraw: Get rid of ICOM_VFIELD_MULTI_NAME2. --- dlls/ddraw/ddcomimpl.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddcomimpl.h b/dlls/ddraw/ddcomimpl.h index 553d29f..387ee3e 100644 --- a/dlls/ddraw/ddcomimpl.h +++ b/dlls/ddraw/ddcomimpl.h @@ -24,8 +24,7 @@ /* Generates the name for a vtable pointer for a given interface. */ /* The canonical name for a single interface is "lpVtbl". */ -#define ICOM_VFIELD_MULTI_NAME2(iface) ITF_##iface -#define ICOM_VFIELD_MULTI_NAME(iface) ICOM_VFIELD_MULTI_NAME2(iface) +#define ICOM_VFIELD_MULTI_NAME(iface) iface##_vtbl /* Declares a vtable pointer field in an implementation. */ #define ICOM_VFIELD_MULTI(iface) \

1 0

Michael Stefaniuc : winenas.drv: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 3ba0eed07183d1a473d519ca0050b69e482d7a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba0eed07183d1a473d519ca0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 09:34:48 2009 +0100 winenas.drv: Remove superfluous pointer casts. --- dlls/winenas.drv/audio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index 51092a8..f418315 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -334,8 +334,8 @@ static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position, static void volume_effect16(void *bufin, void* bufout, int length, int left, int right, int nChannels) { - short *d_out = (short *)bufout; - short *d_in = (short *)bufin; + short *d_out = bufout; + short *d_in = bufin; int i, v; /* @@ -360,8 +360,8 @@ static void volume_effect16(void *bufin, void* bufout, int length, int left, static void volume_effect8(void *bufin, void* bufout, int length, int left, int right, int nChannels) { - char *d_out = (char *)bufout; - char *d_in = (char *)bufin; + char *d_out = bufout; + char *d_in = bufin; int i, v; /* @@ -841,8 +841,8 @@ static void wodPlayer_ProcessMessages(WINE_WAVEOUT* wwo) */ static DWORD CALLBACK wodPlayer(LPVOID pmt) { - WORD uDevID = (DWORD)pmt; - WINE_WAVEOUT* wwo = (WINE_WAVEOUT*)&WOutDev[uDevID]; + WORD uDevID = (DWORD)pmt; + WINE_WAVEOUT* wwo = &WOutDev[uDevID]; wwo->state = WINE_WS_STOPPED; SetEvent(wwo->hStartUpEvent); @@ -1337,7 +1337,7 @@ static int nas_open(WINE_WAVEOUT* wwo) { static AuBool event_handler(AuServer* aud, AuEvent* ev, AuEventHandlerRec* hnd) { - WINE_WAVEOUT *wwo = (WINE_WAVEOUT *)hnd->data; + WINE_WAVEOUT *wwo = hnd->data; switch (ev->type) { case AuEventTypeElementNotify: {

1 0

Michael Stefaniuc : quartz/tests: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 2724adae2d34c756c74703448ff20eb1ce9d3ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2724adae2d34c756c74703448… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 09:35:17 2009 +0100 quartz/tests: Remove superfluous pointer casts. --- dlls/quartz/tests/filtergraph.c | 24 ++++++++++++------------ dlls/quartz/tests/filtermapper.c | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 53f39d5..e3ae100 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -400,9 +400,9 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IEnumMediaTypes)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { @@ -535,9 +535,9 @@ static HRESULT WINAPI TestFilter_Pin_QueryInterface(IPin * iface, REFIID riid, *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { @@ -912,9 +912,9 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)iface; + *ppv = iface; else if (IsEqualIID(riid, &IID_IEnumPins)) - *ppv = (LPVOID)iface; + *ppv = iface; if (*ppv) { @@ -1121,7 +1121,7 @@ static HRESULT TestFilter_Create(const CLSID* pClsid, const TestFilterPinData *p } pTestFilter->nPins = nPins; - *ppv = (LPVOID)pTestFilter; + *ppv = pTestFilter; return S_OK; error: @@ -1147,13 +1147,13 @@ static HRESULT WINAPI TestFilter_QueryInterface(IBaseFilter * iface, REFIID riid *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = (LPVOID)This; + *ppv = This; else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = (LPVOID)This; + *ppv = This; if (*ppv) { @@ -1359,7 +1359,7 @@ static HRESULT WINAPI Test_IClassFactory_QueryInterface( if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { - *ppvObj = (LPVOID)iface; + *ppvObj = iface; IClassFactory_AddRef(iface); return S_OK; } diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index 3025b18..f7d47ab 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -59,7 +59,7 @@ static BOOL enum_find_filter(const WCHAR *wszFilterName, IEnumMoniker *pEnum) { CHAR val1[512], val2[512]; - WideCharToMultiByte(CP_ACP, 0, (WCHAR*)V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); + WideCharToMultiByte(CP_ACP, 0, V_UNION(&var, bstrVal), -1, val1, sizeof(val1), 0, 0); WideCharToMultiByte(CP_ACP, 0, wszFilterName, -1, val2, sizeof(val2), 0, 0); if (!lstrcmpA(val1, val2)) found = TRUE; }

1 0

Michael Stefaniuc : crypt32/tests: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 1dc371c25590c8b464c94f2a43217bfec2c66352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc371c25590c8b464c94f2a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 09:34:36 2009 +0100 crypt32/tests: Remove superfluous pointer casts. --- dlls/crypt32/tests/encode.c | 8 ++++---- dlls/crypt32/tests/msg.c | 42 ++++++++++++++++++++---------------------- dlls/crypt32/tests/store.c | 2 +- dlls/crypt32/tests/str.c | 28 ++++++++++++++-------------- 4 files changed, 39 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1dc371c25590c8b464c94…

1 0

Michael Stefaniuc : comcat: Remove superfluous pointer casts.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: ae6231d0480a7a335c11c07cea1ab3a58f405d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6231d0480a7a335c11c07ce… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 21 09:34:14 2009 +0100 comcat: Remove superfluous pointer casts. --- dlls/comcat/tests/comcat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index 95e05ba..80f774c 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -84,9 +84,9 @@ static void do_enum(void) IEnumCLSID *pIEnum =(IEnumCLSID*)0xdeadcafe; - CLSIDFromString((LPOLESTR)szCatID,the_cat); - CLSIDFromString((LPOLESTR)szGuid,&wanted_guid); - + CLSIDFromString(szCatID,the_cat); + CLSIDFromString(szGuid,&wanted_guid); + OleInitialize(NULL); hr = CoCreateInstance(rclsid,NULL,CLSCTX_INPROC_SERVER,

1 0

Austin English : iphplapi: Reorder defines for NetBSD.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: b0d46d68920a5ee25557ef571cbf7922670835fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d46d68920a5ee25557ef571… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 20 14:10:32 2009 -0600 iphplapi: Reorder defines for NetBSD. --- dlls/iphlpapi/ipstats.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 85f91e2..a4b5b48 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -73,12 +73,12 @@ #ifdef HAVE_NETINET_IN_PCB_H #include <netinet/in_pcb.h> #endif -#ifdef HAVE_NETINET_TCP_VAR_H -#include <netinet/tcp_var.h> -#endif #ifdef HAVE_NETINET_TCP_TIMER_H #include <netinet/tcp_timer.h> #endif +#ifdef HAVE_NETINET_TCP_VAR_H +#include <netinet/tcp_var.h> +#endif #ifdef HAVE_NETINET_IN_SYSTM_H #include <netinet/in_systm.h> #endif

1 0

André Hentschel : comctl32: Fix callback in treeview.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 2ef02afe95f105d0a078e7587625bc3456a34ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef02afe95f105d0a078e7587… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 20 20:34:48 2009 +0100 comctl32: Fix callback in treeview. --- dlls/comctl32/tests/treeview.c | 4 ++-- dlls/comctl32/treeview.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 0e85014..cb10be4 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -311,7 +311,7 @@ static void TestCallback(void) ok(ret == 1, "Expected SetItem return 1, got %ld\n", ret); tvi.pszText = buf; TreeView_GetItem(hTree, &tvi); - todo_wine ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", + ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); U(ins).item.pszText = NULL; @@ -320,7 +320,7 @@ static void TestCallback(void) tvi.hItem = hItem2; memset(buf, 0, sizeof(buf)); TreeView_GetItem(hTree, &tvi); - todo_wine ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", + ok(strcmp(tvi.pszText, TEST_CALLBACK_TEXT) == 0, "Item text mismatch %s vs %s\n", tvi.pszText, TEST_CALLBACK_TEXT); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index dd0563a..abc6fc7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1112,7 +1112,7 @@ TREEVIEW_DoSetItemT(const TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (tvItem->mask & TVIF_TEXT) { wineItem->textWidth = 0; /* force width recalculation */ - if (tvItem->pszText != LPSTR_TEXTCALLBACKW) /* covers != TEXTCALLBACKA too */ + if (tvItem->pszText != LPSTR_TEXTCALLBACKW && tvItem->pszText != NULL) /* covers != TEXTCALLBACKA too, and undocumented: pszText of NULL also means TEXTCALLBACK */ { int len; LPWSTR newText;

1 0

Andrew Talbot : rsaenh: Declare some functions static.
by Alexandre Julliard Jan. 21, 2009

Jan. 21, 2009

Module: wine Branch: master Commit: 98dad209253a5c4b870d02bdc8b825bc4dcf00d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98dad209253a5c4b870d02bdc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 20 22:33:24 2009 +0000 rsaenh: Declare some functions static. --- dlls/rsaenh/mpi.c | 267 ++++++++++++++++++++++++------------------------ dlls/rsaenh/tomcrypt.h | 19 ---- 2 files changed, 133 insertions(+), 153 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index d6d1072..ff514f7 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -52,6 +52,42 @@ static int mp_invmod_slow (const mp_int * a, mp_int * b, mp_int * c); static int mp_karatsuba_mul(const mp_int *a, const mp_int *b, mp_int *c); static int mp_karatsuba_sqr(const mp_int *a, mp_int *b); +/* grow as required */ +static int mp_grow (mp_int * a, int size) +{ + int i; + mp_digit *tmp; + + /* if the alloc size is smaller alloc more ram */ + if (a->alloc < size) { + /* ensure there are always at least MP_PREC digits extra on top */ + size += (MP_PREC * 2) - (size % MP_PREC); + + /* reallocate the array a->dp + * + * We store the return in a temporary variable + * in case the operation failed we don't want + * to overwrite the dp member of a. + */ + tmp = realloc (a->dp, sizeof (mp_digit) * size); + if (tmp == NULL) { + /* reallocation failed but "a" is still valid [can be freed] */ + return MP_MEM; + } + + /* reallocation succeeded so set a->dp */ + a->dp = tmp; + + /* zero excess digits */ + i = a->alloc; + a->alloc = size; + for (; i < a->alloc; i++) { + a->dp[i] = 0; + } + } + return MP_OKAY; +} + /* b = a/2 */ static int mp_div_2(const mp_int * a, mp_int * b) { @@ -99,6 +135,103 @@ static int mp_div_2(const mp_int * a, mp_int * b) return MP_OKAY; } +/* swap the elements of two integers, for cases where you can't simply swap the + * mp_int pointers around + */ +static void +mp_exch (mp_int * a, mp_int * b) +{ + mp_int t; + + t = *a; + *a = *b; + *b = t; +} + +/* init a new mp_int */ +static int mp_init (mp_int * a) +{ + int i; + + /* allocate memory required and clear it */ + a->dp = malloc (sizeof (mp_digit) * MP_PREC); + if (a->dp == NULL) { + return MP_MEM; + } + + /* set the digits to zero */ + for (i = 0; i < MP_PREC; i++) { + a->dp[i] = 0; + } + + /* set the used to zero, allocated digits to the default precision + * and sign to positive */ + a->used = 0; + a->alloc = MP_PREC; + a->sign = MP_ZPOS; + + return MP_OKAY; +} + +/* init an mp_init for a given size */ +static int mp_init_size (mp_int * a, int size) +{ + int x; + + /* pad size so there are always extra digits */ + size += (MP_PREC * 2) - (size % MP_PREC); + + /* alloc mem */ + a->dp = malloc (sizeof (mp_digit) * size); + if (a->dp == NULL) { + return MP_MEM; + } + + /* set the members */ + a->used = 0; + a->alloc = size; + a->sign = MP_ZPOS; + + /* zero the digits */ + for (x = 0; x < size; x++) { + a->dp[x] = 0; + } + + return MP_OKAY; +} + +/* clear one (frees) */ +static void +mp_clear (mp_int * a) +{ + int i; + + /* only do anything if a hasn't been freed previously */ + if (a->dp != NULL) { + /* first zero the digits */ + for (i = 0; i < a->used; i++) { + a->dp[i] = 0; + } + + /* free ram */ + free(a->dp); + + /* reset members to make debugging easier */ + a->dp = NULL; + a->alloc = a->used = 0; + a->sign = MP_ZPOS; + } +} + +/* set to zero */ +static void +mp_zero (mp_int * a) +{ + a->sign = MP_ZPOS; + a->used = 0; + memset (a->dp, 0, sizeof (mp_digit) * a->alloc); +} + /* computes the modular inverse via binary extended euclidean algorithm, * that is c = 1/a mod b * @@ -846,30 +979,6 @@ mp_clamp (mp_int * a) } } -/* clear one (frees) */ -void -mp_clear (mp_int * a) -{ - int i; - - /* only do anything if a hasn't been freed previously */ - if (a->dp != NULL) { - /* first zero the digits */ - for (i = 0; i < a->used; i++) { - a->dp[i] = 0; - } - - /* free ram */ - free(a->dp); - - /* reset members to make debugging easier */ - a->dp = NULL; - a->alloc = a->used = 0; - a->sign = MP_ZPOS; - } -} - - void mp_clear_multi(mp_int *mp, ...) { mp_int* next_mp = mp; @@ -1499,19 +1608,6 @@ static void mp_dr_setup(const mp_int *a, mp_digit *d) ((mp_word)a->dp[0])); } -/* swap the elements of two integers, for cases where you can't simply swap the - * mp_int pointers around - */ -void -mp_exch (mp_int * a, mp_int * b) -{ - mp_int t; - - t = *a; - *a = *b; - *b = t; -} - /* this is a shell function that calls either the normal or Montgomery * exptmod functions. Originally the call to the montgomery code was * embedded in the normal function but that wasted a lot of stack space @@ -1943,67 +2039,6 @@ unsigned long mp_get_int(const mp_int * a) return res & 0xFFFFFFFFUL; } -/* grow as required */ -int mp_grow (mp_int * a, int size) -{ - int i; - mp_digit *tmp; - - /* if the alloc size is smaller alloc more ram */ - if (a->alloc < size) { - /* ensure there are always at least MP_PREC digits extra on top */ - size += (MP_PREC * 2) - (size % MP_PREC); - - /* reallocate the array a->dp - * - * We store the return in a temporary variable - * in case the operation failed we don't want - * to overwrite the dp member of a. - */ - tmp = realloc (a->dp, sizeof (mp_digit) * size); - if (tmp == NULL) { - /* reallocation failed but "a" is still valid [can be freed] */ - return MP_MEM; - } - - /* reallocation succeeded so set a->dp */ - a->dp = tmp; - - /* zero excess digits */ - i = a->alloc; - a->alloc = size; - for (; i < a->alloc; i++) { - a->dp[i] = 0; - } - } - return MP_OKAY; -} - -/* init a new mp_int */ -int mp_init (mp_int * a) -{ - int i; - - /* allocate memory required and clear it */ - a->dp = malloc (sizeof (mp_digit) * MP_PREC); - if (a->dp == NULL) { - return MP_MEM; - } - - /* set the digits to zero */ - for (i = 0; i < MP_PREC; i++) { - a->dp[i] = 0; - } - - /* set the used to zero, allocated digits to the default precision - * and sign to positive */ - a->used = 0; - a->alloc = MP_PREC; - a->sign = MP_ZPOS; - - return MP_OKAY; -} - /* creates "a" then copies b into it */ int mp_init_copy (mp_int * a, const mp_int * b) { @@ -2051,33 +2086,6 @@ int mp_init_multi(mp_int *mp, ...) return res; /* Assumed ok, if error flagged above. */ } -/* init an mp_init for a given size */ -int mp_init_size (mp_int * a, int size) -{ - int x; - - /* pad size so there are always extra digits */ - size += (MP_PREC * 2) - (size % MP_PREC); - - /* alloc mem */ - a->dp = malloc (sizeof (mp_digit) * size); - if (a->dp == NULL) { - return MP_MEM; - } - - /* set the members */ - a->used = 0; - a->alloc = size; - a->sign = MP_ZPOS; - - /* zero the digits */ - for (x = 0; x < size; x++) { - a->dp[x] = 0; - } - - return MP_OKAY; -} - /* hac 14.61, pp608 */ int mp_invmod (const mp_int * a, mp_int * b, mp_int * c) { @@ -3850,15 +3858,6 @@ mp_unsigned_bin_size (const mp_int * a) return (size / 8 + ((size & 7) != 0 ? 1 : 0)); } -/* set to zero */ -void -mp_zero (mp_int * a) -{ - a->sign = MP_ZPOS; - a->used = 0; - memset (a->dp, 0, sizeof (mp_digit) * a->alloc); -} - /* reverse an array, used for radix code */ static void bn_reverse (unsigned char *s, int len) diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index 4ec2dc2..d52ddb3 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -235,39 +235,20 @@ typedef int ltm_prime_callback(unsigned char *dst, int len, void *dat); /* error code to char* string */ char *mp_error_to_string(int code); -/* ---> init and deinit bignum functions <--- */ -/* init a bignum */ -int mp_init(mp_int *a); - -/* free a bignum */ -void mp_clear(mp_int *a); - /* init a null terminated series of arguments */ int mp_init_multi(mp_int *mp, ...); /* clear a null terminated series of arguments */ void mp_clear_multi(mp_int *mp, ...); -/* exchange two ints */ -void mp_exch(mp_int *a, mp_int *b); - /* shrink ram required for a bignum */ int mp_shrink(mp_int *a); -/* grow an int to a given size */ -int mp_grow(mp_int *a, int size); - -/* init to a given number of digits */ -int mp_init_size(mp_int *a, int size); - /* ---> Basic Manipulations <--- */ #define mp_iszero(a) (((a)->used == 0) ? MP_YES : MP_NO) #define mp_iseven(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 0)) ? MP_YES : MP_NO) #define mp_isodd(a) (((a)->used > 0 && (((a)->dp[0] & 1) == 1)) ? MP_YES : MP_NO) -/* set to zero */ -void mp_zero(mp_int *a); - /* set to a digit */ void mp_set(mp_int *a, mp_digit b);

1 0