July 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: DCX_NORESETATTRS should be applied at DC release time.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: f1ea06375d76c9f8e181e3ee4874ddef661e80c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ea06375d76c9f8e181e3ee4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 20:00:35 2010 +0200 user32: DCX_NORESETATTRS should be applied at DC release time. --- dlls/user32/painting.c | 21 ++++++++++++++------- dlls/user32/tests/dce.c | 9 +++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index efb0884..5e57e7f 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -168,6 +168,16 @@ static void update_visible_region( struct dce *dce ) /*********************************************************************** + * reset_dce_attrs + */ +static void reset_dce_attrs( struct dce *dce ) +{ + RestoreDC( dce->hdc, 1 ); /* initial save level is always 1 */ + SaveDC( dce->hdc ); /* save the state again for next time */ +} + + +/*********************************************************************** * release_dce */ static void release_dce( struct dce *dce ) @@ -329,6 +339,7 @@ void free_dce( struct dce *dce, HWND hwnd ) if (!--dce->count) { /* turn it into a cache entry */ + reset_dce_attrs( dce ); release_dce( dce ); dce->flags |= DCX_CACHE; } @@ -455,6 +466,7 @@ static INT release_dc( HWND hwnd, HDC hdc, BOOL end_paint ) dce = (struct dce *)GetDCHook( hdc, NULL ); if (dce && dce->count) { + if (!(dce->flags & DCX_NORESETATTRS)) reset_dce_attrs( dce ); if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); if (dce->flags & DCX_CACHE) dce->count = 0; ret = TRUE; @@ -898,6 +910,7 @@ BOOL WINAPI EndPaint( HWND hwnd, const PAINTSTRUCT *lps ) HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) { static const DWORD clip_flags = DCX_PARENTCLIP | DCX_CLIPSIBLINGS | DCX_CLIPCHILDREN | DCX_WINDOW; + static const DWORD user_flags = clip_flags | DCX_NORESETATTRS; /* flags that can be set by user */ struct dce *dce; BOOL bUpdateVisRgn = TRUE; HWND parent; @@ -1021,18 +1034,12 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) } dce->hwnd = hwnd; - dce->flags = (dce->flags & ~clip_flags) | (flags & clip_flags); + dce->flags = (dce->flags & ~user_flags) | (flags & user_flags); if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ if (bUpdateVisRgn) update_visible_region( dce ); - if (!(flags & DCX_NORESETATTRS)) - { - RestoreDC( dce->hdc, 1 ); /* initial save level is always 1 */ - SaveDC( dce->hdc ); /* save the state again for next time */ - } - TRACE("(%p,%p,0x%x): returning %p\n", hwnd, hrgnClip, flags, dce->hdc); return dce->hdc; } diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index cfa07e5..c366ebc 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -66,10 +66,7 @@ static void test_dc_attributes(void) hdc = hdcs[i] = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS ); if (!hdc) break; rop = GetROP2( hdc ); - if (hdc == old_hdc) - todo_wine ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); - else - ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + ok( rop == def_rop, "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); if (hdc == old_hdc) { found_dc = 1; @@ -104,8 +101,8 @@ static void test_dc_attributes(void) rop = GetROP2( hdc ); if (hdc == old_hdc) { - todo_wine ok( rop == R2_WHITE || broken( rop == def_rop), - "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); + ok( rop == R2_WHITE || broken( rop == def_rop), + "wrong ROP2 %d after release %p/%p\n", rop, old_hdc, hdc ); SetROP2( old_hdc, def_rop ); } else

1 0

