wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Austin English : ntoskrnl.exe: Add a stub for IoStartNextPacket.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 902d619dfef06c7eab46f1afd6e616bc5ef81a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=902d619dfef06c7eab46f1afd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 8 13:14:28 2012 -0800 ntoskrnl.exe: Add a stub for IoStartNextPacket. --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 89f5b17..6eda074 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1760,3 +1760,11 @@ PKEVENT WINAPI IoCreateSynchronizationEvent(PUNICODE_STRING name, PHANDLE handle FIXME("(%p %p) stub\n", name, handle); return NULL; } + +/***************************************************** + * IoStartNextPacket (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoStartNextPacket(PDEVICE_OBJECT deviceobject, BOOLEAN cancelable) +{ + FIXME("(%p %d) stub\n", deviceobject, cancelable); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index da3d38e..97a71fc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -458,7 +458,7 @@ @ stub IoSetSystemPartition @ stdcall IoSetThreadHardErrorMode(long) @ stub IoSetTopLevelIrp -@ stub IoStartNextPacket +@ stdcall IoStartNextPacket(ptr long) @ stub IoStartNextPacketByKey @ stub IoStartPacket @ stdcall IoStartTimer(ptr)

1 0

André Hentschel : ddraw: Fix a typo.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: b9c1e5ad321f0d612682de6a463fc47be64557e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9c1e5ad321f0d612682de6a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 21:03:11 2012 +0100 ddraw: Fix a typo. --- dlls/ddraw/light.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 4eeebd4..2d6a462 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirect3DLightImpl_SetLight(IDirect3DLight *iface, D3DLIGH return DDERR_INVALIDPARAMS; if ( lpLight->dltType == D3DLIGHT_PARALLELPOINT ) - FIXME("D3DLIGHT_PARALLELPOINT no supported\n"); + FIXME("D3DLIGHT_PARALLELPOINT not supported\n"); /* Translate D3DLIGH2 structure to D3DLIGHT7 */ light7->dltType = lpLight->dltType;

1 0

Kusanagi Kouichi : gdi32: Remove unused parameters and code, and a useless wrapper function.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: d77104b93d87a7169966f17b4bb977a60a527e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77104b93d87a7169966f17b4… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:27 2012 +0900 gdi32: Remove unused parameters and code, and a useless wrapper function. --- dlls/gdi32/freetype.c | 77 ++++++++++++++----------------------------------- 1 files changed, 22 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d77104b93d87a7169966f…

1 0

