May 2012 - Wine-commits - list.winehq.org

Alexandre Julliard : gdi32: Remove the bitmap parameter from the Get/ PutImage entry points.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 1416d0e6f151a4937307b42f810606ea09e68fd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1416d0e6f151a4937307b42f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 23:36:20 2012 +0200 gdi32: Remove the bitmap parameter from the Get/PutImage entry points. --- dlls/gdi32/bitblt.c | 20 +++--- dlls/gdi32/dib.c | 10 +- dlls/gdi32/dibdrv/bitblt.c | 30 +------ dlls/gdi32/dibdrv/dibdrv.h | 6 +- dlls/gdi32/driver.c | 6 +- dlls/gdi32/font.c | 6 +- dlls/wineps.drv/bitmap.c | 4 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/bitblt.c | 181 +++++++++++++------------------------------- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 109 +++++++++------------------ include/wine/gdi_driver.h | 6 +- 12 files changed, 125 insertions(+), 259 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1416d0e6f151a4937307b…

1 0

Alexandre Julliard : gdi32: Remove the CreateBitmap and DeleteBitmap driver entry points.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 93758c43fd2d8568ae3003ffece1278ef820dc86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93758c43fd2d8568ae3003ffe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 23:46:22 2012 +0200 gdi32: Remove the CreateBitmap and DeleteBitmap driver entry points. --- dlls/gdi32/dibdrv/dc.c | 10 ------ dlls/gdi32/driver.c | 12 -------- dlls/gdi32/enhmfdrv/init.c | 2 - dlls/gdi32/freetype.c | 2 - dlls/gdi32/mfdrv/init.c | 2 - dlls/gdi32/path.c | 2 - dlls/wineps.drv/init.c | 2 - dlls/winex11.drv/bitmap.c | 48 ------------------------------- dlls/winex11.drv/init.c | 2 - dlls/winex11.drv/opengl.c | 2 - dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/xrender.c | 67 -------------------------------------------- include/wine/gdi_driver.h | 4 +-- 13 files changed, 1 insertions(+), 156 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93758c43fd2d8568ae300…

1 0

