July 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winealsa.drv: Don't trace deprecated parameters.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 123f8d0f2c4ba19235c6c8dd1958c8882d9d2905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123f8d0f2c4ba19235c6c8dd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 7 14:53:49 2008 +0200 winealsa.drv: Don't trace deprecated parameters. --- dlls/winealsa.drv/alsa.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index ce6b75d..a4b1008 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -735,7 +735,6 @@ if (err<0) { \ } while(0); X(period_time); - X(tick_time); #undef X if (!sw)

1 0

Alexandre Julliard : user32: Properly update position after dragging an iconic window.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 2734fb44e0f4065179044b9eb93f87a7630f292d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2734fb44e0f4065179044b9eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 7 15:51:30 2008 +0200 user32: Properly update position after dragging an iconic window. --- dlls/user32/winpos.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a64c621..acfd481 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2591,7 +2591,7 @@ void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) if (!((msg.message == WM_KEYDOWN) && (msg.wParam == VK_ESCAPE)) ) { /* NOTE: SWP_NOACTIVATE prevents document window activation in Word 6 */ - if(!DragFullWindows) + if(!DragFullWindows || iconic) SetWindowPos( hwnd, 0, sizingRect.left, sizingRect.top, sizingRect.right - sizingRect.left, sizingRect.bottom - sizingRect.top,

1 0

Alexandre Julliard : gdiplus: Store the family name directly in the GpFontFamily structure.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: ed985acd9ff9a772d14191610d8cd0a704513a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed985acd9ff9a772d14191610… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 7 14:53:10 2008 +0200 gdiplus: Store the family name directly in the GpFontFamily structure. --- dlls/gdiplus/font.c | 28 +++++----------------------- dlls/gdiplus/gdiplus_private.h | 2 +- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 217481a..63e314d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -98,7 +98,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, const NEWTEXTMETRICW* tmw; GpStatus stat; - if (!fontFamily || !fontFamily->FamilyName || !font) + if (!fontFamily || !font) return InvalidParameter; TRACE("%p (%s), %f, %d, %d, %p\n", fontFamily, @@ -118,7 +118,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, lfw->lfStrikeOut = tmw->tmStruckOut; lfw->lfCharSet = tmw->tmCharSet; lfw->lfPitchAndFamily = tmw->tmPitchAndFamily; - lstrcpynW((lfw->lfFaceName), facename, sizeof(WCHAR) * LF_FACESIZE); + lstrcpynW(lfw->lfFaceName, facename, LF_FACESIZE); switch (unit) { @@ -405,15 +405,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, if (!ffamily) return OutOfMemory; ffamily->tmw = ntm; - - ffamily->FamilyName = GdipAlloc(LF_FACESIZE * sizeof (WCHAR)); - if (!ffamily->FamilyName) - { - GdipFree(ffamily); - return OutOfMemory; - } - - lstrcpynW(ffamily->FamilyName, name, sizeof(WCHAR) * LF_FACESIZE); + lstrcpynW(ffamily->FamilyName, name, LF_FACESIZE); *FontFamily = ffamily; @@ -442,17 +434,8 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** *clonedFontFamily = GdipAlloc(sizeof(GpFontFamily)); if (!*clonedFontFamily) return OutOfMemory; - **clonedFontFamily = *FontFamily; - - (*clonedFontFamily)->FamilyName = GdipAlloc(sizeof(WCHAR) * LF_FACESIZE); - if (!(*clonedFontFamily)->FamilyName) - { - GdipFree (clonedFontFamily); - return OutOfMemory; - } - - lstrcpynW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName, - LF_FACESIZE); + (*clonedFontFamily)->tmw = FontFamily->tmw; + lstrcpyW((*clonedFontFamily)->FamilyName, FontFamily->FamilyName); return Ok; } @@ -510,7 +493,6 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) return InvalidParameter; TRACE("Deleting %p (%s)\n", FontFamily, debugstr_w(FontFamily->FamilyName)); - GdipFree (FontFamily->FamilyName); GdipFree (FontFamily); return Ok; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2b953bf..e7ca874 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -193,7 +193,7 @@ struct GpFontCollection{ struct GpFontFamily{ NEWTEXTMETRICW tmw; - WCHAR* FamilyName; + WCHAR FamilyName[LF_FACESIZE]; }; #endif

1 0

Adam Petaccia : gdiplus: Implement GdipGetCellAscent.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 6fabc9021961099e0674b0ed931ac483df351c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fabc9021961099e0674b0ed9… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:53 2008 -0400 gdiplus: Implement GdipGetCellAscent. --- dlls/gdiplus/font.c | 7 ++++--- dlls/gdiplus/tests/font.c | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 4e443cf..bead434 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -516,13 +516,14 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) return Ok; } -GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellAscent) +GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, + INT style, UINT16* CellAscent) { if (!(family && CellAscent)) return InvalidParameter; - FIXME("stub!\n"); + *CellAscent = family->tmw.tmAscent; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellDescent) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index e09c937..2160c9c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -208,11 +208,14 @@ todo_wine stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 2048, "Expected 2048, got %d\n", result); +} result = 0; stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 1854, "Expected 1854, got %d\n", result); result = 0; +todo_wine +{ stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); ok(result == 434, "Expected 434, got %d\n", result); } @@ -229,11 +232,14 @@ todo_wine stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 2048, "Expected 2048, got %d\n", result); +} result = 0; stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 1825, "Expected 1825, got %d\n", result); result = 0; +todo_wine +{ stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); ok(result == 443, "Expected 443 got %d\n", result); }