Kusanagi Kouichi : gdi32: Simplify font replacement loading.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: eab02574929df3a5a6e6dcdb26d4d9a629618e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab02574929df3a5a6e6dcdb2… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:20 2012 +0900 gdi32: Simplify font replacement loading. --- dlls/gdi32/freetype.c | 54 +++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a4d369a..32a6442 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -281,6 +281,7 @@ typedef struct tagFamily { const WCHAR *FamilyName; const WCHAR *EnglishName; struct list faces; + struct list *replacement; } Family; typedef struct { @@ -1323,6 +1324,7 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) family->FamilyName = strdupW(family_name); family->EnglishName = english_family; list_init(&family->faces); + family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); if(english_family) @@ -1540,6 +1542,7 @@ static void AddFaceToList(FT_Face ft_face, char *fake_family, const char *file, family->FamilyName = strdupW(localised_family ? localised_family : english_family); family->EnglishName = localised_family ? strdupW(english_family) : NULL; list_init(&family->faces); + family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); if(localised_family) { @@ -1900,20 +1903,18 @@ static void LoadReplaceList(void) if(!find_family_from_any_name(value)) { - /* Find the old family and hence all of the font files - in that family */ - const Family * const family = find_family_from_any_name(data); + Family * const family = find_family_from_any_name(data); if (family != NULL) { - const struct list *face_elem_ptr; - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - const Face * const face = LIST_ENTRY(face_elem_ptr, Face, entry); - TRACE("mapping %s %s to %s\n", debugstr_w(family->FamilyName), - debugstr_w(face->StyleName), familyA); - /* Now add a new entry with the new family name */ - AddFontToList(face->file, face->font_data_ptr, face->font_data_size, - familyA, family->FamilyName, - ADDFONT_FORCE_BITMAP | (face->external ? ADDFONT_EXTERNAL_FONT : 0)); + Family * const new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); + if (new_family != NULL) + { + TRACE("mapping %s to %s\n", debugstr_w(data), debugstr_w(value)); + new_family->FamilyName = strdupW(value); + new_family->EnglishName = NULL; + list_init(&new_family->faces); + new_family->replacement = &family->faces; + list_add_tail(&font_list, &new_family->entry); } } else @@ -1991,7 +1992,10 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) static const struct list *get_face_list_from_family(const Family *family) { - return &family->faces; + if (!list_empty(&family->faces)) + return &family->faces; + else + return family->replacement; } static void populate_system_links(const WCHAR *name, const WCHAR *const *values) @@ -4674,24 +4678,24 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) return FALSE; } -static BOOL face_matches(Face *face, const LOGFONTW *lf) +static BOOL face_matches(const WCHAR *family_name, Face *face, const LOGFONTW *lf) { WCHAR full_family_name[LF_FULLFACESIZE]; - if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; + if (!strcmpiW(lf->lfFaceName, family_name)) return TRUE; - if (strlenW(face->family->FamilyName) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) + if (strlenW(family_name) + strlenW(face->StyleName) + 2 > LF_FULLFACESIZE) { FIXME("Length of %s + %s + 2 is longer than LF_FULLFACESIZE\n", - debugstr_w(face->family->FamilyName), debugstr_w(face->StyleName)); + debugstr_w(family_name), debugstr_w(face->StyleName)); return FALSE; } - create_full_name(full_family_name, face->family->FamilyName, face->StyleName); + create_full_name(full_family_name, family_name, face->StyleName); return !strcmpiW(lf->lfFaceName, full_family_name); } -static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, +static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_charset_list *list, FONTENUMPROCW proc, LPARAM lparam) { ENUMLOGFONTEXW elf; @@ -4713,6 +4717,12 @@ static BOOL enum_face_charsets(Face *face, struct enum_charset_list *list, if (!elf.elfScript[0]) FIXME("Unknown elfscript for bit %d\n", ffs(list->element[i].mask) - 1); } + /* Font Replacement */ + if (family != face->family) + { + strcpyW(elf.elfLogFont.lfFaceName, family->FamilyName); + create_full_name(elf.elfFullName, family->FamilyName, face->StyleName); + } TRACE("enuming face %s full %s style %s charset = %d type %d script %s it %d weight %d ntmflags %08x\n", debugstr_w(elf.elfLogFont.lfFaceName), debugstr_w(elf.elfFullName), debugstr_w(elf.elfStyle), @@ -4770,8 +4780,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, face_list = get_face_list_from_family(family); LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!face_matches(face, plf)) continue; - if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; + if (!face_matches(family->FamilyName, face, plf)) continue; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } } } @@ -4781,7 +4791,7 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, face_list = get_face_list_from_family(family); face_elem_ptr = list_head(face_list); face = LIST_ENTRY(face_elem_ptr, Face, entry); - if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; + if (!enum_face_charsets(family, face, &enum_charsets, proc, lparam)) return FALSE; } } LeaveCriticalSection( &freetype_cs );

1 0

