March 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Fix handling of the DC brush/pen in metafiles.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: dfaee0a5d7f4f6ec8bbc1153e035d31444e98de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaee0a5d7f4f6ec8bbc1153e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 10 20:22:22 2011 +0100 gdi32: Fix handling of the DC brush/pen in metafiles. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 4 + dlls/gdi32/enhmfdrv/init.c | 10 ++- dlls/gdi32/enhmfdrv/objects.c | 46 +++++++++- dlls/gdi32/mfdrv/dc.c | 10 ++ dlls/gdi32/mfdrv/init.c | 4 +- dlls/gdi32/mfdrv/metafiledrv.h | 2 + dlls/gdi32/tests/metafile.c | 164 ++++++++++++++++++++++++++++++++++ 7 files changed, 233 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfaee0a5d7f4f6ec8bbc1…

1 0

Alexandre Julliard : wineps: Add support for SetDCBrush/PenColor.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 9285915720cb50814b24e305753287e5f2093b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9285915720cb50814b24e3057… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 10 20:38:51 2011 +0100 wineps: Add support for SetDCBrush/PenColor. --- dlls/wineps.drv/brush.c | 17 +++++++++++++++++ dlls/wineps.drv/pen.c | 13 +++++++++++++ dlls/wineps.drv/wineps.drv.spec | 2 ++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/brush.c b/dlls/wineps.drv/brush.c index c88ab49..c7b350c 100644 --- a/dlls/wineps.drv/brush.c +++ b/dlls/wineps.drv/brush.c @@ -35,6 +35,9 @@ HBRUSH CDECL PSDRV_SelectBrush( PSDRV_PDEVICE *physDev, HBRUSH hbrush ) TRACE("hbrush = %p\n", hbrush); + if (hbrush == GetStockObject( DC_BRUSH )) + logbrush.lbColor = GetDCBrushColor( physDev->hdc ); + switch(logbrush.lbStyle) { case BS_SOLID: @@ -62,6 +65,20 @@ HBRUSH CDECL PSDRV_SelectBrush( PSDRV_PDEVICE *physDev, HBRUSH hbrush ) } +/*********************************************************************** + * SetDCBrushColor (WINEPS.@) + */ +COLORREF CDECL PSDRV_SetDCBrushColor( PSDRV_PDEVICE *physDev, COLORREF color ) +{ + if (GetCurrentObject( physDev->hdc, OBJ_BRUSH ) == GetStockObject( DC_BRUSH )) + { + PSDRV_CreateColor( physDev, &physDev->brush.color, color ); + physDev->brush.set = FALSE; + } + return color; +} + + /********************************************************************** * * PSDRV_SetBrush diff --git a/dlls/wineps.drv/pen.c b/dlls/wineps.drv/pen.c index 529c738..f8f4037 100644 --- a/dlls/wineps.drv/pen.c +++ b/dlls/wineps.drv/pen.c @@ -69,6 +69,8 @@ HPEN CDECL PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen ) physDev->pen.width = PSDRV_XWStoDS( physDev, physDev->pen.width ); if(physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width; } + if (hpen == GetStockObject( DC_PEN )) + logpen.lopnColor = GetDCPenColor( physDev->hdc ); switch (logpen.lopnStyle & PS_JOIN_MASK) { @@ -124,6 +126,17 @@ HPEN CDECL PSDRV_SelectPen( PSDRV_PDEVICE *physDev, HPEN hpen ) } +/*********************************************************************** + * SetDCPenColor (WINEPS.@) + */ +COLORREF CDECL PSDRV_SetDCPenColor( PSDRV_PDEVICE *physDev, COLORREF color ) +{ + if (GetCurrentObject( physDev->hdc, OBJ_PEN ) == GetStockObject( DC_PEN )) + PSDRV_CreateColor( physDev, &physDev->pen.color, color ); + return color; +} + + /********************************************************************** * * PSDRV_SetPen diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 38ada75..d14d919 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -31,6 +31,8 @@ @ cdecl SelectFont(ptr long long) PSDRV_SelectFont @ cdecl SelectPen(ptr long) PSDRV_SelectPen @ cdecl SetBkColor(ptr long) PSDRV_SetBkColor +@ cdecl SetDCBrushColor(ptr long) PSDRV_SetDCBrushColor +@ cdecl SetDCPenColor(ptr long) PSDRV_SetDCPenColor @ cdecl SetDeviceClipping(ptr long long) PSDRV_SetDeviceClipping @ cdecl SetPixel(ptr long long long) PSDRV_SetPixel @ cdecl SetTextColor(ptr long) PSDRV_SetTextColor

1 0

Alexandre Julliard : gdi32: Add null driver entry points for SetDCBrush/ PenColor.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 75f792d72995d8a3ff5e4a3d11ee1bb9ffd44d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75f792d72995d8a3ff5e4a3d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 10 20:42:05 2011 +0100 gdi32: Add null driver entry points for SetDCBrush/PenColor. --- dlls/gdi32/dc.c | 47 ++++------------------------------------------- dlls/gdi32/driver.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 66cdc84..386df25 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2011,10 +2011,6 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) /*********************************************************************** * GetDCBrushColor (GDI32.@) - * - * Retrieves the current brush color for the specified device - * context (DC). - * */ COLORREF WINAPI GetDCBrushColor(HDC hdc) { @@ -2035,11 +2031,6 @@ COLORREF WINAPI GetDCBrushColor(HDC hdc) /*********************************************************************** * SetDCBrushColor (GDI32.@) - * - * Sets the current device context (DC) brush color to the specified - * color value. If the device cannot represent the specified color - * value, the color is set to the nearest physical color. - * */ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) { @@ -2051,23 +2042,13 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) dc = get_dc_ptr( hdc ); if (dc) { - if (dc->funcs->pSetDCBrushColor) - crColor = dc->funcs->pSetDCBrushColor( dc->physDev, crColor ); - else if (dc->hBrush == GetStockObject( DC_BRUSH )) - { - /* If DC_BRUSH is selected, update driver pen color */ - HBRUSH hBrush = CreateSolidBrush( crColor ); - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); - physdev->funcs->pSelectBrush( physdev, hBrush ); - DeleteObject( hBrush ); - } - + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDCBrushColor ); + crColor = physdev->funcs->pSetDCBrushColor( physdev, crColor ); if (crColor != CLR_INVALID) { oldClr = dc->dcBrushColor; dc->dcBrushColor = crColor; } - release_dc_ptr( dc ); } @@ -2076,10 +2057,6 @@ COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor) /*********************************************************************** * GetDCPenColor (GDI32.@) - * - * Retrieves the current pen color for the specified device - * context (DC). - * */ COLORREF WINAPI GetDCPenColor(HDC hdc) { @@ -2100,11 +2077,6 @@ COLORREF WINAPI GetDCPenColor(HDC hdc) /*********************************************************************** * SetDCPenColor (GDI32.@) - * - * Sets the current device context (DC) pen color to the specified - * color value. If the device cannot represent the specified color - * value, the color is set to the nearest physical color. - * */ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) { @@ -2116,24 +2088,13 @@ COLORREF WINAPI SetDCPenColor(HDC hdc, COLORREF crColor) dc = get_dc_ptr( hdc ); if (dc) { - if (dc->funcs->pSetDCPenColor) - crColor = dc->funcs->pSetDCPenColor( dc->physDev, crColor ); - else if (dc->hPen == GetStockObject( DC_PEN )) - { - /* If DC_PEN is selected, update the driver pen color */ - LOGPEN logpen = { PS_SOLID, { 0, 0 }, crColor }; - HPEN hPen = CreatePenIndirect( &logpen ); - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectPen ); - physdev->funcs->pSelectPen( physdev, hPen ); - DeleteObject( hPen ); - } - + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDCPenColor ); + crColor = physdev->funcs->pSetDCPenColor( physdev, crColor ); if (crColor != CLR_INVALID) { oldClr = dc->dcPenColor; dc->dcPenColor = crColor; } - release_dc_ptr( dc ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 1863499..e716296 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -438,6 +438,16 @@ static HPEN CDECL nulldrv_SelectPen( PHYSDEV dev, HPEN pen ) return pen; } +static COLORREF CDECL nulldrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) +{ + return color; +} + +static COLORREF CDECL nulldrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) +{ + return color; +} + static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { } @@ -606,8 +616,8 @@ const DC_FUNCTIONS null_driver = NULL, /* pSetBitmapBits */ NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ - NULL, /* pSetDCBrushColor */ - NULL, /* pSetDCPenColor */ + nulldrv_SetDCBrushColor, /* pSetDCBrushColor */ + nulldrv_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */

