October 2011 - Wine-commits

Alexandre Julliard : gdi32: Get rid of the DC_FUNCTIONS typedef.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 5267c1316b40b44617f1414b46cf2c50b35fc8ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5267c1316b40b44617f1414b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 17 20:39:54 2011 +0200 gdi32: Get rid of the DC_FUNCTIONS typedef. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 10 ++++------ dlls/gdi32/mfdrv/init.c | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 7c8fa54..9fdedb3 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -762,7 +762,7 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) */ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) { - const DC_FUNCTIONS *funcs; + const struct gdi_dc_funcs *funcs; BITMAPOBJ *bmp = GDI_GetObjPtr( handle, OBJ_BITMAP ); if (!bmp) return FALSE; diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b50ea70..74d3747 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -598,7 +598,7 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, { HDC hdc; DC * dc; - const DC_FUNCTIONS *funcs; + const struct gdi_dc_funcs *funcs; WCHAR buf[300]; GDI_CheckNotLock(); diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 2099388..2331e7c 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -509,7 +509,7 @@ static INT dibdrv_SetROP2( PHYSDEV dev, INT rop ) return next->funcs->pSetROP2( next, rop ); } -const DC_FUNCTIONS dib_driver = +const struct gdi_dc_funcs dib_driver = { NULL, /* pAbortDoc */ NULL, /* pAbortPath */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 8647b95..565e0ad 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -138,7 +138,7 @@ static const struct gdi_dc_funcs *get_display_driver(void) /********************************************************************** * DRIVER_load_driver */ -const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) +const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) { HMODULE module; struct graphics_driver *driver, *new_driver; @@ -651,7 +651,7 @@ static BOOL nulldrv_wglUseFontBitmapsW( PHYSDEV dev, DWORD start, DWORD count, D return FALSE; } -const DC_FUNCTIONS null_driver = +const struct gdi_dc_funcs null_driver = { nulldrv_AbortDoc, /* pAbortDoc */ nulldrv_AbortPath, /* pAbortPath */ diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 292f505..56e3de8 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); static BOOL EMFDRV_DeleteDC( PHYSDEV dev ); -static const DC_FUNCTIONS EMFDRV_Funcs = +static const struct gdi_dc_funcs EMFDRV_Funcs = { NULL, /* pAbortDoc */ EMFDRV_AbortPath, /* pAbortPath */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1fc8573..67bdd2c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -72,8 +72,6 @@ typedef struct tagGDIOBJHDR struct hdc_list *hdcs; } GDIOBJHDR; -typedef struct gdi_dc_funcs DC_FUNCTIONS; - /* It should not be necessary to access the contents of the GdiPath * structure directly; if you find that the exported functions don't * allow you to do what you want, then please place a new exported @@ -198,7 +196,7 @@ typedef struct tagBITMAPOBJ GDIOBJHDR header; BITMAP bitmap; SIZE size; /* For SetBitmapDimension() */ - const DC_FUNCTIONS *funcs; /* DC function table */ + const struct gdi_dc_funcs *funcs; /* DC function table */ /* For device-independent bitmaps: */ DIBSECTION *dib; RGBQUAD *color_table; /* DIB color table if <= 8bpp */ @@ -270,9 +268,9 @@ extern DWORD blend_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struc BLENDFUNCTION blend ) DECLSPEC_HIDDEN; /* driver.c */ -extern const DC_FUNCTIONS null_driver DECLSPEC_HIDDEN; -extern const DC_FUNCTIONS dib_driver DECLSPEC_HIDDEN; -extern const DC_FUNCTIONS *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs null_driver DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs dib_driver DECLSPEC_HIDDEN; +extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; /* enhmetafile.c */ diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index 0c93571..92680d3 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -79,7 +79,7 @@ static INT MFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) } -static const DC_FUNCTIONS MFDRV_Funcs = +static const struct gdi_dc_funcs MFDRV_Funcs = { NULL, /* pAbortDoc */ MFDRV_AbortPath, /* pAbortPath */

1 0

Alexandre Julliard : gdi32: Return the correct error code when selecting objects in a metafile.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 013f5a9b2317710997a4ccba66c861fef82b16e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=013f5a9b2317710997a4ccba6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 18 15:01:19 2011 +0200 gdi32: Return the correct error code when selecting objects in a metafile. --- dlls/gdi32/mfdrv/objects.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c index 7a5039d..46b1218 100644 --- a/dlls/gdi32/mfdrv/objects.c +++ b/dlls/gdi32/mfdrv/objects.c @@ -284,7 +284,7 @@ HBRUSH MFDRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) return 0; GDI_hdc_using_object(hbrush, dev->hdc); } - return MFDRV_SelectObject( dev, index ) ? hbrush : HGDI_ERROR; + return MFDRV_SelectObject( dev, index ) ? hbrush : 0; } /****************************************************************** @@ -408,7 +408,7 @@ HPEN MFDRV_SelectPen( PHYSDEV dev, HPEN hpen ) return 0; GDI_hdc_using_object(hpen, dev->hdc); } - return MFDRV_SelectObject( dev, index ) ? hpen : HGDI_ERROR; + return MFDRV_SelectObject( dev, index ) ? hpen : 0; }

1 0

Aric Stewart : usp10: Break out get_cluster_size and use it to correct ScriptStringGetLogicalWidths for clusters .
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 6fb71f53541d14afe125912e567b6186b7acdb64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb71f53541d14afe125912e5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 17 10:40:46 2011 -0500 usp10: Break out get_cluster_size and use it to correct ScriptStringGetLogicalWidths for clusters. --- dlls/usp10/usp10.c | 69 +++++++++++++++++++++++++++++++-------------------- 1 files changed, 42 insertions(+), 27 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3f323b2..941b918 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1617,6 +1617,30 @@ HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) return S_OK; } +static inline int get_cluster_size(const WORD *pwLogClust, int cChars, int item, + int direction, int* iCluster, int *check_out) +{ + int clust_size = 1; + int check; + WORD clust = pwLogClust[item]; + + for (check = item+direction; check < cChars && check >= 0; check+=direction) + { + if (pwLogClust[check] == clust) + { + clust_size ++; + if (iCluster && *iCluster == -1) + *iCluster = item; + } + else break; + } + + if (check_out) + *check_out = check; + + return clust_size; +} + /*********************************************************************** * ScriptCPtoX (USP10.@) * @@ -1674,19 +1698,9 @@ HRESULT WINAPI ScriptCPtoX(int iCP, int check; int clust = pwLogClust[item]; - clust_size = 1; iCluster = -1; - - for (check = item+1; check < cChars; check++) - { - if (pwLogClust[check] == clust) - { - clust_size ++; - if (iCluster == -1) - iCluster = item; - } - else break; - } + clust_size = get_cluster_size(pwLogClust, cChars, item, 1, &iCluster, + &check); if (check >= cChars && !iMaxPos) { @@ -1812,20 +1826,10 @@ HRESULT WINAPI ScriptXtoCP(int iX, int check; int clust = pwLogClust[item]; - clust_size = 1; iCluster = -1; cjump = 0; - - for (check = item+direction; check < cChars && check >= 0; check+=direction) - { - if (pwLogClust[check] == clust) - { - clust_size ++; - if (iCluster == -1) - iCluster = item; - } - else break; - } + clust_size = get_cluster_size(pwLogClust, cChars, item, direction, + &iCluster, &check); if (check >= cChars && direction > 0) { @@ -2569,12 +2573,23 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD for (i = 0; i < analysis->numItems; i++) { int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; + int direction = 1; + + if (analysis->pItem[i].a.fRTL && ! analysis->pItem[i].a.fLogicalOrder) + direction = -1; + for (j = 0; j < cChar; j++) { - + int k; int glyph = analysis->glyphs[i].pwLogClust[j]; - piDx[next] = analysis->glyphs[i].piAdvance[glyph]; - next++; + int clust_size = get_cluster_size(analysis->glyphs[i].pwLogClust, + cChar, j, direction, NULL, NULL); + for (k = 0; k < clust_size; k++) + { + piDx[next] = analysis->glyphs[i].piAdvance[glyph] / clust_size; + next++; + if (k) j++; + } } } return S_OK;

1 0

Aric Stewart : usp10: Handle advance for multi-glyph clusters correctly.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 42db0c0593ed5236668cbc58c62f6d109d9f9294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42db0c0593ed5236668cbc58c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 17 10:40:53 2011 -0500 usp10: Handle advance for multi-glyph clusters correctly. --- dlls/usp10/usp10.c | 64 +++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 941b918..8f472ac 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1641,6 +1641,39 @@ static inline int get_cluster_size(const WORD *pwLogClust, int cChars, int item, return clust_size; } +static inline int get_glyph_cluster_advance(const int* piAdvance, const SCRIPT_VISATTR *pva, const WORD *pwLogClust, int cGlyphs, int cChars, int glyph, int direction) +{ + int advance; + int log_clust_max = 0; + int i; + + advance = piAdvance[glyph]; + + for (i = 0; i < cChars; i++) + { + if (pwLogClust[i] > log_clust_max) + log_clust_max = pwLogClust[i]; + } + + if (glyph > log_clust_max) + return advance; + + for (glyph+=direction; glyph < cGlyphs && glyph >= 0; glyph +=direction) + { + if (pva[glyph].fClusterStart) + break; + for (i = 0; i < cChars; i++) + if (pwLogClust[i] == glyph) break; + if (i != cChars) + break; + if (glyph > log_clust_max) + break; + advance += piAdvance[glyph]; + } + + return advance; +} + /*********************************************************************** * ScriptCPtoX (USP10.@) * @@ -1662,6 +1695,7 @@ HRESULT WINAPI ScriptCPtoX(int iCP, int clust_size = 1; float special_size = 0.0; int iMaxPos = 0; + int advance = 0; BOOL rtl = FALSE; TRACE("(%d,%d,%d,%d,%p,%p,%p,%p,%p)\n", @@ -1702,10 +1736,12 @@ HRESULT WINAPI ScriptCPtoX(int iCP, clust_size = get_cluster_size(pwLogClust, cChars, item, 1, &iCluster, &check); + advance = get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, clust, 1); + if (check >= cChars && !iMaxPos) { for (check = clust; check < cChars; check++) - special_size += piAdvance[check]; + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, 1); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -1716,24 +1752,25 @@ HRESULT WINAPI ScriptCPtoX(int iCP, { clust_size --; if (clust_size == 0) - iPosX += piAdvance[clust]; + iPosX += advance; } else - iPosX += piAdvance[clust] / (float)clust_size; + iPosX += advance / (float)clust_size; } } else if (iSpecial != -1) iPosX += special_size; else /* (iCluster != -1) */ { + int adv = get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, pwLogClust[iCluster], 1); if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) { clust_size --; if (clust_size == 0) - iPosX += piAdvance[pwLogClust[iCluster]]; + iPosX += adv; } else - iPosX += piAdvance[pwLogClust[iCluster]] / (float)clust_size; + iPosX += adv / (float)clust_size; } } @@ -1770,6 +1807,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, int iCluster = -1; int clust_size = 1; int cjump = 0; + int advance; float special_size = 0.0; int direction = 1; @@ -1830,11 +1868,12 @@ HRESULT WINAPI ScriptXtoCP(int iX, cjump = 0; clust_size = get_cluster_size(pwLogClust, cChars, item, direction, &iCluster, &check); + advance = get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, clust, direction); if (check >= cChars && direction > 0) { for (check = clust; check < cChars; check++) - special_size += piAdvance[check]; + special_size += get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, check, direction); iSpecial = item; special_size /= (cChars - item); iPosX += special_size; @@ -1844,25 +1883,26 @@ HRESULT WINAPI ScriptXtoCP(int iX, if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) { if (!cjump) - iPosX += piAdvance[clust]; + iPosX += advance; cjump++; } else - iPosX += piAdvance[clust] / (float)clust_size; + iPosX += advance / (float)clust_size; } } else if (iSpecial != -1) iPosX += special_size; else /* (iCluster != -1) */ { + int adv = get_glyph_cluster_advance(piAdvance, psva, pwLogClust, cGlyphs, cChars, pwLogClust[iCluster], direction); if (scriptInformation[psa->eScript].props.fNeedsCaretInfo) { if (!cjump) - iPosX += piAdvance[pwLogClust[iCluster]]; + iPosX += adv; cjump++; } else - iPosX += piAdvance[pwLogClust[iCluster]] / (float)clust_size; + iPosX += adv / (float)clust_size; } } @@ -2584,9 +2624,11 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD int glyph = analysis->glyphs[i].pwLogClust[j]; int clust_size = get_cluster_size(analysis->glyphs[i].pwLogClust, cChar, j, direction, NULL, NULL); + int advance = get_glyph_cluster_advance(analysis->glyphs[i].piAdvance, analysis->glyphs[i].psva, analysis->glyphs[i].pwLogClust, analysis->glyphs[i].numGlyphs, cChar, glyph, direction); + for (k = 0; k < clust_size; k++) { - piDx[next] = analysis->glyphs[i].piAdvance[glyph] / clust_size; + piDx[next] = advance / clust_size; next++; if (k) j++; }

