wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Piotr Caban : msvcrt: Rework wcsncpy_s to work on overlapping pointers.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: dc830aa640f114bb6596d8bf23405be5d14df98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc830aa640f114bb6596d8bf2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 24 18:44:07 2012 +0200 msvcrt: Rework wcsncpy_s to work on overlapping pointers. --- dlls/msvcrt/tests/string.c | 10 ++++++++++ dlls/msvcrt/wcs.c | 32 +++++++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index afa9954..6f36928 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -688,6 +688,16 @@ static void test_wcscpy_s(void) ok(ret == STRUNCATE, "expected STRUNCATE got %d\n", ret); ok(szDest[4] == 0, "szDest[4] not 0\n"); ok(!memcmp(szDest, szLongText, 4*sizeof(WCHAR)), "szDest = %s\n", wine_dbgstr_w(szDest)); + + ret = p_wcsncpy_s(NULL, 0, (void*)0xdeadbeef, 0); + ok(ret == 0, "ret = %d\n", ret); + + szDestShort[0] = '1'; + szDestShort[1] = 0; + ret = p_wcsncpy_s(szDestShort+1, 4, szDestShort, -1); + ok(ret == STRUNCATE, "expected ERROR_SUCCESS got %d\n", ret); + ok(szDestShort[0]=='1' && szDestShort[1]=='1' && szDestShort[2]=='1' && szDestShort[3]=='1', + "szDestShort = %s\n", wine_dbgstr_w(szDestShort)); } static void test__wcsupr_s(void) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 21cee47..e150a87 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1229,34 +1229,40 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc, MSVCRT_size_t count ) { - MSVCRT_size_t size = 0; - INT ret = 0; + WCHAR *p = wcDest; + BOOL truncate = (count == MSVCRT__TRUNCATE); + + if(!wcDest && !numElement && !count) + return 0; if (!wcDest || !numElement) return MSVCRT_EINVAL; - wcDest[0] = 0; - if (!wcSrc) { + *wcDest = 0; return count ? MSVCRT_EINVAL : 0; } - size = min(strlenW(wcSrc), count); - if (count==MSVCRT__TRUNCATE && size>=numElement) + while (numElement && count && *wcSrc) { - ret = MSVCRT_STRUNCATE; - size = numElement-1; + *p++ = *wcSrc++; + numElement--; + count--; } - else if (size >= numElement) + if (!numElement && truncate) { + *(p-1) = 0; + return MSVCRT_STRUNCATE; + } + else if (!numElement) + { + *wcDest = 0; return MSVCRT_ERANGE; } - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); - wcDest[size] = '\0'; - - return ret; + *p = 0; + return 0; } /******************************************************************

1 0

Dmitry Timoshkov : winex11.drv: Windows always generates VK_DECIMAL for Del /. on a keypad.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: bdae6d7dc05628920db38b6ad23983835f475581 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdae6d7dc05628920db38b6ad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 9 15:08:50 2012 +0900 winex11.drv: Windows always generates VK_DECIMAL for Del/. on a keypad. --- dlls/winex11.drv/keyboard.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3b91d8f..090eae4 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -994,7 +994,11 @@ static const WORD nonchar_key_vkey[256] = VK_END, VK_CLEAR, VK_INSERT, VK_DELETE, 0, 0, 0, 0, 0, 0, 0, 0, /* FFA0 */ 0, 0, VK_MULTIPLY, VK_ADD, /* FFA8 */ - VK_SEPARATOR, VK_SUBTRACT, VK_DECIMAL, VK_DIVIDE, + /* Windows always generates VK_DECIMAL for Del/. on keypad while some + * X11 keyboard layouts generate XK_KP_Separator instead of XK_KP_Decimal + * in order to produce a locale dependent numeric separator. + */ + VK_DECIMAL, VK_SUBTRACT, VK_DECIMAL, VK_DIVIDE, VK_NUMPAD0, VK_NUMPAD1, VK_NUMPAD2, VK_NUMPAD3, /* FFB0 */ VK_NUMPAD4, VK_NUMPAD5, VK_NUMPAD6, VK_NUMPAD7, VK_NUMPAD8, VK_NUMPAD9, 0, 0, 0, VK_OEM_NEC_EQUAL, /* FFB8 */ @@ -2211,8 +2215,12 @@ UINT CDECL X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) if ((wCode>=VK_NUMPAD0) && (wCode<=VK_NUMPAD9)) e.keycode = XKeysymToKeycode(e.display, wCode-VK_NUMPAD0+XK_KP_0); - if (wCode==VK_DECIMAL) - e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); + /* Windows always generates VK_DECIMAL for Del/. on keypad while some + * X11 keyboard layouts generate XK_KP_Separator instead of XK_KP_Decimal + * in order to produce a locale dependent numeric separator. + */ + if (wCode == VK_DECIMAL || wCode == VK_SEPARATOR) + e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); if (!e.keycode) { @@ -2545,10 +2553,11 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if ((virtKey>=VK_NUMPAD0) && (virtKey<=VK_NUMPAD9)) e.keycode = XKeysymToKeycode(e.display, virtKey-VK_NUMPAD0+XK_KP_0); - if (virtKey==VK_DECIMAL) - e.keycode = XKeysymToKeycode(e.display, XK_KP_Decimal); - - if (virtKey==VK_SEPARATOR) + /* Windows always generates VK_DECIMAL for Del/. on keypad while some + * X11 keyboard layouts generate XK_KP_Separator instead of XK_KP_Decimal + * in order to produce a locale dependent numeric separator. + */ + if (virtKey == VK_DECIMAL || virtKey == VK_SEPARATOR) e.keycode = XKeysymToKeycode(e.display, XK_KP_Separator); if (!e.keycode && virtKey != VK_NONAME)

1 0

Dmitry Timoshkov : gdiplus: Use symbolic name of the font style.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 1e12570d72ae1c913550a157c9a9db8af785b18b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e12570d72ae1c913550a157c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 23 23:31:59 2012 +0900 gdiplus: Use symbolic name of the font style. --- dlls/gdiplus/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index eab8284..8e61aba 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -779,7 +779,7 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, static INT CALLBACK font_has_style_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - INT fontstyle=0; + INT fontstyle = FontStyleRegular; if (!ntm) return 1;

1 0

Dmitry Timoshkov : gdi32: ntmCellHeight and ntmAvgWidth should be in font units.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 5476c0e2b9221508ea912a5e0e489ae3650ce8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5476c0e2b9221508ea912a5e0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 17:03:35 2012 +0900 gdi32: ntmCellHeight and ntmAvgWidth should be in font units. --- dlls/gdi32/freetype.c | 13 ++++++++++--- dlls/gdi32/tests/font.c | 8 ++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 401cfd1..3de31f6 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -342,6 +342,7 @@ struct tagGdiFont { SHORT yMax; SHORT yMin; DWORD ntmFlags; + UINT ntmCellHeight, ntmAvgWidth; FONTSIGNATURE fs; GdiFont *base_font; VOID *GSUB_Table; @@ -5070,6 +5071,8 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, memcpy(&pntm->ntmTm, &font->potm->otmTextMetrics, sizeof(TEXTMETRICW)); pntm->ntmTm.ntmSizeEM = font->potm->otmEMSquare; + pntm->ntmTm.ntmCellHeight = font->ntmCellHeight; + pntm->ntmTm.ntmAvgWidth = font->ntmAvgWidth; lstrcpynW(pelf->elfLogFont.lfFaceName, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName), @@ -5086,6 +5089,8 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, get_text_metrics(font, (TEXTMETRICW *)&pntm->ntmTm); pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading; + pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; + pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); if (face->FullName) @@ -5096,8 +5101,6 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, } pntm->ntmTm.ntmFlags = face->ntmFlags; - pntm->ntmTm.ntmCellHeight = pntm->ntmTm.tmHeight; - pntm->ntmTm.ntmAvgWidth = pntm->ntmTm.tmAveCharWidth; pntm->ntmFontSig = face->fs; pelf->elfScript[0] = '\0'; /* This will get set in WineEngEnumFonts */ @@ -6611,9 +6614,10 @@ static BOOL get_outline_text_metrics(GdiFont *font) pPost = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_post); /* we can live with this failing */ - TRACE("OS/2 winA = %d winD = %d typoA = %d typoD = %d typoLG = %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", + TRACE("OS/2 winA = %d winD = %d typoA = %d typoD = %d typoLG = %d avgW %d FT_Face a = %d, d = %d, h = %d: HORZ a = %d, d = %d lg = %d maxY = %ld minY = %ld\n", pOS2->usWinAscent, pOS2->usWinDescent, pOS2->sTypoAscender, pOS2->sTypoDescender, pOS2->sTypoLineGap, + pOS2->xAvgCharWidth, ft_face->ascender, ft_face->descender, ft_face->height, pHori->Ascender, pHori->Descender, pHori->Line_Gap, ft_face->bbox.yMax, ft_face->bbox.yMin); @@ -6631,6 +6635,9 @@ static BOOL get_outline_text_metrics(GdiFont *font) descent = pOS2->usWinDescent; } + font->ntmCellHeight = ascent + descent; + font->ntmAvgWidth = pOS2->xAvgCharWidth; + if(font->yMax) { TM.tmAscent = font->yMax; TM.tmDescent = -font->yMin; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bda8fc8..1708c49 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2056,11 +2056,15 @@ struct enum_font_dataW static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWORD type, LPARAM lParam) { struct enum_font_data *efd = (struct enum_font_data *)lParam; + const NEWTEXTMETRIC *ntm = (const NEWTEXTMETRIC *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; + + ok(ntm->ntmCellHeight + ntm->ntmCellHeight/5 >= ntm->ntmSizeEM, "ntmCellHeight %d should be close to ntmSizeEM %d\n", ntm->ntmCellHeight, ntm->ntmSizeEM); + if (0) /* Disabled to limit console spam */ trace("enumed font \"%s\", charset %d, height %d, weight %d, italic %d\n", lf->lfFaceName, lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic); @@ -2075,11 +2079,15 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, DWORD type, LPARAM lParam) { struct enum_font_dataW *efd = (struct enum_font_dataW *)lParam; + const NEWTEXTMETRICW *ntm = (const NEWTEXTMETRICW *)tm; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; + + ok(ntm->ntmCellHeight + ntm->ntmCellHeight/5 >= ntm->ntmSizeEM, "ntmCellHeight %d should be close to ntmSizeEM %d\n", ntm->ntmCellHeight, ntm->ntmSizeEM); + if (0) /* Disabled to limit console spam */ trace("enumed font %s, charset %d, height %d, weight %d, italic %d\n", wine_dbgstr_w(lf->lfFaceName), lf->lfCharSet, lf->lfHeight, lf->lfWeight, lf->lfItalic);

1 0

Dmitry Timoshkov : gdi32: Enumerated font size should not be too large.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 57fbf1434c9e975d44ef2216b2091aad5c5e27ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fbf1434c9e975d44ef2216b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 17:03:12 2012 +0900 gdi32: Enumerated font size should not be too large. This reverts commit f4625d1ae1109ee9a30faa8254b10779853f0ac2. --- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/tests/font.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3875e4f..401cfd1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5048,7 +5048,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, font = alloc_font(); if(face->scalable) { - height = -2048; /* 2048 is the most common em size */ + height = 100; width = 0; } else { height = face->size.y_ppem >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9bd5f1c..bda8fc8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2058,6 +2058,7 @@ static INT CALLBACK arial_enum_proc(const LOGFONT *lf, const TEXTMETRIC *tm, DWO struct enum_font_data *efd = (struct enum_font_data *)lParam; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); + ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; if (0) /* Disabled to limit console spam */ @@ -2076,6 +2077,7 @@ static INT CALLBACK arial_enum_procw(const LOGFONTW *lf, const TEXTMETRICW *tm, struct enum_font_dataW *efd = (struct enum_font_dataW *)lParam; ok(lf->lfHeight == tm->tmHeight, "lfHeight %d != tmHeight %d\n", lf->lfHeight, tm->tmHeight); + ok(lf->lfHeight > 0 && lf->lfHeight < 200, "enumerated font height %d\n", lf->lfHeight); if (type != TRUETYPE_FONTTYPE) return 1; if (0) /* Disabled to limit console spam */

1 0

Dmitry Timoshkov : gdiplus: Do not rely on an enumerated font size being equal to otmEMSquare.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: e43fce0da93058eabd83a5a1e4f774ddb0f7ff30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43fce0da93058eabd83a5a1e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 24 17:02:59 2012 +0900 gdiplus: Do not rely on an enumerated font size being equal to otmEMSquare. --- dlls/gdiplus/font.c | 61 ++++++++++++++++++++++++--------------- dlls/gdiplus/gdiplus_private.h | 2 +- 2 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index df3d407..eab8284 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -97,7 +97,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, { WCHAR facename[LF_FACESIZE]; LOGFONTW* lfw; - const NEWTEXTMETRICW* tmw; + const OUTLINETEXTMETRICW *otm; GpStatus stat; if (!fontFamily || !font) @@ -110,16 +110,16 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, if (stat != Ok) return stat; *font = GdipAlloc(sizeof(GpFont)); - tmw = &fontFamily->tmw; + otm = &fontFamily->otm; lfw = &((*font)->lfw); ZeroMemory(&(*lfw), sizeof(*lfw)); - lfw->lfWeight = tmw->tmWeight; - lfw->lfItalic = tmw->tmItalic; - lfw->lfUnderline = tmw->tmUnderlined; - lfw->lfStrikeOut = tmw->tmStruckOut; - lfw->lfCharSet = tmw->tmCharSet; - lfw->lfPitchAndFamily = tmw->tmPitchAndFamily; + lfw->lfWeight = otm->otmTextMetrics.tmWeight; + lfw->lfItalic = otm->otmTextMetrics.tmItalic; + lfw->lfUnderline = otm->otmTextMetrics.tmUnderlined; + lfw->lfStrikeOut = otm->otmTextMetrics.tmStruckOut; + lfw->lfCharSet = otm->otmTextMetrics.tmCharSet; + lfw->lfPitchAndFamily = otm->otmTextMetrics.tmPitchAndFamily; lstrcpynW(lfw->lfFaceName, facename, LF_FACESIZE); switch (unit) @@ -155,8 +155,8 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->unit = unit; (*font)->emSize = emSize; - (*font)->height = tmw->ntmSizeEM; - (*font)->line_spacing = tmw->tmAscent + tmw->tmDescent + tmw->tmExternalLeading; + (*font)->height = otm->otmEMSquare; + (*font)->line_spacing = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent + otm->otmTextMetrics.tmExternalLeading; TRACE("<-- %p\n", *font); @@ -529,20 +529,33 @@ static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, return 1; } - *(NEWTEXTMETRICW*)lParam = *(const NEWTEXTMETRICW*)ntm; + *(LOGFONTW *)lParam = *elf; return 0; } -static BOOL find_installed_font(const WCHAR *name, NEWTEXTMETRICW *ntm) +static BOOL find_installed_font(const WCHAR *name, OUTLINETEXTMETRICW *otm) { - HDC hdc = GetDC(0); + LOGFONTW lf; + HDC hdc = CreateCompatibleDC(0); BOOL ret = FALSE; - if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)ntm)) - ret = TRUE; + if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)&lf)) + { + HFONT hfont; + + lf.lfHeight = -2048; + hfont = CreateFontIndirectW(&lf); + hfont = SelectObject(hdc, hfont); - ReleaseDC(0, hdc); + otm->otmSize = sizeof(*otm); + if (GetOutlineTextMetricsW(hdc, otm->otmSize, otm)) + ret = TRUE; + + DeleteObject(SelectObject(hdc, hfont)); + } + + DeleteDC(hdc); return ret; } @@ -571,7 +584,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, GpFontFamily **FontFamily) { GpFontFamily* ffamily; - NEWTEXTMETRICW ntm; + OUTLINETEXTMETRICW otm; TRACE("%s, %p %p\n", debugstr_w(name), fontCollection, FontFamily); @@ -580,13 +593,13 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, if (fontCollection) FIXME("No support for FontCollections yet!\n"); - if (!find_installed_font(name, &ntm)) + if (!find_installed_font(name, &otm)) return FontFamilyNotFound; ffamily = GdipAlloc(sizeof (GpFontFamily)); if (!ffamily) return OutOfMemory; - ffamily->tmw = ntm; + ffamily->otm = otm; lstrcpynW(ffamily->FamilyName, name, LF_FACESIZE); *FontFamily = ffamily; @@ -618,7 +631,7 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** *clonedFontFamily = GdipAlloc(sizeof(GpFontFamily)); if (!*clonedFontFamily) return OutOfMemory; - (*clonedFontFamily)->tmw = FontFamily->tmw; + (*clonedFontFamily)->otm = FontFamily->otm; lstrcpyW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName); TRACE("<-- %p\n", *clonedFontFamily); @@ -691,7 +704,7 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, { if (!(family && CellAscent)) return InvalidParameter; - *CellAscent = family->tmw.tmAscent; + *CellAscent = family->otm.otmTextMetrics.tmAscent; return Ok; } @@ -703,7 +716,7 @@ GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, if (!(family && CellDescent)) return InvalidParameter; - *CellDescent = family->tmw.tmDescent; + *CellDescent = family->otm.otmTextMetrics.tmDescent; return Ok; } @@ -728,7 +741,7 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U TRACE("%p (%s), %d, %p\n", family, debugstr_w(family->FamilyName), style, EmHeight); - *EmHeight = family->tmw.ntmSizeEM; + *EmHeight = family->otm.otmEMSquare; return Ok; } @@ -758,7 +771,7 @@ GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily *family, if (style) FIXME("ignoring style\n"); - *LineSpacing = family->tmw.tmAscent + family->tmw.tmDescent + family->tmw.tmExternalLeading; + *LineSpacing = family->otm.otmTextMetrics.tmAscent + family->otm.otmTextMetrics.tmDescent + family->otm.otmTextMetrics.tmExternalLeading; return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 06dee29..72de9cb 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -377,7 +377,7 @@ struct GpFontCollection{ }; struct GpFontFamily{ - NEWTEXTMETRICW tmw; + OUTLINETEXTMETRICW otm; WCHAR FamilyName[LF_FACESIZE]; };

