April 2006 - Wine-commits - list.winehq.org

Mike McCormack : ole32: Fix a declaration.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: d7424771eade1d3311ac093a6afb092901522b64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7424771eade1d3311ac093… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 18 17:18:19 2006 +0900 ole32: Fix a declaration. --- dlls/ole32/tests/clipboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index ac5ed32..6496471 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -316,7 +316,7 @@ static HRESULT DataObjectImpl_CreateText return S_OK; } -static void test_set_clipboard() +static void test_set_clipboard(void) { HRESULT hr; ULONG ref;

1 0

Mike McCormack : ole32: More tests and fixes for STGM_PRIORITY.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 11e4b21a308930300edee16be006615cf5ed904c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11e4b21a308930300edee16… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Apr 18 17:18:51 2006 +0900 ole32: More tests and fixes for STGM_PRIORITY. --- dlls/ole32/storage32.c | 8 +++++++- dlls/ole32/tests/storage32.c | 23 +++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index ef6b248..5e6696c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5911,8 +5911,14 @@ HRESULT WINAPI StgOpenStorage( /* STGM_PRIORITY implies exclusive access */ if (grfMode & STGM_PRIORITY) { + if (grfMode & (STGM_TRANSACTED|STGM_SIMPLE|STGM_NOSCRATCH|STGM_NOSNAPSHOT)) + return STG_E_INVALIDFLAG; + if (grfMode & STGM_DELETEONRELEASE) + return STG_E_INVALIDFUNCTION; + if(STGM_ACCESS_MODE(grfMode) != STGM_READ) + return STG_E_INVALIDFLAG; grfMode &= ~0xf0; /* remove the existing sharing mode */ - grfMode |= STGM_SHARE_EXCLUSIVE; + grfMode |= STGM_SHARE_DENY_WRITE; } /* diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index d9668a5..e1f40f2 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -478,9 +478,32 @@ static void test_open_storage(void) stg = NULL; r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stg); ok(r == S_OK, "should succeed\n"); + r = StgOpenStorage( filename, NULL, STGM_PRIORITY, NULL, 0, &stg2); + ok(r == S_OK, "should succeed\n"); + if (stg2) + IStorage_Release(stg2); if (stg) IStorage_Release(stg); + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_READWRITE, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_TRANSACTED | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_SIMPLE | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_DELETEONRELEASE | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFUNCTION, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_NOSCRATCH | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + + r = StgOpenStorage( filename, NULL, STGM_NOSNAPSHOT | STGM_PRIORITY, NULL, 0, &stg); + ok(r == STG_E_INVALIDFLAG, "should fail\n"); + r = DeleteFileW(filename); ok(r, "file didn't exist\n"); }

1 0

Stefan Dösinger : wined3d: Add the remaining DirectDraw methods to WineD3DSurface.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 42b9221f51683563774dbda52215c14a473792df URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=42b9221f51683563774dbda… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 17 17:25:55 2006 +0200 wined3d: Add the remaining DirectDraw methods to WineD3DSurface. --- dlls/wined3d/surface.c | 68 +++++++++++++++++++++++++++++++++++++- include/wine/wined3d_interface.h | 22 ++++++++++++ 2 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2f16f54..374e262 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1455,6 +1455,61 @@ HRESULT WINAPI IWineD3DSurfaceImpl_Blt(I return WINED3DERR_INVALIDCALL; } +HRESULT WINAPI IWineD3DSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD Flags) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD Flags) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_IsLost(IWineD3DSurface *iface) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_Restore(IWineD3DSurface *iface) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dstx, DWORD dsty, IWineD3DSurface *Source, RECT *rsrc, DWORD trans) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_SetPixelFormat(IWineD3DSurface *iface, WINED3DFORMAT Format, BYTE *Surface, DWORD Size) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD3DPalette **Pal) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD3DPalette *Pal) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_SetColorKey(IWineD3DSurface *iface, DWORD Flags, DDCOLORKEY *CKey) { + FIXME("This is unimplemented for now(d3d7 merge)\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { + /* Nothing to do for now */ + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -1481,6 +1536,16 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_ReleaseDC, IWineD3DSurfaceImpl_Flip, IWineD3DSurfaceImpl_Blt, + IWineD3DSurfaceImpl_GetBltStatus, + IWineD3DSurfaceImpl_GetFlipStatus, + IWineD3DSurfaceImpl_IsLost, + IWineD3DSurfaceImpl_Restore, + IWineD3DSurfaceImpl_BltFast, + IWineD3DSurfaceImpl_SetPixelFormat, + IWineD3DSurfaceImpl_GetPalette, + IWineD3DSurfaceImpl_SetPalette, + IWineD3DSurfaceImpl_RealizePalette, + IWineD3DSurfaceImpl_SetColorKey, /* Internal use: */ IWineD3DSurfaceImpl_CleanDirtyRect, IWineD3DSurfaceImpl_AddDirtyRect, @@ -1491,5 +1556,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurfac IWineD3DSurfaceImpl_SetGlTextureDesc, IWineD3DSurfaceImpl_GetGlDesc, IWineD3DSurfaceImpl_GetData, - IWineD3DSurfaceImpl_SetFormat + IWineD3DSurfaceImpl_SetFormat, + IWineD3DSurfaceImpl_PrivateSetup }; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 2c590eb..0f4054c 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1140,6 +1140,16 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD(ReleaseDC)(THIS_ HDC hdc) PURE; STDMETHOD(Flip)(THIS_ IWineD3DSurface *Override, DWORD FLAGS) PURE; STDMETHOD(Blt)(THIS_ RECT *DestRect, IWineD3DSurface *SrcSurface, RECT *SrcRect, DWORD Flags, DDBLTFX *DDBltFx) PURE; + STDMETHOD(GetBltStatus)(THIS_ DWORD Flags) PURE; + STDMETHOD(GetFlipStatus)(THIS_ DWORD Flags) PURE; + STDMETHOD(IsLost)(THIS) PURE; + STDMETHOD(Restore)(THIS) PURE; + STDMETHOD(BltFast)(THIS_ DWORD dstx, DWORD dsty, IWineD3DSurface *src, RECT *rsrc, DWORD trans) PURE; + STDMETHOD(SetPixelFormat)(THIS_ WINED3DFORMAT Format, BYTE *Surface, DWORD Size) PURE; + STDMETHOD(GetPalette)(THIS_ struct IWineD3DPalette **Palette) PURE; + STDMETHOD(SetPalette)(THIS_ struct IWineD3DPalette *Palette) PURE; + STDMETHOD(RealizePalette)(THIS) PURE; + STDMETHOD(SetColorKey)(THIS_ DWORD Flags, DDCOLORKEY *CKey) PURE; /* Internally used methods */ STDMETHOD(CleanDirtyRect)(THIS) PURE; STDMETHOD(AddDirtyRect)(THIS_ CONST RECT* pRect) PURE; @@ -1151,6 +1161,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine STDMETHOD_(void,GetGlDesc)(THIS_ glDescriptor **glDescription) PURE; STDMETHOD_(CONST void *, GetData)(THIS) PURE; STDMETHOD(SetFormat)(THIS_ WINED3DFORMAT format) PURE; + STDMETHOD(PrivateSetup)(THIS) PURE; }; #undef INTERFACE @@ -1180,6 +1191,16 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine #define IWineD3DSurface_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a) #define IWineD3DSurface_Flip(p,a,b) (p)->lpVtbl->Flip(p,a,b) #define IWineD3DSurface_Blt(p,a,b,c,d,e) (p)->lpVtbl->Blt(p,a,b,c,d,e) +#define IWineD3DSurface_GetBltStatus(p,a) (p)->lpVtbl->GetBltStatus(p,a) +#define IWineD3DSurface_GetFlipStatus(p,a) (p)->lpVtbl->GetFlipStatus(p,a) +#define IWineD3DSurface_IsLost(p) (p)->lpVtbl->IsLost(p) +#define IWineD3DSurface_Restore(p) (p)->lpVtbl->Restore(p) +#define IWineD3DSurface_BltFast(p,a,b,c,d,e) (p)->lpVtbl->BltFast(p,a,b,c,d,e) +#define IWineD3DSurface_SetPixelFormat(p,a,b,c) (p)->lpVtbl->SetPixelFormat(p,a,b,c) +#define IWineD3DSurface_GetPalette(p, a) (p)->lpVtbl->GetPalette(p, a) +#define IWineD3DSurface_SetPalette(p, a) (p)->lpVtbl->SetPalette(p, a) +#define IWineD3DSurface_RealizePalette(p) (p)->lpVtbl->RealizePalette(p) +#define IWineD3DSurface_SetColorKey(p, a, b) (p)->lpVtbl->SetColorKey(p, a, b) /*** IWineD3DSurface (Internal, no d3d mapping) methods ***/ #define IWineD3DSurface_CleanDirtyRect(p) (p)->lpVtbl->CleanDirtyRect(p) #define IWineD3DSurface_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a) @@ -1191,6 +1212,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWine #define IWineD3DSurface_GetGlDesc(p,a) (p)->lpVtbl->GetGlDesc(p,a) #define IWineD3DSurface_GetData(p) (p)->lpVtbl->GetData(p) #define IWineD3DSurface_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) +#define IWineD3DSurface_PrivateSetup(p) (p)->lpVtbl->PrivateSetup(p) #endif /*****************************************************************************

