wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Iván Matellanes : msvcirt: Add stubs for ostream:: operator<<.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: faf7a2701df30180eef39bd92793af6ee67053a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faf7a2701df30180eef39bd92… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Jun 21 10:54:20 2016 +0100 msvcirt: Add stubs for ostream::operator<<. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 181 +++++++++++++++++++++++++++++++++----------- dlls/msvcirt/msvcirt.spec | 76 +++++++++---------- dlls/msvcrt20/msvcrt20.spec | 60 +++++++-------- dlls/msvcrt40/msvcrt40.spec | 60 +++++++-------- 4 files changed, 235 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=faf7a2701df30180eef39…

1 0

Henri Verbeet : wined3d: Send rendertarget view destruction through the command stream.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 7fe9858988eabf377ab5e2c64d92f973574b1ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe9858988eabf377ab5e2c64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:47 2016 +0200 wined3d: Send rendertarget view destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 329a0bb..e9e62d1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -33,6 +33,11 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v return refcount; } +static void wined3d_rendertarget_view_destroy_object(void *object) +{ + HeapFree(GetProcessHeap(), 0, object); +} + ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedDecrement(&view->refcount); @@ -41,11 +46,13 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v if (!refcount) { + struct wined3d_device *device = view->resource->device; + /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); wined3d_resource_decref(view->resource); - HeapFree(GetProcessHeap(), 0, view); + wined3d_cs_emit_destroy_object(device->cs, wined3d_rendertarget_view_destroy_object, view); } return refcount;

1 0

