November 2012 - Wine-commits

Alexandre Julliard : winex11: Use the default anti-aliasing parameters from gdi32.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 11875bf40a62ece03a7bec739f1e8c2007f9c28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11875bf40a62ece03a7bec739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 13:22:46 2012 +0100 winex11: Use the default anti-aliasing parameters from gdi32. --- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/x11drv_main.c | 8 - dlls/winex11.drv/xrender.c | 320 +++++++++------------------------------- 3 files changed, 67 insertions(+), 263 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11875bf40a62ece03a7be…

1 0

Alexandre Julliard : winex11: Store the anti-aliasing flags in the device instead of the font cache.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 548e1264540e4ecc30b8ad55bd6146fd7d3df51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=548e1264540e4ecc30b8ad55b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 16:48:47 2012 +0100 winex11: Store the anti-aliasing flags in the device instead of the font cache. --- dlls/winex11.drv/xrender.c | 64 +++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b9d27fa..bafc622 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -146,7 +146,6 @@ typedef struct typedef struct { LFANDSIZE lfsz; - AA_Type aa_default; gsCacheEntryFormat * format[AA_MAXVALUE]; INT count; INT next; @@ -158,6 +157,7 @@ struct xrender_physdev X11DRV_PDEVICE *x11dev; HRGN region; enum wxr_format format; + UINT aa_flags; int cache_index; BOOL update_clip; Picture pict; @@ -789,10 +789,8 @@ static AA_Type aa_type_from_flags( UINT aa_flags ) { switch (aa_flags & 0x7f) { - case 0: case GGO_BITMAP: return AA_None; - case GGO_GRAY4_BITMAP: case WINE_GGO_GRAY16_BITMAP: return AA_Grey; case WINE_GGO_HRGB_BITMAP: @@ -860,6 +858,21 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) ret = next->funcs->pSelectFont( next, hfont, aa_flags ); if (!ret) return 0; + switch (*aa_flags) + { + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + physdev->aa_flags = WINE_GGO_GRAY16_BITMAP; + break; + case 0: + physdev->aa_flags = GGO_BITMAP; + break; + default: + physdev->aa_flags = *aa_flags; + break; + } + TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n", lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight, lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName)); @@ -883,7 +896,6 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) if (physdev->cache_index != -1) dec_ref_cache( physdev->cache_index ); physdev->cache_index = GetCacheEntry( &lfsz ); - glyphsetCache[physdev->cache_index].aa_default = aa_type_from_flags( *aa_flags ); LeaveCriticalSection(&xrender_cs); return ret; } @@ -1014,7 +1026,7 @@ static void xrenderdrv_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) * * Helper to ExtTextOut. Must be called inside xrender_cs */ -static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type format) +static void UploadGlyph(struct xrender_physdev *physDev, int glyph) { unsigned int buflen; char *buf; @@ -1023,40 +1035,17 @@ static void UploadGlyph(struct xrender_physdev *physDev, int glyph, AA_Type form XGlyphInfo gi; gsCacheEntry *entry = glyphsetCache + physDev->cache_index; gsCacheEntryFormat *formatEntry; - UINT ggo_format = GGO_GLYPH_INDEX; + UINT ggo_format = GGO_GLYPH_INDEX | physDev->aa_flags; + AA_Type format = aa_type_from_flags( physDev->aa_flags ); enum wxr_format wxr_format; static const char zero[4]; static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; - switch(format) { - case AA_Grey: - ggo_format |= WINE_GGO_GRAY16_BITMAP; - break; - case AA_RGB: - ggo_format |= WINE_GGO_HRGB_BITMAP; - break; - case AA_BGR: - ggo_format |= WINE_GGO_HBGR_BITMAP; - break; - case AA_VRGB: - ggo_format |= WINE_GGO_VRGB_BITMAP; - break; - case AA_VBGR: - ggo_format |= WINE_GGO_VBGR_BITMAP; - break; - - default: - ERR("aa = %d - not implemented\n", format); - case AA_None: - ggo_format |= GGO_BITMAP; - break; - } - buflen = GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, 0, NULL, &identity); if(buflen == GDI_ERROR) { if(format != AA_None) { format = AA_None; - entry->aa_default = AA_None; + physDev->aa_flags = GGO_BITMAP; ggo_format = GGO_GLYPH_INDEX | GGO_BITMAP; buflen = GetGlyphOutlineW(physDev->dev.hdc, glyph, ggo_format, &gm, 0, NULL, &identity); } @@ -1318,7 +1307,6 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, struct xrender_physdev *physdev = get_xrender_dev( dev ); gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; - AA_Type aa_type = AA_None; unsigned int idx; Picture pict, tile_pict = 0; XGlyphElt16 *elts; @@ -1354,17 +1342,15 @@ static BOOL xrenderdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, EnterCriticalSection(&xrender_cs); entry = glyphsetCache + physdev->cache_index; - aa_type = entry->aa_default; - formatEntry = entry->format[aa_type]; + formatEntry = entry->format[aa_type_from_flags( physdev->aa_flags )]; for(idx = 0; idx < count; idx++) { if( !formatEntry ) { - UploadGlyph(physdev, wstr[idx], aa_type); - /* re-evaluate antialias since aa_default may have changed */ - aa_type = entry->aa_default; - formatEntry = entry->format[aa_type]; + UploadGlyph(physdev, wstr[idx]); + /* re-evaluate format entry since aa_flags may have changed */ + formatEntry = entry->format[aa_type_from_flags( physdev->aa_flags )]; } else if( wstr[idx] >= formatEntry->nrealized || formatEntry->realized[wstr[idx]] == FALSE) { - UploadGlyph(physdev, wstr[idx], aa_type); + UploadGlyph(physdev, wstr[idx]); } } if (!formatEntry)

1 0

Nikolay Sivov : scrrun: Invoke() takes interface pointer, not a pointer to pointer.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f43b49fbedc697e33ca81a09d7dd18b4d6348ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43b49fbedc697e33ca81a09d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 10:36:16 2012 -0500 scrrun: Invoke() takes interface pointer, not a pointer to pointer. --- dlls/scrrun/filesystem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index ade3310..d79c061 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -127,7 +127,7 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, hr = get_typeinfo(IFileSystem3_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &iface, dispIdMember, wFlags, + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); }

1 0

Nikolay Sivov : scrrun: Added a stub for IFolder interface.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: fee495d5fda56fa5b0c24ac1f1368ae369209f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee495d5fda56fa5b0c24ac1f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 4 16:59:00 2012 -0500 scrrun: Added a stub for IFolder interface. --- dlls/scrrun/filesystem.c | 325 +++++++++++++++++++++++++++++++++++++++- dlls/scrrun/scrrun.c | 1 + dlls/scrrun/scrrun_private.h | 11 ++ dlls/scrrun/tests/filesystem.c | 32 ++++- 4 files changed, 362 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fee495d5fda56fa5b0c24…

1 0

Jacek Caban : jscript: Use prop_put in jsdisp_propput_dontenum.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 7491d480a9aeb908c9311a91a05d543641d20b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7491d480a9aeb908c9311a91a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 5 15:03:35 2012 +0100 jscript: Use prop_put in jsdisp_propput_dontenum. --- dlls/jscript/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2be474e..b4d333b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1271,7 +1271,7 @@ HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) if(FAILED(hres)) return hres; - return jsval_copy(val, &prop->u.val); + return prop_put(obj, prop, val, NULL); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 571d595b16fbeed6d96474e69ea7ca0a4229032d URL: http://source.winehq.org/git/wine.git/?a=commit;h=571d595b16fbeed6d96474e69… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Nov 3 18:44:13 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index d99b240..7462b4c 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-10-27 10:40+0300\n" +"PO-Revision-Date: 2012-11-03 18:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8270,44 +8270,36 @@ msgid "Security Warning" msgstr "Įspėjimas apie saugumą" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Ar vis tiek norite tęsti?" +msgstr "Ar norite įdiegti šią programinę įrangą?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Vieta:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Įdiegti/Pašalinti" +msgstr "Nediegti" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Kai įdiegta, ActiveX turi visišką prieigą prie kompiuterio. Nespauskite " +"„Įdiegti“, nebent visiškai pasitikite šaltiniu aukščiau." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Nepavyko pritaikyti įdiegimo transformacijos.\n" +msgstr "Nepavyko įdiegti komponento: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Įdiegti" +msgstr "Įdiegti (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Įdiegti" +msgstr "Įdiegti" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: b7576d6f04c533100772c710585e2486209899cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7576d6f04c533100772c7105… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Nov 3 19:50:23 2012 +0200 po: Update Finnish translation. --- po/fi.po | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/po/fi.po b/po/fi.po index 36cbd97..30a01f3 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8253,44 +8253,36 @@ msgid "Security Warning" msgstr "Turvallisuusvaroitus" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Haluatko jatkaa joka tapauksessa?" +msgstr "Haluatko asentaa tämän ohjelmiston?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Sijainti:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Asenna/Poista" +msgstr "Älä asenna" #: urlmon.rc:40 msgid "" "When installed, ActiveX has full access to your computer.Do not click " "install unless you have absolute trust in the above source." msgstr "" +"Asennuksen jälkeen ActiveX voi täysin hallita tietokonettasi. Asenna vain, " +"jos luotat yllä mainittuun lähteeseen täysin." #: urlmon.rc:47 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Muunnoksissa tapahtui virhe.\n" +msgstr "Komponentin asennus epäonnistui: %08x" #: urlmon.rc:48 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Asenna" +msgstr "Asenna (%d)" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Asenna" +msgstr "Asenna" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window"