Alexandre Julliard : gdi32/tests: Fix a typo in a macro name.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 480117fdafd6514568f8f75ec84997580d5d4f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=480117fdafd6514568f8f75ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 22 21:04:56 2010 +0200 gdi32/tests: Fix a typo in a macro name. --- dlls/gdi32/tests/mapping.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 655ab2c..f6d2edb 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -39,7 +39,7 @@ ok(rough_match(_pt.y, _y), "expected y %d, got %d\n", (_y), _pt.y); \ } -#define expect_world_trasform(_hdc, _em11, _em22) \ +#define expect_world_transform(_hdc, _em11, _em22) \ { \ BOOL _ret; \ XFORM _xform; \ @@ -105,7 +105,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); SetLastError(0xdeadbeef); @@ -128,7 +128,7 @@ static void test_world_transform(void) rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); } - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); SetLastError(0xdeadbeef); @@ -137,7 +137,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); ret = SetGraphicsMode(hdc, GM_ADVANCED); @@ -150,7 +150,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 1.0, 1.0); + expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); /* The transform must conform to (eM11 * eM22 != eM12 * eM21) requirement */ @@ -177,7 +177,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); SetLastError(0xdeadbeef); @@ -192,7 +192,7 @@ static void test_world_transform(void) ok( rough_match( size.cy, size_cy * 10 ) || rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, MulDiv(20000, res_x, size.cx), -MulDiv(20000, res_y, size.cy)); SetLastError(0xdeadbeef); @@ -201,7 +201,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); ret = SetGraphicsMode(hdc, GM_COMPATIBLE); @@ -211,7 +211,7 @@ static void test_world_transform(void) expect_viewport_ext(hdc, 1, 1); expect_window_ext(hdc, 1, 1); - expect_world_trasform(hdc, 20.0, 20.0); + expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); DeleteDC(hdc);

1 0

Alexandre Julliard : gdi32: Update the DC mappings when the layout is changed.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: f695c1d19d1d43d7778384841e549342626ca7c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f695c1d19d1d43d7778384841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:34:07 2010 +0200 gdi32: Update the DC mappings when the layout is changed. --- dlls/gdi32/dc.c | 6 +++ dlls/gdi32/mapping.c | 3 +- dlls/gdi32/tests/mapping.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c55442f..7c86d34 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -289,6 +289,7 @@ static void construct_window_to_viewport(DC *dc, XFORM *xform) scaleX = (double)dc->vportExtX / (double)dc->wndExtX; scaleY = (double)dc->vportExtY / (double)dc->wndExtY; + if (dc->layout & LAYOUT_RTL) scaleX = -scaleX; xform->eM11 = scaleX; xform->eM12 = 0.0; xform->eM21 = 0.0; @@ -1948,6 +1949,11 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout) { oldlayout = dc->layout; dc->layout = layout; + if (layout != oldlayout) + { + if (layout & LAYOUT_RTL) dc->MapMode = MM_ANISOTROPIC; + DC_UpdateXforms( dc ); + } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 35bb1ea..8010b3d 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -185,7 +185,8 @@ INT WINAPI SetMapMode( HDC hdc, INT mode ) default: goto done; } - dc->MapMode = mode; + /* RTL layout is always MM_ANISOTROPIC */ + if (!(dc->layout & LAYOUT_RTL)) dc->MapMode = mode; DC_UpdateXforms( dc ); done: release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index f6d2edb..7193a0f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -217,6 +217,81 @@ static void test_world_transform(void) DeleteDC(hdc); } +static void test_dc_layout(void) +{ + INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; + SIZE size; + DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); + DWORD (WINAPI *pGetLayout)(HDC hdc); + HDC hdc; + + pGetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetLayout"); + pSetLayout = (void *)GetProcAddress(GetModuleHandleA("gdi32.dll"), "SetLayout"); + if (!pGetLayout || !pSetLayout) + { + win_skip( "Don't have SetLayout\n" ); + return; + } + + hdc = CreateCompatibleDC(0); + + size_cx = GetDeviceCaps(hdc, HORZSIZE); + size_cy = GetDeviceCaps(hdc, VERTSIZE); + res_x = GetDeviceCaps(hdc, HORZRES); + res_y = GetDeviceCaps(hdc, VERTRES); + dpi_x = GetDeviceCaps(hdc, LOGPIXELSX); + dpi_y = GetDeviceCaps(hdc, LOGPIXELSY); + + ret = GetMapMode( hdc ); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, 1000, 1000); + + pSetLayout( hdc, LAYOUT_RTL ); + if (!pGetLayout( hdc )) + { + win_skip( "SetLayout not supported\n" ); + DeleteDC(hdc); + return; + } + + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, -1000, 1000); + + SetMapMode(hdc, MM_LOMETRIC); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + + expect_viewport_ext(hdc, res_x, -res_y); + ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ + "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ + "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); + expect_world_transform(hdc, 1.0, 1.0); + expect_LPtoDP(hdc, -MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); + + SetMapMode(hdc, MM_TEXT); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + pSetLayout( hdc, LAYOUT_LTR ); + ret = GetMapMode( hdc ); + ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); + SetMapMode(hdc, MM_TEXT); + ret = GetMapMode( hdc ); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + DeleteDC(hdc); +} + static void test_modify_world_transform(void) { HDC hdc = GetDC(0); @@ -562,6 +637,7 @@ START_TEST(mapping) { test_modify_world_transform(); test_world_transform(); + test_dc_layout(); test_isotropic_mapping(); test_setvirtualresolution(); test_gettransform();

