wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Joachim Priesner : comctl32: Treeview: Fix crash when deleting the first visible item while bRedraw == false.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: 4c799937f6a964612fce90d9492c5c2d5d2516e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c799937f6a964612fce90d94… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Sun Jan 31 18:52:07 2016 +0100 comctl32: Treeview: Fix crash when deleting the first visible item while bRedraw == false. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 33 +++++++++++++++++++++++++++++++++ dlls/comctl32/treeview.c | 4 +++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 92504c1..bd030d6 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1878,8 +1878,13 @@ static void test_delete_items(void) { const struct message *msg; HWND hTree; + HTREEITEM hItem1, hItem2; + TVINSERTSTRUCTA ins; INT ret; + static CHAR item1[] = "Item 1"; + static CHAR item2[] = "Item 2"; + hTree = create_treeview_control(0); fill_tree(hTree); @@ -1901,6 +1906,34 @@ static void test_delete_items(void) ok(ret == 0, "got %d\n", ret); DestroyWindow(hTree); + + /* Regression test for a crash when deleting the first visible item while bRedraw == false. */ + hTree = create_treeview_control(0); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = item1; + hItem1 = TreeView_InsertItemA(hTree, &ins); + ok(hItem1 != NULL, "InsertItem failed\n"); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = hItem1; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = item2; + hItem2 = TreeView_InsertItemA(hTree, &ins); + ok(hItem2 != NULL, "InsertItem failed\n"); + + ret = SendMessageA(hTree, WM_SETREDRAW, FALSE, 0); + ok(ret == 0, "got %d\n", ret); + + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hItem1); + ok(ret == TRUE, "got %d\n", ret); + + ret = SendMessageA(hTree, WM_SETREDRAW, TRUE, 0); + ok(ret == 0, "got %d\n", ret); + + DestroyWindow(hTree); } static void test_cchildren(void) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index e0e9945..5938b29 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1580,11 +1580,13 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM item) TREEVIEW_VerifyTree(infoPtr); + if (visible) + TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); + if (!infoPtr->bRedraw) return TRUE; if (visible) { - TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); TREEVIEW_RecalculateVisibleOrder(infoPtr, prev); TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_Invalidate(infoPtr, NULL);

1 0

Anton Baskanov : strmbase: Decommit allocator when streaming stops.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: 3e02882508ae37532752820d1d9ef8965e5fe237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e02882508ae37532752820d1… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Jan 30 22:01:22 2016 +0600 strmbase: Decommit allocator when streaming stops. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 59c89be..4ad9730 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -365,6 +365,8 @@ HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface) This->filter.state = State_Stopped; if (This->pFuncsTable->pfnStopStreaming) hr = This->pFuncsTable->pfnStopStreaming(This); + if (SUCCEEDED(hr)) + hr = BaseOutputPinImpl_Inactive(impl_BaseOutputPin_from_IPin(This->ppPins[1])); } LeaveCriticalSection(&This->csReceive);

1 0

Jacek Caban : mshtml: Wine Gecko 2.44 release.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: db105f08d247997f0d14b905f31b5b4fa2e083c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db105f08d247997f0d14b905f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 30 16:50:52 2016 +0100 mshtml: Wine Gecko 2.44 release. Includes fixes by Sebastian Lackner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/mutation.c | 10 +- dlls/mshtml/nsembed.c | 16 +- dlls/mshtml/nsiface.idl | 245 +++++++++--------- dlls/mshtml/nsio.c | 604 +++++++++++++++---------------------------- 6 files changed, 350 insertions(+), 536 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db105f08d247997f0d14b…

1 0