1 0

Francois Gouget : kernel32/tests: Make test_CompareStringOrdinal() static.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: a4f2c0052639344ecbf93b1dfbb43745cc0e3b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f2c0052639344ecbf93b1df… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:40 2012 +0100 kernel32/tests: Make test_CompareStringOrdinal() static. --- dlls/kernel32/tests/locale.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 197f562..ebd7278 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3480,7 +3480,7 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); } -void test_CompareStringOrdinal(void) +static void test_CompareStringOrdinal(void) { INT ret; WCHAR test1[] = { 't','e','s','t',0 };

1 0

Francois Gouget : msvcp71: Remove an unused VTBL wrapper.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f397f482172326f0f0a265850ca1e9a885ce27fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f397f482172326f0f0a265850… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:47 2012 +0100 msvcp71: Remove an unused VTBL wrapper. --- dlls/msvcp71/msvcp71.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c index cb36893..bcc3685 100644 --- a/dlls/msvcp71/msvcp71.c +++ b/dlls/msvcp71/msvcp71.c @@ -49,7 +49,6 @@ DEFINE_VTBL_WRAPPER(36); DEFINE_VTBL_WRAPPER(40); DEFINE_VTBL_WRAPPER(44); DEFINE_VTBL_WRAPPER(48); -DEFINE_VTBL_WRAPPER(52); #endif

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: d55bb4497f380aba5e4bd691fd5e21ce18fe51a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d55bb4497f380aba5e4bd691f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Nov 4 11:06:58 2012 +0100 Assorted spelling fixes. --- dlls/ntdll/nt.c | 2 +- dlls/urlmon/axinstall.c | 2 +- programs/cmd/tests/test_builtins.cmd | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ab08190..d415db4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1143,7 +1143,7 @@ void fill_cpu_info(void) } #else num = 1; - FIXME("Detecting the number of processors not suported.\n"); + FIXME("Detecting the number of processors is not supported.\n"); #endif NtCurrentTeb()->Peb->NumberOfProcessors = num; diff --git a/dlls/urlmon/axinstall.c b/dlls/urlmon/axinstall.c index dedfb15..9f53ce0 100644 --- a/dlls/urlmon/axinstall.c +++ b/dlls/urlmon/axinstall.c @@ -324,7 +324,7 @@ static HRESULT install_file(install_ctx_t *ctx, const WCHAR *cache_file) if(!strcmpW(ext, cab_extW)) { hres = install_cab_file(ctx); }else { - FIXME("Unsupported extention %s\n", debugstr_w(ext)); + FIXME("Unsupported extension %s\n", debugstr_w(ext)); hres = E_NOTIMPL; } SysFreeString(path); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bfd051b..7f90549 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -732,8 +732,8 @@ for %%i in (%INT_PARMS%) do call :EQUtest %%i 10 for %%i in (%INT_PARMS%) do call :EQUtest %%i 9 if 011 EQU 9 (echo octal ok) if 0xA1 EQU 161 (echo hexa ok) -if 0xA1 EQU "161" (echo hexa should be be recognized) else (echo string/hexa compare ok) -if "0xA1" EQU 161 (echo hexa should be be recognized) else (echo string/hexa compare ok) +if 0xA1 EQU "161" (echo hexa should be recognized) else (echo string/hexa compare ok) +if "0xA1" EQU 161 (echo hexa should be recognized) else (echo string/hexa compare ok) for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 for %%i in (%INT_PARMS%) do call :NEQtest %%i 10

1 0