wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 5c4619d8a78df7fea92333cd83e05c8ce2b49b1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4619d8a78df7fea92333cd8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 30 16:05:23 2012 +0300 po: Update Swedish translation. --- po/sv.po | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/po/sv.po b/po/sv.po index 74249e4..c74d60d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2185,10 +2185,8 @@ msgstr "" "återkallade eller betrodda certifikat:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Standard för kryptografisk meddelandesyntax/PKCS #7-meddelande (.p7b)" +msgstr "Standard för kryptografisk meddelandesyntax/PKCS #7-meddelande (*.p7b)" #: cryptui.rc:298 msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" @@ -2333,22 +2331,17 @@ msgid "Select the format you want to use:" msgstr "Välj formatet du vill använda:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-kodad X.509 (.cer)" +msgstr "&DER-kodad X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-kodad X.509 (.cer):" +msgstr "Ba&se64-kodad X.509 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "Standard för &kryptografisk meddelandesyntax/PKCS #7 (.p7b)" +msgstr "" +"Standard för &kryptografisk meddelandesyntax/PKCS #7-meddelande (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" @@ -3448,10 +3441,8 @@ msgid "Expected ')'" msgstr "')' förväntades" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Ogiltig parameter.\n" +msgstr "Ogiltigt tecken" #: jscript.rc:38 msgid "Unterminated string constant" @@ -12620,9 +12611,8 @@ msgid "Select an executable file" msgstr "Välj en körbar fil" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "Upptäck aut&omatiskt" +msgstr "Upptäck automatiskt" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 0c54f79c9e994b142cd93e02a653a743e396b9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c54f79c9e994b142cd93e02a… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Mar 30 16:05:22 2012 +0300 po: Update Finnish translation. --- po/fi.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 355a705..242b9e6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3446,10 +3446,8 @@ msgid "Expected ')'" msgstr "Odotettiin merkkiä ')'" #: jscript.rc:37 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Virheellinen parametri.\n" +msgstr "Virheellinen merkki" #: jscript.rc:38 msgid "Unterminated string constant"

1 0