1 0

Adam Petaccia : gdiplus: Implement GdipGetCellDescent.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: e96b07d73fe00ce39fa794fbc2eedf8eea812a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96b07d73fe00ce39fa794fbc… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:57 2008 -0400 gdiplus: Implement GdipGetCellDescent. --- dlls/gdiplus/font.c | 7 ++++--- dlls/gdiplus/tests/font.c | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index bead434..baba8e9 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -526,13 +526,14 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, return Ok; } -GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellDescent) +GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, + INT style, UINT16* CellDescent) { if (!(family && CellDescent)) return InvalidParameter; - FIXME("stub!\n"); + *CellDescent = family->tmw.tmDescent; - return NotImplemented; + return Ok; } /******************************************************************************* diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 2160c9c..b1cb340 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -214,11 +214,8 @@ todo_wine expect(Ok, stat); ok(result == 1854, "Expected 1854, got %d\n", result); result = 0; -todo_wine -{ stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); ok(result == 434, "Expected 434, got %d\n", result); -} GdipDeleteFontFamily(FontFamily); GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); @@ -238,11 +235,8 @@ todo_wine expect(Ok, stat); ok(result == 1825, "Expected 1825, got %d\n", result); result = 0; -todo_wine -{ stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); ok(result == 443, "Expected 443 got %d\n", result); -} GdipDeleteFontFamily(FontFamily); }

1 0

Adam Petaccia : gdiplus: Implement GdipGetEmHeight.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: d17d5664129c20c16282df1d05a9c67df258b11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17d5664129c20c16282df1d0… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:27:02 2008 -0400 gdiplus: Implement GdipGetEmHeight. --- dlls/gdiplus/font.c | 7 +++++-- dlls/gdiplus/tests/font.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index baba8e9..217481a 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -554,9 +554,12 @@ GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily *family, INT style, U { if (!(family && EmHeight)) return InvalidParameter; - FIXME("Stub!\n"); + TRACE("%p (%s), %d, %p, stub!\n", family, + debugstr_w(family->FamilyName), style, EmHeight); - return NotImplemented; + *EmHeight = family->tmw.ntmSizeEM; + + return Ok; } diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b1cb340..51fd327 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -204,11 +204,11 @@ todo_wine stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok (result == 2355, "Expected 2355, got %d\n", result); +} result = 0; stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 2048, "Expected 2048, got %d\n", result); -} result = 0; stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); expect(Ok, stat); @@ -225,11 +225,11 @@ todo_wine stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 2355, "Expected 2355, got %d\n", result); +} result = 0; stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); expect(Ok, stat); ok(result == 2048, "Expected 2048, got %d\n", result); -} result = 0; stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); expect(Ok, stat);

1 0

Adam Petaccia : gdiplus: Use a better framework for filling out FontFamilies.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: c027f427efbc98149f9f57197f354d0a2c26ec94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c027f427efbc98149f9f57197… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:50 2008 -0400 gdiplus: Use a better framework for filling out FontFamilies. --- dlls/gdiplus/font.c | 40 ++++++++++++++++++++-------------------- dlls/gdiplus/gdiplus_private.h | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index c7cea81..4e443cf 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -95,7 +95,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, { WCHAR facename[LF_FACESIZE]; LOGFONTW* lfw; - const TEXTMETRICW* tmw; + const NEWTEXTMETRICW* tmw; GpStatus stat; if (!fontFamily || !fontFamily->FamilyName || !font) @@ -333,19 +333,31 @@ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, return NotImplemented; } -/* Borrowed from GDI32 */ +/*********************************************************************** + * Borrowed from GDI32: + * + * Elf is really an ENUMLOGFONTEXW, and ntm is a NEWTEXTMETRICEXW. + * We have to use other types because of the FONTENUMPROCW definition. + */ static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { + if (!ntm) + { + return 1; + } + + *(NEWTEXTMETRICW*)lParam = *(const NEWTEXTMETRICW*)ntm; + return 0; } -static BOOL is_font_installed(const WCHAR *name) +static BOOL find_installed_font(const WCHAR *name, NEWTEXTMETRICW *ntm) { HDC hdc = GetDC(0); BOOL ret = FALSE; - if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, 0)) + if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)ntm)) ret = TRUE; ReleaseDC(0, hdc); @@ -377,9 +389,7 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, GpFontFamily **FontFamily) { GpFontFamily* ffamily; - HDC hdc; - HFONT hFont, hfont_old; - LOGFONTW lfw; + NEWTEXTMETRICW ntm; TRACE("%s, %p %p\n", debugstr_w(name), fontCollection, FontFamily); @@ -387,35 +397,25 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, return InvalidParameter; if (fontCollection) FIXME("No support for FontCollections yet!\n"); - if (!is_font_installed(name)) + + if (!find_installed_font(name, &ntm)) return FontFamilyNotFound; ffamily = GdipAlloc(sizeof (GpFontFamily)); if (!ffamily) return OutOfMemory; - hdc = GetDC(0); - lstrcpynW(lfw.lfFaceName, name, sizeof(WCHAR) * LF_FACESIZE); - lfw.lfCharSet = DEFAULT_CHARSET; - lfw.lfEscapement = lfw.lfOrientation = 0; - - hFont = CreateFontIndirectW (&lfw); - hfont_old = SelectObject(hdc, hFont); - - GetTextMetricsW(hdc, &ffamily->tmw); - DeleteObject(SelectObject(hdc, hfont_old)); + ffamily->tmw = ntm; ffamily->FamilyName = GdipAlloc(LF_FACESIZE * sizeof (WCHAR)); if (!ffamily->FamilyName) { GdipFree(ffamily); - ReleaseDC(0, hdc); return OutOfMemory; } lstrcpynW(ffamily->FamilyName, name, sizeof(WCHAR) * LF_FACESIZE); *FontFamily = ffamily; - ReleaseDC(0, hdc); return Ok; } diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b8269f2..2b953bf 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -192,7 +192,7 @@ struct GpFontCollection{ }; struct GpFontFamily{ - TEXTMETRICW tmw; + NEWTEXTMETRICW tmw; WCHAR* FamilyName; };