1 0

Alexandre Julliard : include: Don't install tlb files, they are platform-dependent.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: c1de11eee5a829ec83438719fae7f93690423f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1de11eee5a829ec83438719f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 23 11:34:23 2010 +0200 include: Don't install tlb files, they are platform-dependent. --- include/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d1f653a..b228795 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -552,7 +552,7 @@ IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) @MAKE_RULES@ -OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) +OBJDIR_INCLUDES = $(PUBLIC_IDL_H_SRCS:.idl=.h) all: $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb)

1 0

Piotr Caban : atl: Improved AtlInternalQueryInterface implementation.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 1dc86ebb9b4aca5aa8c9de6e12a940c872792574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc86ebb9b4aca5aa8c9de6e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 22 18:37:12 2010 +0200 atl: Improved AtlInternalQueryInterface implementation. --- dlls/atl/atl_main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index 7780b41..88795c9 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -259,7 +259,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid), pEntries[i].dw, pEntries[i].pFunc); - if (pEntries[i].piid && IsEqualGUID(iid,pEntries[i].piid)) + if (!pEntries[i].piid || IsEqualGUID(iid,pEntries[i].piid)) { TRACE("MATCH\n"); if (pEntries[i].pFunc == (_ATL_CREATORARGFUNC*)1) @@ -267,14 +267,15 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE TRACE("Offset\n"); *ppvObject = ((LPSTR)this+pEntries[i].dw); IUnknown_AddRef((IUnknown*)*ppvObject); - rc = S_OK; + return S_OK; } else { TRACE("Function\n"); rc = pEntries[i].pFunc(this, iid, ppvObject, pEntries[i].dw); + if(rc==S_OK || pEntries[i].piid) + return rc; } - break; } i++; }

1 0

Igor Paliychuk : cmdlgtst: Add Ukrainian translation.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 70ef03208fa6f9ebad9be66731655ef3e7e135b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70ef03208fa6f9ebad9be6673… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Thu Jul 22 17:22:14 2010 +0300 cmdlgtst: Add Ukrainian translation. --- programs/cmdlgtst/Makefile.in | 1 + programs/cmdlgtst/Uk.rc | 301 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 302 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70ef03208fa6f9ebad9be…

1 0

André Hentschel : krnl386.exe16: Add an error code.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 4291823ff2ce693b87353a629bb4f52e44b35be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4291823ff2ce693b87353a629… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jul 22 19:08:02 2010 +0200 krnl386.exe16: Add an error code. --- dlls/krnl386.exe16/int21.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 4f7ae02..39e195a 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -3587,6 +3587,8 @@ static void INT21_GetExtendedError( CONTEXT86 *context ) locus = EL_Disk; break; case ERROR_FILE_NOT_FOUND: + case ERROR_PATH_NOT_FOUND: + case ERROR_INVALID_NAME: class = EC_NotFound; action = SA_Abort; locus = EL_Disk; @@ -3626,11 +3628,6 @@ static void INT21_GetExtendedError( CONTEXT86 *context ) action = SA_Abort; locus = EL_Memory; break; - case ERROR_PATH_NOT_FOUND: - class = EC_NotFound; - action = SA_Abort; - locus = EL_Disk; - break; case ERROR_SEEK: class = EC_NotFound; action = SA_Ignore;

1 0