1 0

Stefan Dösinger : wined3d: Add the remaining IWineD3DDevice methods.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 80bdb24cad10d617437ec56a882dd4e885a1e88d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80bdb24cad10d617437ec56… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 17 17:51:21 2006 +0200 wined3d: Add the remaining IWineD3DDevice methods. --- dlls/wined3d/device.c | 24 ++++++++++++++++++++++++ include/wine/wined3d_interface.h | 20 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4cded18..4002313 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1698,6 +1698,26 @@ HRESULT WINAPI IWineD3DDeviceImpl_Uninit return WINED3DERR_INVALIDCALL; } +HRESULT WINAPI IWineD3DDeviceImpl_EnumDisplayModes(IWineD3DDevice *iface, DWORD Flags, UINT Width, UINT Height, WINED3DFORMAT pixelformat, LPVOID context, D3DCB_ENUMDISPLAYMODESCALLBACK callback) { + FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { + FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DDeviceImpl_EnumZBufferFormats(IWineD3DDevice *iface, D3DCB_ENUMPIXELFORMATS Callback, void *Context) { + FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); + return WINED3DERR_INVALIDCALL; +} + +HRESULT WINAPI IWineD3DDeviceImpl_EnumTextureFormats(IWineD3DDevice *iface, D3DCB_ENUMPIXELFORMATS Callback, void *Context) { + FIXME("This call is a d3d7 merge stub. It will be implemented later\n"); + return WINED3DERR_INVALIDCALL; +} + HRESULT WINAPI IWineD3DDeviceImpl_GetDirect3D(IWineD3DDevice *iface, IWineD3D **ppD3D) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; *ppD3D= This->wineD3D; @@ -6843,6 +6863,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ /*** Odd functions **/ IWineD3DDeviceImpl_Init3D, IWineD3DDeviceImpl_Uninit3D, + IWineD3DDeviceImpl_EnumDisplayModes, IWineD3DDeviceImpl_EvictManagedResources, IWineD3DDeviceImpl_GetAvailableTextureMem, IWineD3DDeviceImpl_GetBackBuffer, @@ -6850,6 +6871,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ IWineD3DDeviceImpl_GetDeviceCaps, IWineD3DDeviceImpl_GetDirect3D, IWineD3DDeviceImpl_GetDisplayMode, + IWineD3DDeviceImpl_SetDisplayMode, IWineD3DDeviceImpl_GetHWND, IWineD3DDeviceImpl_SetHWND, IWineD3DDeviceImpl_GetNumberOfSwapChains, @@ -6861,6 +6883,8 @@ const IWineD3DDeviceVtbl IWineD3DDevice_ IWineD3DDeviceImpl_SetCursorPosition, IWineD3DDeviceImpl_ShowCursor, IWineD3DDeviceImpl_TestCooperativeLevel, + IWineD3DDeviceImpl_EnumZBufferFormats, + IWineD3DDeviceImpl_EnumTextureFormats, /*** Getters and setters **/ IWineD3DDeviceImpl_SetClipPlane, IWineD3DDeviceImpl_GetClipPlane, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index af58fb4..2c590eb 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -4,6 +4,7 @@ * Copyright 2002-2003 The wine-d3d team * Copyright 2002-2003 Raphael Junqueira * Copyright 2005 Oliver Stieber + * Copyright 2006 Stefan D�singer for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -260,6 +261,17 @@ typedef HRESULT WINAPI (*D3DCB_CREATEADD struct IWineD3DSwapChain **pSwapChain ); +typedef HRESULT WINAPI (*D3DCB_ENUMPIXELFORMATS) (struct IUnknown *pDevice, + WINED3DFORMAT fmt, + void *Context); + +typedef HRESULT WINAPI (*D3DCB_ENUMDISPLAYMODESCALLBACK) (IUnknown *pDevice, + UINT Width, + UINT Height, + WINED3DFORMAT Pixelformat, + FLOAT Refresh, + LPVOID context); + /***************************************************************************** * IWineD3DBase interface */ @@ -373,6 +385,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD_(HRESULT,CreatePalette)(THIS_ DWORD Flags, PALETTEENTRY *PalEnt, struct IWineD3DPalette **Palette, IUnknown *Parent); STDMETHOD(Init3D)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain); STDMETHOD(Uninit3D)(THIS); + STDMETHOD(EnumDisplayModes)(THIS_ DWORD Flags, UINT Width, UINT Height, WINED3DFORMAT Format, void *context, D3DCB_ENUMDISPLAYMODESCALLBACK cb) PURE; STDMETHOD(EvictManagedResources)(THIS) PURE; STDMETHOD_(UINT, GetAvailableTextureMem)(THIS) PURE; STDMETHOD(GetBackBuffer)(THIS_ UINT iSwapChain, UINT BackBuffer, WINED3DBACKBUFFER_TYPE, struct IWineD3DSurface** ppBackBuffer) PURE; @@ -380,6 +393,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(GetDeviceCaps)(THIS_ WINED3DCAPS* pCaps) PURE; STDMETHOD(GetDirect3D)(THIS_ IWineD3D** ppD3D) PURE; STDMETHOD(GetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE; + STDMETHOD(SetDisplayMode)(THIS_ UINT iSwapChain, WINED3DDISPLAYMODE* pMode) PURE; STDMETHOD(GetHWND)(THIS_ HWND *hwnd) PURE; STDMETHOD(SetHWND)(THIS_ HWND hwnd) PURE; STDMETHOD_(UINT, GetNumberOfSwapChains)(THIS) PURE; @@ -391,6 +405,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD_(void, SetCursorPosition)(THIS_ int XScreenSpace, int YScreenSpace, DWORD Flags) PURE; STDMETHOD_(BOOL, ShowCursor)(THIS_ BOOL bShow) PURE; STDMETHOD(TestCooperativeLevel)(THIS) PURE; + STDMETHOD(EnumZBufferFormats)(THIS_ D3DCB_ENUMPIXELFORMATS Callback, void *Context) PURE; + STDMETHOD(EnumTextureFormats)(THIS_ D3DCB_ENUMPIXELFORMATS Callback, void *Context) PURE; STDMETHOD(SetClipPlane)(THIS_ DWORD Index,CONST float * pPlane) PURE; STDMETHOD(GetClipPlane)(THIS_ DWORD Index,float * pPlane) PURE; STDMETHOD(SetClipStatus)(THIS_ CONST WINED3DCLIPSTATUS * pClipStatus) PURE; @@ -517,6 +533,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_CreatePalette(p, a, b, c, d) (p)->lpVtbl->CreatePalette(p, a, b, c, d) #define IWineD3DDevice_Init3D(p, a, b) (p)->lpVtbl->Init3D(p, a, b) #define IWineD3DDevice_Uninit3D(p) (p)->lpVtbl->Uninit3D(p) +#define IWineD3DDevice_EnumDisplayModes(p,a,b,c,d,e,f) (p)->lpVtbl->EnumDisplayModes(p,a,b,c,d,e,f) #define IWineD3DDevice_EvictManagedResources(p) (p)->lpVtbl->EvictManagedResources(p) #define IWineD3DDevice_GetAvailableTextureMem(p) (p)->lpVtbl->GetAvailableTextureMem(p) #define IWineD3DDevice_GetBackBuffer(p,a,b,c,d) (p)->lpVtbl->GetBackBuffer(p,a,b,c,d) @@ -524,6 +541,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_GetDeviceCaps(p,a) (p)->lpVtbl->GetDeviceCaps(p,a) #define IWineD3DDevice_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a) #define IWineD3DDevice_GetDisplayMode(p,a,b) (p)->lpVtbl->GetDisplayMode(p,a,b) +#define IWineD3DDevice_SetDisplayMode(p,a,b) (p)->lpVtbl->SetDisplayMode(p,a,b) #define IWineD3DDevice_GetHWND(p, a) (p)->lpVtbl->GetHWND(p, a) #define IWineD3DDevice_SetHWND(p, a) (p)->lpVtbl->SetHWND(p, a) #define IWineD3DDevice_GetNumberOfSwapChains(p) (p)->lpVtbl->GetNumberOfSwapChains(p) @@ -535,6 +553,8 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p) #define IWineD3DDevice_SetFVF(p,a) (p)->lpVtbl->SetFVF(p,a) #define IWineD3DDevice_GetFVF(p,a) (p)->lpVtbl->GetFVF(p,a) +#define IWineD3DDevice_EnumZBufferFormats(p, a, b) (p)->lpVtbl->EnumZBufferFormats(p, a, b) +#define IWineD3DDevice_EnumTextureFormats(p, a, b) (p)->lpVtbl->EnumTextureFormats(p, a, b) #define IWineD3DDevice_SetClipPlane(p,a,b) (p)->lpVtbl->SetClipPlane(p,a,b) #define IWineD3DDevice_GetClipPlane(p,a,b) (p)->lpVtbl->GetClipPlane(p,a,b) #define IWineD3DDevice_SetClipStatus(p,a) (p)->lpVtbl->SetClipStatus(p,a)

1 0

Stefan Dösinger : wined3d: Add a parameter for surface type selection.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 03b256b16d39cfb9f183b7896785c4a6b5e80269 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03b256b16d39cfb9f183b78… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 17 16:13:28 2006 +0200 wined3d: Add a parameter for surface type selection. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 2 +- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 7 +++++++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1d4ce68..6440233 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -493,7 +493,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); - hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, Format, Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage, (WINED3DPOOL) Pool,MultiSample,MultisampleQuality, NULL,(IUnknown *)object); + hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, Format, Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage, (WINED3DPOOL) Pool,MultiSample,MultisampleQuality, NULL, SURFACE_OPENGL, (IUnknown *)object); if (hrc != D3D_OK || NULL == object->wineD3DSurface) { /* free up object */ FIXME("(%p) call to IWineD3DDevice_CreateSurface failed\n", This); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7aa1337..10cf65f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -271,7 +271,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cre TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); - hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, Format, Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage, (WINED3DPOOL) Pool,MultiSample,MultisampleQuality,pSharedHandle,(IUnknown *)object); + hrc = IWineD3DDevice_CreateSurface(This->WineD3DDevice, Width, Height, Format, Lockable, Discard, Level, &object->wineD3DSurface, Type, Usage, (WINED3DPOOL) Pool,MultiSample,MultisampleQuality,pSharedHandle,SURFACE_OPENGL,(IUnknown *)object); if (hrc != D3D_OK || NULL == object->wineD3DSurface) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d5561cc..4f9d569 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -632,7 +632,7 @@ If this flag is set, the contents of the ******************************** */ -HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UINT Width, UINT Height, WINED3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IWineD3DSurface **ppSurface,WINED3DRESOURCETYPE Type, DWORD Usage, WINED3DPOOL Pool, WINED3DMULTISAMPLE_TYPE MultiSample ,DWORD MultisampleQuality, HANDLE* pSharedHandle, IUnknown *parent) { +HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UINT Width, UINT Height, WINED3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, IWineD3DSurface **ppSurface,WINED3DRESOURCETYPE Type, DWORD Usage, WINED3DPOOL Pool, WINED3DMULTISAMPLE_TYPE MultiSample ,DWORD MultisampleQuality, HANDLE* pSharedHandle, WINED3DSURFTYPE Impl, IUnknown *parent) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *object; /*NOTE: impl ref allowed since this is a create function */ unsigned int pow2Width, pow2Height; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 5c2b4d8..9a31acf 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -356,7 +356,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD STDMETHOD(CreateVertexBuffer)(THIS_ UINT Length,DWORD Usage,DWORD FVF,WINED3DPOOL Pool,struct IWineD3DVertexBuffer **ppVertexBuffer, HANDLE *sharedHandle, IUnknown *parent) PURE; STDMETHOD(CreateIndexBuffer)(THIS_ UINT Length, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DIndexBuffer** ppIndexBuffer, HANDLE* pSharedHandle, IUnknown *parent) PURE; STDMETHOD(CreateStateBlock)(THIS_ WINED3DSTATEBLOCKTYPE Type, struct IWineD3DStateBlock **ppStateBlock, IUnknown *parent) PURE; - STDMETHOD(CreateSurface)(THIS_ UINT Width, UINT Height, WINED3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, struct IWineD3DSurface** ppSurface, WINED3DRESOURCETYPE Type, DWORD Usage, WINED3DPOOL Pool, WINED3DMULTISAMPLE_TYPE MultiSample ,DWORD MultisampleQuality, HANDLE* pSharedHandle, IUnknown *parent) PURE; + STDMETHOD(CreateSurface)(THIS_ UINT Width, UINT Height, WINED3DFORMAT Format, BOOL Lockable, BOOL Discard, UINT Level, struct IWineD3DSurface** ppSurface, WINED3DRESOURCETYPE Type, DWORD Usage, WINED3DPOOL Pool, WINED3DMULTISAMPLE_TYPE MultiSample ,DWORD MultisampleQuality, HANDLE* pSharedHandle, WINED3DSURFTYPE Impl, IUnknown *parent) PURE; STDMETHOD(CreateTexture)(THIS_ UINT Width, UINT Height, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DTexture** ppTexture, HANDLE* pSharedHandle, IUnknown *parent, D3DCB_CREATESURFACEFN pFn) PURE; STDMETHOD(CreateVolumeTexture)(THIS_ UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DVolumeTexture** ppVolumeTexture, HANDLE* pSharedHandle, IUnknown *parent, D3DCB_CREATEVOLUMEFN pFn) PURE; STDMETHOD(CreateVolume)(THIS_ UINT Width, UINT Height, UINT Depth, DWORD Usage, WINED3DFORMAT Format, WINED3DPOOL Pool, struct IWineD3DVolume** ppVolumeTexture, HANDLE* pSharedHandle, IUnknown *parent) PURE; @@ -499,7 +499,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD #define IWineD3DDevice_CreateVertexBuffer(p,a,b,c,d,e,f,g) (p)->lpVtbl->CreateVertexBuffer(p,a,b,c,d,e,f,g) #define IWineD3DDevice_CreateIndexBuffer(p,a,b,c,d,e,f,g) (p)->lpVtbl->CreateIndexBuffer(p,a,b,c,d,e,f,g) #define IWineD3DDevice_CreateStateBlock(p,a,b,c) (p)->lpVtbl->CreateStateBlock(p,a,b,c) -#define IWineD3DDevice_CreateSurface(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n) (p)->lpVtbl->CreateSurface(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n) +#define IWineD3DDevice_CreateSurface(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->lpVtbl->CreateSurface(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) #define IWineD3DDevice_CreateTexture(p,a,b,c,d,e,f,g,h,i,j) (p)->lpVtbl->CreateTexture(p,a,b,c,d,e,f,g,h,i,j) #define IWineD3DDevice_CreateVolumeTexture(p,a,b,c,d,e,f,g,h,i,j,k) (p)->lpVtbl->CreateVolumeTexture(p,a,b,c,d,e,f,g,h,i,j,k) #define IWineD3DDevice_CreateVolume(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateVolume(p,a,b,c,d,e,f,g,h,i) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 88132e4..8358e6d 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -923,6 +923,13 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DUSAGE_AUTOGENMIPMAP 0x00000400L #define WINED3DUSAGE_DMAP 0x00004000L +typedef enum _WINED3DSURFTYPE { + SURFACE_UNKNOWN = 0, /* Default / Unknown surface type */ + SURFACE_OPENGL, /* OpenGL surface: Renders using libGL, needed for 3D */ + SURFACE_GDI, /* User surface. No 3D, DirectDraw rendering with GDI */ + SURFACE_XRENDER /* Future dreams: Use XRENDER / EXA / whatever stuff */ +} WINED3DSURFTYPE; + #define WINED3DPRASTERCAPS_DITHER 0x00000001L #define WINED3DPRASTERCAPS_ROP2 0x00000002L #define WINED3DPRASTERCAPS_XOR 0x00000004L