1 0

Adam Petaccia : gdiplus: Tests for FontFamily properties.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: b5505f63262728c8d1db371f10b16b558cb7bd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5505f63262728c8d1db371f1… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:44 2008 -0400 gdiplus: Tests for FontFamily properties. --- dlls/gdiplus/tests/font.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 0aa597d..e09c937 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -192,6 +192,53 @@ static void test_fontfamily (void) GdipDeleteFontFamily(clonedFontFamily); } +static void test_fontfamily_properties (void) +{ + GpFontFamily* FontFamily = NULL; + GpStatus stat; + UINT16 result = 0; + + GdipCreateFontFamilyFromName(arial, NULL, &FontFamily); +todo_wine +{ + stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok (result == 2355, "Expected 2355, got %d\n", result); + result = 0; + stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2048, "Expected 2048, got %d\n", result); + result = 0; + stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 1854, "Expected 1854, got %d\n", result); + result = 0; + stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + ok(result == 434, "Expected 434, got %d\n", result); +} + GdipDeleteFontFamily(FontFamily); + + GdipCreateFontFamilyFromName(TimesNewRoman, NULL, &FontFamily); + result = 0; +todo_wine +{ + stat = GdipGetLineSpacing(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2355, "Expected 2355, got %d\n", result); + result = 0; + stat = GdipGetEmHeight(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 2048, "Expected 2048, got %d\n", result); + result = 0; + stat = GdipGetCellAscent(FontFamily, FontStyleRegular, &result); + expect(Ok, stat); + ok(result == 1825, "Expected 1825, got %d\n", result); + result = 0; + stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result); + ok(result == 443, "Expected 443 got %d\n", result); +} + GdipDeleteFontFamily(FontFamily); +} static void test_getgenerics (void) { @@ -245,6 +292,7 @@ START_TEST(font) test_createfont(); test_logfont(); test_fontfamily(); + test_fontfamily_properties(); test_getgenerics(); GdiplusShutdown(gdiplusToken);

1 0

Adam Petaccia : gdiplus: Stub GdipGetFontHeightGivenDPI.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: 25e4fd7d3cf557ac937051b979af778e7fe534b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e4fd7d3cf557ac937051b97… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:41 2008 -0400 gdiplus: Stub GdipGetFontHeightGivenDPI. --- dlls/gdiplus/font.c | 25 +++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 5337c6f..c7cea81 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -308,6 +308,31 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) return Ok; } +/******************************************************************************* + * GdipGetFontHeightGivenDPI [GDIPLUS.@] + * PARAMS + * font [I] Font to retrieve DPI from + * dpi [I] DPI to assume + * height [O] Return value + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter if font or height is NULL + * + * NOTES + * According to MSDN, the result is (lineSpacing)*(fontSize / emHeight)*dpi + * (for anything other than unit Pixel) + */ +GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, REAL *height) +{ + if (!(font && height)) return InvalidParameter; + + FIXME("%p (%s), %f, %p\n)", font, + debugstr_w(font->lfw.lfFaceName), dpi, height); + + return NotImplemented; +} + /* Borrowed from GDI32 */ static INT CALLBACK is_font_installed_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index afd07c4..861b68d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -268,7 +268,7 @@ @ stub GdipGetFontCollectionFamilyCount @ stub GdipGetFontCollectionFamilyList @ stub GdipGetFontHeight -@ stub GdipGetFontHeightGivenDPI +@ stdcall GdipGetFontHeightGivenDPI(ptr long ptr) @ stdcall GdipGetFontSize(ptr ptr) @ stub GdipGetFontStyle @ stdcall GdipGetFontUnit(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5791168..3c8d587 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -372,6 +372,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont*,GpGraphics*,LOGFONTW*); GpStatus WINGDIPAPI GdipCloneFont(GpFont*,GpFont**); GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*); +GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*, GpFontCollection*, GpFontFamily**);