Alex Henrie : user32: Avoid double initialization in IsDialogMessageW.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: d9c8effbf3555f37bfbb3866b7be4a2593feeeb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c8effbf3555f37bfbb3866b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 29 23:58:15 2016 -0700 user32: Avoid double initialization in IsDialogMessageW. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 8df38c9..8340850 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1174,7 +1174,7 @@ static HWND DIALOG_IdToHwnd( HWND hwndDlg, INT id ) */ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) { - INT dlgCode = 0; + INT dlgCode; if (CallMsgFilterW( msg, MSGF_DIALOGBOX )) return TRUE;

1 0

Joachim Priesner : comctl32: Fix comments explaining visibleOrder and firstVisible.
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: f0b6584da6e077ccc09a0c6ff6db768221ad0379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b6584da6e077ccc09a0c6ff… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Fri Jan 29 22:04:10 2016 +0100 comctl32: Fix comments explaining visibleOrder and firstVisible. Hopefully this clears up the confusion between a) visible as in "all ancestors are expanded" and b) visible as in "within the part of the tree that is displayed on the screen". Also, the claim that firstVisible has visible order 0 was false. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Nikolay Sivov<nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 695745c..e0e9945 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -96,7 +96,7 @@ typedef struct tagTREEVIEW_INFO HTREEITEM focusedItem; /* item that was under the cursor when WM_LBUTTONDOWN was received */ HTREEITEM editItem; /* item being edited with builtin edit box */ - HTREEITEM firstVisible; /* handle to first visible item */ + HTREEITEM firstVisible; /* handle to item whose top edge is at y = 0 */ LONG maxVisibleOrder; HTREEITEM dropItem; /* handle to item selected by drag cursor */ HTREEITEM insertMarkItem; /* item after which insertion mark is placed */ @@ -162,7 +162,10 @@ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ LONG imageOffset; LONG textOffset; LONG textWidth; /* horizontal text extent for pszText */ - LONG visibleOrder; /* visible ordering, 0 is first visible item */ + LONG visibleOrder; /* Depth-first numbering of the items whose ancestors are all expanded, + corresponding to a top-to-bottom ordering in the tree view. + Each item takes up "item.iIntegral" spots in the visible order. + 0 is the root's first child. */ const TREEVIEW_INFO *infoPtr; /* tree data this item belongs to */ } TREEVIEW_ITEM;

1 0

Henri Verbeet : ddraw: Use wined3d_texture_preload() in d3d_device7_PreLoad().
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: 59116f833ea29839b186617b625bb3aa01927944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59116f833ea29839b186617b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:57 2016 +0100 ddraw: Use wined3d_texture_preload() in d3d_device7_PreLoad(). This is safe because D3D is always initialized in D3D device methods. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 2 +- dlls/wined3d/surface.c | 13 ------------- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 6c1bd49..c460658 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5631,7 +5631,7 @@ static HRESULT d3d_device7_PreLoad(IDirect3DDevice7 *iface, IDirectDrawSurface7 return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_surface_preload(surface->wined3d_surface); + wined3d_texture_preload(surface->wined3d_texture); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 863eca2..245cf27 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1867,19 +1867,6 @@ static inline unsigned short float_32_to_16(const float *in) return ret; } -void CDECL wined3d_surface_preload(struct wined3d_surface *surface) -{ - TRACE("surface %p.\n", surface); - - if (!surface->resource.device->d3d_initialized) - { - ERR("D3D not initialized.\n"); - return; - } - - wined3d_texture_preload(surface->container); -} - void * CDECL wined3d_surface_get_parent(const struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 49041bb..65220c6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -228,7 +228,6 @@ @ cdecl wined3d_surface_get_resource(ptr) @ cdecl wined3d_surface_getdc(ptr ptr) @ cdecl wined3d_surface_map(ptr ptr ptr long) -@ cdecl wined3d_surface_preload(ptr) @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 893fd67..24e4063 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2479,7 +2479,6 @@ struct wined3d_resource * __cdecl wined3d_surface_get_resource(struct wined3d_su HRESULT __cdecl wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc); HRESULT __cdecl wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags); -void __cdecl wined3d_surface_preload(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_unmap(struct wined3d_surface *surface);

1 0

Henri Verbeet : ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip().
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: 8ae4580137c2fbd4815e7e7eababf3bc7a0dba65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae4580137c2fbd4815e7e7ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:56 2016 +0100 ddraw: Print an ERR for non-zero sub-resource indices in ddraw_surface7_Flip(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3e57ad6..c9ac73c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1239,6 +1239,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 tmp_rtv = ddraw_surface_get_rendertarget_view(dst_impl); tmp = dst_impl->wined3d_surface; + if (dst_impl->sub_resource_idx) + ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0); ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); @@ -1271,6 +1273,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 dst_impl->wined3d_surface = src_impl->wined3d_surface; prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + if (src_impl->sub_resource_idx) + ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; ddraw_texture = prev_ddraw_texture; } @@ -1302,6 +1306,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); ddraw_texture = prev_ddraw_texture; + if (src_impl->sub_resource_idx) + ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; dst_impl = src_impl; }

1 0