1 0

Stefan Dösinger : wined3d: Add IWineD3DPalette.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: cff4e1ea4b22c3ef3d2346adc7a10be7f73cc8a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cff4e1ea4b22c3ef3d2346a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 17 17:04:59 2006 +0200 wined3d: Add IWineD3DPalette. --- dlls/wined3d/Makefile.in | 1 dlls/wined3d/device.c | 21 ++++++++ dlls/wined3d/palette.c | 101 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 13 +++++ include/wine/wined3d_interface.h | 36 ++++++++++++++ 5 files changed, 172 insertions(+), 0 deletions(-) create mode 100644 dlls/wined3d/palette.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cff4e1ea4b22c3ef3d2…

1 0

Louis Lenders : shell32: Define 2 more avi resources.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 3d29c5ad77e5d7288b14fb08bead47756343c76b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3d29c5ad77e5d7288b14fb0… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Apr 17 00:47:17 2006 +0100 shell32: Define 2 more avi resources. --- dlls/shell32/shres.rc | 6 ++++++ dlls/shell32/shresdef.h | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index fcb7b3e..6b5f495 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -11841,6 +11841,12 @@ IDR_AVI_SEARCHING AVI searching.avi '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' } */ +/* BINRES search.avi */ +IDR_AVI_SEARCH AVI searching.avi + +/* BINRES filecopy.avi */ +IDR_AVI_FILECOPY AVI searching.avi + /*--------------------- END FIXME ------------------------*/ /* diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 896775a..37f69f1 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -119,6 +119,13 @@ #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_MY_DOCUMENTS 235 +/* +AVI resources, windows shell32 has 14 of them: 150-152 and 160-170 +FIXME: Need to add them, but for now just let them use the same: searching.avi +(also to limit shell32's size) +*/ +#define IDR_AVI_SEARCH 150 #define IDR_AVI_SEARCHING 151 +#define IDR_AVI_FILECOPY 161 #endif

