October 2007 - Wine-Commits

Huw Davies : fonts: Change to OS2 Vendor ID to be 'Wine'.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 71013a9623374d94165333a8125e70806fb87035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71013a9623374d94165333a81… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 12 14:33:04 2007 +0100 fonts: Change to OS2 Vendor ID to be 'Wine'. --- fonts/courier.sfd | 2 +- fonts/marlett.sfd | 1 + fonts/ms_sans_serif.sfd | 2 +- fonts/small_fonts.sfd | 2 +- fonts/system.sfd | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fonts/courier.sfd b/fonts/courier.sfd index 7ca7c79..0829c25 100644 --- a/fonts/courier.sfd +++ b/fonts/courier.sfd @@ -32,7 +32,7 @@ HheadAscent: 0 HheadAOffset: 1 HheadDescent: 0 HheadDOffset: 1 -OS2Vendor: 'PfEd' +OS2Vendor: 'Wine' ScriptLang: 2 1 latn 1 dflt 1 DFLT 1 dflt diff --git a/fonts/marlett.sfd b/fonts/marlett.sfd index 0cfe762..94a45fa 100644 --- a/fonts/marlett.sfd +++ b/fonts/marlett.sfd @@ -23,6 +23,7 @@ OS2WinAscent: 0 OS2WinAOffset: 1 OS2WinDescent: 0 OS2WinDOffset: 1 +OS2Vendor: 'Wine' HheadAscent: 0 HheadAOffset: 1 HheadDescent: 0 diff --git a/fonts/ms_sans_serif.sfd b/fonts/ms_sans_serif.sfd index b529ff2..eb7597c 100644 --- a/fonts/ms_sans_serif.sfd +++ b/fonts/ms_sans_serif.sfd @@ -32,7 +32,7 @@ HheadAscent: 0 HheadAOffset: 1 HheadDescent: 0 HheadDOffset: 1 -OS2Vendor: 'PfEd' +OS2Vendor: 'Wine' ScriptLang: 2 1 DFLT 1 dflt 1 latn 1 dflt diff --git a/fonts/small_fonts.sfd b/fonts/small_fonts.sfd index 1f6ee40..8e97616 100644 --- a/fonts/small_fonts.sfd +++ b/fonts/small_fonts.sfd @@ -43,7 +43,7 @@ OS2SupXOff: 3804 OS2SupYOff: 14120 OS2StrikeYSize: 390 OS2StrikeYPos: 63 -OS2Vendor: 'PfEd' +OS2Vendor: 'Wine' ScriptLang: 1 1 DFLT 1 dflt LangName: 1033 "" "" "" "" "" "" "" "" "Created with FontForge (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" diff --git a/fonts/system.sfd b/fonts/system.sfd index c36fb95..79b9ce5 100644 --- a/fonts/system.sfd +++ b/fonts/system.sfd @@ -32,7 +32,7 @@ HheadAscent: 0 HheadAOffset: 1 HheadDescent: 0 HheadDOffset: 1 -OS2Vendor: 'PfEd' +OS2Vendor: 'Wine' ScriptLang: 2 1 latn 1 dflt 1 DFLT 1 dflt

1 0