1 0

Alexandre Julliard : gdi32: Add null driver entry points for the various DC settings functions.
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 965d41717b881dcd8440f937b146bb6712ff5a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=965d41717b881dcd8440f937b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 10 21:58:47 2011 +0100 gdi32: Add null driver entry points for the various DC settings functions. --- dlls/gdi32/dc.c | 189 ++++++++++++++++++++++------------------ dlls/gdi32/driver.c | 84 +++++++++++++++--- dlls/gdi32/enhmfdrv/dc.c | 12 ++-- dlls/gdi32/enhmfdrv/graphics.c | 6 +- dlls/gdi32/font.c | 55 +++++++----- dlls/gdi32/gdi_private.h | 5 +- dlls/gdi32/mfdrv/dc.c | 20 ++--- dlls/gdi32/mfdrv/metafiledrv.h | 2 +- 8 files changed, 229 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=965d41717b881dcd8440f…

1 0

Alexandre Julliard : gdi32: Add a SetLayout driver entry point and implement it for enhanced metafiles .
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 30997b563422beb2eaf8b9e9025823efccd17e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30997b563422beb2eaf8b9e90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 10 22:10:16 2011 +0100 gdi32: Add a SetLayout driver entry point and implement it for enhanced metafiles. --- dlls/gdi32/dc.c | 15 ++++++++++----- dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/enhmfdrv/mapping.c | 10 ++++++++++ dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/mfdrv/init.c | 1 + 7 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1070506..98b6bf1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2015,12 +2015,17 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) DC * dc = get_dc_ptr( hdc ); if (dc) { - oldlayout = dc->layout; - dc->layout = layout; - if (layout != oldlayout) + PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetLayout ); + layout = physdev->funcs->pSetLayout( physdev, layout ); + if (layout != GDI_ERROR) { - if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; - DC_UpdateXforms( dc ); + oldlayout = dc->layout; + dc->layout = layout; + if (layout != oldlayout) + { + if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; + DC_UpdateXforms( dc ); + } } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 9a19cfd..3d5f0e7 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -467,6 +467,11 @@ static void CDECL nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN cli { } +static DWORD CDECL nulldrv_SetLayout( PHYSDEV dev, DWORD layout ) +{ + return layout; +} + static DWORD CDECL nulldrv_SetMapperFlags( PHYSDEV dev, DWORD flags ) { return flags; @@ -683,6 +688,7 @@ const DC_FUNCTIONS null_driver = NULL, /* pSetDIBitsToDevice */ nulldrv_SetDeviceClipping, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ + nulldrv_SetLayout, /* pSetLayout */ nulldrv_SetMapMode, /* pSetMapMode */ nulldrv_SetMapperFlags, /* pSetMapperFlags */ nulldrv_SetPixel, /* pSetPixel */ diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index eba7536..ee82463 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -137,6 +137,7 @@ extern INT CDECL EMFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDes INT ySrc, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; +extern DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) DECLSPEC_HIDDEN; extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index ff9f69d..1c04d95 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -127,6 +127,7 @@ static const DC_FUNCTIONS EMFDRV_Funcs = EMFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ + EMFDRV_SetLayout, /* pSetLayout */ EMFDRV_SetMapMode, /* pSetMapMode */ EMFDRV_SetMapperFlags, /* pSetMapperFlags */ EMFDRV_SetPixel, /* pSetPixel */ diff --git a/dlls/gdi32/enhmfdrv/mapping.c b/dlls/gdi32/enhmfdrv/mapping.c index b89ed20..e566e01 100644 --- a/dlls/gdi32/enhmfdrv/mapping.c +++ b/dlls/gdi32/enhmfdrv/mapping.c @@ -120,6 +120,16 @@ BOOL CDECL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, return next->funcs->pScaleWindowExtEx( next, xNum, xDenom, yNum, yDenom, size ); } +DWORD CDECL EMFDRV_SetLayout( PHYSDEV dev, DWORD layout ) +{ + EMRSETLAYOUT emr; + + emr.emr.iType = EMR_SETLAYOUT; + emr.emr.nSize = sizeof(emr); + emr.iMode = layout; + return EMFDRV_WriteRecord( dev, &emr.emr ) ? layout : GDI_ERROR; +} + BOOL CDECL EMFDRV_SetWorldTransform( PHYSDEV dev, const XFORM *xform) { EMRSETWORLDTRANSFORM emr; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 40eae6c..aa9ba4b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -175,6 +175,7 @@ typedef struct tagDC_FUNCS const BITMAPINFO*,UINT); VOID (CDECL *pSetDeviceClipping)(PHYSDEV,HRGN,HRGN); BOOL (CDECL *pSetDeviceGammaRamp)(PHYSDEV,LPVOID); + DWORD (CDECL *pSetLayout)(PHYSDEV,DWORD); INT (CDECL *pSetMapMode)(PHYSDEV,INT); DWORD (CDECL *pSetMapperFlags)(PHYSDEV,DWORD); COLORREF (CDECL *pSetPixel)(PHYSDEV,INT,INT,COLORREF); diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 932ab92..63f067f 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -125,6 +125,7 @@ static const DC_FUNCTIONS MFDRV_Funcs = MFDRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ + NULL, /* pSetLayout */ MFDRV_SetMapMode, /* pSetMapMode */ MFDRV_SetMapperFlags, /* pSetMapperFlags */ MFDRV_SetPixel, /* pSetPixel */

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DSurface::GetDesc().
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 2b18192e7aae67e0d19456f055bd7cedab52ba27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b18192e7aae67e0d19456f05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 10 19:07:08 2011 +0100 wined3d: Get rid of IWineD3DSurface::GetDesc(). --- dlls/d3d8/device.c | 7 +++++-- dlls/d3d8/surface.c | 4 +++- dlls/d3d9/device.c | 4 +++- dlls/d3d9/surface.c | 4 +++- dlls/ddraw/ddraw.c | 4 +++- dlls/ddraw/surface.c | 4 +++- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/surface.c | 1 - dlls/wined3d/surface_base.c | 9 --------- dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/wined3d_private.h | 1 - include/wine/wined3d.idl | 3 --- 12 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 67daa5a..0a3c9c8 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -931,6 +931,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, IDirect3DSurface8Impl *Dest = (IDirect3DSurface8Impl *) pDestinationSurface; enum wined3d_format_id srcFormat, destFormat; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", iface, pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints); @@ -939,10 +940,12 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, * destination texture is in WINED3DPOOL_DEFAULT. */ wined3d_mutex_lock(); - IWineD3DSurface_GetDesc(Source->wineD3DSurface, &wined3d_desc); + wined3d_resource = IWineD3DSurface_GetResource(Source->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); srcFormat = wined3d_desc.format; - IWineD3DSurface_GetDesc(Dest->wineD3DSurface, &wined3d_desc); + wined3d_resource = IWineD3DSurface_GetResource(Dest->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); destFormat = wined3d_desc.format; /* Check that the source and destination formats match */ diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 873fd56..0584276 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -191,11 +191,13 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(IDirect3DSurface8 *iface, D3 { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3d_desc); + wined3d_resource = IWineD3DSurface_GetResource(This->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e008b31..3f79b17 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1070,6 +1070,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, }; IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *surface = (IDirect3DSurface9Impl *)pSurface; + struct wined3d_resource *wined3d_resource; struct wined3d_resource_desc desc; HRESULT hr; @@ -1077,7 +1078,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); - IWineD3DSurface_GetDesc(surface->wineD3DSurface, &desc); + wined3d_resource = IWineD3DSurface_GetResource(surface->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &desc); /* This method is only allowed with surfaces that are render targets, or * offscreen plain surfaces in D3DPOOL_DEFAULT. */ diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 7e1294c..cedd30f 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -243,11 +243,13 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(IDirect3DSurface9 *iface, D3 { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3d_desc); + wined3d_resource = IWineD3DSurface_GetResource(This->wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index cc011c1..fe6cbc1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2516,6 +2516,7 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE { IDirectDrawSurfaceImpl *surfImpl = (IDirectDrawSurfaceImpl *)surf; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; IDirectDrawImpl *This = surfImpl->ddraw; struct wined3d_clipper *clipper = NULL; IWineD3DSurface *wineD3DSurface; @@ -2540,7 +2541,8 @@ HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, DDSURFACEDE IWineD3DSurface_GetClipper(wineD3DSurface, &clipper); /* Get the surface properties */ - IWineD3DSurface_GetDesc(wineD3DSurface, &wined3d_desc); + wined3d_resource = IWineD3DSurface_GetResource(wineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); parent = IWineD3DSurface_GetParent(wineD3DSurface); hr = IWineD3DDevice_CreateSurface(This->wineD3DDevice, wined3d_desc.width, wined3d_desc.height, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 61a0215..d152a02 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3500,6 +3500,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type) { struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; WINED3DPOOL pool = WINED3DPOOL_DEFAULT; enum wined3d_format_id format; DWORD usage = 0; @@ -3588,7 +3589,8 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr } surface->surface_desc.dwFlags |= DDSD_PIXELFORMAT; - IWineD3DSurface_GetDesc(surface->WineD3DSurface, &wined3d_desc); + wined3d_resource = IWineD3DSurface_GetResource(surface->WineD3DSurface); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); format = wined3d_desc.format; if (format == WINED3DFMT_UNKNOWN) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 3617009..30f5d37 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1292,7 +1292,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) { struct wined3d_resource_desc desc; - IWineD3DSurface_GetDesc(backbuffer, &desc); + wined3d_resource_get_desc(&((IWineD3DSurfaceImpl *)backbuffer)->resource, &desc); IWineD3DSurface_Release(backbuffer); /* Set the default scissor rect values */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6589f05..ace0c65 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4720,7 +4720,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetResource, - IWineD3DBaseSurfaceImpl_GetDesc, IWineD3DSurfaceImpl_Map, IWineD3DSurfaceImpl_Unmap, IWineD3DSurfaceImpl_GetDC, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index f8b6a63..74fa196 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -157,15 +157,6 @@ struct wined3d_resource * WINAPI IWineD3DBaseSurfaceImpl_GetResource(IWineD3DSur return &((IWineD3DSurfaceImpl *)iface)->resource; } -void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, struct wined3d_resource_desc *desc) -{ - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)iface; - - TRACE("iface %p, desc %p.\n", iface, desc); - - wined3d_resource_get_desc(&surface->resource, desc); -} - HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD flags) { TRACE("iface %p, flags %#x.\n", iface, flags); diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index f0ec491..a2160c4 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -452,7 +452,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetResource, - IWineD3DBaseSurfaceImpl_GetDesc, IWineGDISurfaceImpl_Map, IWineGDISurfaceImpl_Unmap, IWineGDISurfaceImpl_GetDC, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 201e19b..8fc6df5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2200,7 +2200,6 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_SetPriority(IWineD3DSurface *iface, DWORD P DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) DECLSPEC_HIDDEN; WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) DECLSPEC_HIDDEN; struct wined3d_resource * WINAPI IWineD3DBaseSurfaceImpl_GetResource(IWineD3DSurface *iface) DECLSPEC_HIDDEN; -void WINAPI IWineD3DBaseSurfaceImpl_GetDesc(IWineD3DSurface *iface, struct wined3d_resource_desc *desc) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetBltStatus(IWineD3DSurface *iface, DWORD flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetFlipStatus(IWineD3DSurface *iface, DWORD flags) DECLSPEC_HIDDEN; HRESULT WINAPI IWineD3DBaseSurfaceImpl_IsLost(IWineD3DSurface *iface) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index d70ae2c..f6cad6a 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2226,9 +2226,6 @@ interface IWineD3DSurface : IWineD3DResource { struct wined3d_resource *GetResource( ); - void GetDesc( - [out] struct wined3d_resource_desc *desc - ); HRESULT Map( [out] WINED3DLOCKED_RECT *locked_rect, [in] const RECT *rect,

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DVolume::GetDesc().
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 5f73f41f35528816e27b9d1710a7f9500c0ef3d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f73f41f35528816e27b9d171… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 10 19:07:09 2011 +0100 wined3d: Get rid of IWineD3DVolume::GetDesc(). --- dlls/d3d8/volume.c | 4 +++- dlls/d3d9/volume.c | 6 +++--- dlls/wined3d/volume.c | 10 ++++------ include/wine/wined3d.idl | 3 +-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 0e96722..6859884 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -190,11 +190,13 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DV { IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3d_desc); + wined3d_resource = IWineD3DVolume_GetResource(This->wineD3DVolume); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index c80b533..ebfbbbb 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -180,13 +180,13 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(IDirect3DVolume9 *iface, D3DV { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - - IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3d_desc); - + wined3d_resource = IWineD3DVolume_GetResource(This->wineD3DVolume); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 6fb337f..d05a9f2 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -220,13 +220,11 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa return resource_get_type(&((IWineD3DVolumeImpl *)iface)->resource); } -static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, struct wined3d_resource_desc *desc) +struct wined3d_resource * WINAPI IWineD3DVolumeImpl_GetResource(IWineD3DVolume *iface) { - IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface; - - TRACE("iface %p, desc %p.\n", iface, desc); + TRACE("iface %p.\n", iface); - wined3d_resource_get_desc(&volume->resource, desc); + return &((IWineD3DVolumeImpl *)iface)->resource; } static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface, @@ -309,7 +307,7 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_PreLoad, IWineD3DVolumeImpl_GetType, /* IWineD3DVolume */ - IWineD3DVolumeImpl_GetDesc, + IWineD3DVolumeImpl_GetResource, IWineD3DVolumeImpl_Map, IWineD3DVolumeImpl_Unmap, }; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index f6cad6a..bc556f5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2324,8 +2324,7 @@ interface IWineD3DSurface : IWineD3DResource ] interface IWineD3DVolume : IWineD3DResource { - void GetDesc( - [out] struct wined3d_resource_desc *desc + struct wined3d_resource *GetResource( ); HRESULT Map( [out] WINED3DLOCKED_BOX *locked_box,

1 0

Henri Verbeet : wined3d: Get rid of wined3d_buffer_get_desc().
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: adb1e10979d49cc27bf411e353a24a9ba64d93eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb1e10979d49cc27bf411e35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 10 19:07:10 2011 +0100 wined3d: Get rid of wined3d_buffer_get_desc(). --- dlls/d3d8/buffer.c | 8 ++++++-- dlls/d3d9/buffer.c | 8 ++++++-- dlls/ddraw/device.c | 4 +++- dlls/ddraw/vertexbuffer.c | 8 ++++++-- dlls/wined3d/buffer.c | 7 ------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.idl | 1 - 7 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index b0d1589..8ebb871 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -210,11 +210,13 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, D { IDirect3DVertexBuffer8Impl *buffer = (IDirect3DVertexBuffer8Impl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_buffer_get_desc(buffer->wineD3DVertexBuffer, &wined3d_desc); + wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Type = D3DRTYPE_VERTEXBUFFER; @@ -472,11 +474,13 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, D3D { IDirect3DIndexBuffer8Impl *buffer = (IDirect3DIndexBuffer8Impl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_buffer_get_desc(buffer->wineD3DIndexBuffer, &wined3d_desc); + wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(buffer->format); diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index a3bf3db..827a191 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -212,11 +212,13 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, D { IDirect3DVertexBuffer9Impl *buffer = (IDirect3DVertexBuffer9Impl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_buffer_get_desc(buffer->wineD3DVertexBuffer, &wined3d_desc); + wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DVertexBuffer); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = D3DFMT_VERTEXDATA; @@ -474,11 +476,13 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D { IDirect3DIndexBuffer9Impl *buffer = (IDirect3DIndexBuffer9Impl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); wined3d_mutex_lock(); - wined3d_buffer_get_desc(buffer->wineD3DIndexBuffer, &wined3d_desc); + wined3d_resource = wined3d_buffer_get_resource(buffer->wineD3DIndexBuffer); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(buffer->format); diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 710c8f3..7d58e01 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4147,6 +4147,7 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; IDirect3DVertexBufferImpl *vb = (IDirect3DVertexBufferImpl *)D3DVertexBuf; DWORD stride = get_flexible_vertex_size(vb->fvf); + struct wined3d_resource *wined3d_resource; struct wined3d_resource_desc desc; WORD *LockedIndices; HRESULT hr; @@ -4174,7 +4175,8 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, /* check that the buffer is large enough to hold the indices, * reallocate if necessary. */ - wined3d_buffer_get_desc(This->indexbuffer, &desc); + wined3d_resource = wined3d_buffer_get_resource(This->indexbuffer); + wined3d_resource_get_desc(wined3d_resource, &desc); if (desc.size < IndexCount * sizeof(WORD)) { UINT size = max(desc.size * 2, IndexCount * sizeof(WORD)); diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 8874ac8..dae1566 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -209,6 +209,7 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; HRESULT hr; DWORD wined3d_flags = 0; @@ -226,7 +227,8 @@ IDirect3DVertexBufferImpl_Lock(IDirect3DVertexBuffer7 *iface, if(Size) { /* Get the size, for returning it, and for locking */ - wined3d_buffer_get_desc(This->wineD3DVertexBuffer, &wined3d_desc); + wined3d_resource = wined3d_buffer_get_resource(This->wineD3DVertexBuffer); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); *Size = wined3d_desc.size; } @@ -401,13 +403,15 @@ IDirect3DVertexBufferImpl_GetVertexBufferDesc(IDirect3DVertexBuffer7 *iface, { IDirect3DVertexBufferImpl *This = (IDirect3DVertexBufferImpl *)iface; struct wined3d_resource_desc wined3d_desc; + struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, Desc); if(!Desc) return DDERR_INVALIDPARAMS; EnterCriticalSection(&ddraw_cs); - wined3d_buffer_get_desc(This->wineD3DVertexBuffer, &wined3d_desc); + wined3d_resource = wined3d_buffer_get_resource(This->wineD3DVertexBuffer); + wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); LeaveCriticalSection(&ddraw_cs); /* Now fill the Desc structure */ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 8d65ffb..9e4ae2a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1395,13 +1395,6 @@ void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } -void CDECL wined3d_buffer_get_desc(const struct wined3d_buffer *buffer, struct wined3d_resource_desc *desc) -{ - TRACE("buffer %p, desc %p.\n", buffer, desc); - - wined3d_resource_get_desc(&buffer->resource, desc); -} - static const struct wined3d_resource_ops buffer_resource_ops = { buffer_unload, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index aa97169..558fd82 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -21,7 +21,6 @@ @ cdecl wined3d_buffer_decref(ptr) @ cdecl wined3d_buffer_free_private_data(ptr ptr) -@ cdecl wined3d_buffer_get_desc(ptr ptr) @ cdecl wined3d_buffer_get_parent(ptr) @ cdecl wined3d_buffer_get_priority(ptr) @ cdecl wined3d_buffer_get_private_data(ptr ptr ptr ptr) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index bc556f5..21f7039 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3162,7 +3162,6 @@ HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void * ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_buffer_free_private_data(struct wined3d_buffer *buffer, REFGUID guid); -void __cdecl wined3d_buffer_get_desc(const struct wined3d_buffer *buffer, struct wined3d_resource_desc *desc); void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer); DWORD __cdecl wined3d_buffer_get_priority(const struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_buffer_get_private_data(const struct wined3d_buffer *buffer,

1 0

Henri Verbeet : wined3d: Don' t invalidate STATE_VDECL in context_set_render_offscreen().
by Alexandre Julliard 11 Mar '11

11 Mar '11

Module: wine Branch: master Commit: 1bff3599cede087efb126c2980762b90e20e9a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bff3599cede087efb126c298… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 10 19:07:11 2011 +0100 wined3d: Don't invalidate STATE_VDECL in context_set_render_offscreen(). This used to be invalidated to update the vertex shader position fixup uniform, but this is handled by STATE_VIEWPORT now. Any performance impact from this will be minimal, since in practice there are enough other things invalidating STATE_VDECL that it's close to being invalidated for every draw anyway. --- dlls/wined3d/context.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 624f507..86ab77b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1970,7 +1970,6 @@ static inline void context_set_render_offscreen(struct wined3d_context *context, Context_MarkStateDirty(context, STATE_POINTSPRITECOORDORIGIN, StateTable); Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable);

1 0

Erich Hoover : winex11: Add support for retrieving multi-rate animated cursor data.
by Alexandre Julliard 10 Mar '11

10 Mar '11

Module: wine Branch: master Commit: eddffff7809dfc4cff2280ac774e8fda939b7a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddffff7809dfc4cff2280ac7… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Mar 9 22:56:50 2011 -0700 winex11: Add support for retrieving multi-rate animated cursor data. --- dlls/winex11.drv/mouse.c | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6378641..ab500ef 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -294,7 +294,7 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA int width, int height, int istep ) { XcursorImage *image, *ret = NULL; - DWORD delay_jiffies, is_static; + DWORD delay_jiffies, num_steps; int x, y, i, has_alpha; XcursorPixel *ptr; @@ -310,12 +310,11 @@ static XcursorImage *create_xcursor_frame( HDC hdc, const ICONINFOEXW *iinfo, HA image->xhot = iinfo->xHotspot; image->yhot = iinfo->yHotspot; - /* TODO: Handle animated cursors that use multiple rates */ image->delay = 100; /* fallback delay, 100 ms */ - if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0 /* obtain first rate */, &delay_jiffies, &is_static) != 0) + if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, istep, &delay_jiffies, &num_steps) != 0) image->delay = (100 * delay_jiffies) / 6; /* convert jiffies (1/60s) to milliseconds */ else - WARN("Failed to retrieve animated cursor framerate.\n"); + WARN("Failed to retrieve animated cursor frame-rate for frame %d.\n", istep); /* draw the cursor frame to a temporary buffer then copy it into the XcursorImage */ memset( color_bits, 0x00, color_size ); @@ -366,14 +365,16 @@ static Cursor create_xcursor_cursor( HDC hdc, const ICONINFOEXW *iinfo, HANDLE i { unsigned char *color_bits, *mask_bits; HBITMAP hbmColor = 0, hbmMask = 0; - XcursorImage **imgs, *image; + DWORD nFrames, delay_jiffies, i; int color_size, mask_size; BITMAPINFO *info = NULL; XcursorImages *images; + XcursorImage **imgs; Cursor cursor = 0; - int nFrames = 0; - if (!(imgs = HeapAlloc( GetProcessHeap(), 0, sizeof(XcursorImage*) ))) return 0; + /* Retrieve the number of frames to render */ + if (!GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0, &delay_jiffies, &nFrames)) return 0; + if (!(imgs = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XcursorImage*)*nFrames ))) return 0; /* Allocate all of the resources necessary to obtain a cursor frame */ if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto cleanup; @@ -406,19 +407,13 @@ static Cursor create_xcursor_cursor( HDC hdc, const ICONINFOEXW *iinfo, HANDLE i } /* Create an XcursorImage for each frame of the cursor */ - while (1) + for (i=0; i<nFrames; i++) { - XcursorImage **imgstmp; - - image = create_xcursor_frame( hdc, iinfo, icon, - hbmColor, color_bits, color_size, - hbmMask, mask_bits, mask_size, - width, height, nFrames ); - if (!image) break; /* no more drawable frames */ - - imgs[nFrames++] = image; - if (!(imgstmp = HeapReAlloc( GetProcessHeap(), 0, imgs, (nFrames+1)*sizeof(XcursorImage*) ))) goto cleanup; - imgs = imgstmp; + imgs[i] = create_xcursor_frame( hdc, iinfo, icon, + hbmColor, color_bits, color_size, + hbmMask, mask_bits, mask_size, + width, height, i ); + if (!imgs[i]) goto cleanup; } /* Build an X cursor out of all of the frames */ @@ -436,8 +431,8 @@ cleanup: if (imgs) { /* Failed to produce a cursor, free previously allocated frames */ - for (nFrames--; nFrames >= 0; nFrames--) - pXcursorImageDestroy( imgs[nFrames] ); + for (i=0; i<nFrames && imgs[i]; i++) + pXcursorImageDestroy( imgs[i] ); HeapFree( GetProcessHeap(), 0, imgs ); } /* Cleanup all of the resources used to obtain the frame data */

1 0