1 0

Mike McCormack : configure: Exit with a non-zero exit code if a core dependency is missing.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 8d6b9aa63ac66472933c72b0d1451c505f0c973c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d6b9aa63ac66472933c72b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Apr 17 18:16:10 2006 +0900 configure: Exit with a non-zero exit code if a core dependency is missing. --- configure | 14 +++++++++++--- configure.ac | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 55afb90..c453191 100755 --- a/configure +++ b/configure @@ -21011,6 +21011,7 @@ if test "$no_create" != yes; then fi +exitcode=0 if test "$have_x" = "no" then echo @@ -21018,6 +21019,7 @@ then echo "*** X support, which currently does not work, and would probably not be" echo "*** what you want anyway. You will need to install devel packages of" echo "*** Xlib/Xfree86 at the very least." + exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" @@ -21025,6 +21027,7 @@ then echo echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" + exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" @@ -21034,6 +21037,7 @@ then echo "*** installed, but 'freetype-config' is not in your PATH. Install the" echo "*** freetype-devel package (or its equivalent on your distribution) to" echo "*** enable Wine to use TrueType fonts." + exitcode=1 fi if test "$wine_cv_msg_fonts" = "yes" @@ -21041,6 +21045,7 @@ then echo echo "*** Warning: Freetype or Fontforge is missing." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." + exitcode=1 fi if test -z "$ALSALIBS" -a \ @@ -21053,12 +21058,15 @@ if test -z "$ALSALIBS" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" then - echo "*** No sound system was found. Windows applications will be silent." - echo "*** The currently supported sound systems are:" - echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + echo "*** No sound system was found. Windows applications will be silent." + echo "*** The currently supported sound systems are:" + echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + exitcode=1 fi echo echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine." echo +exit $exitcode + diff --git a/configure.ac b/configure.ac index 6ea1906..a4f2f64 100644 --- a/configure.ac +++ b/configure.ac @@ -1746,6 +1746,7 @@ tools/wrc/Makefile]) AC_OUTPUT +exitcode=0 if test "$have_x" = "no" then echo @@ -1753,6 +1754,7 @@ then echo "*** X support, which currently does not work, and would probably not be" echo "*** what you want anyway. You will need to install devel packages of" echo "*** Xlib/Xfree86 at the very least." + exitcode=1 fi if test "$wine_cv_opengl_version_OK" = "no" @@ -1760,6 +1762,7 @@ then echo echo "*** Warning: old Mesa headers detected. Wine will be built without Direct3D" echo "*** support. Consider upgrading your Mesa libraries (http://www.mesa3d.org/)" + exitcode=1 fi if test "$wine_cv_msg_freetype" = "yes" @@ -1769,6 +1772,7 @@ then echo "*** installed, but 'freetype-config' is not in your PATH. Install the" echo "*** freetype-devel package (or its equivalent on your distribution) to" echo "*** enable Wine to use TrueType fonts." + exitcode=1 fi if test "$wine_cv_msg_fonts" = "yes" @@ -1776,6 +1780,7 @@ then echo echo "*** Warning: Freetype or Fontforge is missing." echo "*** Fonts will not be built. Dialog text may be invisible or unaligned." + exitcode=1 fi if test -z "$ALSALIBS" -a \ @@ -1788,15 +1793,18 @@ if test -z "$ALSALIBS" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" then - echo "*** No sound system was found. Windows applications will be silent." - echo "*** The currently supported sound systems are:" - echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + echo "*** No sound system was found. Windows applications will be silent." + echo "*** The currently supported sound systems are:" + echo "*** ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS" + exitcode=1 fi echo echo "Configure finished. Do '${ac_make} depend && ${ac_make}' to compile Wine." echo +exit $exitcode + dnl Local Variables: dnl comment-start: "dnl " dnl comment-end: ""