Jacek Caban : mshtml: Use better helper in IHTMLStyle:: get_width implementation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: c6ada99b896df884783ba54cd127a0ca65a4a79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ada99b896df884783ba54cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 30 14:14:26 2012 +0200 mshtml: Use better helper in IHTMLStyle::get_width implementation. --- dlls/mshtml/htmlstyle.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 448b7c8..627d42c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2002,8 +2002,7 @@ static HRESULT WINAPI HTMLStyle_get_width(IHTMLStyle *iface, VARIANT *p) TRACE("(%p)->(%p)\n", This, p); - V_VT(p) = VT_BSTR; - return get_style_attr(This, STYLEID_WIDTH, &V_BSTR(p)); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_WIDTH, p, 0); } static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v) @@ -2710,8 +2709,8 @@ static HRESULT WINAPI HTMLStyle_setAttribute(IHTMLStyle *iface, BSTR strAttribut HRESULT hres; DISPID dispid; - TRACE("(%p)->(%s v%d %08x)\n", This, debugstr_w(strAttributeName), - V_VT(&AttributeValue), lFlags); + TRACE("(%p)->(%s %s %08x)\n", This, debugstr_w(strAttributeName), + debugstr_variant(&AttributeValue), lFlags); if(!strAttributeName) return E_INVALIDARG;

1 0

Jacek Caban : mshtml: Use proper helpers in IHTMLStyle:: backgroundColor implementation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 27555a52d8c6f64069951c8af227e9ba56a9f5c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27555a52d8c6f64069951c8af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 30 14:14:16 2012 +0200 mshtml: Use proper helpers in IHTMLStyle::backgroundColor implementation. --- dlls/mshtml/htmlstyle.c | 20 +++----------------- dlls/mshtml/tests/style.c | 12 ++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index f13fb35..448b7c8 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -921,30 +921,16 @@ static HRESULT WINAPI HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_BACKGROUND_COLOR, V_BSTR(&v), 0); - case VT_I4: { - WCHAR value[10]; - static const WCHAR format[] = {'#','%','0','6','x',0}; - - wsprintfW(value, format, V_I4(&v)); - return set_style_attr(This, STYLEID_BACKGROUND_COLOR, value, 0); - } - default: - FIXME("unsupported vt %d\n", V_VT(&v)); - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_backgroundColor(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); + TRACE("(%p)->(%p)\n", This, p); - V_VT(p) = VT_BSTR; - return get_style_attr(This, STYLEID_BACKGROUND_COLOR, &V_BSTR(p)); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_COLOR, p, 0); } static HRESULT WINAPI HTMLStyle_put_backgroundImage(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 34e09b1..bb80df1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1256,6 +1256,18 @@ static void test_body_style(IHTMLStyle *style) ok(!V_BSTR(&v), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("red"); + hres = IHTMLStyle_put_backgroundColor(style, v); + ok(hres == S_OK, "put_backgroundColor failed: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_backgroundColor(style, &v); + ok(hres == S_OK, "get_backgroundColor: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "type failed: %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "red"), "str=%s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + /* padding */ hres = IHTMLStyle_get_padding(style, &str); ok(hres == S_OK, "get_padding failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use proper helpers in IHTMLStyle:: color implementation.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 1cd6da26123c7595f4c1e8e117b2bcfaa0332795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd6da26123c7595f4c1e8e11… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 30 14:14:03 2012 +0200 mshtml: Use proper helpers in IHTMLStyle::color implementation. --- dlls/mshtml/htmlstyle.c | 14 ++------------ dlls/mshtml/tests/style.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 69f3720..f13fb35 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -885,16 +885,7 @@ static HRESULT WINAPI HTMLStyle_put_color(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - TRACE("%s\n", debugstr_w(V_BSTR(&v))); - return set_style_attr(This, STYLEID_COLOR, V_BSTR(&v), 0); - - default: - FIXME("unsupported vt=%d\n", V_VT(&v)); - } - - return E_NOTIMPL; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_COLOR, &v, ATTR_HEX_INT); } static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p) @@ -903,8 +894,7 @@ static HRESULT WINAPI HTMLStyle_get_color(IHTMLStyle *iface, VARIANT *p) TRACE("(%p)->(%p)\n", This, p); - V_VT(p) = VT_BSTR; - return get_style_attr(This, STYLEID_COLOR, &V_BSTR(p)); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_COLOR, p, 0); } static HRESULT WINAPI HTMLStyle_put_background(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 7adb0ea..34e09b1 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -572,6 +572,18 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 0xfdfd; + hres = IHTMLStyle_put_color(style, v); + ok(hres == S_OK, "put_color failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_color(style, &v); + ok(hres == S_OK, "get_color failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(color) = %d\n", V_VT(&v)); + todo_wine + ok(!strcmp_wa(V_BSTR(&v), "#00fdfd"), "V_BSTR(color) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + b = 0xfefe; hres = IHTMLStyle_get_textDecorationUnderline(style, &b); ok(hres == S_OK, "get_textDecorationUnderline failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Use proper helpers to implement IHTMLSyle:: fontSize property.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 75dd422c2a566b43f5ce0057dc8d49a25f79b615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75dd422c2a566b43f5ce0057d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 30 14:13:49 2012 +0200 mshtml: Use proper helpers to implement IHTMLSyle::fontSize property. --- dlls/mshtml/htmlstyle.c | 12 ++---------- dlls/mshtml/tests/style.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7efdce6..69f3720 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -853,14 +853,7 @@ static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_FONT_SIZE, V_BSTR(&v), 0); - default: - FIXME("not supported vt %d\n", V_VT(&v)); - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_SIZE, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p) @@ -869,8 +862,7 @@ static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p) TRACE("(%p)->(%p)\n", This, p); - V_VT(p) = VT_BSTR; - return get_style_attr(This, STYLEID_FONT_SIZE, &V_BSTR(p)); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_SIZE, p, 0); } static HRESULT WINAPI HTMLStyle_put_font(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 9fe8512..7adb0ea 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -555,6 +555,17 @@ static void test_body_style(IHTMLStyle *style) ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v)); ok(!V_BSTR(&v), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_I4; + V_I4(&v) = 12; + hres = IHTMLStyle_put_fontSize(style, v); + ok(hres == S_OK, "put_fontSize failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_fontSize(style, &v); + ok(hres == S_OK, "get_fontSize failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "12px"), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + V_VT(&v) = VT_NULL; hres = IHTMLStyle_get_color(style, &v); ok(hres == S_OK, "get_color failed: %08x\n", hres);

1 0

Kusanagi Kouichi : gdi32: Use helper functions when loading font from cache .
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 35c84cddccdc81c56711494834eefa2191763c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c84cddccdc81c5671149483… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Fri Mar 30 17:52:02 2012 +0900 gdi32: Use helper functions when loading font from cache. --- dlls/gdi32/freetype.c | 221 +++++++++++++++++++++++-------------------------- 1 files changed, 105 insertions(+), 116 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d61605e..fd362ab 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1190,6 +1190,109 @@ static WCHAR *get_face_name(FT_Face ft_face, FT_UShort name_id, FT_UShort langua return ret; } +static inline BOOL faces_equal( const Face *f1, const Face *f2 ) +{ + if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE; + if (f1->scalable) return TRUE; + if (f2->size.y_ppem != f2->size.y_ppem) return FALSE; + return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); +} + +static inline void free_face( Face *face ) +{ + HeapFree( GetProcessHeap(), 0, face->file ); + HeapFree( GetProcessHeap(), 0, face->StyleName ); + HeapFree( GetProcessHeap(), 0, face->FullName ); + HeapFree( GetProcessHeap(), 0, face->cached_enum_data ); + HeapFree( GetProcessHeap(), 0, face ); +} + +static inline void free_family( Family *family ) +{ + Face *face, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE( face, cursor2, &family->faces, Face, entry ) + { + list_remove( &face->entry ); + free_face( face ); + } + HeapFree( GetProcessHeap(), 0, family->FamilyName ); + HeapFree( GetProcessHeap(), 0, family->EnglishName ); + HeapFree( GetProcessHeap(), 0, family ); +} + +static inline int style_order(const Face *face) +{ + switch (face->ntmFlags & (NTM_REGULAR | NTM_BOLD | NTM_ITALIC)) + { + case NTM_REGULAR: + return 0; + case NTM_BOLD: + return 1; + case NTM_ITALIC: + return 2; + case NTM_BOLD | NTM_ITALIC: + return 3; + default: + WARN("Don't know how to order font %s %s with flags 0x%08x\n", + debugstr_w(face->family->FamilyName), + debugstr_w(face->StyleName), + face->ntmFlags); + return 9999; + } +} + +static BOOL insert_face_in_family_list( Face *face, Family *family ) +{ + Face *cursor; + + LIST_FOR_EACH_ENTRY( cursor, &family->faces, Face, entry ) + { + if (faces_equal( face, cursor )) + { + TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", + debugstr_w(family->FamilyName), debugstr_w(face->StyleName), + cursor->font_version, face->font_version); + + if (face->font_version <= cursor->font_version) + { + TRACE("Original font is newer so skipping this one\n"); + return FALSE; + } + else + { + TRACE("Replacing original with this one\n"); + list_add_before( &cursor->entry, &face->entry ); + face->family = family; + list_remove( &cursor->entry); + free_face( cursor ); + return TRUE; + } + } + + if (style_order( face ) < style_order( cursor )) break; + } + + list_add_before( &cursor->entry, &face->entry ); + face->family = family; + return TRUE; +} + +/**************************************************************** + * NB This function stores the ptrs to the strings to save copying. + * Don't free them after calling. + */ +static Family *create_family( WCHAR *name, WCHAR *english_name ) +{ + Family * const family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + family->FamilyName = name; + family->EnglishName = english_name; + list_init( &family->faces ); + family->replacement = &family->faces; + + return family; +} + static LONG reg_load_dword(HKEY hkey, const WCHAR *value, DWORD *data) { DWORD type, needed; @@ -1222,7 +1325,6 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) RegQueryValueExA(hkey_face, "File Name", NULL, NULL, (BYTE*)face->file, &needed); face->StyleName = strdupW(face_name); - face->family = family; face->vertical = (family->FamilyName[0] == '@'); if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) @@ -1272,10 +1374,7 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) face->fs.fsUsb[0], face->fs.fsUsb[1], face->fs.fsUsb[2], face->fs.fsUsb[3]); - if(!italic && !bold) - list_add_head(&family->faces, &face->entry); - else - list_add_tail(&family->faces, &face->entry); + insert_face_in_family_list(face, family); TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); } @@ -1330,11 +1429,7 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE*)english_family, &size); } - family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); - family->FamilyName = strdupW(family_name); - family->EnglishName = english_family; - list_init(&family->faces); - family->replacement = &family->faces; + family = create_family(strdupW(family_name), english_family); list_add_tail(&font_list, &family->entry); if(english_family) @@ -1443,30 +1538,6 @@ static void add_face_to_cache(Face *face) RegCloseKey(hkey_font_cache); } -static inline int TestStyles(DWORD flags, DWORD styles) -{ - return (flags & styles) == styles; -} - -static inline int style_order(Face *face) -{ - if (TestStyles(face->ntmFlags, NTM_BOLD | NTM_ITALIC)) - return 3; - if (TestStyles(face->ntmFlags, NTM_ITALIC)) - return 2; - if (TestStyles(face->ntmFlags, NTM_BOLD)) - return 1; - if (TestStyles(face->ntmFlags, NTM_REGULAR)) - return 0; - - WARN("Don't know how to order font %s %s with flags 0x%08x\n", - debugstr_w(face->family->FamilyName), - debugstr_w(face->StyleName), - face->ntmFlags); - - return 9999; -} - static WCHAR *prepend_at(WCHAR *family) { WCHAR *str; @@ -1505,21 +1576,6 @@ static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BO } } -/**************************************************************** - * NB This function stores the ptrs to the strings to save copying. - * Don't free them after calling. - */ -static Family *create_family( WCHAR *name, WCHAR *english_name ) -{ - Family *family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); - family->FamilyName = name; - family->EnglishName = english_name; - list_init( &family->faces ); - family->replacement = &family->faces; - - return family; -} - static Family *get_family( FT_Face ft_face, BOOL vertical ) { Family *family; @@ -1653,29 +1709,6 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } -static inline void free_face( Face *face ) -{ - HeapFree( GetProcessHeap(), 0, face->file ); - HeapFree( GetProcessHeap(), 0, face->StyleName ); - HeapFree( GetProcessHeap(), 0, face->FullName ); - HeapFree( GetProcessHeap(), 0, face->cached_enum_data ); - HeapFree( GetProcessHeap(), 0, face ); -} - -static inline void free_family( Family *family ) -{ - Face *face, *cursor2; - - LIST_FOR_EACH_ENTRY_SAFE( face, cursor2, &family->faces, Face, entry ) - { - list_remove( &face->entry ); - free_face( face ); - } - HeapFree( GetProcessHeap(), 0, family->FamilyName ); - HeapFree( GetProcessHeap(), 0, family->EnglishName ); - HeapFree( GetProcessHeap(), 0, family ); -} - #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1738,50 +1771,6 @@ static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, return face; } -static inline BOOL faces_equal( Face *f1, Face *f2 ) -{ - if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE; - if (f1->scalable) return TRUE; - if (f2->size.y_ppem != f2->size.y_ppem) return FALSE; - return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); -} - -static BOOL insert_face_in_family_list( Face *face, Family *family ) -{ - Face *cursor; - - LIST_FOR_EACH_ENTRY( cursor, &family->faces, Face, entry ) - { - if (faces_equal( face, cursor )) - { - TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", - debugstr_w(family->FamilyName), debugstr_w(face->StyleName), - cursor->font_version, face->font_version); - - if (face->font_version <= cursor->font_version) - { - TRACE("Original font is newer so skipping this one\n"); - return FALSE; - } - else - { - TRACE("Replacing original with this one\n"); - list_add_before( &cursor->entry, &face->entry ); - face->family = family; - list_remove( &cursor->entry); - free_face( cursor ); - return TRUE; - } - } - - if (style_order( face ) < style_order( cursor )) break; - } - - list_add_before( &cursor->entry, &face->entry ); - face->family = family; - return TRUE; -} - static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags, BOOL vertical) {

1 0

Hans Leidekker : advapi32: Return a fake security descriptor from CreatePrivateObjectSecurity.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 40427f1a7741fdc65d32db8480415740f8f19374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40427f1a7741fdc65d32db848… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 30 12:19:23 2012 +0200 advapi32: Return a fake security descriptor from CreatePrivateObjectSecurity. Based on a patch by Robert Shearman. --- dlls/advapi32/security.c | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 172b9a2..9df27db 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5105,16 +5105,53 @@ BOOL WINAPI CreatePrivateObjectSecurity( HANDLE Token, PGENERIC_MAPPING GenericMapping ) { - FIXME("%p %p %p %d %p %p - stub\n", ParentDescriptor, CreatorDescriptor, - NewDescriptor, IsDirectoryObject, Token, GenericMapping); + SECURITY_DESCRIPTOR_RELATIVE *relative; + DWORD needed, offset; + BYTE *buffer; - return FALSE; + FIXME("%p %p %p %d %p %p - returns fake SECURITY_DESCRIPTOR\n", ParentDescriptor, + CreatorDescriptor, NewDescriptor, IsDirectoryObject, Token, GenericMapping); + + needed = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + needed += sizeof(sidWorld); + needed += sizeof(sidWorld); + needed += WINE_SIZE_OF_WORLD_ACCESS_ACL; + needed += WINE_SIZE_OF_WORLD_ACCESS_ACL; + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, needed ))) return FALSE; + relative = (SECURITY_DESCRIPTOR_RELATIVE *)buffer; + if (!InitializeSecurityDescriptor( relative, SECURITY_DESCRIPTOR_REVISION )) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return FALSE; + } + relative->Control |= SE_SELF_RELATIVE; + offset = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + + memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); + relative->Owner = offset; + offset += sizeof(sidWorld); + + memcpy( buffer + offset, &sidWorld, sizeof(sidWorld) ); + relative->Group = offset; + offset += sizeof(sidWorld); + + GetWorldAccessACL( (ACL *)(buffer + offset) ); + relative->Dacl = offset; + offset += WINE_SIZE_OF_WORLD_ACCESS_ACL; + + GetWorldAccessACL( (ACL *)(buffer + offset) ); + relative->Sacl = offset; + + *NewDescriptor = relative; + return TRUE; } BOOL WINAPI DestroyPrivateObjectSecurity( PSECURITY_DESCRIPTOR* ObjectDescriptor ) { FIXME("%p - stub\n", ObjectDescriptor); + HeapFree( GetProcessHeap(), 0, *ObjectDescriptor ); return TRUE; }

