wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Dmitry Timoshkov : gdiplus: Slightly simplify GdipDrawClosedCurve2 implementation.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 4233b82872ac56112567b3dbaa6d1e309c487409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4233b82872ac56112567b3dba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:35 2013 +0800 gdiplus: Slightly simplify GdipDrawClosedCurve2 implementation. --- dlls/gdiplus/graphics.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 275c93b..c48ed2d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2726,7 +2726,7 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { GpPath *path; - GpStatus stat; + GpStatus status; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -2736,20 +2736,16 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - if((stat = GdipCreatePath(FillModeAlternate, &path)) != Ok) - return stat; + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - stat = GdipAddPathClosedCurve2(path, points, count, tension); - if(stat != Ok){ - GdipDeletePath(path); - return stat; - } - - stat = GdipDrawPath(graphics, pen, path); + status = GdipAddPathClosedCurve2(path, points, count, tension); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); GdipDeletePath(path); - return stat; + return status; } GpStatus WINGDIPAPI GdipDrawClosedCurve2I(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawBezierI to GdipDrawBezier.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: cc54d1eb68f6eeba921b3ce1bd4cc90754c7ad50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc54d1eb68f6eeba921b3ce1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:44:11 2013 +0800 gdiplus: Forward GdipDrawBezierI to GdipDrawBezier. --- dlls/gdiplus/graphics.c | 33 +-------------------------------- 1 files changed, 1 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7d54871..275c93b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2642,41 +2642,10 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { - INT save_state; - GpPointF pt[4]; - GpStatus retval; - TRACE("(%p, %p, %d, %d, %d, %d, %d, %d, %d, %d)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); - if(!graphics || !pen) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - pt[0].X = x1; - pt[0].Y = y1; - pt[1].X = x2; - pt[1].Y = y2; - pt[2].X = x3; - pt[2].Y = y3; - pt[3].X = x4; - pt[3].Y = y4; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, 4, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawBezier(graphics, pen, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2, (REAL)x3, (REAL)y3, (REAL)x4, (REAL)y4); } GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen,

1 0

Ken Thomases : winemac: Don't bring a window onto the screen in SetFocus().
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 6cfa0a31d8f6436049e0af22918a8e4984bbc954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfa0a31d8f6436049e0af229… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:24 2013 -0600 winemac: Don't bring a window onto the screen in SetFocus(). --- dlls/winemac.drv/window.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3429e7d..3f344df 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -852,11 +852,10 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return; if (!(data = get_win_data(hwnd))) return; - if (data->cocoa_window) + if (data->cocoa_window && data->on_screen) { /* Set Mac focus */ macdrv_give_cocoa_window_focus(data->cocoa_window); - data->on_screen = TRUE; } release_win_data(data);

1 0

Ken Thomases : winemac: Call sync_window_position() before show_window() since window frame affects whether it shows.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 1561fa41267c9605d304f0b9aaf836769cc63203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1561fa41267c9605d304f0b9a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:22 2013 -0600 winemac: Call sync_window_position() before show_window() since window frame affects whether it shows. --- dlls/winemac.drv/window.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e7ec6c5..3429e7d 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1369,17 +1369,6 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, hide_window(data); } - if (new_style & WS_VISIBLE) - { - if (!data->on_screen || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) - set_cocoa_window_properties(data); - - /* layered windows are not shown until their attributes are set */ - if (!data->on_screen && - (data->layered || !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) - show_window(data); - } - /* check if we are currently processing an event relevant to this window */ if (!thread_data || !thread_data->current_event || thread_data->current_event->window != data->cocoa_window || @@ -1391,6 +1380,17 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, set_cocoa_window_properties(data); } + if (new_style & WS_VISIBLE) + { + if (!data->on_screen || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) + set_cocoa_window_properties(data); + + /* layered windows are not shown until their attributes are set */ + if (!data->on_screen && + (data->layered || !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) + show_window(data); + } + done: release_win_data(data); }

1 0

Ken Thomases : winemac: Always use proper z-order when putting a window on screen.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: abb0161c4c06be5e8606811cf51d89ac8950cf00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb0161c4c06be5e8606811cf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:19 2013 -0600 winemac: Always use proper z-order when putting a window on screen. --- dlls/winemac.drv/window.c | 103 ++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 53 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c7513f0..e7ec6c5 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -151,35 +151,6 @@ static void get_mac_rect_offset(struct macdrv_win_data *data, DWORD style, RECT /*********************************************************************** - * show_window - */ -static void show_window(struct macdrv_win_data *data) -{ - TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, NULL, NULL); - if (data->on_screen) - { - HWND hwndFocus = GetFocus(); - if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) - macdrv_SetFocus(hwndFocus); - } -} - - -/*********************************************************************** - * hide_window - */ -static void hide_window(struct macdrv_win_data *data) -{ - TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); - - macdrv_hide_cocoa_window(data->cocoa_window); - data->on_screen = FALSE; -} - - -/*********************************************************************** * macdrv_window_to_mac_rect * * Convert a rect from client to Mac window coordinates @@ -605,6 +576,55 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win /*********************************************************************** + * show_window + */ +static void show_window(struct macdrv_win_data *data) +{ + HWND prev = NULL; + HWND next = NULL; + macdrv_window prev_window = NULL; + macdrv_window next_window = NULL; + + /* find window that this one must be after */ + prev = GetWindow(data->hwnd, GW_HWNDPREV); + while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && + (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) + prev = GetWindow(prev, GW_HWNDPREV); + if (!prev_window) + { + /* find window that this one must be before */ + next = GetWindow(data->hwnd, GW_HWNDNEXT); + while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && + (next_window = macdrv_get_cocoa_window(next, TRUE)))) + next = GetWindow(next, GW_HWNDNEXT); + } + + TRACE("win %p/%p below %p/%p above %p/%p\n", + data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); + + data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window); + if (data->on_screen) + { + HWND hwndFocus = GetFocus(); + if (hwndFocus && (data->hwnd == hwndFocus || IsChild(data->hwnd, hwndFocus))) + macdrv_SetFocus(hwndFocus); + } +} + + +/*********************************************************************** + * hide_window + */ +static void hide_window(struct macdrv_win_data *data) +{ + TRACE("win %p/%p\n", data->hwnd, data->cocoa_window); + + macdrv_hide_cocoa_window(data->cocoa_window); + data->on_screen = FALSE; +} + + +/*********************************************************************** * get_region_data * * Calls GetRegionData on the given region and converts the rectangle @@ -692,30 +712,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags) wine_dbgstr_rect(&data->whole_rect)); if (data->on_screen && (!(swp_flags & SWP_NOZORDER) || (swp_flags & SWP_SHOWWINDOW))) - { - HWND next = NULL; - macdrv_window prev_window = NULL; - macdrv_window next_window = NULL; - - /* find window that this one must be after */ - HWND prev = GetWindow(data->hwnd, GW_HWNDPREV); - while (prev && !((GetWindowLongW(prev, GWL_STYLE) & WS_VISIBLE) && - (prev_window = macdrv_get_cocoa_window(prev, TRUE)))) - prev = GetWindow(prev, GW_HWNDPREV); - if (!prev_window) - { - /* find window that this one must be before */ - next = GetWindow(data->hwnd, GW_HWNDNEXT); - while (next && !((GetWindowLongW(next, GWL_STYLE) & WS_VISIBLE) && - (next_window = macdrv_get_cocoa_window(next, TRUE)))) - next = GetWindow(next, GW_HWNDNEXT); - } - - data->on_screen = macdrv_order_cocoa_window(data->cocoa_window, prev_window, next_window); - - TRACE("win %p/%p below %p/%p above %p/%p\n", - data->hwnd, data->cocoa_window, prev, prev_window, next, next_window); - } + show_window(data); }

