February 2008 - Wine-Commits

Chris Robinson : winex11: Fix wglCopyContext case where GLX contexts are missing.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: 14abaa5709083529a2abc6d2708b2ba8808fa964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14abaa5709083529a2abc6d27… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Feb 25 12:23:48 2008 -0800 winex11: Fix wglCopyContext case where GLX contexts are missing. --- dlls/winex11.drv/opengl.c | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index a3c1185..0a3745d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1523,15 +1523,44 @@ BOOL X11DRV_wglCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask) { * Up to now that works fine. * * The delayed GLX context creation could cause issues for wglCopyContext as it might get called - * when there is no GLX context yet. Warn the user about it and let him report a bug report. - * The chance this will cause problems is small as at the time of writing Wine has had OpenGL support - * for more than 7 years and this function has remained a stub ever since then. + * when there is no GLX context yet. The chance this will cause problems is small as at the time of + * writing Wine has had OpenGL support for more than 7 years and this function has remained a stub + * ever since then. */ if(!src->ctx || !dst->ctx) { - FIXME("No source or destination context available! This could indicate a Wine bug.\n"); - return FALSE; + /* NOTE: As a special case, if both GLX contexts are NULL, that means + * neither WGL context was made current. In that case, both contexts + * are in a default state, so any copy would no-op. + */ + if(!src->ctx && !dst->ctx) { + TRACE("No source or destination contexts set. No-op.\n"); + return TRUE; + } + + if (!src->ctx) { + DWORD type = GetObjectType(src->hdc); + wine_tsx11_lock(); + if(src->vis) + src->ctx = pglXCreateContext(gdi_display, src->vis, NULL, type == OBJ_MEMDC ? False : True); + else /* Create a GLX Context for a pbuffer */ + src->ctx = pglXCreateNewContext(gdi_display, src->fmt->fbconfig, src->fmt->render_type, NULL, True); + TRACE(" created a delayed OpenGL context (%p)\n", src->ctx); + } + else if (!dst->ctx) { + DWORD type = GetObjectType(dst->hdc); + wine_tsx11_lock(); + if(dst->vis) + dst->ctx = pglXCreateContext(gdi_display, dst->vis, NULL, type == OBJ_MEMDC ? False : True); + else /* Create a GLX Context for a pbuffer */ + dst->ctx = pglXCreateNewContext(gdi_display, dst->fmt->fbconfig, dst->fmt->render_type, NULL, True); + TRACE(" created a delayed OpenGL context (%p)\n", dst->ctx); + } } + else + wine_tsx11_lock(); + pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); + wine_tsx11_unlock(); /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ return TRUE;

1 0

Stefan Dösinger : wined3d: General cross format blitting infrastrucutre, R32F->R16F blits.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: 825506d5ffa5d29deea10d1e685b4fddddd6ec89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825506d5ffa5d29deea10d1e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 25 11:18:03 2008 +0100 wined3d: General cross format blitting infrastrucutre, R32F->R16F blits. --- dlls/wined3d/surface.c | 7 ++- dlls/wined3d/surface_base.c | 137 +++++++++++++++++++++++++++++++++----- dlls/wined3d/surface_gdi.c | 7 ++- dlls/wined3d/wined3d_private.h | 58 ++++++++++++++++- include/wine/wined3d_interface.h | 4 +- 5 files changed, 192 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=825506d5ffa5d29deea10…

1 0