Alexandre Julliard : winex11: XRender repeat mode is no longer needed in functions that use a DC.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 567340f0c581e9e40cd34cf329fbd7a35efed01f URL: http://source.winehq.org/git/wine.git/?a=commit;h=567340f0c581e9e40cd34cf32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 25 11:28:37 2012 +0200 winex11: XRender repeat mode is no longer needed in functions that use a DC. --- dlls/winex11.drv/xrender.c | 50 ++++++++----------------------------------- 1 files changed, 10 insertions(+), 40 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 7986ae7..0c66ff8 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -529,14 +529,6 @@ static void set_xrender_transformation(Picture src_pict, double xscale, double y #endif } -/* check if we can use repeating instead of scaling for the specified source DC */ -static BOOL use_source_repeat( struct xrender_physdev *dev ) -{ - return (dev->x11dev->bitmap && - dev->x11dev->drawable_rect.right - dev->x11dev->drawable_rect.left == 1 && - dev->x11dev->drawable_rect.bottom - dev->x11dev->drawable_rect.top == 1); -} - static void update_xrender_clipping( struct xrender_physdev *dev, HRGN rgn ) { XRenderPictureAttributes pa; @@ -1926,26 +1918,15 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr { int x_dst, y_dst; Picture src_pict = 0, dst_pict, mask_pict = 0; - BOOL use_repeat; - double xscale, yscale; - - use_repeat = use_source_repeat( physdev_src ); - if (!use_repeat) - { - xscale = src->width / (double)dst->width; - yscale = src->height / (double)dst->height; - } - else xscale = yscale = 1; /* no scaling needed with a repeating source */ + double xscale = src->width / (double)dst->width; + double yscale = src->height / (double)dst->height; if (drawable) /* using an intermediate pixmap */ { - XRenderPictureAttributes pa; - x_dst = dst->x; y_dst = dst->y; - pa.repeat = RepeatNone; wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, CPRepeat, &pa ); + dst_pict = pXRenderCreatePicture( gdi_display, drawable, physdev_dst->pict_format, 0, NULL ); wine_tsx11_unlock(); } else @@ -1955,7 +1936,7 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect ); } - src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + src_pict = get_xrender_picture_source( physdev_src, FALSE ); /* mono -> color */ if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) @@ -1998,7 +1979,6 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask { int x_dst, y_dst; Picture dst_pict; - XRenderPictureAttributes pa; double xscale, yscale; if (drawable) /* using an intermediate pixmap */ @@ -2008,9 +1988,8 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask if (clip) clip_data = X11DRV_GetRegionData( clip, 0 ); x_dst = dst->x; y_dst = dst->y; - pa.repeat = RepeatNone; wine_tsx11_lock(); - dst_pict = pXRenderCreatePicture( gdi_display, drawable, dst_format, CPRepeat, &pa ); + dst_pict = pXRenderCreatePicture( gdi_display, drawable, dst_format, 0, NULL ); if (clip_data) pXRenderSetPictureClipRectangles( gdi_display, dst_pict, 0, 0, (XRectangle *)clip_data->Buffer, clip_data->rdh.nCount ); @@ -2280,7 +2259,6 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, XRenderPictureAttributes pa; Pixmap tmp_pixmap = 0; double xscale, yscale; - BOOL use_repeat; if (src_dev->funcs != dst_dev->funcs) { @@ -2296,15 +2274,10 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, dst_pict = get_xrender_picture( physdev_dst, 0, &dst->visrect ); - use_repeat = use_source_repeat( physdev_src ); - if (!use_repeat) - { - xscale = src->width / (double)dst->width; - yscale = src->height / (double)dst->height; - } - else xscale = yscale = 1; /* no scaling needed with a repeating source */ + xscale = src->width / (double)dst->width; + yscale = src->height / (double)dst->height; - src_pict = get_xrender_picture_source( physdev_src, use_repeat ); + src_pict = get_xrender_picture_source( physdev_src, FALSE ); if (physdev_src->format == WXR_FORMAT_MONO && physdev_dst->format != WXR_FORMAT_MONO) { @@ -2321,9 +2294,7 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, wine_tsx11_lock(); tmp_pixmap = XCreatePixmap( gdi_display, root_window, width, height, physdev_dst->pict_format->depth ); - pa.repeat = use_repeat ? RepeatNormal : RepeatNone; - tmp_pict = pXRenderCreatePicture( gdi_display, tmp_pixmap, physdev_dst->pict_format, - CPRepeat, &pa ); + tmp_pict = pXRenderCreatePicture( gdi_display, tmp_pixmap, physdev_dst->pict_format, 0, NULL ); wine_tsx11_unlock(); xrender_mono_blit( src_pict, tmp_pict, physdev_dst->format, &fg, &bg, @@ -2337,9 +2308,8 @@ static BOOL xrenderdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, { wine_tsx11_lock(); pa.subwindow_mode = IncludeInferiors; - pa.repeat = use_repeat ? RepeatNormal : RepeatNone; tmp_pict = pXRenderCreatePicture( gdi_display, physdev_src->x11dev->drawable, - pict_formats[format], CPSubwindowMode|CPRepeat, &pa ); + pict_formats[format], CPSubwindowMode, &pa ); wine_tsx11_unlock(); } }

1 0

