July 2016 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Move the release until after the final dc access.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: d4d65e2df9c465f02a06ca91c847dd575c0df6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d65e2df9c465f02a06ca91c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:33 2016 +0100 gdi32: Move the release until after the final dc access. Also only reselect the font if the graphics mode changes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 59a3d9b..3b6c2ea 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1037,9 +1037,9 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode ) ret = dc->GraphicsMode; dc->GraphicsMode = mode; } - release_dc_ptr( dc ); /* font metrics depend on the graphics mode */ - if (ret) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); + if (ret != mode) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT)); + release_dc_ptr( dc ); return ret; }

1 0

Huw Davies : gdi32: Remove an unnecessary call to get_dc_ptr().
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 637c99f675083984af401217b820017a38cafdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=637c99f675083984af401217b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:31 2016 +0100 gdi32: Remove an unnecessary call to get_dc_ptr(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index c204fde..f6b6552 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -798,12 +798,9 @@ static BOOL pathdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, LPCWSTR output, const DEVMODEW *devmode ) { struct path_physdev *physdev = HeapAlloc( GetProcessHeap(), 0, sizeof(*physdev) ); - DC *dc; if (!physdev) return FALSE; - dc = get_dc_ptr( (*dev)->hdc ); push_dc_driver( dev, &physdev->dev, &path_driver ); - release_dc_ptr( dc ); return TRUE; }

1 0

Huw Davies : gdi32: Access a few more properties directly from the DC in the path driver.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: e767a607909377752af355117b9403c25fa4a471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e767a607909377752af355117… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 15:09:30 2016 +0100 gdi32: Access a few more properties directly from the DC in the path driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 015a059..c204fde 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -702,7 +702,7 @@ HRGN WINAPI PathToRegion(HDC hdc) dc->path = NULL; if (path) { - ret = path_to_region( path, GetPolyFillMode( hdc )); + ret = path_to_region( path, dc->polyFillMode ); free_gdi_path( path ); } } @@ -873,10 +873,12 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) static BOOL pathdrv_MoveTo( PHYSDEV dev, INT x, INT y ) { struct path_physdev *physdev = get_path_physdev( dev ); + DC *dc = get_physdev_dc( dev ); + physdev->path->newStroke = TRUE; physdev->path->pos.x = x; physdev->path->pos.y = y; - LPtoDP( physdev->dev.hdc, &physdev->path->pos, 1 ); + lp_to_dp( dc, &physdev->path->pos, 1 ); return TRUE; } @@ -1137,7 +1139,7 @@ static BOOL PATH_Arc( PHYSDEV dev, INT x1, INT y1, INT x2, INT y2, } /* In GM_COMPATIBLE, don't include bottom and right edges */ - if (GetGraphicsMode(dev->hdc) == GM_COMPATIBLE) + if (dc->GraphicsMode == GM_COMPATIBLE) { corners[1].x--; corners[1].y--; @@ -1225,8 +1227,9 @@ static BOOL pathdrv_AngleArc( PHYSDEV dev, INT x, INT y, DWORD radius, FLOAT eSt static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { + DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - GetArcDirection( dev->hdc ), 0 ); + dc->ArcDirection, 0 ); } @@ -1236,8 +1239,9 @@ static BOOL pathdrv_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { + DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - GetArcDirection( dev->hdc ), -1 ); + dc->ArcDirection, -1 ); } @@ -1247,8 +1251,9 @@ static BOOL pathdrv_ArcTo( PHYSDEV dev, INT left, INT top, INT right, INT bottom static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { + DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - GetArcDirection( dev->hdc ), 1 ); + dc->ArcDirection, 1 ); } @@ -1258,8 +1263,9 @@ static BOOL pathdrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom static BOOL pathdrv_Pie( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { + DC *dc = get_physdev_dc( dev ); return PATH_Arc( dev, left, top, right, bottom, xstart, ystart, xend, yend, - GetArcDirection( dev->hdc ), 2 ); + dc->ArcDirection, 2 ); } @@ -1311,7 +1317,7 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, case PT_MOVETO: path->newStroke = TRUE; path->pos = pts[i]; - LPtoDP( dev->hdc, &path->pos, 1 ); + lp_to_dp( dc, &path->pos, 1 ); lastmove = path->count; break; case PT_LINETO: @@ -2022,7 +2028,7 @@ BOOL nulldrv_BeginPath( PHYSDEV dev ) physdev = get_path_physdev( find_dc_driver( dc, &path_driver )); physdev->path = path; path->pos = dc->cur_pos; - LPtoDP( dev->hdc, &path->pos, 1 ); + lp_to_dp( dc, &path->pos, 1 ); if (dc->path) free_gdi_path( dc->path ); dc->path = NULL; return TRUE;

