wine-commits February 2007

wine-commits@winehq.org

4 participants
839 discussions

Stefan Dösinger : wined3d: No bounds checking is done on sampler / texture numbers.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: bbcf98209c9a9810c50d9d83dd53a967f9298b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbcf98209c9a9810c50d9d83d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:24:48 2007 +0100 wined3d: No bounds checking is done on sampler / texture numbers. --- dlls/d3d8/tests/device.c | 59 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/d3d.c | 30 +++++++++++++++++++++ dlls/wined3d/device.c | 24 ----------------- 4 files changed, 153 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbcf98209c9a9810c50d9…

1 0

Stefan Dösinger : wined3d: Remove IWineD3DDevice:: EnumDisplayModes.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 27113156d96d20296409fcb92839609c8dd7e34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=27113156d96d20296409fcb92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:24:00 2007 +0100 wined3d: Remove IWineD3DDevice::EnumDisplayModes. --- dlls/ddraw/ddraw.c | 99 +++++++++++++++---------------------- dlls/wined3d/device.c | 25 ---------- include/wine/wined3d_interface.h | 9 ---- 3 files changed, 40 insertions(+), 93 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 96b30d3..3270e41 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1136,50 +1136,6 @@ IDirectDrawImpl_GetGDISurface(IDirectDraw7 *iface, } /***************************************************************************** - * IDirectDrawImpl_EnumDisplayModesCB - * - * Callback function for IDirectDraw7::EnumDisplayModes. Translates - * the wineD3D values to ddraw values and calls the application callback - * - * Params: - * device: The IDirectDraw7 interface to the current device - * With, Height, Pixelformat, Refresh: Enumerated display mode - * context: the context pointer passed to IWineD3DDevice::EnumDisplayModes - * - * Returns: - * The return value from the application callback - * - *****************************************************************************/ -static HRESULT WINAPI -IDirectDrawImpl_EnumDisplayModesCB(IUnknown *pDevice, - UINT Width, - UINT Height, - WINED3DFORMAT Pixelformat, - FLOAT Refresh, - void *context) -{ - DDSURFACEDESC2 callback_sd; - EnumDisplayModesCBS *cbs = (EnumDisplayModesCBS *) context; - - memset(&callback_sd, 0, sizeof(callback_sd)); - callback_sd.dwSize = sizeof(callback_sd); - callback_sd.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); - - callback_sd.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH; - if(Refresh > 0.0) - { - callback_sd.dwFlags |= DDSD_REFRESHRATE; - callback_sd.u2.dwRefreshRate = 60.0; - } - - callback_sd.dwHeight = Height; - callback_sd.dwWidth = Width; - - PixelFormat_WineD3DtoDD(&callback_sd.u4.ddpfPixelFormat, Pixelformat); - return cbs->callback(&callback_sd, cbs->context); -} - -/***************************************************************************** * IDirectDraw7::EnumDisplayModes * * Enumerates the supported Display modes. The modes can be filtered with @@ -1204,34 +1160,59 @@ IDirectDrawImpl_EnumDisplayModes(IDirectDraw7 *iface, LPDDENUMMODESCALLBACK2 cb) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw7, iface); - UINT Width = 0, Height = 0; + unsigned int modenum = 0; WINED3DFORMAT pixelformat = WINED3DFMT_UNKNOWN; - EnumDisplayModesCBS cbs; + WINED3DDISPLAYMODE mode; + DDSURFACEDESC2 callback_sd; TRACE("(%p)->(%p,%p,%p): Relay\n", This, DDSD, Context, cb); /* This looks sane */ if(!cb) return DDERR_INVALIDPARAMS; - /* The private callback structure */ - cbs.callback = cb; - cbs.context = Context; - if(DDSD) { - if (DDSD->dwFlags & DDSD_WIDTH) - Width = DDSD->dwWidth; - if (DDSD->dwFlags & DDSD_HEIGHT) - Height = DDSD->dwHeight; if ((DDSD->dwFlags & DDSD_PIXELFORMAT) && (DDSD->u4.ddpfPixelFormat.dwFlags & DDPF_RGB) ) pixelformat = PixelFormat_DD2WineD3D(&DDSD->u4.ddpfPixelFormat); } - return IWineD3DDevice_EnumDisplayModes(This->wineD3DDevice, - Flags, - Width, Height, pixelformat, - &cbs, - IDirectDrawImpl_EnumDisplayModesCB); + while(IWineD3D_EnumAdapterModes(This->wineD3D, + WINED3DADAPTER_DEFAULT, + pixelformat, + modenum++, + &mode) == WINED3D_OK) { + if(DDSD) + { + if(DDSD->dwFlags & DDSD_WIDTH && mode.Width != DDSD->dwWidth) continue; + if(DDSD->dwFlags & DDSD_HEIGHT && mode.Height != DDSD->dwHeight) continue; + } + + memset(&callback_sd, 0, sizeof(callback_sd)); + callback_sd.dwSize = sizeof(callback_sd); + callback_sd.u4.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + + callback_sd.dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH; + if(Flags & DDEDM_REFRESHRATES) + { + callback_sd.dwFlags |= DDSD_REFRESHRATE; + callback_sd.u2.dwRefreshRate = mode.RefreshRate; + } + + callback_sd.dwWidth = mode.Width; + callback_sd.dwHeight = mode.Height; + + PixelFormat_WineD3DtoDD(&callback_sd.u4.ddpfPixelFormat, mode.Format); + + TRACE("Enumerating %dx%d@%d\n", callback_sd.dwWidth, callback_sd.dwHeight, callback_sd.u4.ddpfPixelFormat.u1.dwRGBBitCount); + + if(cb(&callback_sd, Context) == DDENUMRET_CANCEL) + { + TRACE("Application asked to terminate the enumeration\n"); + return DD_OK; + } + } + TRACE("End of enumeration\n"); + return DD_OK; } /***************************************************************************** diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2799ffd..3e66075 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1822,30 +1822,6 @@ static void WINAPI IWineD3DDeviceImpl_SetFullscreen(IWineD3DDevice *iface, BOOL This->ddraw_fullscreen = fullscreen; } -static HRESULT WINAPI IWineD3DDeviceImpl_EnumDisplayModes(IWineD3DDevice *iface, DWORD Flags, UINT Width, UINT Height, WINED3DFORMAT pixelformat, LPVOID context, D3DCB_ENUMDISPLAYMODESCALLBACK callback) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - DEVMODEW DevModeW; - int i; - const PixelFormatDesc *formatDesc = getFormatDescEntry(pixelformat); - - TRACE("(%p)->(%x,%d,%d,%d,%p,%p)\n", This, Flags, Width, Height, pixelformat, context, callback); - - for (i = 0; EnumDisplaySettingsExW(NULL, i, &DevModeW, 0); i++) { - /* Ignore some modes if a description was passed */ - if ( (Width > 0) && (Width != DevModeW.dmPelsWidth)) continue; - if ( (Height > 0) && (Height != DevModeW.dmPelsHeight)) continue; - if ( (pixelformat != WINED3DFMT_UNKNOWN) && ( formatDesc->bpp != DevModeW.dmBitsPerPel) ) continue; - - TRACE("Enumerating %dx%d@%s\n", DevModeW.dmPelsWidth, DevModeW.dmPelsHeight, debug_d3dformat(pixelformat_for_depth(DevModeW.dmBitsPerPel))); - - if (callback((IUnknown *) This, (UINT) DevModeW.dmPelsWidth, (UINT) DevModeW.dmPelsHeight, pixelformat_for_depth(DevModeW.dmBitsPerPel), 60.0, context) == DDENUMRET_CANCEL) - return WINED3D_OK; - } - - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { DEVMODEW devmode; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -5713,7 +5689,6 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_Init3D, IWineD3DDeviceImpl_Uninit3D, IWineD3DDeviceImpl_SetFullscreen, - IWineD3DDeviceImpl_EnumDisplayModes, IWineD3DDeviceImpl_EvictManagedResources, IWineD3DDeviceImpl_GetAvailableTextureMem, IWineD3DDeviceImpl_GetBackBuffer, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 998c84c..3783ebc 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -233,13 +233,6 @@ typedef HRESULT WINAPI (*D3DCB_CREATEADDITIONALSWAPCHAIN) (IUnknown *pDevice, struct IWineD3DSwapChain **pSwapChain ); -typedef HRESULT WINAPI (*D3DCB_ENUMDISPLAYMODESCALLBACK) (IUnknown *pDevice, - UINT Width, - UINT Height, - WINED3DFORMAT Pixelformat, - FLOAT Refresh, - LPVOID context); - /***************************************************************************** * Callback functions for custom implicit object destruction. */ @@ -363,7 +356,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(Init3D)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain); STDMETHOD(Uninit3D)(THIS, D3DCB_DESTROYSURFACEFN pFn, D3DCB_DESTROYSWAPCHAINFN pFn2); STDMETHOD_(void, SetFullscreen)(THIS_ BOOL fullscreen); - 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; @@ -500,7 +492,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_Init3D(p, a, b) (p)->lpVtbl->Init3D(p, a, b) #define IWineD3DDevice_Uninit3D(p, a, b) (p)->lpVtbl->Uninit3D(p, a, b) #define IWineD3DDevice_SetFullscreen(p, a) (p)->lpVtbl->SetFullscreen(p, a) -#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)

