January 2012 - Wine-commits

Alexandre Julliard : winhlp32: Avoid Unicode macros.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: e12d39dc10c8802de4241893337cfc3601d2af2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e12d39dc10c8802de42418933… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 12:50:15 2012 +0100 winhlp32: Avoid Unicode macros. --- programs/winhlp32/Makefile.in | 1 + programs/winhlp32/callback.c | 2 +- programs/winhlp32/hlpfile.c | 14 +- programs/winhlp32/hlpfile.h | 2 +- programs/winhlp32/macro.c | 46 ++++---- programs/winhlp32/winhelp.c | 284 ++++++++++++++++++++--------------------- 6 files changed, 174 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e12d39dc10c8802de4241…

1 0

Alexandre Julliard : progman: Avoid Unicode macros.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 6109f05e450dffb99feeebed5bb0734635624359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6109f05e450dffb99feeebed5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 20 13:06:40 2012 +0100 progman: Avoid Unicode macros. --- programs/progman/Makefile.in | 1 + programs/progman/dialog.c | 132 ++++++++++++++++-------------------------- programs/progman/group.c | 42 ++++++------- programs/progman/grpfile.c | 39 ++++++------- programs/progman/main.c | 90 +++++++++++++---------------- programs/progman/progman.h | 31 +++++----- programs/progman/progman.rc | 16 +++--- programs/progman/program.c | 51 ++++++++--------- programs/progman/string.c | 34 +++-------- 9 files changed, 184 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6109f05e450dffb99feee…

1 0

Alexandre Julliard : makefiles: Disable use of Unicode macros globally for all the programs.
by Alexandre Julliard 20 Jan '12

20 Jan '12

1 0