Huw Davies : gdi32: Try to load Wine' s TrueType fonts from the build directory.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: bc2a4dbee086de69cd05a30f3d717cb6858d030c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc2a4dbee086de69cd05a30f3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 12 14:36:44 2007 +0100 gdi32: Try to load Wine's TrueType fonts from the build directory. --- dlls/gdi32/freetype.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8d48e66..4ece12c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2179,6 +2179,7 @@ BOOL WineEngInit(void) /* load the system truetype fonts */ data_dir = wine_get_data_dir(); + if (!data_dir) data_dir = wine_get_build_dir(); if (data_dir && (unixname = HeapAlloc(GetProcessHeap(), 0, strlen(data_dir) + sizeof("/fonts/")))) { strcpy(unixname, data_dir); strcat(unixname, "/fonts/");

1 0

Huw Davies : gdi32: Factor out the code to call FT_Load_Sfnt_Table.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: 6ee7182ebbe36ea68f9d6f4cdc5f9785498e8cad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee7182ebbe36ea68f9d6f4cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 12 14:06:24 2007 +0100 gdi32: Factor out the code to call FT_Load_Sfnt_Table. --- dlls/gdi32/freetype.c | 103 ++++++++++++++++++++++++++++-------------------- 1 files changed, 60 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 495db78..b9bc82a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -944,6 +944,58 @@ static WCHAR *get_familyname(FT_Face ft_face) } +/***************************************************************** + * load_sfnt_table + * + * Wrapper around FT_Load_Sfnt_Table to cope with older versions + * of FreeType that don't export this function. + * + */ +static FT_Error load_sfnt_table(FT_Face ft_face, FT_ULong table, FT_Long offset, FT_Byte *buf, FT_ULong *len) +{ + + FT_Error err; + + /* If the FT_Load_Sfnt_Table function is there we'll use it */ + if(pFT_Load_Sfnt_Table) + { + err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, len); + } +#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H + else /* Do it the hard way */ + { + TT_Face tt_face = (TT_Face) ft_face; + SFNT_Interface *sfnt; + if (FT_Version.major==2 && FT_Version.minor==0) + { + /* 2.0.x */ + sfnt = *(SFNT_Interface**)((char*)tt_face + 528); + } + else + { + /* A field was added in the middle of the structure in 2.1.x */ + sfnt = *(SFNT_Interface**)((char*)tt_face + 532); + } + err = sfnt->load_any(tt_face, table, offset, buf, len); + } +#else + else + { + static int msg; + if(!msg) + { + MESSAGE("This version of Wine was compiled with freetype headers later than 2.2.0\n" + "but is being run with a freetype library without the FT_Load_Sfnt_Table function.\n" + "Please upgrade your freetype library.\n"); + msg++; + } + err = FT_Err_Unimplemented_Feature; + } +#endif + return err; +} + + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_size, char *fake_family, const WCHAR *target_family, DWORD flags) @@ -4564,50 +4616,15 @@ DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, (table >> 8 & 0xff00) | (table << 8 & 0xff0000); } - /* If the FT_Load_Sfnt_Table function is there we'll use it */ - if(pFT_Load_Sfnt_Table) { - /* make sure value of len is the value freetype says it needs */ - if( buf && len) { - FT_ULong needed = 0; - err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed); - if( !err && needed < len) len = needed; - } - err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); - } -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H - else { /* Do it the hard way */ - TT_Face tt_face = (TT_Face) ft_face; - SFNT_Interface *sfnt; - if (FT_Version.major==2 && FT_Version.minor==0) - { - /* 2.0.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 528); - } - else - { - /* A field was added in the middle of the structure in 2.1.x */ - sfnt = *(SFNT_Interface**)((char*)tt_face + 532); - } - /* make sure value of len is the value freetype says it needs */ - if( buf && len) { - FT_ULong needed = 0; - err = sfnt->load_any(tt_face, table, offset, NULL, &needed); - if( !err && needed < len) len = needed; - } - err = sfnt->load_any(tt_face, table, offset, buf, &len); - } -#else - else { - static int msg; - if(!msg) { - MESSAGE("This version of Wine was compiled with freetype headers later than 2.2.0\n" - "but is being run with a freetype library without the FT_Load_Sfnt_Table function.\n" - "Please upgrade your freetype library.\n"); - msg++; - } - err = FT_Err_Unimplemented_Feature; + /* make sure value of len is the value freetype says it needs */ + if(buf && len) + { + FT_ULong needed = 0; + err = load_sfnt_table(ft_face, table, offset, NULL, &needed); + if( !err && needed < len) len = needed; } -#endif + err = load_sfnt_table(ft_face, table, offset, buf, &len); + if(err) { TRACE("Can't find table %c%c%c%c\n", /* bytes were reversed */

1 0