Henri Verbeet : wined3d: Send shader resource view destruction through the command stream.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 8a8b57ce3d0cde8c4ff2f1a0ab06f0e975124671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8b57ce3d0cde8c4ff2f1a0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:46 2016 +0200 wined3d: Send shader resource view destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/view.c | 34 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bbd5c0d..46f623a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -52,6 +52,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_COLOR_KEY, WINED3D_CS_OP_SET_MATERIAL, WINED3D_CS_OP_RESET_STATE, + WINED3D_CS_OP_DESTROY_OBJECT, }; struct wined3d_cs_present @@ -252,6 +253,13 @@ struct wined3d_cs_reset_state enum wined3d_cs_op opcode; }; +struct wined3d_cs_destroy_object +{ + enum wined3d_cs_op opcode; + void (*callback)(void *object); + void *object; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1029,6 +1037,25 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) cs->ops->submit(cs); } +static void wined3d_cs_exec_destroy_object(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_destroy_object *op = data; + + op->callback(op->object); +} + +void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) +{ + struct wined3d_cs_destroy_object *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_DESTROY_OBJECT; + op->callback = callback; + op->object = object; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1057,6 +1084,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_COLOR_KEY */ wined3d_cs_exec_set_color_key, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, + /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 52e3f1e..329a0bb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -194,6 +194,25 @@ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_v return refcount; } +static void wined3d_shader_resource_view_destroy_object(void *object) +{ + struct wined3d_shader_resource_view *view = object; + + if (view->object) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(view->resource->device, NULL); + gl_info = context->gl_info; + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); + checkGLcall("glDeleteTextures"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); +} + ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) { ULONG refcount = InterlockedDecrement(&view->refcount); @@ -202,22 +221,13 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { - if (view->object) - { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(view->resource->device, NULL); - gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); - checkGLcall("glDeleteTextures"); - context_release(context); - } + struct wined3d_device *device = view->resource->device; + /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); wined3d_resource_decref(view->resource); - HeapFree(GetProcessHeap(), 0, view); + wined3d_cs_emit_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); } return refcount; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76425e0..43714a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2916,6 +2916,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, + void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : wined3d: Resolve "load_base_vertex_index" in wined3d_cs_exec_draw().
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 4afc7470fb630035c911a1bf1d48f66bf16c230c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4afc7470fb630035c911a1bf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:45 2016 +0200 wined3d: Resolve "load_base_vertex_index" in wined3d_cs_exec_draw(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +++++++++- dlls/wined3d/device.c | 15 --------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2ab3ca5..bbd5c0d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -311,9 +311,17 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_draw *op = data; - draw_primitive(cs->device, &cs->device->state, op->base_vertex_idx, op->start_idx, + if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] + && state->load_base_vertex_index != op->base_vertex_idx) + { + state->load_base_vertex_index = op->base_vertex_idx; + device_invalidate_state(cs->device, STATE_BASEVERTEXINDEX); + } + + draw_primitive(cs->device, state, op->base_vertex_idx, op->start_idx, op->index_count, op->start_instance, op->instance_count, op->indexed); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6678219..b52970f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3497,12 +3497,6 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT { TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - if (device->state.load_base_vertex_index) - { - device->state.load_base_vertex_index = 0; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - wined3d_cs_emit_draw(device->cs, 0, start_vertex, vertex_count, 0, 0, FALSE); return WINED3D_OK; @@ -3519,8 +3513,6 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); if (!device->state.index_buffer) @@ -3533,13 +3525,6 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - if (!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && - device->state.load_base_vertex_index != device->state.base_vertex_index) - { - device->state.load_base_vertex_index = device->state.base_vertex_index; - device_invalidate_state(device, STATE_BASEVERTEXINDEX); - } - wined3d_cs_emit_draw(device->cs, device->state.base_vertex_index, start_idx, index_count, 0, 0, TRUE); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Include the base vertex index in WINED3D_CS_OP_DRAW.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 9c1fbe509576d7cbaada3af9736888cfa1d02847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1fbe509576d7cbaada3af97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:44 2016 +0200 wined3d: Include the base vertex index in WINED3D_CS_OP_DRAW. Ideally we'd just remove the base vertex index from the wined3d_state structure, but it's included in d3d8 stateblocks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++-------- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/drawprim.c | 30 +++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 34 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c1fbe509576d7cbaada3…

1 0

Henri Verbeet : wined3d: Don't bother with glGetError() if we have ARB_DEBUG_OUTPUT.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: a1bc5b8c975799ee1d4281cdd83279cc196db79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1bc5b8c975799ee1d4281cdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:43 2016 +0200 wined3d: Don't bother with glGetError() if we have ARB_DEBUG_OUTPUT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 19 +++++++++++++++++++ dlls/wined3d/drawprim.c | 1 + dlls/wined3d/wined3d_private.h | 17 ++++++----------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 04265d0..ae82a82 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1550,6 +1550,25 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc } } +void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, + const char *file, unsigned int line, const char *name) +{ + GLint err; + + if (gl_info->supported[ARB_DEBUG_OUTPUT] || (err = gl_info->gl_ops.gl.p_glGetError()) == GL_NO_ERROR) + { + TRACE("%s call ok %s / %u.\n", name, file, line); + return; + } + + do + { + ERR(">>>>>>> %s (%#x) from %s @ %s / %u.\n", + debug_glerror(err), err, name, file,line); + err = gl_info->gl_ops.gl.p_glGetError(); + } while (err != GL_NO_ERROR); +} + static BOOL context_debug_output_enabled(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_DEBUG_OUTPUT] diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2b58def..5a9e084 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); +WINE_DECLARE_DEBUG_CHANNEL(d3d); #include <stdio.h> #include <math.h> diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04dd160..f6f6bb3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1130,22 +1130,17 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col #define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ +void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, + const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN; + /* Checking of API calls */ /* --------------------- */ #ifndef WINE_NO_DEBUG_MSGS #define checkGLcall(A) \ do { \ - GLint err; \ - if (!__WINE_IS_DEBUG_ON(_ERR, __wine_dbch___default)) break; \ - err = gl_info->gl_ops.gl.p_glGetError(); \ - if (err == GL_NO_ERROR) { \ - TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ - \ - } else do { \ - ERR(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ - debug_glerror(err), err, A, __FILE__, __LINE__); \ - err = gl_info->gl_ops.gl.p_glGetError(); \ - } while (err != GL_NO_ERROR); \ + if (__WINE_IS_DEBUG_ON(_ERR, &__wine_dbch_d3d) \ + && !gl_info->supported[ARB_DEBUG_OUTPUT]) \ + wined3d_check_gl_call(gl_info, __FILE__, __LINE__, A); \ } while(0) #else #define checkGLcall(A) do {} while(0)

1 0