1 0

Matteo Bruni : wined3d: Add RESZ support.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 5e28b0c9747369b752102e56b94e58a012b8cf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e28b0c9747369b752102e56b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:23 2013 +0100 wined3d: Add RESZ support. --- dlls/wined3d/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/utils.c | 11 +++++++++++ include/wine/wined3d.h | 3 +++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bbd27df..c7874ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2212,6 +2212,22 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->stateBlock->state.viewport; } +static void resolve_depth_buffer(struct wined3d_state *state) +{ + struct wined3d_texture *texture = state->textures[0]; + struct wined3d_surface *depth_stencil, *surface; + + if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE + || !(texture->resource.format->flags & WINED3DFMT_FLAG_DEPTH)) + return; + surface = surface_from_resource(texture->sub_resources[0]); + depth_stencil = state->fb->depth_stencil; + if (!depth_stencil) + return; + + wined3d_surface_blt(surface, NULL, depth_stencil, NULL, 0, NULL, WINED3D_TEXF_POINT); +} + void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { @@ -2234,6 +2250,12 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, TRACE("Application is setting the old value over, nothing to do.\n"); else device_invalidate_state(device, STATE_RENDER(state)); + + if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) + { + TRACE("RESZ multisampled depth buffer resolve triggered.\n"); + resolve_depth_buffer(&device->stateBlock->state); + } } DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4b29ec8..7c508ee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -126,6 +126,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, + {WINED3DFMT_RESZ, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_NVHU, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NVHS, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NULL, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, @@ -1712,6 +1713,15 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE; } + /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ + * support by checking for availability of MAKEFOURCC('R','E','S','Z') surfaces with + * RENDERTARGET usage. */ + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + { + idx = getFmtIdx(WINED3DFMT_RESZ); + gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET; + } + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { struct wined3d_format *format = &gl_info->formats[idx]; @@ -1975,6 +1985,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); FMT_TO_STR(WINED3DFMT_INTZ); + FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 723d938..378a46b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -245,6 +245,7 @@ enum wined3d_format_id WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), + WINED3DFMT_RESZ = WINEMAKEFOURCC('R','E','S','Z'), WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'), WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'), WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'), @@ -1216,6 +1217,8 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 +#define WINED3D_RESZ_CODE 0x7fa05000 + /* dwDDFX */ /* arithmetic stretching along y axis */ #define WINEDDBLTFX_ARITHSTRETCHY 0x00000001