Huw Davies : gdi32: Don't load Wine's bitmap-only TrueType fonts.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: e5df622ff3d44d097ef287811d6f6a1c914b1f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5df622ff3d44d097ef287811… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 12 14:35:44 2007 +0100 gdi32: Don't load Wine's bitmap-only TrueType fonts. --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b9bc82a..8d48e66 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1071,14 +1071,32 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ return 0; } - if(FT_IS_SFNT(ft_face) && (!pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2) || - !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea) || - !(pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head)))) { - TRACE("Font %s/%p lacks either an OS2, HHEA or HEAD table.\n" - "Skipping this font.\n", debugstr_a(file), font_data_ptr); - pFT_Done_Face(ft_face); - return 0; - } + if(FT_IS_SFNT(ft_face)) + { + if(!(pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2)) || + !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea) || + !(pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head))) + { + TRACE("Font %s/%p lacks either an OS2, HHEA or HEAD table.\n" + "Skipping this font.\n", debugstr_a(file), font_data_ptr); + pFT_Done_Face(ft_face); + return 0; + } + + /* Wine uses ttfs as an intermediate step in building its bitmap fonts; + we don't want to load these. */ + if(!memcmp(pOS2->achVendID, "Wine", sizeof(pOS2->achVendID))) + { + FT_ULong len = 0; + + if(!load_sfnt_table(ft_face, FT_MAKE_TAG('E','B','S','C'), 0, NULL, &len)) + { + TRACE("Skipping Wine bitmap-only TrueType font %s\n", debugstr_a(file)); + pFT_Done_Face(ft_face); + return 0; + } + } + } if(!ft_face->family_name || !ft_face->style_name) { TRACE("Font %s/%p lacks either a family or style name\n", debugstr_a(file), font_data_ptr);

1 0

Roderick Colenbrander : wined3d: Optimize P8 fragment shader.
by Alexandre Julliard Oct. 15, 2007

Oct. 15, 2007

Module: wine Branch: master Commit: b4678b7b10515ae3556a8642a36ee2baf45cd989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4678b7b10515ae3556a8642a… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Oct 12 13:34:43 2007 +0200 wined3d: Optimize P8 fragment shader. --- dlls/wined3d/surface.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fc1b10d..ade950e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1980,8 +1980,7 @@ const char *fragment_palette_conversion = "TEMP index;\n" "PARAM constants = { 0.996, 0.00195, 0, 0 };\n" /* { 255/256, 0.5/255*255/256, 0, 0 } */ "TEX index.x, fragment.texcoord[0], texture[0], 2D;\n" /* store the red-component of the current pixel */ - "MUL index.x, index.x, constants.x;\n" /* Scale the index by 255/256 */ - "ADD index.x, index.x, constants.y;\n" /* Add a bias of '0.5' in order to sample in the middle */ + "MAD index.x, index.x, constants.x, constants.y;\n" /* Scale the index by 255/256 and add a bias of '0.5' in order to sample in the middle */ "TEX result.color, index, texture[1], 1D;\n" /* use the red-component as a index in the palette to get the final color */ "END";

1 0

wiki/winehq/css common.css
by Dimi Paun Oct. 15, 2007

Oct. 15, 2007

ChangeSet ID: 1192414774205773845854313 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/14 19:19:34 Modified files: winehq/css : common.css Log message: Add a bit of space in between paragraphs. Old revision New revision Changes Path 1.5 1.6 +1 -1 wiki/winehq/css/common.css Index: wiki/winehq/css/common.css diff -u -p wiki/winehq/css/common.css:1.5 wiki/winehq/css/common.css:1.6 --- wiki/winehq/css/common.css 15 Oct 2007 2:19:34 -0000 +++ /dev/null 15 Oct 2007 2:19:34 -0000 @@ -103,7 +103,7 @@ td } td p { - margin: 0; + margin: 0.5em 0 0 0; padding: 0; font-size: 12px; }

1 0

wiki/winehq/css screen.css
by Dimi Paun Oct. 15, 2007

Oct. 15, 2007

ChangeSet ID: 1192409580863680857773037 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/14 17:53:00 Modified files: winehq/css : screen.css Log message: Aerate lists a bit, based on a suggestion from Mitchell Mebane. Old revision New revision Changes Path 1.6 1.7 +4 -0 wiki/winehq/css/screen.css Index: wiki/winehq/css/screen.css diff -u -p wiki/winehq/css/screen.css:1.6 wiki/winehq/css/screen.css:1.7 --- wiki/winehq/css/screen.css 15 Oct 2007 0:53: 0 -0000 +++ /dev/null 15 Oct 2007 0:53: 0 -0000 @@ -326,6 +326,10 @@ form.dialog { width: 100%; } +.table-of-contents li { + line-height: 20px; +} + /* We use here dumb css1 ids becuase of IE suckiness */ #editor-textarea, #editor-comment { width: 100%;