Henri Verbeet : ddraw: Use wined3d_texture_blt() in copy_mipmap_chain().
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: f7e9604c3eb9082d3a1b0172ec7e3b21234fe7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e9604c3eb9082d3a1b0172e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:55 2016 +0100 ddraw: Use wined3d_texture_blt() in copy_mipmap_chain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 33 ++++++++++++++++++--------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 3 +++ include/wine/wined3d.h | 3 --- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index e2ed277..6c1bd49 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5950,10 +5950,10 @@ static BOOL is_mip_level_subset(struct ddraw_surface *dest, struct ddraw_surface return !dest_level && levelFound; } -static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *dest, +static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *dst, struct ddraw_surface *src, const POINT *DestPoint, const RECT *SrcRect) { - struct ddraw_surface *src_level, *dest_level; + struct ddraw_surface *dst_level, *src_level; IDirectDrawSurface7 *temp; DDSURFACEDESC2 ddsd; POINT point; @@ -5965,7 +5965,7 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d /* Copy palette, if possible. */ IDirectDrawSurface7_GetPalette(&src->IDirectDrawSurface7_iface, &pal_src); - IDirectDrawSurface7_GetPalette(&dest->IDirectDrawSurface7_iface, &pal); + IDirectDrawSurface7_GetPalette(&dst->IDirectDrawSurface7_iface, &pal); if (pal_src != NULL && pal != NULL) { @@ -5985,36 +5985,37 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d if (SUCCEEDED(hr)) { - IDirectDrawSurface7_SetColorKey(&dest->IDirectDrawSurface7_iface, ckeyflag, &ddckey); + IDirectDrawSurface7_SetColorKey(&dst->IDirectDrawSurface7_iface, ckeyflag, &ddckey); } } src_level = src; - dest_level = dest; + dst_level = dst; point = *DestPoint; src_rect = *SrcRect; - for (;src_level && dest_level;) + for (;src_level && dst_level;) { - if (src_level->surface_desc.dwWidth == dest_level->surface_desc.dwWidth && - src_level->surface_desc.dwHeight == dest_level->surface_desc.dwHeight) + if (src_level->surface_desc.dwWidth == dst_level->surface_desc.dwWidth + && src_level->surface_desc.dwHeight == dst_level->surface_desc.dwHeight) { UINT src_w = src_rect.right - src_rect.left; UINT src_h = src_rect.bottom - src_rect.top; RECT dst_rect = {point.x, point.y, point.x + src_w, point.y + src_h}; - if (FAILED(hr = wined3d_surface_blt(dest_level->wined3d_surface, &dst_rect, - src_level->wined3d_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + if (FAILED(hr = wined3d_texture_blt(dst_level->wined3d_texture, dst_level->sub_resource_idx, &dst_rect, + src_level->wined3d_texture, src_level->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) ERR("Blit failed, hr %#x.\n", hr); ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; ddsd.ddsCaps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; - IDirectDrawSurface7_GetAttachedSurface(&dest_level->IDirectDrawSurface7_iface, &ddsd.ddsCaps, &temp); + IDirectDrawSurface7_GetAttachedSurface(&dst_level->IDirectDrawSurface7_iface, &ddsd.ddsCaps, &temp); - if (dest_level != dest) IDirectDrawSurface7_Release(&dest_level->IDirectDrawSurface7_iface); + if (dst_level != dst) + IDirectDrawSurface7_Release(&dst_level->IDirectDrawSurface7_iface); - dest_level = unsafe_impl_from_IDirectDrawSurface7(temp); + dst_level = unsafe_impl_from_IDirectDrawSurface7(temp); } ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; @@ -6034,8 +6035,10 @@ static void copy_mipmap_chain(struct d3d_device *device, struct ddraw_surface *d src_rect.bottom = (src_rect.bottom + 1) / 2; } - if (src_level && src_level != src) IDirectDrawSurface7_Release(&src_level->IDirectDrawSurface7_iface); - if (dest_level && dest_level != dest) IDirectDrawSurface7_Release(&dest_level->IDirectDrawSurface7_iface); + if (src_level && src_level != src) + IDirectDrawSurface7_Release(&src_level->IDirectDrawSurface7_iface); + if (dst_level && dst_level != dst) + IDirectDrawSurface7_Release(&dst_level->IDirectDrawSurface7_iface); } /***************************************************************************** diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 86e5290..863eca2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5013,7 +5013,7 @@ const struct blit_shader cpu_blit = { cpu_blit_blit_surface, }; -HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, +HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8a172f..49041bb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -222,7 +222,6 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) -@ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4bd019f..6e06a5e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2485,6 +2485,9 @@ static inline GLuint surface_get_texture_name(const struct wined3d_surface *surf ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; } +HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, + struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, + const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c502cc4..893fd67 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2472,9 +2472,6 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); -HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, - const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);

1 0

Henri Verbeet : ddraw: Use wined3d_texture_blt() in ddraw_surface_update_frontbuffer().
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: 257ee8cc6e63acc54576f60ad09de5b4051f8045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=257ee8cc6e63acc54576f60ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:54 2016 +0100 ddraw: Use wined3d_texture_blt() in ddraw_surface_update_frontbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/surface.c | 5 ----- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d7bf099..89ce07a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4822,7 +4822,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } - ddraw->wined3d_frontbuffer = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(*texture, 0)); + ddraw->wined3d_frontbuffer = *texture; return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 4fb1820..704d6db 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -92,7 +92,7 @@ struct ddraw struct ddraw_surface *primary; RECT primary_lock; - struct wined3d_surface *wined3d_frontbuffer; + struct wined3d_texture *wined3d_frontbuffer; struct wined3d_swapchain *wined3d_swapchain; HWND swapchain_window; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ac1c140..3e57ad6 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -69,8 +69,8 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE if (read) return DD_OK; - return wined3d_surface_blt(surface->ddraw->wined3d_frontbuffer, rect, - surface->wined3d_surface, rect, 0, NULL, WINED3D_TEXF_POINT); + return wined3d_texture_blt(surface->ddraw->wined3d_frontbuffer, 0, rect, + surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT); } if (FAILED(hr = wined3d_surface_getdc(surface->wined3d_surface, &surface_dc))) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b1cf28..86e5290 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2431,11 +2431,6 @@ do { \ return WINED3D_OK; } -struct wined3d_surface * CDECL wined3d_surface_from_resource(struct wined3d_resource *resource) -{ - return surface_from_resource(resource); -} - HRESULT CDECL wined3d_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index cd8174c..c8a172f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,7 +223,6 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) -@ cdecl wined3d_surface_from_resource(ptr) @ cdecl wined3d_surface_get_overlay_position(ptr ptr ptr) @ cdecl wined3d_surface_get_parent(ptr) @ cdecl wined3d_surface_get_pitch(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bd0a9c7..c502cc4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2475,7 +2475,6 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); -struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); HRESULT __cdecl wined3d_surface_get_overlay_position(const struct wined3d_surface *surface, LONG *x, LONG *y); void * __cdecl wined3d_surface_get_parent(const struct wined3d_surface *surface); DWORD __cdecl wined3d_surface_get_pitch(const struct wined3d_surface *surface);

1 0

Henri Verbeet : ddraw: Use wined3d_texture_blt() in ddraw_surface_blt_clipped().
by Alexandre Julliard 01 Feb '16

01 Feb '16

Module: wine Branch: master Commit: 1a812eb666fc3080cae1fed329cbf931cb777040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a812eb666fc3080cae1fed32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 29 18:48:53 2016 +0100 ddraw: Use wined3d_texture_blt() in ddraw_surface_blt_clipped(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1296e59..ac1c140 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1389,7 +1389,8 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons struct ddraw_surface *src_surface, const RECT *src_rect_in, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_surface *wined3d_src_surface = src_surface ? src_surface->wined3d_surface : NULL; + struct wined3d_texture *wined3d_src_texture; + unsigned int src_sub_resource_idx; RECT src_rect, dst_rect; float scale_x, scale_y; const RECT *clip_rect; @@ -1429,10 +1430,15 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (IsRectEmpty(&src_rect)) return DDERR_INVALIDRECT; + + wined3d_src_texture = src_surface->wined3d_texture; + src_sub_resource_idx = src_surface->sub_resource_idx; } else { SetRect(&src_rect, 0, 0, 0, 0); + wined3d_src_texture = NULL; + src_sub_resource_idx = 0; } if (!dst_surface->clipper) @@ -1440,8 +1446,8 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(dst_surface->wined3d_surface, &dst_rect, - wined3d_src_surface, &src_rect, flags, fx, filter); + hr = wined3d_texture_blt(dst_surface->wined3d_texture, dst_surface->sub_resource_idx, &dst_rect, + wined3d_src_texture, src_sub_resource_idx, &src_rect, flags, fx, filter); if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE); @@ -1491,8 +1497,8 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons } } - if (FAILED(hr = wined3d_surface_blt(dst_surface->wined3d_surface, &clip_rect[i], - wined3d_src_surface, &src_rect_clipped, flags, fx, filter))) + if (FAILED(hr = wined3d_texture_blt(dst_surface->wined3d_texture, dst_surface->sub_resource_idx, + &clip_rect[i], wined3d_src_texture, src_sub_resource_idx, &src_rect_clipped, flags, fx, filter))) break; if (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)

1 0

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 February 2016