1 0

Mike McCormack : configure: Remove the --disable-debug and --disable-trace options.
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: 6d9af55a120df781f69e919bad05e35c813d0dbe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d9af55a120df781f69e919… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Apr 17 18:17:18 2006 +0900 configure: Remove the --disable-debug and --disable-trace options. --- configure | 26 +------------------------- configure.ac | 12 ------------ dlls/Makedll.rules.in | 3 +-- dlls/Makeimplib.rules.in | 3 +-- dlls/Maketest.rules.in | 3 +-- programs/Makeprog.rules.in | 3 +-- 6 files changed, 5 insertions(+), 45 deletions(-) diff --git a/configure b/configure index ed428e7..55afb90 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DLLDEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS RESOLVLIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDEXERPATH LDDLLRPATH COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WIN16_FILES WIN16_INSTALL SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPPBIN ac_ct_CPPBIN TOOLSDIR CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LEX LEXLIB LEX_OUTPUT_ROOT XLEX BISON AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN EGREP LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS FONTFORGE PKG_CONFIG PRELINK LIBPTHREAD XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS GLUT_LIBS GLUT32FILES NASLIBS XML2LIBS XML2INCL XSLTLIBS XSLTINCL CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS RESOLVLIBS LCMSLIBS LDAPLIBS FREETYPELIBS FREETYPEINCL ft_devel ft_devel2 FONTSSUBDIRS ARTSCCONFIG ARTSLIBS ARTSINCL ESDCONFIG ESDLIBS ESDINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS BUILTINFLAG DLLEXT DLLFLAGS DLLIBS LDSHARED LDDLLFLAGS LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS LDEXERPATH LDDLLRPATH COREFOUNDATIONLIB IOKITLIB CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS SOCKETLIBS MAIN_BINARY EXTRA_BINARIES LDD LIBOBJS LTLIBOBJS' ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_IMPLIB_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES' # Initialize some variables set by options. @@ -861,8 +861,6 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-win16 do not include Win16 support - --disable-debug compile out all debugging messages - --disable-trace compile out TRACE messages --enable-win64 build a Win64 emulator on AMD64 (won't run Win32 binaries) @@ -1369,16 +1367,6 @@ if test "${enable_win16+set}" = set; the enableval="$enable_win16" fi; -# Check whether --enable-debug or --disable-debug was given. -if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - -fi; -# Check whether --enable-trace or --disable-trace was given. -if test "${enable_trace+set}" = set; then - enableval="$enable_trace" - -fi; # Check whether --enable-win64 or --disable-win64 was given. if test "${enable_win64+set}" = set; then enableval="$enable_win64" @@ -1404,17 +1392,6 @@ if test "${with_wine_tools+set}" = set; fi; -DLLDEFS="" - -if test "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS" -fi -if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS" -fi - # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 @@ -20279,7 +20256,6 @@ s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t -s,@DLLDEFS@,$DLLDEFS,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t diff --git a/configure.ac b/configure.ac index ffc921d..6ea1906 100644 --- a/configure.ac +++ b/configure.ac @@ -13,24 +13,12 @@ AC_CONFIG_AUX_DIR(tools) dnl **** Command-line arguments **** AC_ARG_ENABLE(win16, AC_HELP_STRING([--disable-win16],[do not include Win16 support])) -AC_ARG_ENABLE(debug, AC_HELP_STRING([--disable-debug],[compile out all debugging messages])) -AC_ARG_ENABLE(trace, AC_HELP_STRING([--disable-trace],[compile out TRACE messages])) AC_ARG_ENABLE(win64, AC_HELP_STRING([--enable-win64], [build a Win64 emulator on AMD64 (won't run Win32 binaries)])) AC_ARG_WITH(opengl, AC_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(curses, AC_HELP_STRING([--without-curses],[do not use curses])) AC_ARG_WITH(wine-tools,AC_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>])) -AC_SUBST(DLLDEFS,"") -if test "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_DEBUG_MSGS" -fi -if test "x$enable_trace" = "xno" -o "x$enable_debug" = "xno" -then - DLLDEFS="$DLLDEFS -DWINE_NO_TRACE_MSGS" -fi - AC_CANONICAL_HOST case $host in x86_64*linux*) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 54488b9..f3ff734 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -9,12 +9,11 @@ # plus all variables required by the global Make.rules.in # -DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ DLLEXT = @DLLEXT@ IMPLIBEXT = @IMPLIBEXT@ LDRPATH = @LDDLLRPATH@ -DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS) +DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec SPEC_DEF = lib$(BASEMODULE).def diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 4d93ee7..be17698 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -6,9 +6,8 @@ # plus all variables required by the global Make.rules.in # -DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ -DEFS = -D__WINESRC__ $(DLLDEFS) $(EXTRADEFS) +DEFS = -D__WINESRC__ $(EXTRADEFS) @MAKE_RULES@ diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 73499b5..f1272c4 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -9,9 +9,8 @@ # plus all variables required by the global Make.rules.in # -DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ -DEFS = $(DLLDEFS) $(EXTRADEFS) +DEFS = $(EXTRADEFS) MODULE = $(TESTDLL:%.dll=%)_test.exe TESTLIST = testlist.c diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 4ef0ab7..019c726 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -9,10 +9,9 @@ # plus all variables required by the global Make.rules.in # -DLLDEFS = @DLLDEFS@ DLLFLAGS = @DLLFLAGS@ LDRPATH = @LDDLLRPATH@ -DEFS = $(DLLDEFS) $(EXTRADEFS) +DEFS = $(EXTRADEFS) ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) ALL_LIBS = $(ALL_IMPORTS:%=-l%) -L$(LIBDIR) -lwine $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) BASEMODULE = $(MODULE:.exe=)

