wine-commits May 2007

wine-commits@winehq.org

3 participants
715 discussions

Ben Taylor : wineshelllink: Improve /bin/sh and awk compatibility.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: b39381f4f90cc010e480155fb0823c85492096f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39381f4f90cc010e480155fb… Author: Ben Taylor <sol11x86(a)comcast.net> Date: Tue May 1 02:23:29 2007 +0000 wineshelllink: Improve /bin/sh and awk compatibility. --- tools/wineshelllink | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/wineshelllink b/tools/wineshelllink index b4d76d8..3cfea28 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -141,7 +141,8 @@ get_menu_entries() awk ' BEGIN { RS="<" } /^Filename/ { - if (match($0,/>/)) { + RSTART=index($0,">") + if (RSTART>0) { print substr($0,RSTART+1) } }' $tmp @@ -182,7 +183,8 @@ write_menu_file() IFS=" " - for i in $(get_menu_entries "$menu"); do + for i in `get_menu_entries "$menu"` + do test "$i" = "$filename" && continue echo " <Filename>$i</Filename>" done

1 0

Andrey Turkin : shlwapi: Implement IConnectionPoint_SimpleInvoke.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: b63e9a78289baec5b73f6ed327c13febefd5c3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63e9a78289baec5b73f6ed32… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Apr 30 23:11:47 2007 +0400 shlwapi: Implement IConnectionPoint_SimpleInvoke. --- dlls/shlwapi/ordinal.c | 58 +++++++++++++++++++++++++++++++++++++++----- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index dd38eda..f480482 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2856,17 +2856,61 @@ HRESULT WINAPI SHPackDispParams(LPVOID w, LPVOID x, LPVOID y, LPVOID z) } /************************************************************************* + * SHLWAPI_InvokeByIID + * + * This helper function calls IDispatch::Invoke for each sink + * which implements given iid or IDispatch. + * + */ +static HRESULT SHLWAPI_InvokeByIID( + IConnectionPoint* iCP, + REFIID iid, + DISPID dispId, + DISPPARAMS* dispParams) +{ + IEnumConnections *enumerator; + CONNECTDATA rgcd; + + HRESULT result = IConnectionPoint_EnumConnections(iCP, &enumerator); + if (FAILED(result)) + return result; + + while(IEnumConnections_Next(enumerator, 1, &rgcd, NULL)==S_OK) + { + IDispatch *dispIface; + if (SUCCEEDED(IUnknown_QueryInterface(rgcd.pUnk, iid, (LPVOID*)&dispIface)) || + SUCCEEDED(IUnknown_QueryInterface(rgcd.pUnk, &IID_IDispatch, (LPVOID*)&dispIface))) + { + IDispatch_Invoke(dispIface, dispId, &IID_NULL, 0, DISPATCH_METHOD, dispParams, NULL, NULL, NULL); + IDispatch_Release(dispIface); + } + } + + IEnumConnections_Release(enumerator); + + return S_OK; +} + +/************************************************************************* * @ [SHLWAPI.284] * - * _IConnectionPoint_SimpleInvoke + * IConnectionPoint_SimpleInvoke */ -DWORD WINAPI IConnectionPoint_SimpleInvoke( - LPVOID x, - LPVOID y, - LPVOID z) +HRESULT WINAPI IConnectionPoint_SimpleInvoke( + IConnectionPoint* iCP, + DISPID dispId, + DISPPARAMS* dispParams) { - FIXME("(%p %p %p) stub\n",x,y,z); - return 0; + IID iid; + HRESULT result; + + TRACE("(%p)->(0x%x %p)\n",iCP,dispId,dispParams); + + result = IConnectionPoint_GetConnectionInterface(iCP, &iid); + if (SUCCEEDED(result)) + result = SHLWAPI_InvokeByIID(iCP, &iid, dispId, dispParams); + + return result; } /************************************************************************* diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index c1cebdd..cca778d 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -281,7 +281,7 @@ 281 stdcall -noname SHPackDispParamsV(ptr ptr ptr ptr) 282 stdcall -noname SHPackDispParams(ptr ptr ptr ptr) 283 stub -noname IConnectionPoint_InvokeWithCancel -284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr ptr ptr) +284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr) 285 stdcall -noname IConnectionPoint_OnChanged(ptr long) 286 stub -noname IUnknown_CPContainerInvokeParam 287 stdcall -noname IUnknown_CPContainerOnChanged(ptr long)

1 0

Louis Lenders : kernel32: Add stub for BindIoCompletionCallback.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: f9a54ebc51fe1ab39b798cbcaa10b068b1074ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9a54ebc51fe1ab39b798cbca… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Apr 30 21:29:18 2007 +0100 kernel32: Add stub for BindIoCompletionCallback. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/sync.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 4d3d083..d6bb2bf 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -168,7 +168,7 @@ @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) -# @ stub BindIoCompletionCallback +@ stdcall BindIoCompletionCallback(long ptr long) @ stdcall BuildCommDCBA(str ptr) @ stdcall BuildCommDCBAndTimeoutsA(str ptr ptr) @ stdcall BuildCommDCBAndTimeoutsW(wstr ptr ptr) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 5956268..2674764 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1855,6 +1855,16 @@ BOOL WINAPI PostQueuedCompletionStatus( HANDLE CompletionPort, DWORD dwNumberOfB } /****************************************************************************** + * BindIoCompletionCallback (KERNEL32.@) + */ +BOOL WINAPI BindIoCompletionCallback( HANDLE FileHandle, LPOVERLAPPED_COMPLETION_ROUTINE Function, ULONG Flags) +{ + FIXME("%p, %p, %d, stub!\n", FileHandle, Function, Flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************************** * CreateJobObjectW (KERNEL32.@) */ HANDLE WINAPI CreateJobObjectW( LPSECURITY_ATTRIBUTES attr, LPCWSTR name )

1 0

Stefan Dösinger : ddraw: Update the wined3d depth stencil on device creation, render.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: ffae39c3f37c8c1f5d671c6fe37966ebd1878e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffae39c3f37c8c1f5d671c6fe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 22:30:03 2007 +0200 ddraw: Update the wined3d depth stencil on device creation, render. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 53 +++++++++++++++++++++++++++++++++++++++++-- dlls/ddraw/direct3d.c | 18 ++------------ dlls/ddraw/surface.c | 16 +++++-------- 4 files changed, 60 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index b2fc8b3..8a04ad2 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -360,6 +360,7 @@ const GUID IID_D3DDEVICE_WineD3D; /* Helper functions */ HRESULT IDirect3DImpl_GetCaps(IWineD3D *WineD3D, D3DDEVICEDESC *Desc123, D3DDEVICEDESC7 *Desc7); DWORD IDirect3DDeviceImpl_CreateHandle(IDirect3DDeviceImpl *This); +WINED3DZBUFFERTYPE IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This); /* Structures */ struct EnumTextureFormatsCBS diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 61be064..5ef8748 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1742,13 +1742,23 @@ IDirect3DDeviceImpl_7_SetRenderTarget(IDirect3DDevice7 *iface, { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); IDirectDrawSurfaceImpl *Target = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, NewTarget); + HRESULT hr; TRACE("(%p)->(%p,%08x): Relay\n", This, NewTarget, Flags); /* Flags: Not used */ - return IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, - 0, - Target ? Target->WineD3DSurface : NULL); + hr = IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, + 0, + Target ? Target->WineD3DSurface : NULL); + if(hr != D3D_OK) + { + return hr; + } + IDirectDrawSurface7_AddRef(NewTarget); + IDirectDrawSurface7_Release(ICOM_INTERFACE(This->target, IDirectDrawSurface7)); + This->target = Target; + IDirect3DDeviceImpl_UpdateDepthStencil(This); + return D3D_OK; } static HRESULT WINAPI @@ -5135,3 +5145,40 @@ IDirect3DDeviceImpl_CreateHandle(IDirect3DDeviceImpl *This) TRACE("Returning %d\n", This->numHandles); return This->numHandles; } + +/***************************************************************************** + * IDirect3DDeviceImpl_UpdateDepthStencil + * + * Checks the current render target for attached depth stencils and sets the + * WineD3D depth stencil accordingly. + * + * Returns: + * The depth stencil state to set if creating the device + * + *****************************************************************************/ +WINED3DZBUFFERTYPE +IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *This) +{ + IDirectDrawSurface7 *depthStencil = NULL; + IDirectDrawSurfaceImpl *dsi; + static DDSCAPS2 depthcaps = { DDSCAPS_ZBUFFER, 0, 0, 0 }; + + IDirectDrawSurface7_GetAttachedSurface(ICOM_INTERFACE(This->target, IDirectDrawSurface7), + &depthcaps, + &depthStencil); + if(!depthStencil) + { + TRACE("Setting wined3d depth stencil to NULL\n"); + IWineD3DDevice_SetDepthStencilSurface(This->wineD3DDevice, + NULL); + return WINED3DZB_FALSE; + } + + dsi = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, depthStencil); + TRACE("Setting wined3d depth stencil to %p (wined3d %p)\n", dsi, dsi->WineD3DSurface); + IWineD3DDevice_SetDepthStencilSurface(This->wineD3DDevice, + dsi->WineD3DSurface); + + IDirectDrawSurface7_Release(depthStencil); + return WINED3DZB_TRUE; +} diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index ad18bf8..9f7e136 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -735,8 +735,6 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, IParentImpl *IndexBufferParent; HRESULT hr; IDirectDrawSurfaceImpl *target = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, Surface); - IDirectDrawSurface7 *depthbuffer = NULL; - static DDSCAPS2 depthcaps = { DDSCAPS_ZBUFFER, 0, 0, 0 }; TRACE("(%p)->(%s,%p,%p)\n", iface, debugstr_guid(refiid), Surface, Device); *Device = NULL; @@ -876,19 +874,9 @@ IDirect3DImpl_7_CreateDevice(IDirect3D7 *iface, This->d3ddevice = object; - /* Look for a depth buffer and enable the Z test if one is found */ - hr = IDirectDrawSurface7_GetAttachedSurface(Surface, - &depthcaps, - &depthbuffer); - if(depthbuffer) - { - TRACE("(%p) Depth buffer found, enabling Z test\n", object); - IWineD3DDevice_SetRenderState(This->wineD3DDevice, - WINED3DRS_ZENABLE, - TRUE); - IDirectDrawSurface7_Release(depthbuffer); - } - + IWineD3DDevice_SetRenderState(This->wineD3DDevice, + WINED3DRS_ZENABLE, + IDirect3DDeviceImpl_UpdateDepthStencil(object)); return D3D_OK; } diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 96aec40..00b2820 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -825,12 +825,10 @@ IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurface7 *iface, Surf->first_attached = This->first_attached; This->next_attached = Surf; - /* Check if we attach a back buffer to the primary */ - if(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER && - This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + /* Check if the WineD3D depth stencil needs updating */ + if(This->ddraw->d3ddevice) { - IWineD3DDevice_SetDepthStencilSurface(This->ddraw->wineD3DDevice, - Surf->WineD3DSurface); + IDirect3DDeviceImpl_UpdateDepthStencil(This->ddraw->d3ddevice); } /* MSDN: @@ -892,12 +890,10 @@ IDirectDrawSurfaceImpl_DeleteAttachedSurface(IDirectDrawSurface7 *iface, Surf->next_attached = NULL; Surf->first_attached = Surf; - /* Check if we attach a back buffer to the primary */ - if(Surf->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER && - This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + /* Check if the WineD3D depth stencil needs updating */ + if(This->ddraw->d3ddevice) { - IWineD3DDevice_SetDepthStencilSurface(This->ddraw->wineD3DDevice, - NULL); + IDirect3DDeviceImpl_UpdateDepthStencil(This->ddraw->d3ddevice); } IDirectDrawSurface7_Release(Attach);

1 0

Stefan Dösinger : ddraw: Cube map structure test.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 378005442e5351a0ff82d6d6c68525f0a04afc39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378005442e5351a0ff82d6d6c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 10:34:26 2007 +0200 ddraw: Cube map structure test. --- dlls/ddraw/tests/dsurface.c | 197 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 197 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 6db2d98..fc3ee44 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1042,6 +1042,202 @@ static void AttachmentTest(void) IDirectDraw7_Release(dd7); } +struct compare +{ + DWORD width, height; + DWORD caps, caps2; + UINT mips; +}; + +HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + UINT *mips = context; + + (*mips)++; + IDirectDrawSurface7_EnumAttachedSurfaces(surface, + context, + CubeTestLvl2Enum); + + return DDENUMRET_OK; +} + +HRESULT WINAPI CubeTestLvl1Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + UINT mips = 0; + UINT *num = (UINT *) context; + static const struct compare expected[] = + { + { + 128, 128, + DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX, + DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEZ, + 7 + }, + { + 128, 128, + DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX, + DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEZ, + 7 + }, + { + 128, 128, + DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX, + DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEY, + 7 + }, + { + 128, 128, + DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX, + DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEY, + 7 + }, + { + 128, 128, + DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX, + DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_NEGATIVEX, + 7 + }, + { + 64, 64, /* This is the first mipmap */ + DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX, + DDSCAPS2_MIPMAPSUBLEVEL | DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEX, + 6 + }, + }; + + mips = 0; + IDirectDrawSurface7_EnumAttachedSurfaces(surface, + &mips, + CubeTestLvl2Enum); + + ok(desc->dwWidth == expected[*num].width, "Surface width is %d expected %d\n", desc->dwWidth, expected[*num].width); + ok(desc->dwHeight == expected[*num].height, "Surface height is %d expected %d\n", desc->dwHeight, expected[*num].height); + ok(desc->ddsCaps.dwCaps == expected[*num].caps, "Surface caps are %08x expected %08x\n", desc->ddsCaps.dwCaps, expected[*num].caps); + ok(desc->ddsCaps.dwCaps2 == expected[*num].caps2, "Surface caps2 are %08x expected %08x\n", desc->ddsCaps.dwCaps2, expected[*num].caps2); + ok(mips == expected[*num].mips, "Surface has %d mipmaps, expected %d\n", mips, expected[*num].mips); + + (*num)++; + + IDirectDrawSurface7_Release(surface); + + return DDENUMRET_OK; +} + +static void CubeMapTest(void) +{ + IDirectDraw7 *dd7 = NULL; + IDirectDrawSurface7 *cubemap; + DDSURFACEDESC2 ddsd; + HRESULT hr; + UINT num = 0; + struct enumstruct ctx; + + hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); + ok(hr == DD_OK, "IDirectDraw::QueryInterface returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + + /* D3DFMT_R5G6B5 */ + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + ddsd.ddpfPixelFormat.dwRGBBitCount = 16; + ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; + ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; + ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); + ok(hr == DD_OK, "IDirectDraw7::CreateSurface returned %08x\n", hr); + + hr = IDirectDrawSurface7_GetSurfaceDesc(cubemap, &ddsd); + ok(hr == DD_OK, "IDirectDrawSurface7_GetSurfaceDesc returned %08x\n", hr); + ok(ddsd.ddsCaps.dwCaps == (DDSCAPS_MIPMAP | DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY | DDSCAPS_COMPLEX), + "Root Caps are %08x\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == (DDSCAPS2_CUBEMAP_POSITIVEX | DDSCAPS2_CUBEMAP), + "Root Caps2 are %08x\n", ddsd.ddsCaps.dwCaps2); + + IDirectDrawSurface7_EnumAttachedSurfaces(cubemap, + &num, + CubeTestLvl1Enum); + trace("Enumerated %d surfaces in total\n", num); + ok(num == 6, "Surface has %d attachments\n", num); + IDirectDrawSurface7_Release(cubemap); + + /* What happens if I do not specify any faces? */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP; + + /* D3DFMT_R5G6B5 */ + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + ddsd.ddpfPixelFormat.dwRGBBitCount = 16; + ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; + ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; + ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); + ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw7::CreateSurface asking for a cube map without faces returned %08x\n", hr); + + /* Cube map faces without a cube map? */ + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP_ALLFACES; + + /* D3DFMT_R5G6B5 */ + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + ddsd.ddpfPixelFormat.dwRGBBitCount = 16; + ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; + ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; + ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7::CreateSurface returned %08x\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + ddsd.dwWidth = 128; + ddsd.dwHeight = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP | DDSCAPS_SYSTEMMEMORY; + ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX; + + /* D3DFMT_R5G6B5 */ + ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; + ddsd.ddpfPixelFormat.dwRGBBitCount = 16; + ddsd.ddpfPixelFormat.dwRBitMask = 0xF800; + ddsd.ddpfPixelFormat.dwGBitMask = 0x07E0; + ddsd.ddpfPixelFormat.dwBBitMask = 0x001F; + + hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &cubemap, NULL); + ok(hr == DDERR_INVALIDCAPS, "IDirectDraw7::CreateSurface returned %08x\n", hr); + + /* Make sure everything is cleaned up properly. Use the enumSurfaces test infrastructure */ + memset(&ctx, 0, sizeof(ctx)); + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(DDSURFACEDESC); + hr = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, (DDSURFACEDESC *) &ddsd, (void *) &ctx, enumCB); + ok(hr == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", hr); + ok(ctx.count == 0, "%d surfaces enumerated, expected 0\n", ctx.count); + + IDirectDraw7_Release(dd7); +} + START_TEST(dsurface) { if (!CreateDirectDraw()) @@ -1055,5 +1251,6 @@ START_TEST(dsurface) GetDDInterface_7(); EnumTest(); AttachmentTest(); + CubeMapTest(); ReleaseDirectDraw(); }