1 0

Matteo Bruni : wined3d: Make (wined3d_) surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 25d0d0876d290e1e803ce16ed9d96189ba5948e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d0d0876d290e1e803ce16ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:22 2013 +0100 wined3d: Make (wined3d_)surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE. --- dlls/d3d9/tests/visual.c | 11 +++-------- dlls/wined3d/surface.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d429c4..81926ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13411,14 +13411,9 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { D3DCOLOR color = getPixelColorFromSurface(readback, expected_colors[i].x, expected_colors[i].y); - if (i % 4 < 2) - todo_wine ok(color_match(color, expected_colors[i].color, 1), - "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", - expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); - else - ok(color_match(color, expected_colors[i].color, 1), - "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", - expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57527e4..51a7578 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1040,17 +1040,20 @@ static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RE return TRUE; } -static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, - const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect) +static void surface_depth_blt_fbo(const struct wined3d_device *device, + struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; DWORD src_mask, dst_mask; GLbitfield gl_mask; - TRACE("device %p, src_surface %p, src_rect %s, dst_surface %p, dst_rect %s.\n", - device, src_surface, wine_dbgstr_rect(src_rect), - dst_surface, wine_dbgstr_rect(dst_rect)); + TRACE("device %p\n", device); + TRACE("src_surface %p, src_location %s, src_rect %s,\n", + src_surface, debug_surflocation(src_location), wine_dbgstr_rect(src_rect)); + TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", + dst_surface, debug_surflocation(dst_location), wine_dbgstr_rect(dst_rect)); src_mask = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -1078,9 +1081,9 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ - surface_load_location(src_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(src_surface, src_location, NULL); if (!surface_is_full_rect(dst_surface, dst_rect)) - surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(dst_surface, dst_location, NULL); context = context_acquire(device, NULL); if (!context->valid) @@ -1092,12 +1095,12 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location); gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -1404,8 +1407,8 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const return blitter->depth_fill(device, surface, rect, depth); } -static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect) +static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { struct wined3d_device *device = src_surface->resource.device; @@ -1414,9 +1417,9 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) return WINED3DERR_INVALIDCALL; - wined3d_surface_depth_blt_fbo(device, src_surface, src_rect, dst_surface, dst_rect); + surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); - surface_modify_ds_location(dst_surface, SFLAG_INTEXTURE, + surface_modify_ds_location(dst_surface, dst_location, dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); return WINED3D_OK; @@ -1612,7 +1615,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3DERR_INVALIDCALL; } - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect))) return WINED3D_OK; } } @@ -6168,16 +6172,22 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == SFLAG_INTEXTURE) + if (location == SFLAG_INTEXTURE && surface->flags & SFLAG_INDRAWABLE) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location); context_release(context); return WINED3D_OK; } + else if (location & surface->flags && surface->draw_binding != SFLAG_INDRAWABLE) + { + /* Already up to date, nothing to do. */ + return WINED3D_OK; + } else { - FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(location)); + FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", + debug_surflocation(surface->flags & SFLAG_LOCATIONS), debug_surflocation(location)); return WINED3DERR_INVALIDCALL; } }

1 0

Austin English : riched20: Make sure to load dll below 2GB address space.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: d50baaa1df6dd56b4e84b828785b54cae558d3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50baaa1df6dd56b4e84b8287… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 18 13:48:14 2013 -0600 riched20: Make sure to load dll below 2GB address space. --- dlls/riched20/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 9975537..49ba7a1 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,6 +1,7 @@ MODULE = riched20.dll IMPORTLIB = riched20 IMPORTS = uuid ole32 oleaut32 imm32 user32 gdi32 +EXTRADLLFLAGS = -Wl,--image-base,0x7ac00000 C_SRCS = \ caret.c \

1 0

Michael Stefaniuc : Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.".
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 621d9e444a14885830a1a87178f3d3cce47ab562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621d9e444a14885830a1a8717… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 18 22:55:08 2013 +0100 Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.". This reverts commit 7959778d3f84680fcee2e0d43cfcd0e613d68242. This is not always the case on Windows. --- dlls/dsound/tests/dsound.c | 3 --- dlls/dsound/tests/dsound8.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0f199a4..ed17f2a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -642,9 +642,6 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0,FALSE,0); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index a0b78e5..664ba0c 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -648,9 +648,6 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer8(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0);

1 0

André Hentschel : ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM .
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 242da6708202c1bd4835e49e2dd2315c95ba0e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242da6708202c1bd4835e49e2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 18 23:24:15 2013 +0100 ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM. --- dlls/ntdll/relay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index b3c4aea..81e1593 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -364,7 +364,8 @@ __ASM_GLOBAL_FUNC( call_entry_point, "cmp r3, #0\n\t" "beq 5f\n\t" "sub SP, SP, r3\n\t" - "bic SP, SP, #15\n\t" + "tst r1, #1\n\t" + "subeq SP, SP, #4\n\t" "1:\tsub r3, r3, #4\n\t" "ldr r0, [r2, r3]\n\t" "str r0, [SP, r3]\n\t"

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
46
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 February 2013