1 0

Christian Costa : amstream: Add IAudioMediaStream stub implementation.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: d5bbdabf283acd7c2c4a8c97fc82f13253807884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bbdabf283acd7c2c4a8c97f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:44:28 2012 +0200 amstream: Add IAudioMediaStream stub implementation. --- dlls/amstream/amstream.c | 3 +- dlls/amstream/amstream_private.h | 2 + dlls/amstream/mediastream.c | 204 +++++++++++++++++++++++++++++++++++++- dlls/amstream/tests/amstream.c | 4 +- 4 files changed, 207 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 4dec521..c61fcd0 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -371,8 +371,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); else - /* FIXME: should call audiomediastream_create instead */ - hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index d81b915..0881c3e 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -37,5 +37,7 @@ HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; +HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, + STREAM_TYPE stream_type, IMediaStream **media_stream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 366bfac..afebdcd 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -1,7 +1,7 @@ /* - * Implementation of IMediaStream Interface + * Implementation of IMediaStream Interfaces * - * Copyright 2005, 2008 Christian Costa + * Copyright 2005, 2008, 2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -254,3 +254,203 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurpose return S_OK; } + +typedef struct { + IAudioMediaStream IAudioMediaStream_iface; + LONG ref; + IMultiMediaStream* parent; + MSPID purpose_id; + STREAM_TYPE stream_type; +} IAudioMediaStreamImpl; + +static inline IAudioMediaStreamImpl *impl_from_IAudioMediaStream(IAudioMediaStream *iface) +{ + return CONTAINING_RECORD(iface, IAudioMediaStreamImpl, IAudioMediaStream_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI IAudioMediaStreamImpl_QueryInterface(IAudioMediaStream *iface, + REFIID riid, void **ret_iface) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMediaStream) || + IsEqualGUID(riid, &IID_IAudioMediaStream)) + { + IAudioMediaStream_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + *ret_iface = NULL; + + ERR("(%p/%p)->(%s,%p),not found\n", iface, This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAudioMediaStreamImpl_AddRef(IAudioMediaStream *iface) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p/%p): new ref = %u\n", iface, This, ref); + + return ref; +} + +static ULONG WINAPI IAudioMediaStreamImpl_Release(IAudioMediaStream *iface) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p): new ref = %u\n", iface, This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IMediaStream methods ***/ +static HRESULT WINAPI IAudioMediaStreamImpl_GetMultiMediaStream(IAudioMediaStream *iface, + IMultiMediaStream** multimedia_stream) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", iface, This, multimedia_stream); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_GetInformation(IAudioMediaStream *iface, + MSPID *purpose_id, STREAM_TYPE *type) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + TRACE("(%p/%p)->(%p,%p)\n", iface, This, purpose_id, type); + + if (purpose_id) + *purpose_id = This->purpose_id; + if (type) + *type = This->stream_type; + + return S_OK; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_SetSameFormat(IAudioMediaStream *iface, + IMediaStream *stream_format, DWORD flags) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x) stub!\n", iface, This, stream_format, flags); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_AllocateSample(IAudioMediaStream *iface, + DWORD flags, IStreamSample **sample) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%x,%p) stub!\n", iface, This, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_CreateSharedSample(IAudioMediaStream *iface, + IStreamSample *existing_sample, DWORD flags, IStreamSample **sample) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p,%x,%p) stub!\n", iface, This, existing_sample, flags, sample); + + return S_FALSE; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_SendEndOfStream(IAudioMediaStream *iface, + DWORD flags) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%x) stub!\n", iface, This, flags); + + return S_FALSE; +} + +/*** IAudioMediaStream methods ***/ +static HRESULT WINAPI IAudioMediaStreamImpl_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *wave_format_current) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); + + return E_NOTIMPL; + +} + +static HRESULT WINAPI IAudioMediaStreamImpl_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioMediaStreamImpl_CreateSample(IAudioMediaStream *iface, IAudioData *audio_data, + DWORD flags, IAudioStreamSample **sample) +{ + IAudioMediaStreamImpl *This = impl_from_IAudioMediaStream(iface); + + FIXME("(%p/%p)->(%p,%u,%p) stub!\n", iface, This, audio_data, flags, sample); + + return E_NOTIMPL; +} + +static const struct IAudioMediaStreamVtbl AudioMediaStream_Vtbl = +{ + /*** IUnknown methods ***/ + IAudioMediaStreamImpl_QueryInterface, + IAudioMediaStreamImpl_AddRef, + IAudioMediaStreamImpl_Release, + /*** IMediaStream methods ***/ + IAudioMediaStreamImpl_GetMultiMediaStream, + IAudioMediaStreamImpl_GetInformation, + IAudioMediaStreamImpl_SetSameFormat, + IAudioMediaStreamImpl_AllocateSample, + IAudioMediaStreamImpl_CreateSharedSample, + IAudioMediaStreamImpl_SendEndOfStream, + /*** IAudioMediaStream methods ***/ + IAudioMediaStreamImpl_GetFormat, + IAudioMediaStreamImpl_SetFormat, + IAudioMediaStreamImpl_CreateSample +}; + +HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, + STREAM_TYPE stream_type, IMediaStream **media_stream) +{ + IAudioMediaStreamImpl *object; + + TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IAudioMediaStreamImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IAudioMediaStream_iface.lpVtbl = &AudioMediaStream_Vtbl; + object->ref = 1; + + object->parent = parent; + object->purpose_id = *purpose_id; + object->stream_type = stream_type; + + *media_stream = (IMediaStream*)&object->IAudioMediaStream_iface; + + return S_OK; +} diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 87bbcc7..14c3e42 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -325,10 +325,10 @@ static void test_media_streams(void) IAMMediaStream_Release(am_media_stream); hr = IMediaStream_QueryInterface(audio_stream, &IID_IDirectDrawMediaStream, (LPVOID*)&ddraw_stream); - todo_wine ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); + ok(hr == E_NOINTERFACE, "IMediaStream_QueryInterface returned: %x\n", hr); hr = IMediaStream_QueryInterface(audio_stream, &IID_IAudioMediaStream, (LPVOID*)&audio_media_stream); - todo_wine ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); + ok(hr == S_OK, "IMediaStream_QueryInterface returned: %x\n", hr); if (SUCCEEDED(hr)) {