Alexandre Julliard : gdi32: Implement bounds for FillPath, StrokeAndFillPath and StrokePath in enhanced metafiles.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: c7bbc83062bad9dbd095e52988eedc0a9a096405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7bbc83062bad9dbd095e5298… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 15:16:04 2016 +0900 gdi32: Implement bounds for FillPath, StrokeAndFillPath and StrokePath in enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 42 ----------------------------------- dlls/gdi32/enhmfdrv/graphics.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/metafile.c | 23 ++++++++++++++----- 3 files changed, 67 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 12f03f4..00f4d65 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -471,20 +471,6 @@ BOOL EMFDRV_EndPath( PHYSDEV dev ) return FALSE; /* always fails without a path */ } -BOOL EMFDRV_FillPath( PHYSDEV dev ) -{ - EMRFILLPATH emr; - - emr.emr.iType = EMR_FILLPATH; - emr.emr.nSize = sizeof(emr); - FIXME("Bounds\n"); - emr.rclBounds.left = 0; - emr.rclBounds.top = 0; - emr.rclBounds.right = 0; - emr.rclBounds.bottom = 0; - return EMFDRV_WriteRecord( dev, &emr.emr ); -} - BOOL EMFDRV_FlattenPath( PHYSDEV dev ) { EMRFLATTENPATH emr; @@ -508,34 +494,6 @@ BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) return next->funcs->pSelectClipPath( next, iMode ); } -BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) -{ - EMRSTROKEANDFILLPATH emr; - - emr.emr.iType = EMR_STROKEANDFILLPATH; - emr.emr.nSize = sizeof(emr); - FIXME("Bounds\n"); - emr.rclBounds.left = 0; - emr.rclBounds.top = 0; - emr.rclBounds.right = 0; - emr.rclBounds.bottom = 0; - return EMFDRV_WriteRecord( dev, &emr.emr ); -} - -BOOL EMFDRV_StrokePath( PHYSDEV dev ) -{ - EMRSTROKEPATH emr; - - emr.emr.iType = EMR_STROKEPATH; - emr.emr.nSize = sizeof(emr); - FIXME("Bounds\n"); - emr.rclBounds.left = 0; - emr.rclBounds.top = 0; - emr.rclBounds.right = 0; - emr.rclBounds.bottom = 0; - return EMFDRV_WriteRecord( dev, &emr.emr ); -} - BOOL EMFDRV_WidenPath( PHYSDEV dev ) { EMRWIDENPATH emr; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index fb0ac9c..d905490 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -96,6 +96,32 @@ static void get_points_bounds( RECTL *bounds, const POINT *pts, UINT count, HDC } } +/* helper for path stroke and fill functions */ +static BOOL emfdrv_stroke_and_fill_path( PHYSDEV dev, INT type ) +{ + EMRSTROKEANDFILLPATH emr; + int count; + POINT *points; + BYTE *flags; + + emr.emr.iType = type; + emr.emr.nSize = sizeof(emr); + + count = get_gdi_flat_path( dev->hdc, &points, &flags, NULL ); + if (count >= 0) + { + get_points_bounds( &emr.rclBounds, points, count, 0 ); + HeapFree( GetProcessHeap(), 0, points ); + HeapFree( GetProcessHeap(), 0, flags ); + } + else emr.rclBounds = empty_bounds; + + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; + if (count < 0) return FALSE; + EMFDRV_UpdateBBox( dev, &emr.rclBounds ); + return TRUE; +} + /********************************************************************** * EMFDRV_MoveTo */ @@ -961,3 +987,27 @@ BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, HeapFree( GetProcessHeap(), 0, emr ); return ret; } + +/********************************************************************** + * EMFDRV_FillPath + */ +BOOL EMFDRV_FillPath( PHYSDEV dev ) +{ + return emfdrv_stroke_and_fill_path( dev, EMR_FILLPATH ); +} + +/********************************************************************** + * EMFDRV_StrokeAndFillPath + */ +BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev ) +{ + return emfdrv_stroke_and_fill_path( dev, EMR_STROKEANDFILLPATH ); +} + +/********************************************************************** + * EMFDRV_MoveTo + */ +BOOL EMFDRV_StrokePath( PHYSDEV dev ) +{ + return emfdrv_stroke_and_fill_path( dev, EMR_STROKEPATH ); +} diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f655d01..bcd085c 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3583,12 +3583,12 @@ static void test_emf_polybezier(void) static const unsigned char EMF_PATH_BITS[] = { 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xd8, 0xff, 0xff, 0xff, 0xd8, 0xff, 0xff, 0xff, + 0x0a, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, + 0x70, 0x17, 0x00, 0x00, 0x70, 0x17, 0x00, 0x00, 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, - 0xc8, 0x02, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, + 0xf8, 0x02, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x03, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, @@ -3668,7 +3668,13 @@ static const unsigned char EMF_PATH_BITS[] = 0x25, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb4, 0x42, 0x00, 0x00, 0x34, 0x43, 0x3c, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x96, 0x00, 0x00, 0x00, + 0x96, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 }; @@ -3745,6 +3751,11 @@ static void test_emf_paths(void) size = GetPath(hdcMetafile, NULL, NULL, 0); todo_wine ok( size == 112, "GetPath returned %d.\n", size); + ret = StrokeAndFillPath( hdcMetafile ); + ok( ret, "StrokeAndFillPath failed err %d\n", GetLastError() ); + ret = StrokeAndFillPath( hdcMetafile ); + ok( !ret, "StrokeAndFillPath succeeded\n" ); + hemf = CloseEnhMetaFile(hdcMetafile); ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Alexandre Julliard : gdi32: Implement a path driver for enhanced metafiles.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 625ff9b528a5aa11e31df2ed467ccc2f115c7ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=625ff9b528a5aa11e31df2ed4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:38:19 2016 +0900 gdi32: Implement a path driver for enhanced metafiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 473 ++++++++++++++++++++++++++++++++++- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/tests/metafile.c | 75 +++++- 3 files changed, 535 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=625ff9b528a5aa11e31df…