Kusanagi Kouichi : gdi32: Add a helper function to get face list from family.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 4bb0e2d076bcf535df3dbab4dafca24a78f44855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb0e2d076bcf535df3dbab4d… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:15 2012 +0900 gdi32: Add a helper function to get face list from family. --- dlls/gdi32/freetype.c | 42 +++++++++++++++++++++++++++++------------- 1 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 9a4a6b6..a4d369a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1989,6 +1989,11 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) return NULL; } +static const struct list *get_face_list_from_family(const Family *family) +{ + return &family->faces; +} + static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value; @@ -2023,6 +2028,7 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) memset(&font_link->fs, 0, sizeof font_link->fs); for (i = 0; values[i] != NULL; i++) { + const struct list *face_list; CHILD_FONT *child_font; value = values[i]; @@ -2036,7 +2042,8 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) continue; file = NULL; /* Use first extant filename for this Family */ - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (!face->file) continue; @@ -3902,7 +3909,7 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) GdiFont *ret; Face *face, *best, *best_bitmap; Family *family, *last_resort_family; - struct list *family_elem_ptr, *face_elem_ptr; + const struct list *family_elem_ptr, *face_list, *face_elem_ptr; INT height, width = 0; unsigned int score = 0, new_score; signed int diff = 0, newdiff; @@ -4034,7 +4041,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) (psub && !strcmpiW(family->FamilyName, psub->to.name))) { font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!(face->scalable || can_use_bitmap)) continue; @@ -4052,7 +4060,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) /* Search by full face name. */ LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->FullName && !strcmpiW(face->FullName, FaceName) && (face->scalable || can_use_bitmap)) @@ -4127,7 +4136,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) family = LIST_ENTRY(family_elem_ptr, Family, entry); if(!strcmpiW(family->FamilyName, lf.lfFaceName)) { font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!(face->scalable || can_use_bitmap)) continue; @@ -4143,7 +4153,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->vertical == want_vertical && (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || @@ -4164,7 +4175,8 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->scalable && face->vertical == want_vertical) { csi.fs.fsCsb[0] = 0; @@ -4194,7 +4206,8 @@ found: face = best = best_bitmap = NULL; font_link = find_font_link(family->FamilyName); - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (csi.fs.fsCsb[0] & face->fs.fsCsb[0] || (font_link != NULL && csi.fs.fsCsb[0] & font_link->fs.fsCsb[0]) || @@ -4637,11 +4650,12 @@ static void create_full_name(WCHAR *full_name, const WCHAR *family_name, const W static BOOL family_matches(Family *family, const LOGFONTW *lf) { - struct list *face_elem_ptr; + const struct list *face_list, *face_elem_ptr; if (!strcmpiW(lf->lfFaceName, family->FamilyName)) return TRUE; - LIST_FOR_EACH(face_elem_ptr, &family->faces) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { WCHAR full_family_name[LF_FULLFACESIZE]; Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); @@ -4720,7 +4734,7 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, { Family *family; Face *face; - struct list *family_elem_ptr, *face_elem_ptr; + const struct list *family_elem_ptr, *face_list, *face_elem_ptr; LOGFONTW lf; struct enum_charset_list enum_charsets; @@ -4753,7 +4767,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); if(family_matches(family, plf)) { - LIST_FOR_EACH(face_elem_ptr, &family->faces) { + face_list = get_face_list_from_family(family); + LIST_FOR_EACH(face_elem_ptr, face_list) { face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!face_matches(face, plf)) continue; if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; @@ -4763,7 +4778,8 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, } else { LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - face_elem_ptr = list_head(&family->faces); + face_list = get_face_list_from_family(family); + face_elem_ptr = list_head(face_list); face = LIST_ENTRY(face_elem_ptr, Face, entry); if (!enum_face_charsets(face, &enum_charsets, proc, lparam)) return FALSE; }

1 0

Kusanagi Kouichi : gdi32: Add a helper function to create a full name from a family name and a style name .
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: fc03398cd50a338739dc2bc815d09091a535cf8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc03398cd50a338739dc2bc81… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:08 2012 +0900 gdi32: Add a helper function to create a full name from a family name and a style name. --- dlls/gdi32/freetype.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c6bfe8d..9a4a6b6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4626,6 +4626,15 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, free_font(font); } +static void create_full_name(WCHAR *full_name, const WCHAR *family_name, const WCHAR *style_name) +{ + static const WCHAR spaceW[] = { ' ', 0 }; + + strcpyW(full_name, family_name); + strcatW(full_name, spaceW); + strcatW(full_name, style_name); +} + static BOOL family_matches(Family *family, const LOGFONTW *lf) { struct list *face_elem_ptr; @@ -4634,7 +4643,6 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) LIST_FOR_EACH(face_elem_ptr, &family->faces) { - static const WCHAR spaceW[] = { ' ',0 }; WCHAR full_family_name[LF_FULLFACESIZE]; Face *face = LIST_ENTRY(face_elem_ptr, Face, entry); @@ -4645,9 +4653,7 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) continue; } - strcpyW(full_family_name, family->FamilyName); - strcatW(full_family_name, spaceW); - strcatW(full_family_name, face->StyleName); + create_full_name(full_family_name, family->FamilyName, face->StyleName); if (!strcmpiW(lf->lfFaceName, full_family_name)) return TRUE; } @@ -4656,7 +4662,6 @@ static BOOL family_matches(Family *family, const LOGFONTW *lf) static BOOL face_matches(Face *face, const LOGFONTW *lf) { - static const WCHAR spaceW[] = { ' ',0 }; WCHAR full_family_name[LF_FULLFACESIZE]; if (!strcmpiW(lf->lfFaceName, face->family->FamilyName)) return TRUE; @@ -4668,9 +4673,7 @@ static BOOL face_matches(Face *face, const LOGFONTW *lf) return FALSE; } - strcpyW(full_family_name, face->family->FamilyName); - strcatW(full_family_name, spaceW); - strcatW(full_family_name, face->StyleName); + create_full_name(full_family_name, face->family->FamilyName, face->StyleName); return !strcmpiW(lf->lfFaceName, full_family_name); }

1 0

Kusanagi Kouichi : gdi32: Move font signature of font link from Face to SYSTEM_LINKS.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: d696d5fee8864ddcfe240a188416573b84c2be3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d696d5fee8864ddcfe240a188… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:33:02 2012 +0900 gdi32: Move font signature of font link from Face to SYSTEM_LINKS. --- dlls/gdi32/freetype.c | 125 +++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d696d5fee8864ddcfe240…

1 0

Kusanagi Kouichi : gdi32: Add a helper function to find font link.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: e86519c9b36ea78c3904aac3ceb698d06b864516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86519c9b36ea78c3904aac3c… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:32:49 2012 +0900 gdi32: Add a helper function to find font link. --- dlls/gdi32/freetype.c | 102 +++++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8a0c096..3056462 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1978,6 +1978,19 @@ static const struct font_links_defaults_list }; +static SYSTEM_LINKS *find_font_link(const WCHAR *name) +{ + SYSTEM_LINKS *font_link; + + LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + if(!strcmpiW(font_link->font_name, name)) + return font_link; + } + + return NULL; +} + static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value; @@ -1992,7 +2005,6 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) if (values) { SYSTEM_LINKS *font_link; - BOOL existing = FALSE; memset(&fs, 0, sizeof(fs)); psub = get_font_subst(&font_subst_list, name, -1); @@ -2003,20 +2015,13 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) return; } - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) - { - if(!strcmpiW(font_link->font_name, name)) - { - existing = TRUE; - break; - } - } - - if (!existing) + font_link = find_font_link(name); + if (font_link == NULL) { font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); font_link->font_name = strdupW(name); list_init(&font_link->links); + list_add_tail(&system_links, &font_link->entry); } for (i = 0; values[i] != NULL; i++) @@ -2076,8 +2081,6 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) face->fs_links = fs; } } - if (!existing) - list_add_tail(&system_links, &font_link->entry); } } @@ -2225,22 +2228,19 @@ skip_internal: TRACE("Found Tahoma in %s index %ld\n", child_font->face->file, child_font->face->face_index); list_add_tail(&system_font_link->links, &child_font->entry); } - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + font_link = find_font_link(Tahoma); + if (font_link != NULL) { - if(!strcmpiW(font_link->font_name, Tahoma)) + CHILD_FONT *font_link_entry; + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { - CHILD_FONT *font_link_entry; - LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) - { - CHILD_FONT *new_child; - new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->face = font_link_entry->face; - new_child->font = NULL; - fs.fsCsb[0] |= font_link_entry->face->fs.fsCsb[0]; - fs.fsCsb[1] |= font_link_entry->face->fs.fsCsb[1]; - list_add_tail(&system_font_link->links, &new_child->entry); - } - break; + CHILD_FONT *new_child; + new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); + new_child->face = font_link_entry->face; + new_child->font = NULL; + fs.fsCsb[0] |= font_link_entry->face->fs.fsCsb[0]; + fs.fsCsb[1] |= font_link_entry->face->fs.fsCsb[1]; + list_add_tail(&system_font_link->links, &new_child->entry); } } family = find_family_from_name(system_font_link->font_name); @@ -3793,22 +3793,19 @@ static BOOL create_child_font_list(GdiFont *font) psub = get_font_subst(&font_subst_list, font->name, -1); font_name = psub ? psub->to.name : font->name; - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + font_link = find_font_link(font_name); + if (font_link != NULL) { - if(!strcmpiW(font_link->font_name, font_name)) + TRACE("found entry in system list\n"); + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { - TRACE("found entry in system list\n"); - LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) - { - new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->face = font_link_entry->face; - new_child->font = NULL; - list_add_tail(&font->child_fonts, &new_child->entry); - TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); - } - ret = TRUE; - break; + new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); + new_child->face = font_link_entry->face; + new_child->font = NULL; + list_add_tail(&font->child_fonts, &new_child->entry); + TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); } + ret = TRUE; } /* * if not SYMBOL or OEM then we also get all the fonts for Microsoft @@ -3817,23 +3814,22 @@ static BOOL create_child_font_list(GdiFont *font) if (use_default_fallback && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && strcmpiW(font_name,szDefaultFallbackLink) != 0) - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + font_link = find_font_link(szDefaultFallbackLink); + if (font_link != NULL) { - if(!strcmpiW(font_link->font_name,szDefaultFallbackLink)) + TRACE("found entry in default fallback list\n"); + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { - TRACE("found entry in default fallback list\n"); - LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) - { - new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->face = font_link_entry->face; - new_child->font = NULL; - list_add_tail(&font->child_fonts, &new_child->entry); - TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); - } - ret = TRUE; - break; + new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); + new_child->face = font_link_entry->face; + new_child->font = NULL; + list_add_tail(&font->child_fonts, &new_child->entry); + TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); } + ret = TRUE; } + } return ret; }

1 0

Jacek Caban : jscript: Removed no longer needed ref counting in parser_ctx_t.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: a6ee63eef35c54b0c651d36f8ddb8883e727d3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ee63eef35c54b0c651d36f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:24:34 2012 +0100 jscript: Removed no longer needed ref counting in parser_ctx_t. --- dlls/jscript/engine.h | 7 ------- dlls/jscript/parser.y | 4 ---- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 65b3a60..040b3c4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,8 +43,6 @@ typedef struct _func_stack { } func_stack_t; typedef struct { - LONG ref; - WCHAR *begin; const WCHAR *end; const WCHAR *ptr; @@ -196,11 +194,6 @@ void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; -static inline void parser_addref(parser_ctx_t *ctx) -{ - ctx->ref++; -} - static inline void *parser_alloc(parser_ctx_t *ctx, DWORD size) { return jsheap_alloc(&ctx->heap, size); diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index af6933f..717a95c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1532,9 +1532,6 @@ static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) void parser_release(parser_ctx_t *ctx) { - if(--ctx->ref) - return; - script_release(ctx->script); heap_free(ctx->begin); jsheap_free(&ctx->heap); @@ -1554,7 +1551,6 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite if(!parser_ctx) return E_OUTOFMEMORY; - parser_ctx->ref = 1; parser_ctx->hres = JS_E_SYNTAX; parser_ctx->is_html = delimiter && !strcmpiW(delimiter, html_tagW);

1 0

Jacek Caban : jscript: Store parser_ctx_t in bytecode_t instead of other way around.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: a1c4c840055159c2ffa02b55d618857e1a635f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c4c840055159c2ffa02b55d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:24:22 2012 +0100 jscript: Store parser_ctx_t in bytecode_t instead of other way around. --- dlls/jscript/compile.c | 24 ++++++++++++------ dlls/jscript/engine.c | 23 +++++++----------- dlls/jscript/engine.h | 60 +++++++++++++++++++++++++--------------------- dlls/jscript/function.c | 30 ++++++++++++----------- dlls/jscript/global.c | 8 +++--- dlls/jscript/jscript.c | 34 +++++++++++++------------- dlls/jscript/parser.y | 2 - 7 files changed, 95 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1c4c840055159c2ffa02…

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
71
Older →

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