Stefan Dösinger : wined3d: Add GL_APPLE_float_pixels.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: 62694157936baf64d20ab10e2c464bd1b1d6d34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62694157936baf64d20ab10e2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 13 14:22:40 2008 +0100 wined3d: Add GL_APPLE_float_pixels. --- dlls/wined3d/directx.c | 20 ++++++++++++++++++++ include/wine/wined3d_gl.h | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 58a2781..2e31f33 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -47,6 +47,7 @@ static const struct { {"GL_APPLE_fence", APPLE_FENCE, 0 }, {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER, 0 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422, 0 }, + {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS, 0 }, /* ATI */ {"GL_ATI_separate_stencil", ATI_SEPARATE_STENCIL, 0 }, @@ -784,6 +785,25 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { */ gl_info->supported[NV_FENCE] = FALSE; } + if (gl_info->supported[APPLE_FLOAT_PIXELS]) { + /* GL_APPLE_float_pixels == GL_ARB_texture_float + GL_ARB_half_float_pixel + * + * The enums are the same: + * GL_RGBA16F_ARB = GL_RGBA_FLOAT16_APPLE = 0x881A + * GL_RGB16F_ARB = GL_RGB_FLOAT16_APPLE = 0x881B + * GL_RGBA32F_ARB = GL_RGBA_FLOAT32_APPLE = 0x8814 + * GL_RGB32F_ARB = GL_RGB_FLOAT32_APPLE = 0x8815 + * GL_HALF_FLOAT_ARB = GL_HALF_APPLE = 0x140B + */ + if(!gl_info->supported[ARB_TEXTURE_FLOAT]) { + TRACE_(d3d_caps)(" IMPLIED: GL_ARB_texture_float support(from GL_APPLE_float_pixels\n"); + gl_info->supported[ARB_TEXTURE_FLOAT] = TRUE; + } + if(!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { + TRACE_(d3d_caps)(" IMPLIED: GL_ARB_half_float_pixel support(from GL_APPLE_float_pixels\n"); + gl_info->supported[ARB_HALF_FLOAT_PIXEL] = TRUE; + } + } if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { TRACE_(d3d_caps)(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support\n"); gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index bb46124..66bfad8 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -2887,6 +2887,25 @@ typedef void (WINE_GLAPI * PGLFNFINISHRENDERAPPLEPROC) (void); #define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 #endif +/* GL_APPLE_float_pixels */ +#ifndef GL_APPLE_float_pixels +#define GL_APPLE_float_pixels +#define GL_HALF_APPLE 0x140B +#define GL_COLOR_FLOAT_APPLE 0x8A0F +#define GL_RGBA_FLOAT32_APPLE 0x8814 +#define GL_RGB_FLOAT32_APPLE 0x8815 +#define GL_ALPHA_FLOAT32_APPLE 0x8816 +#define GL_INTENSITY_FLOAT32_APPLE 0x8817 +#define GL_LUMINANCE_FLOAT32_APPLE 0x8818 +#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819 +#define GL_RGBA_FLOAT16_APPLE 0x881A +#define GL_RGB_FLOAT16_APPLE 0x881B +#define GL_ALPHA_FLOAT16_APPLE 0x881C +#define GL_INTENSITY_FLOAT16_APPLE 0x881D +#define GL_LUMINANCE_FLOAT16_APPLE 0x881E +#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F +#endif + /* GL_VERSION_2_0 */ #ifndef GL_VERSION_2_0 #define GL_VERSION_2_0 1 @@ -3251,6 +3270,7 @@ typedef enum _GL_SupportedExt { APPLE_CLIENT_STORAGE, APPLE_FLUSH_RENDER, APPLE_YCBCR_422, + APPLE_FLOAT_PIXELS, /* SGI */ SGI_VIDEO_SYNC, SGIS_GENERATE_MIPMAP,

1 0

Roderick Colenbrander : wined3d: Check real depth/ stencil capabilities based on WGL pixel formats.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: f5149e651e504b80f09e866becfc06aa096cceb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5149e651e504b80f09e866be… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Feb 26 00:23:14 2008 +0100 wined3d: Check real depth/stencil capabilities based on WGL pixel formats. --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c3afa7f..58a2781 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1613,10 +1613,10 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const WineD3D_Pixel return FALSE; } - if(cfg->depthSize < depthSize) + if(cfg->depthSize != depthSize) return FALSE; - if(cfg->stencilSize < stencilSize) + if(cfg->stencilSize != stencilSize) return FALSE; return TRUE;

1 0

Royal Chan : gdiplus: Added conformance tests for GdipDrawLineI.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: b83abb61221ff3b0d62d9afa210aac281d8deca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83abb61221ff3b0d62d9afa2… Author: Royal Chan <chanroyal(a)gmail.com> Date: Mon Feb 25 21:08:01 2008 -0800 gdiplus: Added conformance tests for GdipDrawLineI. --- dlls/gdiplus/tests/graphics.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index da61893..c3a3315 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -346,6 +346,44 @@ static void test_GdipDrawBezierI(void) ReleaseDC(0, hdc); } +static void test_GdipDrawLineI(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + + /* make a graphics object and pen object */ + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawLineI(NULL, NULL, 0, 0, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawLineI(graphics, NULL, 0, 0, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawLineI(NULL, pen, 0, 0, 0, 0); + expect(InvalidParameter, status); + + /* successful case */ + status = GdipDrawLineI(graphics, pen, 0, 0, 0, 0); + expect(Ok, status); + + GdipDeletePen(pen); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -363,6 +401,7 @@ START_TEST(graphics) test_GdipDrawBezierI(); test_GdipDrawArc(); test_GdipDrawArcI(); + test_GdipDrawLineI(); GdiplusShutdown(gdiplusToken); }

1 0

Royal Chan : gdiplus: GdipDrawArc should return InvalidParameter for non-positive values of height and width .
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: ea92872af0dbc1508598086784edbfef6d64d6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea92872af0dbc150859808678… Author: Royal Chan <chanroyal(a)gmail.com> Date: Mon Feb 25 21:06:27 2008 -0800 gdiplus: GdipDrawArc should return InvalidParameter for non-positive values of height and width. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index bd53102..123da48 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -915,7 +915,7 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, GpPointF points[MAX_ARC_PTS]; GpStatus retval; - if(!graphics || !pen) + if(!graphics || !pen || width <= 0 || height <= 0) return InvalidParameter; num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9edeb91..da61893 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -220,6 +220,50 @@ static void test_save_restore(void) ReleaseDC(0, hdc); } +static void test_GdipDrawArc(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + + /* make a graphics object and pen object */ + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen, non-positive width, non-positive height */ + status = GdipDrawArc(NULL, NULL, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + expect(InvalidParameter, status); + + status = GdipDrawArc(graphics, NULL, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0); + expect(InvalidParameter, status); + + status = GdipDrawArc(NULL, pen, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0); + expect(InvalidParameter, status); + + status = GdipDrawArc(graphics, pen, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0); + expect(InvalidParameter, status); + + status = GdipDrawArc(graphics, pen, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0); + expect(InvalidParameter, status); + + /* successful case */ + status = GdipDrawArc(graphics, pen, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0); + expect(Ok, status); + + GdipDeletePen(pen); + ReleaseDC(0, hdc); +} + static void test_GdipDrawArcI(void) { GpStatus status; @@ -317,6 +361,7 @@ START_TEST(graphics) test_constructor_destructor(); test_save_restore(); test_GdipDrawBezierI(); + test_GdipDrawArc(); test_GdipDrawArcI(); GdiplusShutdown(gdiplusToken);

1 0

Royal Chan : diplus: Implemented GdipDrawArcI based on GdipDrawArc.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: fc313037803a20fc10a99eb70086f762bbd98549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc313037803a20fc10a99eb70… Author: Royal Chan <chanroyal(a)gmail.com> Date: Mon Feb 25 21:02:59 2008 -0800 diplus: Implemented GdipDrawArcI based on GdipDrawArc. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 21 +++++++++++++++++++ dlls/gdiplus/tests/graphics.c | 45 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d28de1e..55fabe4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -153,7 +153,7 @@ @ stdcall GdipDisposeImage(ptr) @ stdcall GdipDisposeImageAttributes(ptr) @ stdcall GdipDrawArc(ptr ptr long long long long long long) -@ stub GdipDrawArcI +@ stdcall GdipDrawArcI(ptr ptr long long long long long long) @ stdcall GdipDrawBezier(ptr ptr long long long long long long long long) @ stdcall GdipDrawBezierI(ptr ptr long long long long long long long long) @ stub GdipDrawBeziers diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index ebd46aa..bd53102 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -929,6 +929,27 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, return retval; } +GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) +{ + INT save_state, num_pts; + GpPointF points[MAX_ARC_PTS]; + GpStatus retval; + + if(!graphics || !pen || width <= 0 || height <= 0) + return InvalidParameter; + + num_pts = arc2polybezier(points, x, y, width, height, startAngle, sweepAngle); + + save_state = prepare_dc(graphics, pen); + + retval = draw_polybezier(graphics, pen, points, num_pts, TRUE); + + restore_dc(graphics, save_state); + + return retval; +} + GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 826ab67..9edeb91 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -220,6 +220,50 @@ static void test_save_restore(void) ReleaseDC(0, hdc); } +static void test_GdipDrawArcI(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + + /* make a graphics object and pen object */ + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen, non-positive width, non-positive height */ + status = GdipDrawArcI(NULL, NULL, 0, 0, 0, 0, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawArcI(graphics, NULL, 0, 0, 1, 1, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawArcI(NULL, pen, 0, 0, 1, 1, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawArcI(graphics, pen, 0, 0, 1, 0, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawArcI(graphics, pen, 0, 0, 0, 1, 0, 0); + expect(InvalidParameter, status); + + /* successful case */ + status = GdipDrawArcI(graphics, pen, 0, 0, 1, 1, 0, 0); + expect(Ok, status); + + GdipDeletePen(pen); + ReleaseDC(0, hdc); +} + static void test_GdipDrawBezierI(void) { GpStatus status; @@ -273,6 +317,7 @@ START_TEST(graphics) test_constructor_destructor(); test_save_restore(); test_GdipDrawBezierI(); + test_GdipDrawArcI(); GdiplusShutdown(gdiplusToken); }

1 0

Alexandre Julliard : ole32: Added a CoGetContextToken stub.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: de61fc5ecad7c8049ec1c468d6697d6d7d9dd08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=de61fc5ecad7c8049ec1c468d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 26 11:21:54 2008 +0100 ole32: Added a CoGetContextToken stub. --- dlls/ole32/compobj.c | 12 ++++++++++++ dlls/ole32/ole32.spec | 1 + include/objbase.h | 2 ++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index c800a2c..8764877 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3734,6 +3734,18 @@ HRESULT WINAPI CoGetObjectContext(REFIID riid, void **ppv) return hr; } + +/*********************************************************************** + * CoGetContextToken [OLE32.@] + */ +HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) +{ + FIXME( "stub\n" ); + if (token) *token = 0; + return E_NOTIMPL; +} + + /*********************************************************************** * DllMain (OLE32.@) */ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e1b2250..7561156 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -24,6 +24,7 @@ @ stdcall CoGetCallContext(ptr ptr) @ stub CoGetCallerTID @ stdcall CoGetClassObject(ptr long ptr ptr ptr) +@ stdcall CoGetContextToken(ptr) @ stub CoGetCurrentLogicalThreadId @ stdcall CoGetCurrentProcess() @ stub CoGetInstanceFromFile #@ stdcall (ptr ptr ptr long wstr long ptr) return 0,ERR_NOTIMPLEMENTED diff --git a/include/objbase.h b/include/objbase.h index 33fe4c9..9f86fa9 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -350,6 +350,8 @@ LPVOID WINAPI CoTaskMemRealloc(LPVOID ptr, ULONG size); HRESULT WINAPI CoRegisterMallocSpy(LPMALLOCSPY pMallocSpy); HRESULT WINAPI CoRevokeMallocSpy(void); +HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ); + /* class registration flags; passed to CoRegisterClassObject */ typedef enum tagREGCLS {

1 0

Royal Chan : diplus: Implement GdipDrawBezierI based on GdipDrawBezier.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: da161a50f3d5b094c5ead2859010b1f487b7031a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da161a50f3d5b094c5ead2859… Author: Royal Chan <chanroyal(a)gmail.com> Date: Mon Feb 25 21:00:43 2008 -0800 diplus: Implement GdipDrawBezierI based on GdipDrawBezier. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 28 ++++++++++++++++++++++++++++ dlls/gdiplus/tests/graphics.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 33b474d..d28de1e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -155,7 +155,7 @@ @ stdcall GdipDrawArc(ptr ptr long long long long long long) @ stub GdipDrawArcI @ stdcall GdipDrawBezier(ptr ptr long long long long long long long long) -@ stub GdipDrawBezierI +@ stdcall GdipDrawBezierI(ptr ptr long long long long long long long long) @ stub GdipDrawBeziers @ stub GdipDrawBeziersI @ stub GdipDrawCachedBitmap diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index aed61c5..ebd46aa 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -957,6 +957,34 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, return retval; } +GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, + INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) +{ + INT save_state; + GpPointF pt[4]; + GpStatus retval; + + if(!graphics || !pen) + return InvalidParameter; + + pt[0].X = x1; + pt[0].Y = y1; + pt[1].X = x2; + pt[1].Y = y2; + pt[2].X = x3; + pt[2].Y = y3; + pt[3].X = x4; + pt[3].Y = y4; + + save_state = prepare_dc(graphics, pen); + + retval = draw_polybezier(graphics, pen, pt, 4, TRUE); + + restore_dc(graphics, save_state); + + return retval; +} + /* Approximates cardinal spline with Bezier curves. */ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index de29bfb..826ab67 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -220,6 +220,44 @@ static void test_save_restore(void) ReleaseDC(0, hdc); } +static void test_GdipDrawBezierI(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpPen *pen = NULL; + HDC hdc = GetDC(0); + + /* make a graphics object and pen object */ + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); + expect(Ok, status); + ok(pen != NULL, "Expected pen to be initialized\n"); + + /* InvalidParameter cases: null graphics, null pen */ + status = GdipDrawBezierI(NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawBezierI(graphics, NULL, 0, 0, 0, 0, 0, 0, 0, 0); + expect(InvalidParameter, status); + + status = GdipDrawBezierI(NULL, pen, 0, 0, 0, 0, 0, 0, 0, 0); + expect(InvalidParameter, status); + + /* successful case */ + status = GdipDrawBezierI(graphics, pen, 0, 0, 0, 0, 0, 0, 0, 0); + expect(Ok, status); + + GdipDeletePen(pen); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -234,6 +272,7 @@ START_TEST(graphics) test_constructor_destructor(); test_save_restore(); + test_GdipDrawBezierI(); GdiplusShutdown(gdiplusToken); }

1 0

Francois Gouget : dinput: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Feb. 26, 2008

Feb. 26, 2008

Module: wine Branch: master Commit: 8e97ff5e3bf823b0ec31d5e42c4fdbc6456b1556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e97ff5e3bf823b0ec31d5e42… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 26 09:49:20 2008 +0100 dinput: Fix compilation on systems that don't support nameless unions. --- dlls/dinput/dinput_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2e4b4f5..5fa21f0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -36,6 +36,7 @@ #include <string.h> #define COBJMACROS +#define NONAMELESSUNION #include "wine/debug.h" #include "wine/unicode.h" @@ -223,7 +224,7 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics); FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); - FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].lptszActionName)); + FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); FIXME("\tdwObjID=%x\n", lpdiActionFormat->rgoAction[i].dwObjID); FIXME("\tdwHow=%x\n", lpdiActionFormat->rgoAction[i].dwHow);

1 0