David Hedberg : shell32: Implement Set/ GetCurrentViewMode in the default shellview.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 0e7a5bf76c0d24f320c70b03251c9abf2ae20eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7a5bf76c0d24f320c70b032… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Jul 22 22:08:07 2010 +0200 shell32: Implement Set/GetCurrentViewMode in the default shellview. --- dlls/shell32/shlview.c | 71 +++++++--- dlls/shell32/tests/shlview.c | 341 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 393 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7a5bf76c0d24f320c70…

1 0

Aric Stewart : usp10: Start implementing Chaining Context Substitution Format 3: Coverage-based Chaining Context Glyph Substitution.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 1b37809dba65745828d7895ad5fda9bc3fd1e403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b37809dba65745828d7895ad… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jul 22 16:18:02 2010 -0500 usp10: Start implementing Chaining Context Substitution Format 3: Coverage-based Chaining Context Glyph Substitution. --- dlls/usp10/shape.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0a4f5b9..0018ae5 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -185,6 +185,42 @@ typedef struct{ WORD Component[1]; }GSUB_Ligature; +typedef struct{ + WORD SequenceIndex; + WORD LookupListIndex; + +}GSUB_SubstLookupRecord; + +typedef struct{ + WORD SubstFormat; /* = 1 */ + WORD Coverage; + WORD ChainSubRuleSetCount; + WORD ChainSubRuleSet[1]; +}GSUB_ChainContextSubstFormat1; + +typedef struct { + WORD SubstFormat; /* = 3 */ + WORD BacktrackGlyphCount; + WORD Coverage[1]; +}GSUB_ChainContextSubstFormat3_1; + +typedef struct{ + WORD InputGlyphCount; + WORD Coverage[1]; +}GSUB_ChainContextSubstFormat3_2; + +typedef struct{ + WORD LookaheadGlyphCount; + WORD Coverage[1]; +}GSUB_ChainContextSubstFormat3_3; + +typedef struct{ + WORD SubstCount; + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_ChainContextSubstFormat3_4; + +static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); + /* the orders of joined_forms and contextual_features need to line up */ static const char* contextual_features[] = { @@ -429,6 +465,101 @@ static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, return GSUB_E_NOGLYPH; } +static INT GSUB_apply_ChainContextSubst(const GSUB_LookupList* lookup, const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + BOOL done = FALSE; + + TRACE("Chaining Contextual Substitution Subtable\n"); + for (j = 0; j < GET_BE_WORD(look->SubTableCount) && !done; j++) + { + const GSUB_ChainContextSubstFormat1 *ccsf1; + int offset; + int dirLookahead = write_dir; + int dirBacktrack = -1 * write_dir; + + offset = GET_BE_WORD(look->SubTable[j]); + ccsf1 = (const GSUB_ChainContextSubstFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(ccsf1->SubstFormat) == 1) + { + FIXME(" TODO: subtype 1 (Simple context glyph substitution)\n"); + return -1; + } + else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) + { + FIXME(" TODO: subtype 2 (Class-based Chaining Context Glyph Substitution)\n"); + return -1; + } + else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) + { + int k; + int indexGlyphs; + const GSUB_ChainContextSubstFormat3_1 *ccsf3_1; + const GSUB_ChainContextSubstFormat3_2 *ccsf3_2; + const GSUB_ChainContextSubstFormat3_3 *ccsf3_3; + const GSUB_ChainContextSubstFormat3_4 *ccsf3_4; + int newIndex = glyph_index; + + ccsf3_1 = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; + + TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Substitution)\n"); + + for (k = 0; k < GET_BE_WORD(ccsf3_1->BacktrackGlyphCount); k++) + { + offset = GET_BE_WORD(ccsf3_1->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (dirBacktrack * (k+1))]) == -1) + break; + } + if (k != GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)) + return -1; + TRACE("Matched Backtrack\n"); + + ccsf3_2 = (const GSUB_ChainContextSubstFormat3_2 *)(((LPBYTE)ccsf1)+sizeof(GSUB_ChainContextSubstFormat3_1) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_1->BacktrackGlyphCount)-1))); + + indexGlyphs = GET_BE_WORD(ccsf3_2->InputGlyphCount); + for (k = 0; k < indexGlyphs; k++) + { + offset = GET_BE_WORD(ccsf3_2->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (write_dir * k)]) == -1) + break; + } + if (k != indexGlyphs) + return -1; + TRACE("Matched IndexGlyphs\n"); + + ccsf3_3 = (const GSUB_ChainContextSubstFormat3_3 *)(((LPBYTE)ccsf3_2)+sizeof(GSUB_ChainContextSubstFormat3_2) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_2->InputGlyphCount)-1))); + + for (k = 0; k < GET_BE_WORD(ccsf3_3->LookaheadGlyphCount); k++) + { + offset = GET_BE_WORD(ccsf3_3->Coverage[k]); + if (GSUB_is_glyph_covered((const BYTE*)ccsf3_1+offset, glyphs[glyph_index + (dirLookahead * (indexGlyphs + k+1))]) == -1) + break; + } + if (k != GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)) + return -1; + TRACE("Matched LookAhead\n"); + + ccsf3_4 = (const GSUB_ChainContextSubstFormat3_4 *)(((LPBYTE)ccsf3_3)+sizeof(GSUB_ChainContextSubstFormat3_3) + (sizeof(WORD) * (GET_BE_WORD(ccsf3_3->LookaheadGlyphCount)-1))); + + for (k = 0; k < GET_BE_WORD(ccsf3_4->SubstCount); k++) + { + int lookupIndex = GET_BE_WORD(ccsf3_4->SubstLookupRecord[k].LookupListIndex); + int SequenceIndex = GET_BE_WORD(ccsf3_4->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == -1) + { + ERR("Chain failed to generate a glyph\n"); + return -1; + } + } + return newIndex + 1; + } + } + return -1; +} + static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int offset; @@ -443,6 +574,8 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 6: + return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); }