Henri Verbeet : wined3d: Properly enable / disable register combiners.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: d1254eddb598ad2a6bddaf09ddb5d73247d460cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1254eddb598ad2a6bddaf09d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:25 2012 +0100 wined3d: Properly enable / disable register combiners. --- dlls/wined3d/nvidia_texture_shader.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index dc3f8b9..1fef980 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -629,15 +629,31 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d } /* Context activation is done by the caller. */ -static void nvrc_enable(BOOL enable) {} +static void nvrc_enable(BOOL enable) +{ + if (enable) + { + glEnable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); + } + else + { + glDisable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); + } +} /* Context activation and GL locking are done by the caller. */ static void nvts_enable(BOOL enable) { - if(enable) { + nvrc_enable(enable); + if (enable) + { glEnable(GL_TEXTURE_SHADER_NV); checkGLcall("glEnable(GL_TEXTURE_SHADER_NV)"); - } else { + } + else + { glDisable(GL_TEXTURE_SHADER_NV); checkGLcall("glDisable(GL_TEXTURE_SHADER_NV)"); }

1 0

Henri Verbeet : wined3d: Don' t load the draw_binding location in surface_unmap() unless the surface is on a swapchain.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 8692ff48a953f368860967c1141ec875adba9aaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8692ff48a953f368860967c11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:26 2012 +0100 wined3d: Don't load the draw_binding location in surface_unmap() unless the surface is on a swapchain. It really makes no sense to do this just because a surface happens to be the current render target. In particular, this patch prevents needlessly bouncing the surface between the CPU and the GPU when the application does e.g. multiple colorkeyed blits to the current render target to draw a HUD. --- dlls/wined3d/surface.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7aa68d1..21bd088 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -953,8 +953,14 @@ static void surface_unmap(struct wined3d_surface *surface) goto done; } + /* FIXME: The ORM_BACKBUFFER case probably isn't needed, but who knows + * what obscure bugs in backbuffer ORM removing it will uncover. Also, + * this should only be needed for the frontbuffer, but that requires + * present calls to call surface_load_location() on the backbuffer. + * Fix both of those after 1.4. */ if (surface->container.type == WINED3D_CONTAINER_SWAPCHAIN - || (device->fb.render_targets && surface == device->fb.render_targets[0])) + || (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER + && device->fb.render_targets && surface == device->fb.render_targets[0])) { if (!surface->dirtyRect.left && !surface->dirtyRect.top && surface->dirtyRect.right == surface->resource.width

1 0

Henri Verbeet : wined3d: Get rid of the CONVERT_TYPES typedef.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: d8b00ecf34fd97c12378900a394677d56339f881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b00ecf34fd97c12378900a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:27 2012 +0100 wined3d: Get rid of the CONVERT_TYPES typedef. --- dlls/wined3d/surface.c | 71 +++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 21 ++++++------ 2 files changed, 49 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8b00ecf34fd97c123789…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSURFTYPE typedef.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 3769afa33d5ff7dacf9fd4899e99c8400b6c53c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3769afa33d5ff7dacf9fd4899… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:28 2012 +0100 wined3d: Get rid of the WINED3DSURFTYPE typedef. --- dlls/d3d10core/texture.c | 2 +- dlls/d3d8/directx.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/ddraw/ddraw.c | 19 ++++++++++--------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/main.c | 6 +++--- dlls/dxgi/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 15 ++++++++------- dlls/wined3d/surface.c | 13 +++++++------ dlls/wined3d/swapchain.c | 16 +++++++--------- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 17 +++++++++-------- 18 files changed, 58 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3769afa33d5ff7dacf9fd…

1 0

Henri Verbeet : wined3d: Rename WineD3DRectPatch to wined3d_rect_patch.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: 1ec21e323ba19165fd720dbdeb83e3bfb2219d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec21e323ba19165fd720dbde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 20 00:36:29 2012 +0100 wined3d: Rename WineD3DRectPatch to wined3d_rect_patch. --- dlls/wined3d/device.c | 16 +++++++++------- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6847f81..f56d027 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1443,12 +1443,14 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) } TRACE("Deleting high order patches\n"); - for(i = 0; i < PATCHMAP_SIZE; i++) { + for (i = 0; i < PATCHMAP_SIZE; ++i) + { + struct wined3d_rect_patch *patch; struct list *e1, *e2; - struct WineD3DRectPatch *patch; + LIST_FOR_EACH_SAFE(e1, e2, &device->patches[i]) { - patch = LIST_ENTRY(e1, struct WineD3DRectPatch, entry); + patch = LIST_ENTRY(e1, struct wined3d_rect_patch, entry); wined3d_device_delete_patch(device, patch->Handle); } } @@ -4633,7 +4635,7 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT handle, const float *num_segs, const struct wined3d_rect_patch_info *rect_patch_info) { - struct WineD3DRectPatch *patch; + struct wined3d_rect_patch *patch; GLenum old_primitive_type; unsigned int i; struct list *e; @@ -4655,7 +4657,7 @@ HRESULT CDECL wined3d_device_draw_rect_patch(struct wined3d_device *device, UINT found = FALSE; LIST_FOR_EACH(e, &device->patches[i]) { - patch = LIST_ENTRY(e, struct WineD3DRectPatch, entry); + patch = LIST_ENTRY(e, struct wined3d_rect_patch, entry); if (patch->Handle == handle) { found = TRUE; @@ -4739,7 +4741,7 @@ HRESULT CDECL wined3d_device_draw_tri_patch(struct wined3d_device *device, UINT HRESULT CDECL wined3d_device_delete_patch(struct wined3d_device *device, UINT handle) { - struct WineD3DRectPatch *patch; + struct wined3d_rect_patch *patch; struct list *e; int i; @@ -4748,7 +4750,7 @@ HRESULT CDECL wined3d_device_delete_patch(struct wined3d_device *device, UINT ha i = PATCHMAP_HASHFUNC(handle); LIST_FOR_EACH(e, &device->patches[i]) { - patch = LIST_ENTRY(e, struct WineD3DRectPatch, entry); + patch = LIST_ENTRY(e, struct wined3d_rect_patch, entry); if (patch->Handle == handle) { TRACE("Deleting patch %p\n", patch); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index a5e81db..6c67ada 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -788,7 +788,7 @@ static void normalize_normal(float *n) { * responsible of taking care that either the gl states are restored, or the context activated * for drawing to reset the lastWasBlit flag. */ -HRESULT tesselate_rectpatch(struct wined3d_device *This, struct WineD3DRectPatch *patch) +HRESULT tesselate_rectpatch(struct wined3d_device *This, struct wined3d_rect_patch *patch) { unsigned int i, j, num_quads, out_vertex_size, buffer_size, d3d_out_vertex_size; const struct wined3d_rect_patch_info *info = &patch->rect_patch_info; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2682f7e..b218ca7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1577,7 +1577,7 @@ extern void add_gl_compat_wrappers(struct wined3d_gl_info *gl_info) DECLSPEC_HID /***************************************************************************** * High order patch management */ -struct WineD3DRectPatch +struct wined3d_rect_patch { UINT Handle; float *mem; @@ -1588,7 +1588,7 @@ struct WineD3DRectPatch struct list entry; }; -HRESULT tesselate_rectpatch(struct wined3d_device *device, struct WineD3DRectPatch *patch) DECLSPEC_HIDDEN; +HRESULT tesselate_rectpatch(struct wined3d_device *device, struct wined3d_rect_patch *patch) DECLSPEC_HIDDEN; enum projection_types {

1 0

Nikolay Sivov : msxml3: IXMLDOMSchemaCollection::get() is a stub for version 6.
by Alexandre Julliard 20 Jan '12

20 Jan '12

Module: wine Branch: master Commit: ca046f9eb5ca9f0ca4cb05044fcd866dff10c4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca046f9eb5ca9f0ca4cb05044… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 20 04:00:23 2012 +0300 msxml3: IXMLDOMSchemaCollection::get() is a stub for version 6. --- dlls/msxml3/domdoc.c | 7 +++- dlls/msxml3/schema.c | 7 +++- dlls/msxml3/tests/domdoc.c | 81 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/schema.c | 36 +++++++++++++++++++ 4 files changed, 127 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 47ce60d..8943507 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2508,10 +2508,13 @@ static HRESULT WINAPI domdoc_put_onTransformNode( static HRESULT WINAPI domdoc_get_namespaces( IXMLDOMDocument3* iface, - IXMLDOMSchemaCollection** schemaCollection ) + IXMLDOMSchemaCollection** collection ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("(%p)->(%p)\n", This, schemaCollection); + FIXME("(%p)->(%p): stub\n", This, collection); + + if (!collection) return E_POINTER; + return E_NOTIMPL; } diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 7473dbb..2312f6d 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1139,10 +1139,13 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri IXMLDOMNode** node) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name; cache_entry* entry; + xmlChar* name; + TRACE("(%p)->(%s %p)\n", This, wine_dbgstr_w(uri), node); + if (This->version == MSXML6) return E_NOTIMPL; + if (!node) return E_POINTER; @@ -1438,7 +1441,7 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) #else -HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* pUnkOuter, void** ppObj) +HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) { MESSAGE("This program tried to use a SchemaCache object, but\n" "libxml2 support was not present at compile time.\n"); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 21809f8..cc01a25 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -11140,6 +11140,86 @@ static void test_nodeValue(void) IXMLDOMDocument_Release(doc); } +static char namespacesA[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>" +" <ns1:elem1 xmlns:ns1=\"http://blah.org\">" +" <ns1:elem2/>" +" <ns1:elem3/>" +" <ns1:elem4/>" +" <elem5 xmlns=\"http://blahblah.org\"/>" +" <ns1:elem6>true</ns1:elem6>" +" </ns1:elem1>"; + +static void test_get_namespaces(void) +{ + IXMLDOMSchemaCollection *collection, *collection2; + IXMLDOMDocument2 *doc; + IXMLDOMNode *node; + VARIANT_BOOL b; + HRESULT hr; + LONG len; + + doc = create_document(&IID_IXMLDOMDocument2); + if (!doc) return; + + /* null pointer */ + hr = IXMLDOMDocument2_get_namespaces(doc, NULL); + EXPECT_HR(hr, E_POINTER); + + /* no document loaded */ + collection = (void*)0xdeadbeef; + hr = IXMLDOMDocument2_get_namespaces(doc, &collection); +todo_wine + EXPECT_HR(hr, S_OK); + if (hr != S_OK) + { + IXMLDOMDocument_Release(doc); + return; + } + EXPECT_REF(collection, 2); + + collection2 = (void*)0xdeadbeef; + hr = IXMLDOMDocument2_get_namespaces(doc, &collection2); + EXPECT_HR(hr, S_OK); + ok(collection == collection2, "got %p\n", collection2); + EXPECT_REF(collection, 3); + IXMLDOMSchemaCollection_Release(collection); + + len = -1; + hr = IXMLDOMSchemaCollection_get_length(collection, &len); + EXPECT_HR(hr, S_OK); + ok(len == 0, "got %d\n", len); + IXMLDOMSchemaCollection_Release(collection); + + /* now with document */ + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(namespacesA), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument2_get_namespaces(doc, &collection); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = IXMLDOMSchemaCollection_get_length(collection, &len); + EXPECT_HR(hr, S_OK); + ok(len == 2, "got %d\n", len); + + /* try to lookup some uris */ + node = (void*)0xdeadbeef; + hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah.org"), &node); + EXPECT_HR(hr, S_OK); + ok(node == NULL, "got %p\n", node); + + node = (void*)0xdeadbeef; + hr = IXMLDOMSchemaCollection_get(collection, _bstr_("http://blah1.org"), &node); + EXPECT_HR(hr, S_OK); + ok(node == NULL, "got %p\n", node); + + IXMLDOMSchemaCollection_Release(collection); + + IXMLDOMDocument2_Release(doc); + free_bstrs(); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -11216,6 +11296,7 @@ START_TEST(domdoc) test_getAttributeNode(); test_supporterrorinfo(); test_nodeValue(); + test_get_namespaces(); test_xsltemplate(); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 59ceac5..e819264 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -2061,6 +2061,41 @@ static void test_dispex(void) IXMLDOMSchemaCollection_Release(cache); } +static void test_get(void) +{ + static const WCHAR uriW[] = {'u','r','i',0}; + IXMLDOMSchemaCollection2 *cache; + IXMLDOMNode *node; + HRESULT hr; + BSTR s; + + cache = create_cache_version(60, &IID_IXMLDOMSchemaCollection2); + if (!cache) return; + + hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); + EXPECT_HR(hr, E_NOTIMPL); + + s = SysAllocString(uriW); + hr = IXMLDOMSchemaCollection2_get(cache, s, &node); + EXPECT_HR(hr, E_NOTIMPL); + SysFreeString(s); + + IXMLDOMSchemaCollection2_Release(cache); + + cache = create_cache_version(40, &IID_IXMLDOMSchemaCollection2); + if (!cache) return; + + hr = IXMLDOMSchemaCollection2_get(cache, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + s = SysAllocString(uriW); + hr = IXMLDOMSchemaCollection2_get(cache, s, &node); + EXPECT_HR(hr, S_OK); + SysFreeString(s); + + IXMLDOMSchemaCollection2_Release(cache); +} + START_TEST(schema) { HRESULT r; @@ -2076,6 +2111,7 @@ START_TEST(schema) test_XDR_datatypes(); test_validate_on_load(); test_dispex(); + test_get(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : gdi32: Add EnhMetafile PolyBezier, PolyBezierTo support.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: c5235eeab020394b7431d5c6233b59f59c790492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5235eeab020394b7431d5c62… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 17 14:38:15 2012 +1100 gdi32: Add EnhMetafile PolyBezier, PolyBezierTo support. --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 + dlls/gdi32/enhmfdrv/graphics.c | 20 ++++++ dlls/gdi32/enhmfdrv/init.c | 4 +- dlls/gdi32/tests/metafile.c | 119 ++++++++++++++++++++++++++++++++-- 4 files changed, 137 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index a1cead5..53d69bc 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -94,6 +94,8 @@ extern BOOL EMFDRV_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyPolygon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polys) DECLSPEC_HIDDEN; extern BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index 71fd118..553801c 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -451,6 +451,26 @@ BOOL EMFDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) return EMFDRV_Polylinegon( dev, pt, count, EMR_POLYGON ); } +/********************************************************************** + * EMFDRV_PolyBezier + */ +BOOL EMFDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) +{ + if(EMFDRV_Polylinegon16( dev, pts, count, EMR_POLYBEZIER16 )) + return TRUE; + return EMFDRV_Polylinegon( dev, pts, count, EMR_POLYBEZIER ); +} + +/********************************************************************** + * EMFDRV_PolyBezierTo + */ +BOOL EMFDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) +{ + if(EMFDRV_Polylinegon16( dev, pts, count, EMR_POLYBEZIERTO16 )) + return TRUE; + return EMFDRV_Polylinegon( dev, pts, count, EMR_POLYBEZIERTO ); +} + /********************************************************************** * EMFDRV_PolyPolylinegon diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index f988ebd..d254cba 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -109,8 +109,8 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = EMFDRV_PaintRgn, /* pPaintRgn */ EMFDRV_PatBlt, /* pPatBlt */ EMFDRV_Pie, /* pPie */ - NULL, /* pPolyBezier */ - NULL, /* pPolyBezierTo */ + EMFDRV_PolyBezier, /* pPolyBezier */ + EMFDRV_PolyBezierTo, /* pPolyBezierTo */ NULL, /* pPolyDraw */ EMFDRV_PolyPolygon, /* pPolyPolygon */ EMFDRV_PolyPolyline, /* pPolyPolyline */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 206e15a..0bbf9c3 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1321,6 +1321,51 @@ static const unsigned char EMF_DCBRUSH_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_BEZIER_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1a, 0x2a, 0x0d, 0x00, 0x1a, 0x2f, 0x0d, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x44, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x51, 0x01, 0x00, 0x00, 0x0e, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x68, 0x24, 0x05, 0x00, + 0xb0, 0x1e, 0x04, 0x00, 0x58, 0x00, 0x00, 0x00, + 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x0f, 0x00, 0x0f, 0x00, 0x55, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, + 0x19, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x14, 0x00, + 0x0f, 0x00, 0x0f, 0x00, 0x19, 0x00, 0x19, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, + 0x19, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x34, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -1588,6 +1633,28 @@ static BOOL match_emf_record(const ENHMETARECORD *emr1, const ENHMETARECORD *emr HeapFree(GetProcessHeap(), 0, emr_nt4); } } + else if (emr1->iType == EMR_POLYBEZIERTO16 || emr1->iType == EMR_POLYBEZIER16) + { + EMRPOLYBEZIER16 *eto1, *eto2; + + eto1 = (EMRPOLYBEZIER16*)emr1; + eto2 = (EMRPOLYBEZIER16*)emr2; + + diff = eto1->cpts != eto1->cpts; + if(!diff) + diff = memcmp(eto1->apts, eto2->apts, eto1->cpts * sizeof(POINTS)); + } + else if (emr1->iType == EMR_POLYBEZIERTO || emr1->iType == EMR_POLYBEZIER) + { + EMRPOLYBEZIER *eto1, *eto2; + + eto1 = (EMRPOLYBEZIER*)emr1; + eto2 = (EMRPOLYBEZIER*)emr2; + + diff = eto1->cptl != eto1->cptl; + if(!diff) + diff = memcmp(eto1->aptl, eto2->aptl, eto1->cptl * sizeof(POINTL)); + } else diff = memcmp(emr1, emr2, emr1->nSize); @@ -1658,17 +1725,17 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, offset2 = emh2->nSize; /* Needed for Win9x/WinME/NT4 */ while (offset1 < emh1->nBytes) { - const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); - const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); + const ENHMETARECORD *emr1 = (const ENHMETARECORD *)(bits + offset1); + const ENHMETARECORD *emr2 = (const ENHMETARECORD *)(buf + offset2); - trace("%s: EMF record %u, size %u/record %u, size %u\n", + trace("%s: EMF record %u, size %u/record %u, size %u\n", desc, emr1->iType, emr1->nSize, emr2->iType, emr2->nSize); if (!match_emf_record(emr1, emr2, desc, ignore_scaling)) return -1; /* We have already bailed out if iType or nSize don't match */ - offset1 += emr1->nSize; - offset2 += emr2->nSize; + offset1 += emr1->nSize; + offset2 += emr2->nSize; } return 0; } @@ -2250,7 +2317,7 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, { if (emr->iType == EMR_EXTSELECTCLIPRGN) { - const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)emr; + const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)emr; union _rgn { RGNDATA data; @@ -3089,6 +3156,45 @@ static void test_SetEnhMetaFileBits(void) DeleteEnhMetaFile(hemf); } +static void test_emf_polybezier(void) +{ + HDC hdcMetafile; + HENHMETAFILE hemf; + POINT pts[4]; + BOOL ret; + + SetLastError(0xdeadbeef); + hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + pts[0].x = pts[0].y = 10; + pts[1].x = pts[1].y = 20; + pts[2].x = pts[2].y = 15; + pts[3].x = pts[3].y = 25; + ret = PolyBezierTo(hdcMetafile, pts, 3); /* EMR_POLYBEZIERTO16 */ + ok( ret, "PolyBezierTo failed\n" ); + ret = PolyBezier(hdcMetafile, pts, 4); /* EMR_POLYBEZIER16 */ + ok( ret, "PolyBezier failed\n" ); + + pts[0].x = pts[0].y = 32769; + ret = PolyBezier(hdcMetafile, pts, 4); /* EMR_POLYBEZIER */ + ok( ret, "PolyBezier failed\n" ); + ret = PolyBezierTo(hdcMetafile, pts, 3); /* EMR_POLYBEZIERTO */ + ok( ret, "PolyBezierTo failed\n" ); + + hemf = CloseEnhMetaFile(hdcMetafile); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if(compare_emf_bits(hemf, EMF_BEZIER_BITS, sizeof(EMF_BEZIER_BITS), + "emf_Bezier", FALSE) != 0) + { + dump_emf_bits(hemf, "emf_Bezier"); + dump_emf_records(hemf, "emf_Bezier"); + } + + DeleteEnhMetaFile(hemf); +} + START_TEST(metafile) { init_function_pointers(); @@ -3111,6 +3217,7 @@ START_TEST(metafile) test_mf_ExtTextOut_on_path(); test_emf_ExtTextOut_on_path(); test_emf_clipping(); + test_emf_polybezier(); /* For metafile conversions */ test_mf_conversions();

1 0