1 0

Huw Davies : gdi32: Use a buffer on the stack if the number of points is small.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 22202eae59f95bc370c37da8bb385e019f712a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=22202eae59f95bc370c37da8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 29 13:13:05 2016 +0100 gdi32: Use a buffer on the stack if the number of points is small. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 08e777d..3ea39a1 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -1239,7 +1239,8 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD DC *dc = get_physdev_dc( dev ); DWORD total, i, pos; BOOL ret = TRUE; - POINT *points; + POINT pt_buf[32]; + POINT *points = pt_buf; HRGN outline = 0, interior = 0; for (i = total = 0; i < polygons; i++) @@ -1248,16 +1249,19 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD total += counts[i]; } - points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); - if (!points) return FALSE; + if (total > sizeof(pt_buf) / sizeof(pt_buf[0])) + { + points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); + if (!points) return FALSE; + } memcpy( points, pt, total * sizeof(*pt) ); lp_to_dp( dc, points, total ); if (pdev->brush.style != BS_NULL && !(interior = CreatePolyPolygonRgn( points, counts, polygons, dc->polyFillMode ))) { - HeapFree( GetProcessHeap(), 0, points ); - return FALSE; + ret = FALSE; + goto done; } if (pdev->pen_uses_region) outline = CreateRectRgn( 0, 0, 0, 0 ); @@ -1289,7 +1293,9 @@ BOOL dibdrv_PolyPolygon( PHYSDEV dev, const POINT *pt, const INT *counts, DWORD if (ret) ret = pen_region( pdev, outline ); DeleteObject( outline ); } - HeapFree( GetProcessHeap(), 0, points ); + +done: + if (points != pt_buf) HeapFree( GetProcessHeap(), 0, points ); return ret; } @@ -1301,7 +1307,8 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO dibdrv_physdev *pdev = get_dibdrv_pdev(dev); DC *dc = get_physdev_dc( dev ); DWORD total, pos, i; - POINT *points; + POINT pt_buf[32]; + POINT *points = pt_buf; BOOL ret = TRUE; HRGN outline = 0; @@ -1311,15 +1318,18 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO total += counts[i]; } - points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); - if (!points) return FALSE; + if (total > sizeof(pt_buf) / sizeof(pt_buf[0])) + { + points = HeapAlloc( GetProcessHeap(), 0, total * sizeof(*pt) ); + if (!points) return FALSE; + } memcpy( points, pt, total * sizeof(*pt) ); lp_to_dp( dc, points, total ); if (pdev->pen_uses_region && !(outline = CreateRectRgn( 0, 0, 0, 0 ))) { - HeapFree( GetProcessHeap(), 0, points ); - return FALSE; + ret = FALSE; + goto done; } for (i = pos = 0; i < polylines; i++) @@ -1336,7 +1346,8 @@ BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWO DeleteObject( outline ); } - HeapFree( GetProcessHeap(), 0, points ); +done: + if (points != pt_buf) HeapFree( GetProcessHeap(), 0, points ); return ret; }

1 0