1 0

Stefan Dösinger : ddraw: Cube texture support.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: cdaf29f64e50cd72071ee1a9bdc800f390f04f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdaf29f64e50cd72071ee1a9b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 27 13:50:42 2007 +0200 ddraw: Cube texture support. --- dlls/ddraw/ddraw.c | 191 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 161 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdaf29f64e50cd72071ee…

1 0

Stefan Dösinger : d3d: Pass the cube face to Create*Texture's surface creation callback.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 94b3fddec8c701dea670b623ee1c02d5ed4aeae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b3fddec8c701dea670b623e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 10:29:22 2007 +0200 d3d: Pass the cube face to Create*Texture's surface creation callback. --- dlls/d3d8/d3d8_private.h | 3 ++- dlls/d3d8/device.c | 3 ++- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 3 ++- dlls/ddraw/ddraw.c | 2 ++ dlls/wined3d/device.c | 4 ++-- include/wine/wined3d_interface.h | 1 + 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index a86867c..f41b7ed 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -626,7 +626,8 @@ size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_el /* Callbacks */ extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, - IWineD3DSurface** ppSurface, HANDLE* pSharedHandle); + WINED3DCUBEMAP_FACES Face, IWineD3DSurface** ppSurface, + HANDLE* pSharedHandle); extern HRESULT WINAPI D3D8CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT Width, UINT Height, UINT Depth, WINED3DFORMAT Format, WINED3DPOOL Pool, DWORD Usage, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 71de017..da3280d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1769,7 +1769,8 @@ const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl = /* Internal function called back during the CreateDevice to create a render target */ HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, - IWineD3DSurface **ppSurface, HANDLE *pSharedHandle) { + WINED3DCUBEMAP_FACES Face, IWineD3DSurface **ppSurface, + HANDLE *pSharedHandle) { HRESULT res = D3D_OK; IDirect3DSurface8Impl *d3dSurface = NULL; diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 33c780b..af308ac 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -552,7 +552,8 @@ typedef struct IDirect3DQuery9Impl { /* Callbacks */ extern HRESULT WINAPI D3D9CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, - IWineD3DSurface** ppSurface, HANDLE* pSharedHandle); + WINED3DCUBEMAP_FACES Face, IWineD3DSurface** ppSurface, + HANDLE* pSharedHandle); extern HRESULT WINAPI D3D9CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT Width, UINT Height, UINT Depth, WINED3DFORMAT Format, WINED3DPOOL Pool, DWORD Usage, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index af4f3ad..c42f456 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1085,7 +1085,8 @@ const IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl = /* Internal function called back during the CreateDevice to create a render target */ HRESULT WINAPI D3D9CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT Level, - IWineD3DSurface** ppSurface, HANDLE* pSharedHandle) { + WINED3DCUBEMAP_FACES Face,IWineD3DSurface** ppSurface, + HANDLE* pSharedHandle) { HRESULT res = D3D_OK; IDirect3DSurface9Impl *d3dSurface = NULL; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 9f641e1..a7b0639 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1578,6 +1578,7 @@ IDirectDrawImpl_RecreateAllSurfaces(IDirectDrawImpl *This) * Format: The requested format * Usage, Pool: D3DUSAGE and D3DPOOL of the surface * level: The mipmap level + * Face: The cube map face type * Surface: Pointer to pass the created surface back at * SharedHandle: NULL * @@ -1591,6 +1592,7 @@ D3D7CB_CreateSurface(IUnknown *device, UINT Width, UINT Height, WINED3DFORMAT Format, DWORD Usage, WINED3DPOOL Pool, UINT level, + WINED3DCUBEMAP_FACES Face, IWineD3DSurface **Surface, HANDLE *SharedHandle) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f4f3002..5c2d700 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -851,7 +851,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, U for (i = 0; i < object->baseTexture.levels; i++) { /* use the callback to create the texture surface */ - hr = D3DCB_CreateSurface(This->parent, parent, tmpW, tmpH, Format, Usage, Pool, i, &object->surfaces[i],NULL); + hr = D3DCB_CreateSurface(This->parent, parent, tmpW, tmpH, Format, Usage, Pool, i, WINED3DCUBEMAP_FACE_POSITIVE_X, &object->surfaces[i],NULL); if (hr!= WINED3D_OK || ( (IWineD3DSurfaceImpl *) object->surfaces[i])->Flags & SFLAG_OVERSIZE) { FIXME("Failed to create surface %p\n", object); /* clean up */ @@ -1046,7 +1046,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface for (j = 0; j < 6; j++) { hr=D3DCB_CreateSurface(This->parent, parent, tmpW, tmpW, Format, Usage, Pool, - i /* Level */, &object->surfaces[j][i],pSharedHandle); + i /* Level */, j, &object->surfaces[j][i],pSharedHandle); if(hr!= WINED3D_OK) { /* clean up */ diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index d9f33d0..82ddc23 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -209,6 +209,7 @@ typedef HRESULT WINAPI (*D3DCB_CREATESURFACEFN) (IUnknown *pDevice, DWORD Usage, WINED3DPOOL Pool, UINT Level, + WINED3DCUBEMAP_FACES Face, struct IWineD3DSurface **ppSurface, HANDLE *pSharedHandle);

1 0

Stefan Dösinger : ddraw: Store a WineD3DBaseTexture instead of a WineD3DTexture.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 7ca369d9b6aefa53bfb611cdcd5d18327ac4ad2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ca369d9b6aefa53bfb611cdc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 24 02:04:11 2007 +0200 ddraw: Store a WineD3DBaseTexture instead of a WineD3DTexture. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 ++-- dlls/ddraw/surface.c | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 17adb27..9f641e1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2406,7 +2406,7 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface, 0, /* usage */ Format, Pool, - &object->wineD3DTexture, + (IWineD3DTexture **) &object->wineD3DTexture, 0, /* SharedHandle */ (IUnknown *) ICOM_INTERFACE(object, IDirectDrawSurface7), D3D7CB_CreateSurface ); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 85e15bc..b2fc8b3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -227,7 +227,7 @@ struct IDirectDrawSurfaceImpl /* Connections to other Objects */ IDirectDrawImpl *ddraw; IWineD3DSurface *WineD3DSurface; - IWineD3DTexture *wineD3DTexture; + IWineD3DBaseTexture *wineD3DTexture; /* This implementation handles attaching surfaces to other surfaces */ IDirectDrawSurfaceImpl *next_attached; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d26c39d..61be064 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2295,7 +2295,7 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, IDirectDrawSurfaceImpl *surf = (IDirectDrawSurfaceImpl *) This->Handles[Value - 1].ptr; return IWineD3DDevice_SetTexture(This->wineD3DDevice, 0, - (IWineD3DBaseTexture *) surf->wineD3DTexture); + surf->wineD3DTexture); } } @@ -3946,7 +3946,7 @@ IDirect3DDeviceImpl_7_SetTexture(IDirect3DDevice7 *iface, /* Texture may be NULL here */ return IWineD3DDevice_SetTexture(This->wineD3DDevice, Stage, - surf ? (IWineD3DBaseTexture * ) surf->wineD3DTexture : NULL); + surf ? surf->wineD3DTexture : NULL); } static HRESULT WINAPI diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ea09f85..96aec40 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -301,7 +301,7 @@ IDirectDrawSurfaceImpl_Release(IDirectDrawSurface7 *iface) */ if(This->wineD3DTexture) { - IWineD3DTexture_Release(This->wineD3DTexture); + IWineD3DBaseTexture_Release(This->wineD3DTexture); } /* If it's the RenderTarget, destroy the d3ddevice */ else if( (ddraw->d3d_initialized) && (This == ddraw->d3d_target)) @@ -1815,8 +1815,8 @@ IDirectDrawSurfaceImpl_SetLOD(IDirectDrawSurface7 *iface, return DDERR_INVALIDOBJECT; } - return IWineD3DTexture_SetLOD(This->wineD3DTexture, - MaxLOD); + return IWineD3DBaseTexture_SetLOD(This->wineD3DTexture, + MaxLOD); } /***************************************************************************** @@ -1846,7 +1846,7 @@ IDirectDrawSurfaceImpl_GetLOD(IDirectDrawSurface7 *iface, if (!(This->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE)) return DDERR_INVALIDOBJECT; - *MaxLOD = IWineD3DTexture_GetLOD(This->wineD3DTexture); + *MaxLOD = IWineD3DBaseTexture_GetLOD(This->wineD3DTexture); return DD_OK; }

1 0

Andrew Talbot : ddraw: Exclude unused headers.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: 0629946e655a9e26698bc4a0ebc4c5120d1e95f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0629946e655a9e26698bc4a0e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 30 21:40:06 2007 +0100 ddraw: Exclude unused headers. --- dlls/ddraw/ddraw.c | 2 -- dlls/ddraw/ddraw_thunks.c | 2 -- dlls/ddraw/device.c | 2 -- dlls/ddraw/direct3d.c | 2 -- dlls/ddraw/executebuffer.c | 2 -- dlls/ddraw/gamma.c | 2 -- dlls/ddraw/light.c | 2 -- dlls/ddraw/main.c | 2 -- dlls/ddraw/material.c | 2 -- dlls/ddraw/parent.c | 2 -- dlls/ddraw/surface.c | 2 -- dlls/ddraw/texture.c | 2 -- dlls/ddraw/vertexbuffer.c | 2 -- dlls/ddraw/viewport.c | 2 -- 14 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 25b02d8..17adb27 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -32,11 +32,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 964466d..c832ff7 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -29,11 +29,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e7e975d..d26c39d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -39,11 +39,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/direct3d.c b/dlls/ddraw/direct3d.c index 927dcd3..ad18bf8 100644 --- a/dlls/ddraw/direct3d.c +++ b/dlls/ddraw/direct3d.c @@ -29,11 +29,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 2c064a9..9dbff68 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -33,11 +33,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/gamma.c b/dlls/ddraw/gamma.c index b885b81..8a8e2dd 100644 --- a/dlls/ddraw/gamma.c +++ b/dlls/ddraw/gamma.c @@ -31,11 +31,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 1eb7961..93144d3 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -32,11 +32,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 239460c..1e83c5b 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -36,11 +36,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "winreg.h" #include "ddraw.h" diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index 06fecb0..5b7332e 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -32,11 +32,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/parent.c b/dlls/ddraw/parent.c index 14f6172..163bc4d 100644 --- a/dlls/ddraw/parent.c +++ b/dlls/ddraw/parent.c @@ -34,11 +34,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fa9ce3d..ea09f85 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -36,11 +36,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/texture.c b/dlls/ddraw/texture.c index 087996b..e7e5f3f 100644 --- a/dlls/ddraw/texture.c +++ b/dlls/ddraw/texture.c @@ -32,11 +32,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index d0592e2..fce64a7 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -32,11 +32,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h" diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 2ce1490..c2b8fc6 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -32,11 +32,9 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "winerror.h" #include "wingdi.h" #include "wine/exception.h" -#include "excpt.h" #include "ddraw.h" #include "d3d.h"

1 0

Andrew Talbot : dbghelp: Exclude unused headers.
by Alexandre Julliard 01 May '07

01 May '07

Module: wine Branch: master Commit: dcb298b468deb34148f2287cac685a213e111576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcb298b468deb34148f2287ca… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 30 21:39:48 2007 +0100 dbghelp: Exclude unused headers. --- dlls/dbghelp/coff.c | 2 -- dlls/dbghelp/dwarf.c | 2 -- dlls/dbghelp/image.c | 1 - dlls/dbghelp/minidump.c | 2 -- dlls/dbghelp/module.c | 1 - dlls/dbghelp/msc.c | 2 -- dlls/dbghelp/path.c | 1 - dlls/dbghelp/pe_module.c | 2 -- dlls/dbghelp/stabs.c | 1 - dlls/dbghelp/stack.c | 1 - dlls/dbghelp/type.c | 1 - 11 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index 00d25a2..ef8632b 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -48,12 +48,10 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winternl.h" #include "wine/exception.h" #include "wine/debug.h" -#include "excpt.h" #include "dbghelp_private.h" #include "wine/mscvpdb.h" diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 45fe854..bf8435f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -44,8 +44,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" -#include "winnls.h" #include "winuser.h" #include "ole2.h" #include "oleauto.h" diff --git a/dlls/dbghelp/image.c b/dlls/dbghelp/image.c index f35bb7e..23c74b5 100644 --- a/dlls/dbghelp/image.c +++ b/dlls/dbghelp/image.c @@ -24,7 +24,6 @@ #include <string.h> #include "dbghelp_private.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 3bd0f74..9a317b9 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -26,8 +26,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "winnls.h" -#include "winreg.h" #include "winternl.h" #include "psapi.h" #include "wine/debug.h" diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c2a3f04..3093c58 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -27,7 +27,6 @@ #include "dbghelp_private.h" #include "psapi.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index b20f771..0bd353e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -49,12 +49,10 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winternl.h" #include "wine/exception.h" #include "wine/debug.h" -#include "excpt.h" #include "dbghelp_private.h" #include "wine/mscvpdb.h" diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index bd97437..73a3c27 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -25,7 +25,6 @@ #include "dbghelp_private.h" #include "winnls.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index ee6997f..a42ade1 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -28,10 +28,8 @@ #include <assert.h> #include "dbghelp_private.h" -#include "winreg.h" #include "winternl.h" #include "wine/debug.h" -#include "winnls.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 7693ff7..8f651b1 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -54,7 +54,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winnls.h" #include "dbghelp_private.h" diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 10b5612..3cb71e6 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -30,7 +30,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "dbghelp_private.h" -#include "winreg.h" #include "winternl.h" #include "wine/winbase16.h" #include "wine/debug.h" diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 97c606a..537d059 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -28,7 +28,6 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winnls.h" #include "wine/debug.h" #include "dbghelp_private.h"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2007