1 0

Vincent Povirk : wineboot: Query windows from all desktops when --end-session --kill is used.
by Alexandre Julliard 23 Jul '10

23 Jul '10

Module: wine Branch: master Commit: 4f30ff875bfc556a2a69bf45218129cd196e5105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f30ff875bfc556a2a69bf452… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 18 13:36:36 2010 -0500 wineboot: Query windows from all desktops when --end-session --kill is used. --- programs/wineboot/shutdown.c | 39 +++++++++++++++++++++++++++++++++++++++ programs/wineboot/wineboot.c | 7 ++++++- 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index ed80bf0..cebe16b 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -322,6 +322,45 @@ BOOL shutdown_close_windows( BOOL force ) return (result != 0); } +static BOOL CALLBACK shutdown_one_desktop( LPWSTR name, LPARAM force ) +{ + HDESK hdesk; + + WINE_TRACE("Shutting down desktop %s\n", wine_dbgstr_w(name)); + + hdesk = OpenDesktopW( name, 0, FALSE, GENERIC_ALL ); + if (hdesk == NULL) + { + WINE_ERR("Cannot open desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + return 0; + } + + if (!SetThreadDesktop( hdesk )) + { + CloseDesktop( hdesk ); + WINE_ERR("Cannot set thread desktop %s, err=%i\n", wine_dbgstr_w(name), GetLastError()); + return 0; + } + + CloseDesktop( hdesk ); + + return shutdown_close_windows( force ); +} + +BOOL shutdown_all_desktops( BOOL force ) +{ + BOOL ret; + HDESK prev_desktop; + + prev_desktop = GetThreadDesktop(GetCurrentThreadId()); + + ret = EnumDesktopsW( NULL, shutdown_one_desktop, (LPARAM)force ); + + SetThreadDesktop(prev_desktop); + + return ret; +} + /* forcibly kill all processes without any cleanup */ void kill_processes( BOOL kill_desktop ) { diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 32ac3ac..02d3746 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -88,6 +88,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineboot); #define MAX_LINE_LENGTH (2*MAX_PATH+2) extern BOOL shutdown_close_windows( BOOL force ); +extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop ); static WCHAR windowsdir[MAX_PATH]; @@ -1142,7 +1143,11 @@ int main( int argc, char *argv[] ) if (end_session) { - if (!shutdown_close_windows( force )) return 1; + if (kill) + { + if (!shutdown_all_desktops( force )) return 1; + } + else if (!shutdown_close_windows( force )) return 1; } if (kill) kill_processes( shutdown );

1 0