1 0

Henri Verbeet : wined3d: Keep surfaces in sysmem if they' re both already there in wined3d_surface_blt().
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: ca43c49968553b3db7d7ef63966b76fcbf9c8a1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca43c49968553b3db7d7ef639… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 17 21:06:20 2011 +0200 wined3d: Keep surfaces in sysmem if they're both already there in wined3d_surface_blt(). The idea is to avoid bouncing surfaces between the CPU and GPU when doing both locks and blits on a surface. This is mostly an issue for ddraw applications. --- dlls/wined3d/surface.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e32a64e..c7bba27 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1469,6 +1469,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC struct wined3d_device *device = dst_surface->resource.device; DWORD src_ds_flags, dst_ds_flags; RECT src_rect, dst_rect; + BOOL scale, convert; static const DWORD simple_blit = WINEDDBLT_ASYNC | WINEDDBLT_COLORFILL @@ -1621,6 +1622,11 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC goto fallback; } + scale = src_surface + && (src_rect.right - src_rect.left != dst_rect.right - dst_rect.left + || src_rect.bottom - src_rect.top != dst_rect.bottom - dst_rect.top); + convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id; + dst_ds_flags = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) src_ds_flags = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -1675,8 +1681,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3DERR_INVALIDCALL; } - if (src_surface->resource.height != dst_surface->resource.height - || src_surface->resource.width != dst_surface->resource.width) + if (scale) { WARN("Rejecting depth / stencil blit with mismatched surface sizes.\n"); return WINED3DERR_INVALIDCALL; @@ -1688,6 +1693,19 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC } else { + /* In principle this would apply to depth blits as well, but we don't + * implement those in the CPU blitter at the moment. */ + if ((dst_surface->flags & SFLAG_INSYSMEM) + && (!src_surface || (src_surface->flags & SFLAG_INSYSMEM))) + { + if (scale) + TRACE("Not doing sysmem blit because of scaling.\n"); + else if (convert) + TRACE("Not doing sysmem blit because of format conversion.\n"); + else + return surface_cpu_blt(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter); + } + if (flags & WINEDDBLT_COLORFILL) { WINED3DCOLORVALUE color;

1 0

Henri Verbeet : wined3d: Mark default pool surfaces lost when they' re unloaded.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 68e1484bec61784cc026db4885439097e789cb0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68e1484bec61784cc026db488… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 17 21:06:21 2011 +0200 wined3d: Mark default pool surfaces lost when they're unloaded. --- dlls/wined3d/surface.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c7bba27..277a317 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1866,6 +1866,11 @@ static void surface_unload(struct wined3d_resource *resource) * and all flags get lost */ surface_init_sysmem(surface); + /* We also get here when the ddraw swapchain is destroyed, for example + * for a mode switch. In this case this surface won't necessarily be + * an implicit surface. We have to mark it lost so that the + * application can restore it after the mode switch. */ + surface->flags |= SFLAG_LOST; } else { @@ -2966,7 +2971,6 @@ HRESULT CDECL wined3d_surface_restore(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); - /* So far we don't lose anything :) */ surface->flags &= ~SFLAG_LOST; return WINED3D_OK; }