1 0

Huw Davies : gdi32: Add support for loading scalable font resources.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: 88a2620b149b3fa82b20cca2aff3b2088026456e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a2620b149b3fa82b20cca2a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 30 12:38:04 2012 +0100 gdi32: Add support for loading scalable font resources. --- dlls/gdi32/font.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 1abb6ae..230d421 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3446,12 +3446,85 @@ static BOOL CALLBACK load_enumed_resource(HMODULE hModule, LPCWSTR type, LPWSTR return TRUE; } +static void *map_file( const WCHAR *filename, LARGE_INTEGER *size ) +{ + HANDLE file, mapping; + void *ptr; + + file = CreateFileW( filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + if (file == INVALID_HANDLE_VALUE) return NULL; + + GetFileSizeEx( file, size ); + mapping = CreateFileMappingW( file, NULL, PAGE_READONLY, 0, 0, NULL ); + CloseHandle( file ); + if (mapping == NULL) return NULL; + + ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); + CloseHandle( mapping ); + + return ptr; +} + +static WCHAR *get_scalable_filename( const WCHAR *res ) +{ + LARGE_INTEGER size; + BYTE *ptr = map_file( res, &size ); + const IMAGE_DOS_HEADER *dos; + const IMAGE_OS2_HEADER *ne; + WCHAR *name = NULL; + WORD rsrc_off, align, type_id, count; + DWORD res_off, res_len, i; + int len; + + if (!ptr) return NULL; + + if (size.u.HighPart) goto fail; + if (size.u.LowPart < sizeof( *dos )) goto fail; + dos = (const IMAGE_DOS_HEADER *)ptr; + if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto fail; + if (size.u.LowPart < dos->e_lfanew + sizeof( *ne )) goto fail; + ne = (const IMAGE_OS2_HEADER *)(ptr + dos->e_lfanew); + rsrc_off = dos->e_lfanew + ne->ne_rsrctab; + if (size.u.LowPart < rsrc_off + 10) goto fail; + align = *(WORD *)(ptr + rsrc_off); + rsrc_off += 2; + type_id = *(WORD *)(ptr + rsrc_off); + while (type_id && type_id != 0x80cc) + { + count = *(WORD *)(ptr + rsrc_off + 2); + rsrc_off += 8 + count * 12; + if (size.u.LowPart < rsrc_off + 8) goto fail; + type_id = *(WORD *)(ptr + rsrc_off); + } + if (!type_id) goto fail; + count = *(WORD *)(ptr + rsrc_off + 2); + if (size.u.LowPart < rsrc_off + 8 + count * 12) goto fail; + + res_off = *(WORD *)(ptr + rsrc_off + 8) << align; + res_len = *(WORD *)(ptr + rsrc_off + 10) << align; + if (size.u.LowPart < res_off + res_len) goto fail; + + for (i = 0; i < res_len; i++) + if (ptr[ res_off + i ] == 0) break; + if (i == res_len) goto fail; + + len = MultiByteToWideChar( CP_ACP, 0, (char *)ptr + res_off, -1, NULL, 0 ); + name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + if (name) MultiByteToWideChar( CP_ACP, 0, (char *)ptr + res_off, -1, name, len ); + +fail: + UnmapViewOfFile( ptr ); + return name; +} + /*********************************************************************** * AddFontResourceExW (GDI32.@) */ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { int ret = WineEngAddFontResourceEx(str, fl, pdv); + WCHAR *filename; + if (ret == 0) { /* FreeType <2.3.5 has problems reading resources wrapped in PE files. */ @@ -3467,6 +3540,11 @@ INT WINAPI AddFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) ret = num_resources; FreeLibrary(hModule); } + else if ((filename = get_scalable_filename( str )) != NULL) + { + ret = WineEngAddFontResourceEx( filename, fl, pdv ); + HeapFree( GetProcessHeap(), 0, filename ); + } } return ret; }

1 0

Alexandre Julliard : ntdll: Also call the unwind handler for the target frame.
by Alexandre Julliard 30 Mar '12

30 Mar '12

Module: wine Branch: master Commit: a777676bc48d4575a0bafb40bad1fe85d269e352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a777676bc48d4575a0bafb40b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 14:42:55 2012 +0200 ntdll: Also call the unwind handler for the target frame. --- dlls/ntdll/signal_x86_64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 5470a59..6677fed 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3049,7 +3049,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec dispatch.EstablisherFrame = new_context.Rsp; } - if (dispatch.EstablisherFrame == (ULONG64)end_frame) break; + if (context->Rsp == (ULONG64)end_frame) break; *context = new_context; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2012