1 0

Alexander Nicolaysen Sørnes : objectManager: Add support for hiding the reject button, use it for buglinks
by Chris Morgan Oct. 14, 2007

Oct. 14, 2007

Module: appdb Branch: master Commit: f2e17d3af3abcbf5fdcaf32cbe4ad076cbf599e7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f2e17d3af3abcbf5fdcaf32c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Oct 14 16:12:21 2007 +0200 objectManager: Add support for hiding the reject button, use it for buglinks --- include/bugs.php | 5 +++++ include/objectManager.php | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/include/bugs.php b/include/bugs.php index 7e87f0d..6e28be0 100644 --- a/include/bugs.php +++ b/include/bugs.php @@ -482,6 +482,11 @@ class Bug echo $oTable->GetString(); } + function objectHideReject() + { + return TRUE; + } + // NOTE: we don't have any editing support for this entry at this time // so output the entry and a field to identify the bug id function outputEditor() diff --git a/include/objectManager.php b/include/objectManager.php index fec70ff..75de915 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -271,6 +271,14 @@ class ObjectManager $this->handleMultiPageControls($aClean, FALSE); } + private function getOptionalSetting($sFunction, $bDefault) + { + if(!method_exists($this->sClass, $sFunction)) + return $bDefault; + + return $this->getObject()->$sFunction(); + } + /* display the entry for editing */ public function display_entry_for_editing($aClean, $sErrors) { @@ -363,7 +371,7 @@ class ObjectManager 'class="button" />',"\n"; } - if(!$this->bIsRejected) + if(!$this->bIsRejected && !$this->getOptionalSetting("objectHideReject", FALSE)) { echo '<input name="sSubmit" type="submit" value="Reject" class="button" '. '/>',"\n";

1 0

wiki/winehq/css common.css
by Dimi Paun Oct. 13, 2007

Oct. 13, 2007

ChangeSet ID: 1192258496444006107355566 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/12 23:54:56 Modified files: winehq/css : common.css Log message: Make the text font smaller to match WineHQ. I now think I know why we had all the rendering problems, what a bunch of ... Old revision New revision Changes Path 1.4 1.5 +5 -0 wiki/winehq/css/common.css Index: wiki/winehq/css/common.css diff -u -p wiki/winehq/css/common.css:1.4 wiki/winehq/css/common.css:1.5 --- wiki/winehq/css/common.css 13 Oct 2007 6:54:56 -0000 +++ /dev/null 13 Oct 2007 6:54:56 -0000 @@ -105,6 +105,11 @@ td td p { margin: 0; padding: 0; + font-size: 12px; +} + +td li { + font-size: 12px; } /* standard rule ---- */

1 0

wiki/winehq/css screen.css
by Dimi Paun Oct. 13, 2007

Oct. 13, 2007

ChangeSet ID: 1192256188408124954513372 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/12 23:16:28 Modified files: winehq/css : screen.css Log message: Really fix the display problem. It is amazing how CSS works sometimes: in this case, a no-op operation (setting the font-size to 12px shouldn't have mattered because it was already set to 12px by the <body>) results in a consistent bug in a bunch of different browsers. NOTE: Brownie points to anyone who can explain why this change fixes the problem! Old revision New revision Changes Path 1.5 1.6 +0 -4 wiki/winehq/css/screen.css Index: wiki/winehq/css/screen.css diff -u -p wiki/winehq/css/screen.css:1.5 wiki/winehq/css/screen.css:1.6 --- wiki/winehq/css/screen.css 13 Oct 2007 6:16:28 -0000 +++ /dev/null 13 Oct 2007 6:16:28 -0000 @@ -133,10 +133,6 @@ span.sep { background: white ; } -#pagecontent p { - font-size: 12px; -} - #pagetitle { margin: 0px 0px 0px 0px; height: 10px;

1 0