Alexandre Julliard : winex11: Always allocate a new GC for bitmap operations.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 73919154bf7b781132404d2ef6937fe7e5133574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73919154bf7b781132404d2ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 21:12:15 2012 +0200 winex11: Always allocate a new GC for bitmap operations. --- dlls/winex11.drv/bitblt.c | 13 ++++++++++--- dlls/winex11.drv/bitmap.c | 2 +- dlls/winex11.drv/brush.c | 7 ++++--- dlls/winex11.drv/x11drv.h | 3 --- dlls/winex11.drv/xrender.c | 6 ++++-- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 887384e..2db9e70 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1365,16 +1365,21 @@ DWORD X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, if (X11DRV_check_error()) { /* use a temporary pixmap to avoid the BadMatch error */ + GC gc; Pixmap pixmap; wine_tsx11_lock(); pixmap = XCreatePixmap( gdi_display, root_window, width, height, vis.depth ); - XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(vis.depth), + gc = XCreateGC( gdi_display, pixmap, 0, NULL ); + XSetGraphicsExposures( gdi_display, gc, False ); + XCopyArea( gdi_display, physdev->drawable, pixmap, gc, physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, 0, 0 ); image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); XFreePixmap( gdi_display, pixmap ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); } + if (!image) return ERROR_OUTOFMEMORY; info->bmiHeader.biWidth = width; @@ -1408,6 +1413,7 @@ static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, { DWORD ret; XImage *image; + GC gc; struct bitblt_coords coords; struct gdi_image_bits dst_bits; const XPixmapFormatValues *format = pixmap_formats[vis->depth]; @@ -1439,8 +1445,9 @@ static DWORD put_pixmap_image( Pixmap pixmap, const XVisualInfo *vis, { image->data = dst_bits.ptr; wine_tsx11_lock(); - XPutImage( gdi_display, pixmap, get_bitmap_gc( vis->depth ), - image, 0, 0, 0, 0, coords.width, coords.height ); + gc = XCreateGC( gdi_display, pixmap, 0, NULL ); + XPutImage( gdi_display, pixmap, gc, image, 0, 0, 0, 0, coords.width, coords.height ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); image->data = NULL; } diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 27723ef..eb423a2 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -36,7 +36,7 @@ X_PHYSBITMAP BITMAP_stock_phys_bitmap = { 0 }; /* phys bitmap for the default s static XContext bitmap_context; /* X context to associate a phys bitmap to a handle */ -GC get_bitmap_gc(int depth) +static GC get_bitmap_gc(int depth) { if(depth < 1 || depth > 32) return 0; diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 3406190..23fcce5 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -110,7 +110,7 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) static COLORREF prevColor = 0xffffffff; unsigned int x, y; Pixmap pixmap; - GC gc = get_bitmap_gc(depth); + GC gc; wine_tsx11_lock(); if (!ditherImage) @@ -149,8 +149,9 @@ static Pixmap BRUSH_DitherColor( COLORREF color, int depth) } pixmap = XCreatePixmap( gdi_display, root_window, MATRIX_SIZE, MATRIX_SIZE, depth ); - XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, - 0, 0, MATRIX_SIZE, MATRIX_SIZE ); + gc = XCreateGC( gdi_display, pixmap, 0, NULL ); + XPutImage( gdi_display, pixmap, gc, ditherImage, 0, 0, 0, 0, MATRIX_SIZE, MATRIX_SIZE ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); return pixmap; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0b10ecf..0d9746a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -164,9 +164,6 @@ static inline void add_bounds_rect( RECT *bounds, const RECT *rect ) extern X_PHYSBITMAP BITMAP_stock_phys_bitmap DECLSPEC_HIDDEN; /* phys bitmap for the default stock bitmap */ -/* Retrieve the GC used for bitmap operations */ -extern GC get_bitmap_gc(int depth) DECLSPEC_HIDDEN; - /* Wine driver X11 functions */ extern BOOL X11DRV_Arc( PHYSDEV dev, INT left, INT top, INT right, diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 0c66ff8..68a2b4d 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1876,6 +1876,7 @@ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits int depth = pict_formats[format]->depth; struct gdi_image_bits dst_bits; XRenderPictureAttributes pa; + GC gc; XImage *image; wine_tsx11_lock(); @@ -1894,9 +1895,10 @@ static DWORD create_image_pixmap( BITMAPINFO *info, const struct gdi_image_bits wine_tsx11_lock(); *pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); - XPutImage( gdi_display, *pixmap, get_bitmap_gc( depth ), image, - src->visrect.left, 0, 0, 0, width, height ); + gc = XCreateGC( gdi_display, *pixmap, 0, NULL ); + XPutImage( gdi_display, *pixmap, gc, image, src->visrect.left, 0, 0, 0, width, height ); *pict = pXRenderCreatePicture( gdi_display, *pixmap, pict_formats[format], CPRepeat, &pa ); + XFreeGC( gdi_display, gc ); wine_tsx11_unlock(); /* make coordinates relative to the pixmap */

1 0

Alexandre Julliard : winex11: Remove the support for device-dependent bitmaps.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 191cd773202357edce7d27d92fa0c7c160a473be URL: http://source.winehq.org/git/wine.git/?a=commit;h=191cd773202357edce7d27d92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 23:55:17 2012 +0200 winex11: Remove the support for device-dependent bitmaps. --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/bitblt.c | 27 ++---- dlls/winex11.drv/bitmap.c | 214 ------------------------------------------ dlls/winex11.drv/init.c | 13 +-- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/x11drv.h | 21 ---- dlls/winex11.drv/xrender.c | 22 +---- dlls/winex11.drv/xvidmode.c | 10 -- 8 files changed, 17 insertions(+), 293 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=191cd773202357edce7d2…

1 0

Alexandre Julliard : ntdll: Export _local_unwind.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: bb23d63663ad6d9cb4b5fed72fd9e1ae7319321b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb23d63663ad6d9cb4b5fed72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 21:30:29 2012 +0200 ntdll: Export _local_unwind. --- dlls/kernel32/kernel32.spec | 1 + dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_x86_64.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 842fc41..ec865cc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1289,6 +1289,7 @@ @ stdcall _lclose(long) @ stdcall _lcreat(str long) @ stdcall _llseek(long long long) +@ stdcall -arch=x86_64 -private _local_unwind(ptr ptr) ntdll._local_unwind @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) @ stdcall _lwrite(long ptr long) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cff7081..65fd405 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1270,6 +1270,7 @@ @ cdecl -private _itoa(long ptr long) @ cdecl -private _itow(long ptr long) @ cdecl -private _lfind(ptr ptr ptr long ptr) +@ stdcall -arch=x86_64 _local_unwind(ptr ptr) @ cdecl -private _ltoa(long ptr long) @ cdecl -private _ltow(long ptr long) @ cdecl -private _memccpy(ptr ptr long long) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b31cfb8..7d2b8d5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3109,6 +3109,16 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void /******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); +} + + +/******************************************************************* * __C_specific_handler (NTDLL.@) */ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec,