1 0

Adam Petaccia : gdiplus: Stub GdipGetCellDescent.
by Alexandre Julliard 07 Jul '08

07 Jul '08

Module: wine Branch: master Commit: f6da80297dfe5b86ac60434c1b59c998d6d6042e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6da80297dfe5b86ac60434c1… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Thu Jul 3 14:26:37 2008 -0400 gdiplus: Stub GdipGetCellDescent. --- dlls/gdiplus/font.c | 9 +++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a5e3b01..5337c6f 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -500,6 +500,15 @@ GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily *family, INT style, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily *family, INT style, UINT16 * CellDescent) +{ + if (!(family && CellDescent)) return InvalidParameter; + + FIXME("stub!\n"); + + return NotImplemented; +} + /******************************************************************************* * GdipGetEmHeight [GDIPLUS.@] * diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d054503..afd07c4 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -243,7 +243,7 @@ @ stub GdipGetAllPropertyItems @ stdcall GdipGetBrushType(ptr ptr) @ stdcall GdipGetCellAscent(ptr long ptr) -@ stub GdipGetCellDescent +@ stdcall GdipGetCellDescent(ptr long ptr) @ stdcall GdipGetClip(ptr ptr) @ stub GdipGetClipBounds @ stub GdipGetClipBoundsI diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cd940f0..5791168 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -379,6 +379,7 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily*, GpFontFamily**); GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily*); GpStatus WINGDIPAPI GdipGetFamilyName(GDIPCONST GpFontFamily*, WCHAR*, LANGID); GpStatus WINGDIPAPI GdipGetCellAscent(GDIPCONST GpFontFamily*, INT, UINT16*); +GpStatus WINGDIPAPI GdipGetCellDescent(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetEmHeight(GDIPCONST GpFontFamily*, INT, UINT16*); GpStatus WINGDIPAPI GdipGetLineSpacing(GDIPCONST GpFontFamily*, INT, UINT16*);

1 0