1 0

Henri Verbeet : ddraw: Destroy the swapchain in ddraw_destroy() if it still exists.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 14ca56ed97c4cde388fa3938bf72fb74d3d606b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ca56ed97c4cde388fa3938b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 17 21:06:22 2011 +0200 ddraw: Destroy the swapchain in ddraw_destroy() if it still exists. --- dlls/ddraw/ddraw.c | 55 +++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 41 +-------------------------------- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 17f1900..0801976 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -410,6 +410,50 @@ static ULONG WINAPI d3d1_AddRef(IDirect3D *iface) return ddraw1_AddRef(&This->IDirectDraw_iface); } +void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) +{ + TRACE("Destroying the swapchain.\n"); + + wined3d_swapchain_decref(ddraw->wined3d_swapchain); + ddraw->wined3d_swapchain = NULL; + + if (DefaultSurfaceType == SURFACE_OPENGL) + { + UINT i; + + for (i = 0; i < ddraw->numConvertedDecls; ++i) + { + wined3d_vertex_declaration_decref(ddraw->decls[i].decl); + } + HeapFree(GetProcessHeap(), 0, ddraw->decls); + ddraw->numConvertedDecls = 0; + + if (FAILED(wined3d_device_uninit_3d(ddraw->wined3d_device))) + { + ERR("Failed to uninit 3D.\n"); + } + else + { + /* Free the d3d window if one was created. */ + if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) + { + TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); + DestroyWindow(ddraw->d3d_window); + ddraw->d3d_window = 0; + } + } + + ddraw->d3d_initialized = FALSE; + ddraw->d3d_target = NULL; + } + else + { + wined3d_device_uninit_gdi(ddraw->wined3d_device); + } + + TRACE("Swapchain destroyed.\n"); +} + /***************************************************************************** * ddraw_destroy * @@ -437,7 +481,16 @@ static void ddraw_destroy(IDirectDrawImpl *This) list_remove(&This->ddraw_list_entry); LeaveCriticalSection(&ddraw_cs); - /* Release the attached WineD3D stuff */ + /* This can happen more or less legitimately for ddraw 1 and 2, where + * surfaces don't keep a reference to the ddraw object. The surfaces + * will of course be broken after this, (and on native trying to do + * anything with them in that state results in an access violation), but + * the release of the ddraw object should succeed without crashing. */ + if (This->wined3d_swapchain) + { + WARN("DirectDraw object is being destroyed while the swapchain still exists.\n"); + ddraw_destroy_swapchain(This); + } wined3d_device_decref(This->wined3d_device); wined3d_decref(This->wineD3D); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7b0d608..2f8b609 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -127,6 +127,7 @@ struct IDirectDrawImpl #define DDRAW_WINDOW_CLASS_NAME "ddraw_wc" HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) DECLSPEC_HIDDEN; +void ddraw_destroy_swapchain(IDirectDrawImpl *ddraw) DECLSPEC_HIDDEN; /* Utility functions */ void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 976f557..561bca7 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -430,46 +430,7 @@ static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) ddraw_surface_destroy(surface); if (ddraw->wined3d_swapchain && destroy_swapchain) - { - TRACE("Destroying the swapchain.\n"); - - wined3d_swapchain_decref(ddraw->wined3d_swapchain); - ddraw->wined3d_swapchain = NULL; - - if (DefaultSurfaceType == SURFACE_OPENGL) - { - for (i = 0; i < ddraw->numConvertedDecls; ++i) - { - wined3d_vertex_declaration_decref(ddraw->decls[i].decl); - } - HeapFree(GetProcessHeap(), 0, ddraw->decls); - ddraw->numConvertedDecls = 0; - - if (FAILED(wined3d_device_uninit_3d(ddraw->wined3d_device))) - { - ERR("Failed to uninit 3D.\n"); - } - else - { - /* Free the d3d window if one was created. */ - if (ddraw->d3d_window && ddraw->d3d_window != ddraw->dest_window) - { - TRACE("Destroying the hidden render window %p.\n", ddraw->d3d_window); - DestroyWindow(ddraw->d3d_window); - ddraw->d3d_window = 0; - } - } - - ddraw->d3d_initialized = FALSE; - ddraw->d3d_target = NULL; - } - else - { - wined3d_device_uninit_gdi(ddraw->wined3d_device); - } - - TRACE("Swapchain destroyed.\n"); - } + ddraw_destroy_swapchain(ddraw); /* Reduce the ddraw refcount */ if (ifaceToRelease)