1 0

Mike McCormack : msi: Fix some possible NULL pointer dereferences (Coverity ).
by Alexandre Julliard 17 Apr '06

17 Apr '06

Module: wine Branch: refs/heads/master Commit: a92fe55cce1e23dcf252f6bcdb9a08d62ed4370b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a92fe55cce1e23dcf252f6b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Apr 17 18:17:52 2006 +0900 msi: Fix some possible NULL pointer dereferences (Coverity). --- dlls/msi/msi.c | 3 +++ dlls/msi/package.c | 3 +++ dlls/msi/registry.c | 3 +++ dlls/msi/tests/msi.c | 16 ++++++++++++++++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b80fe91..b2038a1 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -667,6 +667,9 @@ INSTALLSTATE WINAPI MsiQueryProductState TRACE("%s\n", debugstr_w(szProduct)); + if (!szProduct) + return INSTALLSTATE_INVALIDARG; + rc = MSIREG_OpenUserProductsKey(szProduct,&hkey,FALSE); if (rc != ERROR_SUCCESS) goto end; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 24a23d6..aaf93e9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -514,6 +514,9 @@ UINT WINAPI MsiOpenPackageExW(LPCWSTR sz TRACE("%s %08lx %p\n", debugstr_w(szPackage), dwOptions, phPackage ); + if( szPackage == NULL ) + return ERROR_INVALID_PARAMETER; + if( dwOptions ) FIXME("dwOptions %08lx not supported\n", dwOptions); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 528070e..3ff8d3f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -675,6 +675,9 @@ UINT WINAPI MsiEnumFeaturesW(LPCWSTR szP TRACE("%s %ld %p %p\n",debugstr_w(szProduct),index,szFeature,szParent); + if( !szProduct ) + return ERROR_INVALID_PARAMETER; + r = MSIREG_OpenFeaturesKey(szProduct,&hkeyProduct,FALSE); if( r != ERROR_SUCCESS ) return ERROR_NO_MORE_ITEMS; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index c9afdca..e6fd855 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -66,6 +66,21 @@ static void test_usefeature(void) } +static void test_null(void) +{ + MSIHANDLE hpkg; + UINT r; + + r = MsiOpenPackageExW(NULL, 0, &hpkg); + ok( r == ERROR_INVALID_PARAMETER,"wrong error"); + + r = MsiQueryProductStateW(NULL); + ok( r == INSTALLSTATE_INVALIDARG, "wrong return\n"); + + r = MsiEnumFeaturesW(NULL,0,NULL,NULL); + ok( r == ERROR_INVALID_PARAMETER,"wrong error"); +} + START_TEST(msi) { HMODULE hmod = GetModuleHandle("msi.dll"); @@ -73,4 +88,5 @@ START_TEST(msi) GetProcAddress(hmod, "MsiUseFeatureExA"); test_usefeature(); + test_null(); }

1 0