Henri Verbeet : wined3d: Issue queries through the command stream.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 7cda73e81864c52457d4d65f71f0140af30597d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cda73e81864c52457d4d65f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:34 2016 +0200 wined3d: Issue queries 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 | 29 +++++++++++++++++++++++++++++ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a898c2c..b52e887 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -54,6 +54,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_MATERIAL, WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, + WINED3D_CS_OP_QUERY_ISSUE, }; struct wined3d_cs_present @@ -267,6 +268,13 @@ struct wined3d_cs_destroy_object void *object; }; +struct wined3d_cs_query_issue +{ + enum wined3d_cs_op opcode; + struct wined3d_query *query; + DWORD flags; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1215,6 +1223,26 @@ void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void cs->ops->submit(cs); } +static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_query_issue *op = data; + struct wined3d_query *query = op->query; + + query->query_ops->query_issue(query, op->flags); +} + +void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) +{ + struct wined3d_cs_query_issue *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_QUERY_ISSUE; + op->query = query; + op->flags = flags; + + 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, @@ -1245,6 +1273,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* 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, + /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9843558..97675ad 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -350,7 +350,7 @@ HRESULT CDECL wined3d_query_issue(struct wined3d_query *query, DWORD flags) { TRACE("query %p, flags %#x.\n", query, flags); - query->query_ops->query_issue(query, flags); + wined3d_cs_emit_query_issue(query->device->cs, query, flags); if (flags & WINED3DISSUE_BEGIN) query->state = QUERY_BUILDING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e3b0a56..e933909 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3041,6 +3041,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i 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, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *query, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Upload only a single sub-resource in wined3d_texture_upload_data().
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: d72ff80a4661f07a0be244abc94864e6f1f2a2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72ff80a4661f07a0be244abc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:32 2016 +0200 wined3d: Upload only a single sub-resource in wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 73 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0c1fa05..4a9ed42 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1426,40 +1426,12 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3D_OK; } -static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, - const struct wined3d_sub_resource_data *data) +static void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { - unsigned int sub_count = texture->level_count * texture->layer_count; - struct wined3d_context *context; - unsigned int i; - - for (i = 0; i < sub_count; ++i) - { - if (!data[i].data) - { - WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); - return E_INVALIDARG; - } - } - - context = context_acquire(texture->resource.device, NULL); - - wined3d_texture_prepare_texture(texture, context, FALSE); - wined3d_texture_bind_and_dirtify(texture, context, FALSE); - - for (i = 0; i < sub_count; ++i) - { - const struct wined3d_const_bo_address addr = {0, data[i].data}; - - texture->texture_ops->texture_upload_data(texture, i, context, - &addr, data[i].row_pitch, data[i].slice_pitch); - wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); - } - - context_release(context); - - return WINED3D_OK; + texture->texture_ops->texture_upload_data(texture, sub_resource_idx, + context, data, row_pitch, slice_pitch); } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2783,11 +2755,38 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct /* FIXME: We'd like to avoid ever allocating system memory for the texture * in this case. */ - if (data && FAILED(hr = wined3d_texture_upload_data(object, data))) + if (data) { - wined3d_texture_cleanup_sync(object); - HeapFree(GetProcessHeap(), 0, object); - return hr; + unsigned int sub_count = level_count * layer_count; + struct wined3d_context *context; + unsigned int i; + + for (i = 0; i < sub_count; ++i) + { + if (!data[i].data) + { + WARN("Invalid sub-resource data specified for sub-resource %u.\n", i); + wined3d_texture_cleanup_sync(object); + HeapFree(GetProcessHeap(), 0, object); + return E_INVALIDARG; + } + } + + context = context_acquire(device, NULL); + + wined3d_texture_prepare_texture(object, context, FALSE); + wined3d_texture_bind_and_dirtify(object, context, FALSE); + + for (i = 0; i < sub_count; ++i) + { + const struct wined3d_const_bo_address addr = {0, data[i].data}; + + wined3d_texture_upload_data(object, i, context, &addr, data[i].row_pitch, data[i].slice_pitch); + wined3d_texture_validate_location(object, i, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(object, i, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + context_release(context); } TRACE("Created texture %p.\n", object);

1 0

Michael Stefaniuc : comctl32: Use straight assignments instead of CopyRect ().
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 77fc4697dd7c2b81181c4549c22210bc16913736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77fc4697dd7c2b81181c4549c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 29 12:23:39 2016 +0200 comctl32: Use straight assignments instead of CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tab.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index a6243a9..752f870 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2389,7 +2389,7 @@ REBAR_GetRect (const REBAR_INFO *infoPtr, INT iBand, RECT *lprc) lpBand = REBAR_GetBand(infoPtr, iBand); /* For CCS_VERT the coordinates will be swapped - like on Windows */ - CopyRect (lprc, &lpBand->rcBand); + *lprc = lpBand->rcBand; TRACE("band %d, (%s)\n", iBand, wine_dbgstr_rect(lprc)); diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 9806783..0ed9152 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -458,7 +458,7 @@ static BOOL TAB_InternalGetItemRect( /* Now, calculate the position of the item as if it were selected. */ if (selectedRect!=NULL) { - CopyRect(selectedRect, itemRect); + *selectedRect = *itemRect; /* The rectangle of a selected item is a bit wider. */ if(infoPtr->dwStyle & TCS_VERTICAL) @@ -1729,7 +1729,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect dis.itemState |= ODS_FOCUS; dis.hwndItem = infoPtr->hwnd; dis.hDC = hdc; - CopyRect(&dis.rcItem,drawRect); + dis.rcItem = *drawRect; /* when extra data fits ULONG_PTR, store it directly */ if (infoPtr->cbInfo > sizeof(LPARAM))

1 0

Nikolay Sivov : rpcrt4: Added NdrAsyncServerCall stub.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 858064abf694877de6b6558e5074bcee508cdbe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858064abf694877de6b6558e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 18:17:16 2016 +0300 rpcrt4: Added NdrAsyncServerCall stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 5 +++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index f5a6bab..92a3665 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1850,3 +1850,8 @@ RPCRTAPI LONG RPC_ENTRY NdrAsyncStubCall(struct IRpcStubBuffer* pThis, FIXME("unimplemented, expect crash!\n"); return 0; } + +void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) +{ + FIXME("unimplemented, %p\n", pRpcMsg); +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index f85d263..0fe9d65 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -117,7 +117,7 @@ @ stub NDRcopy @ stdcall NdrAllocate(ptr long) @ varargs NdrAsyncClientCall(ptr ptr) -@ stub NdrAsyncServerCall +@ stdcall NdrAsyncServerCall(ptr) @ stdcall NdrAsyncStubCall(ptr ptr ptr ptr) @ stdcall NdrByteCountPointerBufferSize(ptr ptr ptr) @ stdcall NdrByteCountPointerFree(ptr ptr ptr)

1 0

Henri Verbeet : wined3d: Pass a wined3d_const_bo_address structure to wined3d_texture_ops.texture_upload_data ().
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: 90cff7284a04b0f5d6505dc3d906a152532ba26e URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cff7284a04b0f5d6505dc3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 29 12:34:31 2016 +0200 wined3d: Pass a wined3d_const_bo_address structure to wined3d_texture_ops.texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 31 ++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 9feb108..0c1fa05 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1449,7 +1449,10 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_upload_data(texture, i, context, &data[i]); + const struct wined3d_const_bo_address addr = {0, data[i].data}; + + texture->texture_ops->texture_upload_data(texture, i, context, + &addr, data[i].row_pitch, data[i].slice_pitch); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); } @@ -1460,10 +1463,10 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, } static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { static const POINT dst_point = {0, 0}; - struct wined3d_const_bo_address addr; unsigned int texture_level; RECT src_rect; @@ -1471,11 +1474,8 @@ static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(texture, texture_level), wined3d_texture_get_level_height(texture, texture_level)); - addr.buffer_object = 0; - addr.addr = data->data; - wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, - texture->resource.format, &src_rect, data->row_pitch, &dst_point, FALSE, &addr); + texture->resource.format, &src_rect, row_pitch, &dst_point, FALSE, data); } static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2101,19 +2101,16 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch) { - struct wined3d_const_bo_address addr; - unsigned int row_pitch, slice_pitch; - - wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); - if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) - FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch); + unsigned int dst_row_pitch, dst_slice_pitch; - addr.buffer_object = 0; - addr.addr = data->data; + wined3d_texture_get_pitch(texture, sub_resource_idx, &dst_row_pitch, &dst_slice_pitch); + if (row_pitch != dst_row_pitch || slice_pitch != dst_slice_pitch) + FIXME("Ignoring row/slice pitch (%u/%u).\n", row_pitch, slice_pitch); - wined3d_volume_upload_data(texture, sub_resource_idx, context, &addr); + wined3d_volume_upload_data(texture, sub_resource_idx, context, data); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5793d3..e3b0a56 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2614,7 +2614,8 @@ struct gl_texture struct wined3d_texture_ops { void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); + const struct wined3d_context *context, const struct wined3d_const_bo_address *data, + unsigned int row_pitch, unsigned int slice_pitch); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location); void (*texture_prepare_texture)(struct wined3d_texture *texture,

1 0

Jacek Caban : jscript: Set output to undefined in jsval_copy on failure.
by Alexandre Julliard July 29, 2016

July 29, 2016

Module: wine Branch: master Commit: e641469f9ffb48a33712147a884f3f1f071dbd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e641469f9ffb48a33712147a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 18:45:13 2016 +0200 jscript: Set output to undefined in jsval_copy on failure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 4 +--- dlls/jscript/jsutils.c | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 538219e..cbfcc85 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -491,10 +491,8 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi TRACE("%s = %s\n", debugstr_w(prop->name), debugstr_jsval(val)); hres = jsval_copy(val, &prop->u.val); - if(FAILED(hres)) { - prop->u.val = jsval_undefined(); + if(FAILED(hres)) return hres; - } if(This->builtin_info->on_put) This->builtin_info->on_put(This, prop->name); diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index dd79510..e7100ba 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -212,13 +212,17 @@ static HRESULT jsval_variant(jsval_t *val, VARIANT *var) __JSVAL_TYPE(*val) = JSV_VARIANT; __JSVAL_VAR(*val) = v = heap_alloc(sizeof(VARIANT)); - if(!v) + if(!v) { + *val = jsval_undefined(); return E_OUTOFMEMORY; + } V_VT(v) = VT_EMPTY; hres = VariantCopy(v, var); - if(FAILED(hres)) + if(FAILED(hres)) { + *val = jsval_undefined(); heap_free(v); + } return hres; }

1 0