1 0

Stefan Dösinger : wined3d: Fix d3d8/9 style palettes.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 7676462a3dd23c8b52d473e10190eb2debb3edb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7676462a3dd23c8b52d473e10… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:23:36 2007 +0100 wined3d: Fix d3d8/9 style palettes. --- dlls/wined3d/surface.c | 25 +++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b090366..562adcd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -297,6 +297,8 @@ ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) { } if(This->Flags & SFLAG_USERPTR) IWineD3DSurface_SetMem(iface, NULL); + HeapFree(GetProcessHeap(), 0, This->palette9); + IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); if(iface == device->ddraw_primary) device->ddraw_primary = NULL; @@ -1649,6 +1651,27 @@ void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES convert) { GL_EXTCALL(glColorTableEXT(GL_TEXTURE_2D,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table)); } +static BOOL palette9_changed(IWineD3DSurfaceImpl *This) { + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + if(This->palette || (This->resource.format != WINED3DFMT_P8 && This->resource.format != WINED3DFMT_A8P8)) { + /* If a ddraw-style palette is attached assume no d3d9 palette change. + * Also the palette isn't interesting if the surface format isn't P8 or A8P8 + */ + return FALSE; + } + + if(This->palette9) { + if(memcmp(This->palette9, &device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256) == 0) { + return FALSE; + } + } else { + This->palette9 = (PALETTEENTRY *) HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * 256); + } + memcpy(This->palette9, &device->palettes[device->currentPalette], sizeof(PALETTEENTRY) * 256); + return TRUE; +} + static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; GLenum format, internal, type; @@ -1672,6 +1695,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface) { (This->glCKey.dwColorSpaceLowValue != This->SrcBltCKey.dwColorSpaceLowValue) || (This->glCKey.dwColorSpaceHighValue != This->SrcBltCKey.dwColorSpaceHighValue)))) { TRACE("Reloading because of color keying\n"); + } else if(palette9_changed(This)) { + TRACE("Reloading surface because the d3d8/9 palette was changed\n"); } else { TRACE("surface isn't dirty\n"); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9454a38..7fea727 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -973,7 +973,8 @@ struct IWineD3DSurfaceImpl /* IWineD3DSurface fields */ IWineD3DBase *container; WINED3DSURFACET_DESC currentDesc; - IWineD3DPaletteImpl *palette; + IWineD3DPaletteImpl *palette; /* D3D7 style palette handling */ + PALETTEENTRY *palette9; /* D3D8/9 style palette handling */ UINT bytesPerPixel;

1 0

Stefan Dösinger : wined3d: Remove stream flags from GetStreamSource.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 4a93eb840aa9c9444629190ab11e902e0101a706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a93eb840aa9c9444629190ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:19:46 2007 +0100 wined3d: Remove stream flags from GetStreamSource. --- dlls/wined3d/device.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92f7176..2799ffd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2025,24 +2025,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_GetStreamSource(IWineD3DDevice *iface, UINT StreamNumber,IWineD3DVertexBuffer** pStream, UINT *pOffset, UINT* pStride) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - UINT streamFlags; TRACE("(%p) : StreamNo: %d, Stream (%p), Stride %d\n", This, StreamNumber, This->stateBlock->streamSource[StreamNumber], This->stateBlock->streamStride[StreamNumber]); - - streamFlags = StreamNumber &(WINED3DSTREAMSOURCE_INDEXEDDATA | WINED3DSTREAMSOURCE_INSTANCEDATA); - if (streamFlags) { - if (streamFlags & WINED3DSTREAMSOURCE_INDEXEDDATA) { - FIXME("stream index data not supported\n"); - } - if (streamFlags & WINED3DSTREAMSOURCE_INDEXEDDATA) { - FIXME("stream instance data not supported\n"); - } - } - - StreamNumber&= ~(WINED3DSTREAMSOURCE_INDEXEDDATA | WINED3DSTREAMSOURCE_INSTANCEDATA); - if (StreamNumber >= MAX_STREAMS) { WARN("Stream out of range %d\n", StreamNumber); return WINED3DERR_INVALIDCALL;

1 0

Stefan Dösinger : wined3d/d3d8: Move todo about sw vp usage to d3d8.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: ef68e32b0362f8526492c10b2f5e2e73c104acb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef68e32b0362f8526492c10b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:19:19 2007 +0100 wined3d/d3d8: Move todo about sw vp usage to d3d8. --- dlls/d3d8/device.c | 2 +- dlls/wined3d/device.c | 9 --------- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ee8d162..95a1331 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1257,7 +1257,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 } wined3d_vertex_declaration = ((IDirect3DVertexDeclaration8Impl *)object->vertex_declaration)->wined3d_vertex_declaration; - /* Usage is missing ..*/ + /* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */ hrc = IWineD3DDevice_CreateVertexShader(This->WineD3DDevice, wined3d_vertex_declaration, pFunction, &object->wineD3DVertexShader, (IUnknown *)object); if (FAILED(hrc)) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 510a32c..92f7176 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1586,15 +1586,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac return WINED3DERR_INVALIDCALL; } -#if 0 /* TODO: In D3D* SVP is atatched to the shader, in D3D9 it's attached to the device and isn't stored in the stateblock. */ - if(Usage == WINED3DUSAGE_SOFTWAREVERTEXPROCESSING) { - /* Foo */ - } else { - /* Bar */ - } - -#endif - return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Check volume texture creation errors.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 401110538aa39214280367725f2d8cb80abbc3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=401110538aa39214280367725… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 19 15:18:45 2007 +0100 wined3d: Check volume texture creation errors. Volumetexture::Release checks for NULL pointers, so releasing a partially created texture works. --- dlls/wined3d/device.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30771b0..510a32c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -939,9 +939,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVolumeTexture(IWineD3DDevice *ifa for (i = 0; i < object->baseTexture.levels; i++) { + HRESULT hr; /* Create the volume */ - D3DCB_CreateVolume(This->parent, parent, Width, Height, Depth, Format, Pool, Usage, - (IWineD3DVolume **)&object->volumes[i], pSharedHandle); + hr = D3DCB_CreateVolume(This->parent, parent, Width, Height, Depth, Format, Pool, Usage, + (IWineD3DVolume **)&object->volumes[i], pSharedHandle); + + if(FAILED(hr)) { + ERR("Creating a volume for the volume texture failed(%08x)\n", hr); + IWineD3DVolumeTexture_Release((IWineD3DVolumeTexture *) object); + *ppVolumeTexture = NULL; + return hr; + } /* Set its container to this object */ IWineD3DVolume_SetContainer(object->volumes[i], (IWineD3DBase *)object);