1 0

Alexandre Julliard : gdi32: Add a helper function to return the metafile device.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 6bab6ad40d28c05661d2b3638a749b1a5c03eba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bab6ad40d28c05661d2b3638… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:52:43 2016 +0900 gdi32: Add a helper function to return the metafile device. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 10 +++++----- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 4 ++++ dlls/gdi32/enhmfdrv/graphics.c | 18 +++++++++--------- dlls/gdi32/enhmfdrv/init.c | 14 +++++++------- dlls/gdi32/enhmfdrv/objects.c | 18 +++++++++--------- 5 files changed, 34 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bab6ad40d28c05661d2b…

1 0

Alexandre Julliard : gdi32: Implement DeleteDC in the path driver.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 234daa752270899a13bd12bc01fbca63c05c7486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234daa752270899a13bd12bc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 21 14:46:04 2016 +0900 gdi32: Implement DeleteDC in the path driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index de4193f..c6b87d4 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -99,7 +99,7 @@ struct path_physdev static inline struct path_physdev *get_path_physdev( PHYSDEV dev ) { - return (struct path_physdev *)dev; + return CONTAINING_RECORD( dev, struct path_physdev, dev ); } void free_gdi_path( struct gdi_path *path ) @@ -750,13 +750,9 @@ static BOOL pathdrv_BeginPath( PHYSDEV dev ) */ static BOOL pathdrv_AbortPath( PHYSDEV dev ) { - struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_dc_ptr( dev->hdc ); - if (!dc) return FALSE; - free_gdi_path( physdev->path ); - pop_dc_driver( dc, &path_driver ); - HeapFree( GetProcessHeap(), 0, physdev ); + path_driver.pDeleteDC( pop_dc_driver( dc, &path_driver )); release_dc_ptr( dc ); return TRUE; } @@ -770,7 +766,6 @@ static BOOL pathdrv_EndPath( PHYSDEV dev ) struct path_physdev *physdev = get_path_physdev( dev ); DC *dc = get_dc_ptr( dev->hdc ); - if (!dc) return FALSE; dc->path = physdev->path; pop_dc_driver( dc, &path_driver ); HeapFree( GetProcessHeap(), 0, physdev ); @@ -801,7 +796,10 @@ static BOOL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, */ static BOOL pathdrv_DeleteDC( PHYSDEV dev ) { - assert( 0 ); /* should never be called */ + struct path_physdev *physdev = get_path_physdev( dev ); + + free_gdi_path( physdev->path ); + HeapFree( GetProcessHeap(), 0, physdev ); return TRUE; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016