1 0

Daniel Jelinski : ntdll: Add missing parameters to syscall call.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 6ec731b65cb6525d04b86737ff85a3e77054ed36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec731b65cb6525d04b86737f… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue May 29 21:49:35 2012 +0200 ntdll: Add missing parameters to syscall call. --- dlls/ntdll/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 881d961..8f8fdcf 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1188,7 +1188,7 @@ ULONG WINAPI NtGetCurrentProcessorNumber(void) ULONG processor; #if defined(__linux__) && defined(__NR_getcpu) - int res = syscall(__NR_getcpu, &processor); + int res = syscall(__NR_getcpu, &processor, NULL, NULL); if (res != -1) return processor; #endif

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Type.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: 8fa6a0b4fd2ecd6299286965a2df8df940f8edc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa6a0b4fd2ecd6299286965a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:03 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Type. --- dlls/d3drm/light.c | 11 +++++++---- dlls/d3drm/tests/d3drm.c | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 82ec825..620fb97 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -32,6 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); typedef struct { IDirect3DRMLight IDirect3DRMLight_iface; LONG ref; + D3DRMLIGHTTYPE type; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -174,9 +175,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetType(IDirect3DRMLight* iface, D3DR { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, type); + TRACE("(%p/%p)->(%u)\n", iface, This, type); - return E_NOTIMPL; + This->type = type; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetColor(IDirect3DRMLight* iface, D3DCOLOR color) @@ -322,9 +325,9 @@ static D3DRMLIGHTTYPE WINAPI IDirect3DRMLightImpl_GetType(IDirect3DRMLight* ifac { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return D3DRMLIGHT_AMBIENT; + return This->type; } static HRESULT WINAPI IDirect3DRMLightImpl_SetEnableFrame(IDirect3DRMLight* iface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5bbd363..16db2c2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -839,15 +839,15 @@ static void test_Light(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRMLight interface (hr = %x)\n", hr); type = IDirect3DRMLight_GetType(pLight); - todo_wine ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); + ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); color = IDirect3DRMLight_GetColor(pLight); todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetType(pLight, D3DRMLIGHT_POINT); - todo_wine ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); type = IDirect3DRMLight_GetType(pLight); - todo_wine ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); + ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); hr = IDirect3DRMLight_SetColor(pLight, 0xff180587); todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr);

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Color and IDirect3DRMLight_SetColorRGB.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d2a52d1e17bc2500744824e6801a7fdb7e6bce05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a52d1e17bc2500744824e68… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:32 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Color and IDirect3DRMLight_SetColorRGB. --- dlls/d3drm/light.c | 21 +++++++++++++++------ dlls/d3drm/tests/d3drm.c | 10 +++++----- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 620fb97..0e3b5af 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -29,10 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) + typedef struct { IDirect3DRMLight IDirect3DRMLight_iface; LONG ref; D3DRMLIGHTTYPE type; + D3DCOLOR color; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -186,9 +189,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColor(IDirect3DRMLight* iface, D3D { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, color); + TRACE("(%p/%p)->(%u)\n", iface, This, color); - return E_NOTIMPL; + This->color = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, @@ -196,9 +201,13 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f,%f,%f): stub\n", iface, This, red, green, blue); + TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - return E_NOTIMPL; + This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetRange(IDirect3DRMLight* iface, D3DVALUE range) @@ -316,9 +325,9 @@ static D3DCOLOR WINAPI IDirect3DRMLightImpl_GetColor(IDirect3DRMLight* iface) { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->color; } static D3DRMLIGHTTYPE WINAPI IDirect3DRMLightImpl_GetType(IDirect3DRMLight* iface) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 16db2c2..b6ed51a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -842,7 +842,7 @@ static void test_Light(void) ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetType(pLight, D3DRMLIGHT_POINT); ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); @@ -850,14 +850,14 @@ static void test_Light(void) ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); hr = IDirect3DRMLight_SetColor(pLight, 0xff180587); - todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff180587, "wrong color (%x)\n", color); + ok(color == 0xff180587, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetColorRGB(pLight, 0.5, 0.5, 0.5); - todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); IDirect3DRMLight_Release(pLight);

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Range.
by Alexandre Julliard 29 May '12

29 May '12

Module: wine Branch: master Commit: d04d994093b3d091220dda4b5b30ae63f50f86b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d994093b3d091220dda4b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:57 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Range. --- dlls/d3drm/light.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 0e3b5af..1326b6a 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -36,6 +36,7 @@ typedef struct { LONG ref; D3DRMLIGHTTYPE type; D3DCOLOR color; + D3DVALUE range; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -214,9 +215,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetRange(IDirect3DRMLight* iface, D3D { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, range); + TRACE("(%p/%p)->(%f)\n", iface, This, range); - return E_NOTIMPL; + This->range = range; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetUmbra(IDirect3DRMLight* iface, D3DVALUE umbra) @@ -271,9 +274,9 @@ static D3DVALUE WINAPI IDirect3DRMLightImpl_GetRange(IDirect3DRMLight* iface) { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->range; } static D3DVALUE WINAPI IDirect3DRMLightImpl_GetUmbra(IDirect3DRMLight* iface)

1 0