1 0

Mikołaj Zalewski : comctl32: rebar: Store the oldSize as a local variable.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: 3f5458dc95fbdd05df876e34ce2678be7c0f0f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5458dc95fbdd05df876e34c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 19 14:10:27 2007 +0100 comctl32: rebar: Store the oldSize as a local variable. --- dlls/comctl32/rebar.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index c82d9fb..e61fb39 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -175,7 +175,6 @@ typedef struct DWORD dwStyle; /* window style */ DWORD orgStyle; /* original style (dwStyle may change) */ SIZE calcSize; /* calculated rebar size - coordinates swapped for CCS_VERT */ - SIZE oldSize; /* previous calculated rebar size */ BOOL bUnicode; /* TRUE if parent wants notify in W format */ BOOL DoRedraw; /* TRUE to acutally draw bands */ UINT fStatus; /* Status flags (see below) */ @@ -937,9 +936,7 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) INT xedge = 0, yedge = 0; RECT rcSelf; - TRACE( "old [%d x %d], new [%d x %d]\n", - infoPtr->oldSize.cx, infoPtr->oldSize.cy, - infoPtr->calcSize.cx, infoPtr->calcSize.cy); + TRACE("new size [%d x %d]\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy); if (infoPtr->dwStyle & CCS_NORESIZE) return; @@ -1328,6 +1325,7 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) { REBAR_BAND *lpBand; RECT rcAdj; + SIZE oldSize; INT adjcx, adjcy, i; INT rowstart = 0; INT row = 0; @@ -1359,7 +1357,7 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) if (infoPtr->uNumBands == 0) { TRACE("No bands - setting size to (0,%d), vert: %lx\n", adjcx, infoPtr->dwStyle & CCS_VERT); - infoPtr->oldSize = infoPtr->calcSize; + /* TODO: send a notify if height changed */ infoPtr->calcSize.cx = adjcx; infoPtr->calcSize.cy = 0; infoPtr->uNumRows = 0; @@ -1399,16 +1397,16 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) else REBAR_CalcHorzBand(infoPtr, 0, infoPtr->uNumBands); /* now compute size of Rebar itself */ - infoPtr->oldSize = infoPtr->calcSize; + oldSize = infoPtr->calcSize; infoPtr->calcSize.cx = adjcx; infoPtr->calcSize.cy = yPos; - if (notify && (infoPtr->oldSize.cy != infoPtr->calcSize.cy)) + if (notify && (oldSize.cy != infoPtr->calcSize.cy)) infoPtr->fStatus |= NTF_HGHTCHG; TRACE("calcsize notify=%d, size=(%d, %d), origheight=(%d,%d)\n", notify, infoPtr->calcSize.cx, infoPtr->calcSize.cy, - infoPtr->oldSize.cx, infoPtr->oldSize.cy); + oldSize.cx, oldSize.cy); REBAR_DumpBand (infoPtr); REBAR_MoveChildWindows (infoPtr, 0, infoPtr->uNumBands);

1 0

Mikołaj Zalewski : comctl32: rebar: Store the coordinates of infoPtr->calcSize swapped for CCS_VERT.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: a268538e0ed1568d1a3a999676504b8c1e8a6681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a268538e0ed1568d1a3a99967… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 19 14:10:01 2007 +0100 comctl32: rebar: Store the coordinates of infoPtr->calcSize swapped for CCS_VERT. --- dlls/comctl32/rebar.c | 35 ++++++++++------------------------- 1 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index b7d1c57..c82d9fb 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -133,7 +133,7 @@ typedef struct UINT fStatus; /* status flags, reset only by _Validate */ UINT fDraw; /* drawing flags, reset only by _Layout */ UINT uCDret; /* last return from NM_CUSTOMDRAW */ - RECT rcBand; /* calculated band rectangle */ + RECT rcBand; /* calculated band rectangle - coordinates swapped for CCS_VERT */ RECT rcGripper; /* calculated gripper rectangle */ RECT rcCapImage; /* calculated caption image rectangle */ RECT rcCapText; /* calculated caption text rectangle */ @@ -174,7 +174,7 @@ typedef struct SIZE imageSize; /* image size (image list) */ DWORD dwStyle; /* window style */ DWORD orgStyle; /* original style (dwStyle may change) */ - SIZE calcSize; /* calculated rebar size */ + SIZE calcSize; /* calculated rebar size - coordinates swapped for CCS_VERT */ SIZE oldSize; /* previous calculated rebar size */ BOOL bUnicode; /* TRUE if parent wants notify in W format */ BOOL DoRedraw; /* TRUE to acutally draw bands */ @@ -465,16 +465,6 @@ static int get_rect_cy(REBAR_INFO *infoPtr, RECT *lpRect) return lpRect->bottom - lpRect->top; } -static void swap_size_if_vert(REBAR_INFO *infoPtr, SIZE *size) -{ - if (infoPtr->dwStyle & CCS_VERT) - { - LONG tmp = size->cx; - size->cx = size->cy; - size->cy = tmp; - } -} - static void round_child_height(REBAR_BAND *lpBand, int cyHeight) { int cy = 0; @@ -966,13 +956,12 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) MapWindowPoints(HWND_DESKTOP, GetParent(infoPtr->hwndSelf), (LPPOINT)&rcSelf, 2); translate_rect(infoPtr, &rcSelf, &rcSelf); - height = (infoPtr->dwStyle & CCS_VERT ? infoPtr->calcSize.cx : infoPtr->calcSize.cy) + 2*yedge; + height = infoPtr->calcSize.cy + 2*yedge; if (!(infoPtr->dwStyle & CCS_NOPARENTALIGN)) { RECT rcParent; - SIZE calcSize; x = -xedge; - width = (infoPtr->dwStyle & CCS_VERT ? infoPtr->calcSize.cy : infoPtr->calcSize.cx) + 2*xedge; + width = infoPtr->calcSize.cx + 2*xedge; y = 0; /* quiet compiler warning */ switch ( infoPtr->dwStyle & CCS_LAYOUT_MASK) { case 0: /* shouldn't happen - see NCCreate */ @@ -985,9 +974,7 @@ REBAR_ForceResize (REBAR_INFO *infoPtr) case CCS_BOTTOM: GetClientRect(GetParent(infoPtr->hwndSelf), &rcParent); translate_rect(infoPtr, &rcParent, &rcParent); - calcSize = infoPtr->calcSize; - swap_size_if_vert(infoPtr, &calcSize); - y = rcParent.bottom - calcSize.cy - yedge; + y = rcParent.bottom - infoPtr->calcSize.cy - yedge; break; } } @@ -1375,7 +1362,6 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) infoPtr->oldSize = infoPtr->calcSize; infoPtr->calcSize.cx = adjcx; infoPtr->calcSize.cy = 0; - swap_size_if_vert(infoPtr, &infoPtr->calcSize); infoPtr->uNumRows = 0; REBAR_ForceResize(infoPtr); return; @@ -1417,9 +1403,8 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) infoPtr->calcSize.cx = adjcx; infoPtr->calcSize.cy = yPos; - swap_size_if_vert(infoPtr, &infoPtr->calcSize); - if (infoPtr->calcSize.cx != infoPtr->oldSize.cx || infoPtr->calcSize.cy != infoPtr->oldSize.cy) - if (notify && (yPos != infoPtr->calcSize.cy)) infoPtr->fStatus |= NTF_HGHTCHG; + if (notify && (infoPtr->oldSize.cy != infoPtr->calcSize.cy)) + infoPtr->fStatus |= NTF_HGHTCHG; TRACE("calcsize notify=%d, size=(%d, %d), origheight=(%d,%d)\n", notify, infoPtr->calcSize.cx, infoPtr->calcSize.cy, @@ -1717,7 +1702,7 @@ REBAR_InternalEraseBkGnd (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, REC rcRowSep = rcBand; if (infoPtr->dwStyle & CCS_VERT) { rcRowSep.right += SEP_WIDTH_SIZE; - rcRowSep.bottom = infoPtr->calcSize.cy; + rcRowSep.bottom = infoPtr->calcSize.cx; if (theme) DrawThemeEdge (theme, hdc, RP_BAND, 0, &rcRowSep, EDGE_ETCHED, BF_RIGHT, NULL); else @@ -2120,7 +2105,7 @@ REBAR_GetBarHeight (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { INT nHeight; - nHeight = (infoPtr->dwStyle & CCS_VERT) ? infoPtr->calcSize.cx : infoPtr->calcSize.cy; + nHeight = infoPtr->calcSize.cy; TRACE("height = %d\n", nHeight); @@ -2382,7 +2367,7 @@ REBAR_MaximizeBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (lParam && (lpBand->cxEffective < cxIdealBand)) cxDesired = cxIdealBand; else - cxDesired = (infoPtr->dwStyle&CCS_VERT ? infoPtr->calcSize.cy : infoPtr->calcSize.cx); + cxDesired = infoPtr->calcSize.cx; iRowBegin = get_row_begin_for_band(infoPtr, uBand); iRowEnd = get_row_end_for_band(infoPtr, uBand);

1 0

Mikołaj Zalewski : comctl32: rebar: Test and fix the WM_SIZE handler and REBAR_ForceResize.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: ffbf61ae55c8e0062aa76bc9a04cb62815d3fc92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbf61ae55c8e0062aa76bc9a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 19 14:09:24 2007 +0100 comctl32: rebar: Test and fix the WM_SIZE handler and REBAR_ForceResize. --- dlls/comctl32/comctl32.h | 3 + dlls/comctl32/rebar.c | 264 +++++++++++++------------------------------ dlls/comctl32/tests/rebar.c | 183 ++++++++++++++++++++++++++++++ 3 files changed, 263 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffbf61ae55c8e0062aa76…

1 0

Mikołaj Zalewski : comctl32: rebar: Rewrite the layout code.
by Alexandre Julliard 20 Feb '07

20 Feb '07

Module: wine Branch: master Commit: f0a7a74666e2cf9aa1213ea638c4d899f86f19e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0a7a74666e2cf9aa1213ea63… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 19 13:56:51 2007 +0100 comctl32: rebar: Rewrite the layout code. --- dlls/comctl32/rebar.c | 1737 +++++++++++++------------------------------ dlls/comctl32/tests/rebar.c | 420 ++++++++++- 2 files changed, 902 insertions(+), 1255 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a7a74666e2cf9aa1213…

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
84
Older →

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 February 2007