October 2011 - Wine-Commits

Henri Verbeet : wined3d: Make the device parameter to context_apply_blit_state() const.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 9b42c657e475c5e370ab75f05902788b2b786110 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b42c657e475c5e370ab75f05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 21:24:39 2011 +0200 wined3d: Make the device parameter to context_apply_blit_state() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 66460d9..888c40c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2100,7 +2100,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device } /* Context activation is done by the caller. */ -void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) +void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { struct wined3d_surface *rt = context->current_rt; DWORD rt_mask, old_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8278983..02c60e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1233,7 +1233,7 @@ void context_alloc_event_query(struct wined3d_context *context, struct wined3d_event_query *query) DECLSPEC_HIDDEN; void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; -void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; +void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : ddraw: Read/draw from/ to the actual screen when there is no swapchain window.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: d09ad48328e9614b1f8a52157b5827eb23e2b0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d09ad48328e9614b1f8a52157… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 21:24:38 2011 +0200 ddraw: Read/draw from/to the actual screen when there is no swapchain window. --- dlls/ddraw/ddraw.c | 5 ++ dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 121 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 107 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d09ad48328e9614b1f8a5…

1 0

Alexandre Julliard : gdi32: Implement GetCharABCWidthsI as a standard driver entry point.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 27208a0ec5800277831e7764a97e42237fa1fffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=27208a0ec5800277831e7764a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 22:00:55 2011 +0200 gdi32: Implement GetCharABCWidthsI as a standard driver entry point. --- dlls/gdi32/font.c | 11 ++++------- dlls/gdi32/freetype.c | 26 ++++++++++++-------------- dlls/gdi32/gdi_private.h | 2 -- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d12e73b..e8d10f1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2434,8 +2434,9 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, LPWORD pgi, LPABC abc) { DC *dc = get_dc_ptr(hdc); + PHYSDEV dev; unsigned int i; - BOOL ret = FALSE; + BOOL ret; if (!dc) return FALSE; @@ -2445,11 +2446,8 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, return FALSE; } - if(dc->gdiFont) - ret = WineEngGetCharABCWidthsI( dc->gdiFont, firstChar, count, pgi, abc ); - else - FIXME(": stub\n"); - + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidthsI ); + ret = dev->funcs->pGetCharABCWidthsI( dev, firstChar, count, pgi, abc ); if (ret) { /* convert device units to logical */ @@ -2458,7 +2456,6 @@ BOOL WINAPI GetCharABCWidthsI( HDC hdc, UINT firstChar, UINT count, abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); } - ret = TRUE; } release_dc_ptr( dc ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 00ea0ec..fa3f72b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6419,25 +6419,30 @@ BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLO } /************************************************************* - * WineEngGetCharABCWidthsI - * + * freetype_GetCharABCWidthsI */ -BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, - LPABC buffer) +static BOOL freetype_GetCharABCWidthsI( PHYSDEV dev, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; FT_UInt glyph_index; GdiFont *linked_font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetCharABCWidthsI ); + return dev->funcs->pGetCharABCWidthsI( dev, firstChar, count, pgi, buffer ); + } - if(!FT_HAS_HORIZONTAL(font->ft_face)) + if(!FT_HAS_HORIZONTAL(physdev->font->ft_face)) return FALSE; GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); - get_glyph_index_linked(font, 'a', &linked_font, &glyph_index); + get_glyph_index_linked(physdev->font, 'a', &linked_font, &glyph_index); if (!pgi) for(c = firstChar; c < firstChar+count; c++) { get_glyph_outline(linked_font, c, GGO_METRICS | GGO_GLYPH_INDEX, @@ -7094,7 +7099,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ freetype_GetCharABCWidths, /* pGetCharABCWidths */ - NULL, /* pGetCharABCWidthsI */ + freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ NULL, /* pGetDeviceGammaRamp */ @@ -7229,13 +7234,6 @@ BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLO return FALSE; } -BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, - LPABC buffer) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 413d61f..fff72b1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,8 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar, UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN; -extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, - UINT count, LPWORD pgi, LPABC buffer) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontUnicodeRanges(GdiFont *, LPGLYPHSET) DECLSPEC_HIDDEN; extern DWORD WineEngGetGlyphIndices(GdiFont *font, LPCWSTR lpstr, INT count,

1 0

Alexandre Julliard : gdi32: Implement GetCharABCWidths as a standard driver entry point.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: e5a0fa7089dfafd2e7a0fc6e5cc6856ecc3e8d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a0fa7089dfafd2e7a0fc6e5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 11:33:04 2011 +0200 gdi32: Implement GetCharABCWidths as a standard driver entry point. --- dlls/gdi32/font.c | 11 ++++------- dlls/gdi32/freetype.c | 28 +++++++++++++--------------- dlls/gdi32/gdi_private.h | 2 -- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e1fc856..d12e73b 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2382,8 +2382,9 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, LPABC abc ) { DC *dc = get_dc_ptr(hdc); + PHYSDEV dev; unsigned int i; - BOOL ret = FALSE; + BOOL ret; if (!dc) return FALSE; @@ -2393,11 +2394,8 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, return FALSE; } - if(dc->gdiFont) - ret = WineEngGetCharABCWidths( dc->gdiFont, firstChar, lastChar, abc ); - else - FIXME(": stub\n"); - + dev = GET_DC_PHYSDEV( dc, pGetCharABCWidths ); + ret = dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, abc ); if (ret) { /* convert device units to logical */ @@ -2406,7 +2404,6 @@ BOOL WINAPI GetCharABCWidthsW( HDC hdc, UINT firstChar, UINT lastChar, abc->abcB = INTERNAL_XDSTOWS(dc, abc->abcB); abc->abcC = INTERNAL_XDSTOWS(dc, abc->abcC); } - ret = TRUE; } release_dc_ptr( dc ); diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6fbfd0d..00ea0ec 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6348,28 +6348,33 @@ static BOOL freetype_GetCharWidth( PHYSDEV dev, UINT firstChar, UINT lastChar, L } /************************************************************* - * WineEngGetCharABCWidths - * + * freetype_GetCharABCWidths */ -BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, - LPABC buffer) +static BOOL freetype_GetCharABCWidths( PHYSDEV dev, UINT firstChar, UINT lastChar, LPABC buffer ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; UINT c; GLYPHMETRICS gm; FT_UInt glyph_index; GdiFont *linked_font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); - TRACE("%p, %d, %d, %p\n", font, firstChar, lastChar, buffer); + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetCharABCWidths ); + return dev->funcs->pGetCharABCWidths( dev, firstChar, lastChar, buffer ); + } + + TRACE("%p, %d, %d, %p\n", physdev->font, firstChar, lastChar, buffer); - if(!FT_IS_SCALABLE(font->ft_face)) + if(!FT_IS_SCALABLE(physdev->font->ft_face)) return FALSE; GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); for(c = firstChar; c <= lastChar; c++) { - get_glyph_index_linked(font, c, &linked_font, &glyph_index); + get_glyph_index_linked(physdev->font, c, &linked_font, &glyph_index); get_glyph_outline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); buffer[c - firstChar].abcA = FONT_GM(linked_font,glyph_index)->lsb; @@ -7088,7 +7093,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pFrameRgn */ NULL, /* pGdiComment */ NULL, /* pGdiRealizationInfo */ - NULL, /* pGetCharABCWidths */ + freetype_GetCharABCWidths, /* pGetCharABCWidths */ NULL, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ NULL, /* pGetDeviceCaps */ @@ -7218,13 +7223,6 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, return 0; } -BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, - LPABC buffer) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLOAT buffer) { ERR("called but we don't have FreeType\n"); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index efd3e56..413d61f 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -292,8 +292,6 @@ typedef struct extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; -extern BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, - UINT lastChar, LPABC buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar, UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar,

1 0

Rico Schüller : d3dx9/tests: Fix typo.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 5b7834851fc885c6011395d441047a8a74e21cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7834851fc885c6011395d44… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 25 10:39:33 2011 +0200 d3dx9/tests: Fix typo. --- dlls/d3dx9_36/tests/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 8d82a68..d11a918 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -260,7 +260,7 @@ static void test_get_shader_constant_table_ex(void) /* No CTAB data */ hr = D3DXGetShaderConstantTableEx(simple_ps, 0, &constant_table); - ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DXERR_INVALIDDATA); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); /* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table);

1 0

Michael Stefaniuc : include: Remove 'l' modifier from numeric constants in digitalv.h.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 4b6ad8c21923164fce70efd3d175808e2fb26113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6ad8c21923164fce70efd3d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 24 23:26:28 2011 +0200 include: Remove 'l' modifier from numeric constants in digitalv.h. --- include/digitalv.h | 506 ++++++++++++++++++++++++++-------------------------- 1 files changed, 253 insertions(+), 253 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b6ad8c21923164fce70e…

1 0

Michael Stefaniuc : include: Remove 'l' modifier from numeric constants in mmsystem.h.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 5439aede62e40511703784eca5d01b16678b680a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5439aede62e40511703784eca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 24 23:22:16 2011 +0200 include: Remove 'l' modifier from numeric constants in mmsystem.h. --- dlls/mmsystem.dll16/message16.c | 2 +- dlls/winmm/mci.c | 5 +- dlls/winmm/tests/capture.c | 4 +- dlls/winmm/tests/wave.c | 2 +- dlls/winmm/waveform.c | 3 +- include/mmsystem.h | 518 +++++++++++++++++++------------------- 6 files changed, 266 insertions(+), 268 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5439aede62e4051170378…

1 0

Juan Lang : wininet: Fix off by one error parsing RFC 850 dates.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: ad3e22d5ee2e4f8855bd722bc6004891bef96950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad3e22d5ee2e4f8855bd722bc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 24 13:21:10 2011 -0700 wininet: Fix off by one error parsing RFC 850 dates. --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d1a870b..db85d0b 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4292,7 +4292,7 @@ static BOOL HTTP_ParseRfc850Date(LPCWSTR value, FILETIME *ft) return FALSE; } } - else if (ptr - value <= sizeof(day) / sizeof(day[0])) + else if (ptr - value < sizeof(day) / sizeof(day[0])) { memcpy(day, value, (ptr - value) * sizeof(WCHAR)); day[ptr - value + 1] = 0;

1 0

Henri Verbeet : wined3d: Make the device parameter to context_apply_clear_state() const.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: bab2a40f87599caef5fa194740c1546cf5ba4c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab2a40f87599caef5fa19474… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 21:24:40 2011 +0200 wined3d: Make the device parameter to context_apply_clear_state() const. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 888c40c..1def817 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2171,7 +2171,7 @@ static BOOL context_validate_rt_config(UINT rt_count, } /* Context activation is done by the caller. */ -BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { DWORD rt_mask = 0, old_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 02c60e1..e911edd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1234,7 +1234,7 @@ void context_alloc_event_query(struct wined3d_context *context, void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; -BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,

1 0

Henri Verbeet : ddraw: Keep track of the affected rectangle for ddraw_surface_update_frontbuffer( ).
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 8330558e125c9073068ffbd7741f1128c17c1e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8330558e125c9073068ffbd77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 21:24:37 2011 +0200 ddraw: Keep track of the affected rectangle for ddraw_surface_update_frontbuffer(). --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 29 +++++++++++++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 2f8b609..5eafe09 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,6 +89,7 @@ struct IDirectDrawImpl BOOL d3d_initialized; IDirectDrawSurfaceImpl *primary; + RECT primary_lock; struct wined3d_surface *wined3d_frontbuffer; struct wined3d_swapchain *wined3d_swapchain; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c01ac45..3de1cb0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -39,10 +39,13 @@ static inline IDirectDrawSurfaceImpl *impl_from_IDirectDrawGammaControl(IDirectD return CONTAINING_RECORD(iface, IDirectDrawSurfaceImpl, IDirectDrawGammaControl_iface); } -static HRESULT ddraw_surface_update_frontbuffer(IDirectDrawSurfaceImpl *surface) +static HRESULT ddraw_surface_update_frontbuffer(IDirectDrawSurfaceImpl *surface, const RECT *rect) { - return wined3d_surface_blt(surface->ddraw->wined3d_frontbuffer, NULL, - surface->wined3d_surface, NULL, 0, NULL, WINED3DTEXF_POINT); + if (rect && (rect->right - rect->left <= 0 || rect->bottom - rect->top <= 0)) + return DD_OK; + + return wined3d_surface_blt(surface->ddraw->wined3d_frontbuffer, rect, + surface->wined3d_surface, rect, 0, NULL, WINED3DTEXF_POINT); } /***************************************************************************** @@ -903,6 +906,13 @@ static HRESULT surface_lock(IDirectDrawSurfaceImpl *This, } } + if (Flags & DDLOCK_READONLY) + memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); + else if (Rect) + This->ddraw->primary_lock = *Rect; + else + SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight); + /* Override the memory area. The pitch should be set already. Strangely windows * does not set the LPSURFACE flag on locked surfaces !?!. * DDSD->dwFlags |= DDSD_LPSURFACE; @@ -1051,7 +1061,7 @@ static HRESULT WINAPI ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pR if (SUCCEEDED(hr)) { if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - hr = ddraw_surface_update_frontbuffer(This); + hr = ddraw_surface_update_frontbuffer(This, &This->ddraw->primary_lock); This->surface_desc.lpSurface = NULL; } LeaveCriticalSection(&ddraw_cs); @@ -1151,7 +1161,7 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra hr = wined3d_surface_flip(This->wined3d_surface, Override->wined3d_surface, Flags); if (SUCCEEDED(hr) && This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) - hr = ddraw_surface_update_frontbuffer(This); + hr = ddraw_surface_update_frontbuffer(This, NULL); LeaveCriticalSection(&ddraw_cs); return hr; @@ -1252,7 +1262,7 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR hr = wined3d_surface_blt(This->wined3d_surface, DestRect, Src ? Src->wined3d_surface : NULL, SrcRect, Flags, (WINEDDBLTFX *)DDBltFx, WINED3DTEXF_LINEAR); if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - hr = ddraw_surface_update_frontbuffer(This); + hr = ddraw_surface_update_frontbuffer(This, DestRect); LeaveCriticalSection(&ddraw_cs); switch(hr) @@ -1800,7 +1810,7 @@ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC h EnterCriticalSection(&ddraw_cs); hr = wined3d_surface_releasedc(This->wined3d_surface, hdc); if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - hr = ddraw_surface_update_frontbuffer(This); + hr = ddraw_surface_update_frontbuffer(This, NULL); LeaveCriticalSection(&ddraw_cs); return hr; } @@ -3647,7 +3657,10 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d hr = wined3d_surface_bltfast(This->wined3d_surface, dstx, dsty, src->wined3d_surface, rsrc, trans); if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER)) - hr = ddraw_surface_update_frontbuffer(This); + { + RECT dst_rect = {dstx, dsty, dstx + src_w, dsty + src_h}; + hr = ddraw_surface_update_frontbuffer(This, &dst_rect); + } LeaveCriticalSection(&ddraw_cs); switch(hr) {

1 0