1 0

Christian Costa : amstream: Use proper constructor name for ddraw mediastream.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: badb5d555d7e24f97528665a2145d61d83c27880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=badb5d555d7e24f97528665a2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 23 21:44:19 2012 +0200 amstream: Use proper constructor name for ddraw mediastream. --- dlls/amstream/amstream.c | 6 +++++- dlls/amstream/amstream_private.h | 2 +- dlls/amstream/mediastream.c | 7 ++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 156fd69..4dec521 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -368,7 +368,11 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream } } - hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) + hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + else + /* FIXME: should call audiomediastream_create instead */ + hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index e40c409..d81b915 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -35,7 +35,7 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, +HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 12d3542..366bfac 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -45,6 +45,7 @@ static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDire return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface); } +/*** IUnknown methods ***/ static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream *iface, REFIID riid, void **ppv) { @@ -153,6 +154,7 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_SendEndOfStream(IDirectDrawMedi return S_FALSE; } +/*** IDirectDrawMediaStream methods ***/ static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface, DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette, DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) @@ -207,15 +209,18 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMedi static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl = { + /*** IUnknown methods ***/ IDirectDrawMediaStreamImpl_QueryInterface, IDirectDrawMediaStreamImpl_AddRef, IDirectDrawMediaStreamImpl_Release, + /*** IMediaStream methods ***/ IDirectDrawMediaStreamImpl_GetMultiMediaStream, IDirectDrawMediaStreamImpl_GetInformation, IDirectDrawMediaStreamImpl_SetSameFormat, IDirectDrawMediaStreamImpl_AllocateSample, IDirectDrawMediaStreamImpl_CreateSharedSample, IDirectDrawMediaStreamImpl_SendEndOfStream, + /*** IDirectDrawMediaStream methods ***/ IDirectDrawMediaStreamImpl_GetFormat, IDirectDrawMediaStreamImpl_SetFormat, IDirectDrawMediaStreamImpl_GetDirectDraw, @@ -224,7 +229,7 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl = IDirectDrawMediaStreamImpl_GetTimePerFrame }; -HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, +HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) { IDirectDrawMediaStreamImpl *object;

1 0

Jacek Caban : jscript: Store source code range in function_code_t.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 375ab889d8929db12f58e3498c0760328b2697fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=375ab889d8929db12f58e3498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 24 17:39:40 2012 +0200 jscript: Store source code range in function_code_t. --- dlls/jscript/compile.c | 5 +++++ dlls/jscript/engine.c | 4 ++-- dlls/jscript/engine.h | 5 ++++- dlls/jscript/function.c | 12 +++--------- dlls/jscript/jscript.c | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3f6a2b6..f8aaa41 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1804,6 +1804,11 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return E_OUTOFMEMORY; } + if(func_expr) { + func->source = func_expr->src_str; + func->source_len = func_expr->src_len; + } + func->source_elements = source; func->expr = func_expr; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 929be80..ec906a1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -814,7 +814,7 @@ static HRESULT interp_func(exec_ctx_t *ctx) expr = ctx->func_code->funcs[func_idx].expr; hres = create_source_function(ctx->script, ctx->code, expr->parameter_list, ctx->func_code->funcs+func_idx, - ctx->scope_chain, expr->src_str, expr->src_len, &dispex); + ctx->scope_chain, &dispex); if(FAILED(hres)) return hres; @@ -2629,7 +2629,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO expr = func->funcs[i].expr; hres = create_source_function(ctx->script, code, expr->parameter_list, func->funcs+i, - ctx->scope_chain, expr->src_str, expr->src_len, &func_obj); + ctx->scope_chain, &func_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ce7ff8c..a2be6ee 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -173,6 +173,9 @@ typedef struct _function_code_t { function_expression_t *expr; /* FIXME */ source_elements_t *source_elements; /* FIXME */ + const WCHAR *source; + unsigned source_len; + unsigned func_cnt; struct _function_code_t *funcs; } function_code_t; @@ -268,7 +271,7 @@ HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,BOOL,jsexcept_t*,VA typedef struct _parameter_t parameter_t; HRESULT create_source_function(script_ctx_t*,bytecode_t*,parameter_t*,function_code_t*,scope_chain_t*, - const WCHAR*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; + jsdisp_t**) DECLSPEC_HIDDEN; typedef enum { LT_INT, diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index f79ac04..dc4c5e8 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -32,8 +32,6 @@ typedef struct { scope_chain_t *scope_chain; bytecode_t *code; function_code_t *func_code; - const WCHAR *src_str; - DWORD src_len; DWORD length; jsdisp_t *arguments; } FunctionInstance; @@ -303,7 +301,7 @@ static HRESULT function_to_string(FunctionInstance *function, BSTR *ret) memcpy(str + sizeof(native_prefixW)/sizeof(WCHAR), function->name, name_len*sizeof(WCHAR)); memcpy(str + sizeof(native_prefixW)/sizeof(WCHAR) + name_len, native_suffixW, sizeof(native_suffixW)); }else { - str = SysAllocStringLen(function->src_str, function->src_len); + str = SysAllocStringLen(function->func_code->source, function->func_code->source_len); if(!str) return E_OUTOFMEMORY; } @@ -661,7 +659,7 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, } HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t *parameters, function_code_t *func_code, - scope_chain_t *scope_chain, const WCHAR *src_str, DWORD src_len, jsdisp_t **ret) + scope_chain_t *scope_chain, jsdisp_t **ret) { FunctionInstance *function; jsdisp_t *prototype; @@ -698,9 +696,6 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t length++; function->length = length; - function->src_str = src_str; - function->src_len = src_len; - *ret = &function->dispex; return S_OK; } @@ -786,8 +781,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t } expr = code->global_code.funcs[0].expr; - hres = create_source_function(ctx, code, expr->parameter_list, code->global_code.funcs, NULL, expr->src_str, - expr->src_len, &function); + hres = create_source_function(ctx, code, expr->parameter_list, code->global_code.funcs, NULL, &function); release_bytecode(code); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index dfd7d6c..da34c11 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -836,7 +836,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars return hres; } - hres = create_source_function(This->ctx, code, NULL, &code->global_code, NULL, NULL, 0, &dispex); + hres = create_source_function(This->ctx, code, NULL, &code->global_code, NULL, &dispex); release_bytecode(code); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Store function name in function_code_t.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 8c533d10d6aeafd1f1de06ea59ed9434f53b9e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c533d10d6aeafd1f1de06ea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 24 17:39:25 2012 +0200 jscript: Store function name in function_code_t. --- dlls/jscript/compile.c | 16 ++++++++++++---- dlls/jscript/engine.c | 4 ++-- dlls/jscript/engine.h | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e2d3390..3f6a2b6 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1771,7 +1771,8 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) return S_OK; } -static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, BOOL from_eval, function_code_t *func) +static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, function_expression_t *func_expr, + BOOL from_eval, function_code_t *func) { function_declaration_t *iter; unsigned off, i; @@ -1796,17 +1797,24 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, dump_code(ctx, off); func->instr_off = off; + + if(func_expr && func_expr->identifier) { + func->name = compiler_alloc_bstr(ctx, func_expr->identifier); + if(!func->name) + return E_OUTOFMEMORY; + } + func->source_elements = source; + func->expr = func_expr; func->funcs = heap_alloc_zero(func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) return E_OUTOFMEMORY; for(iter = source->functions, i=0; iter; iter = iter->next, i++) { - hres = compile_function(ctx, iter->expr->source_elements, FALSE, func->funcs+i); + hres = compile_function(ctx, iter->expr->source_elements, iter->expr, FALSE, func->funcs+i); if(FAILED(hres)) return hres; - func->funcs[i].expr = iter->expr; } assert(i == func->func_cnt); @@ -1839,7 +1847,7 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimi compiler.code->parser = compiler.parser; - hres = compile_function(&compiler, compiler.parser->source, from_eval, &compiler.code->global_code); + hres = compile_function(&compiler, compiler.parser->source, NULL, from_eval, &compiler.code->global_code); if(FAILED(hres)) { release_bytecode(compiler.code); return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7baa8c6..929be80 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2624,7 +2624,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO jsdisp_t *func_obj; VARIANT var; - if(!func->funcs[i].expr->identifier) + if(!func->funcs[i].name) continue; expr = func->funcs[i].expr; @@ -2634,7 +2634,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO return hres; var_set_jsdisp(&var, func_obj); - hres = jsdisp_propput_name(ctx->var_disp, expr->identifier, &var, ei); + hres = jsdisp_propput_name(ctx->var_disp, func->funcs[i].name, &var, ei); jsdisp_release(func_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3234ed9..ce7ff8c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -167,6 +167,7 @@ typedef struct { } instr_t; typedef struct _function_code_t { + BSTR name; unsigned instr_off; function_expression_t *expr; /* FIXME */

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
72
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 April 2012