1 0

Henri Verbeet : wined3d: Make the device parameter to invalidate_active_texture() const.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 71640e00f9e071f1467d32394724de3bb616c3c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71640e00f9e071f1467d32394… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 17 21:06:23 2011 +0200 wined3d: Make the device parameter to invalidate_active_texture() const. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 10ea92d..044ee34 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4628,7 +4628,7 @@ float CDECL wined3d_device_get_npatch_mode(const struct wined3d_device *device) return 0.0f; } -static inline void invalidate_active_texture(struct wined3d_device *device, struct wined3d_context *context) +static void invalidate_active_texture(const struct wined3d_device *device, struct wined3d_context *context) { DWORD sampler = device->rev_tex_unit_map[context->active_texture]; if (sampler != WINED3D_UNMAPPED_STAGE)

1 0

Henri Verbeet : wined3d: Make the device parameter to is_display_mode_supported() const.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 6cc9a89c8a6b9aed9aebde0bc4a8d4b02612d189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc9a89c8a6b9aed9aebde0bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 17 21:06:24 2011 +0200 wined3d: Make the device parameter to is_display_mode_supported() const. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 044ee34..10acdce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5380,7 +5380,7 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, return WINED3D_OK; } -static BOOL is_display_mode_supported(struct wined3d_device *device, const WINED3DPRESENT_PARAMETERS *pp) +static BOOL is_display_mode_supported(const struct wined3d_device *device, const WINED3DPRESENT_PARAMETERS *pp) { UINT i, count; WINED3DDISPLAYMODE m;

1 0

Andrew Talbot : winex11.drv: Mark some fall-throughs in switch statements.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 53a8746dcdc07d3eba42e40dcffdb531531fd5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a8746dcdc07d3eba42e40dc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 17 20:29:58 2011 +0100 winex11.drv: Mark some fall-throughs in switch statements. --- dlls/winex11.drv/dib.c | 6 ++++++ dlls/winex11.drv/keyboard.c | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 4593d9a..a1ce9bb 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -437,11 +437,17 @@ static void X11DRV_DIB_SetImageBits_1( int lines, const BYTE *srcbits, switch (width & 7) { case 7: XPutPixel(bmpImage, x++, h, colors[srcval >> 7]); srcval<<=1; + /* fall through */ case 6: XPutPixel(bmpImage, x++, h, colors[srcval >> 7]); srcval<<=1; + /* fall through */ case 5: XPutPixel(bmpImage, x++, h, colors[srcval >> 7]); srcval<<=1; + /* fall through */ case 4: XPutPixel(bmpImage, x++, h, colors[srcval >> 7]); srcval<<=1; + /* fall through */ case 3: XPutPixel(bmpImage, x++, h, colors[srcval >> 7]); srcval<<=1; + /* fall through */ case 2: XPutPixel(bmpImage, x++, h, colors[srcval >> 7]); srcval<<=1; + /* fall through */ case 1: XPutPixel(bmpImage, x++, h, colors[srcval >> 7]); } } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 47317e6..e985694 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2242,6 +2242,7 @@ INT CDECL X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize) case VK_RSHIFT: /* R-Shift is "special" - it is an extended key with separate scan code */ scanCode |= 0x100; + /* fall through */ case VK_LSHIFT: vkey = VK_SHIFT; break;

1 0