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

Jim Cameron : user32: Fixed bug in loading .cur files.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 08775c642a3f19ecf1e47b8bdbbc20221442414c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08775c642a3f19ecf1e47b8bd… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Wed Aug 27 21:46:59 2008 +0100 user32: Fixed bug in loading .cur files. --- dlls/user32/cursoricon.c | 75 ++++++++++++++++++++++++--------------- dlls/user32/tests/cursoricon.c | 3 -- 2 files changed, 46 insertions(+), 32 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 066203b..2af3798 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -660,48 +660,26 @@ static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *d return &dir->idEntries[n]; } -/********************************************************************** - * CreateIconFromResourceEx (USER32.@) - * - * FIXME: Convert to mono when cFlag is LR_MONOCHROME. Do something - * with cbSize parameter as well. - */ -HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, - BOOL bIcon, DWORD dwVersion, - INT width, INT height, - UINT cFlag ) +static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, + POINT16 hotspot, BOOL bIcon, + DWORD dwVersion, + INT width, INT height, + UINT cFlag ) { HGLOBAL16 hObj; static HDC hdcMem; int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; - POINT16 hotspot; - BITMAPINFO *bmi; BOOL DoStretch; INT size; - hotspot.x = ICON_HOTSPOT; - hotspot.y = ICON_HOTSPOT; - - TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", - bits, cbSize, dwVersion, width, height, - bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); if (dwVersion == 0x00020000) { FIXME_(cursor)("\t2.xx resources are not supported\n"); return 0; } - if (bIcon) - bmi = (BITMAPINFO *)bits; - else /* get the hotspot */ - { - POINT16 *pt = (POINT16 *)bits; - hotspot = *pt; - bmi = (BITMAPINFO *)(pt + 1); - } - /* Check bitmap header */ if ( (bmi->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) && @@ -873,6 +851,41 @@ HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, /********************************************************************** + * CreateIconFromResourceEx (USER32.@) + * + * FIXME: Convert to mono when cFlag is LR_MONOCHROME. Do something + * with cbSize parameter as well. + */ +HICON WINAPI CreateIconFromResourceEx( LPBYTE bits, UINT cbSize, + BOOL bIcon, DWORD dwVersion, + INT width, INT height, + UINT cFlag ) +{ + POINT16 hotspot; + BITMAPINFO *bmi; + + hotspot.x = ICON_HOTSPOT; + hotspot.y = ICON_HOTSPOT; + + TRACE_(cursor)("%p (%u bytes), ver %08x, %ix%i %s %s\n", + bits, cbSize, dwVersion, width, height, + bIcon ? "icon" : "cursor", (cFlag & LR_MONOCHROME) ? "mono" : "" ); + + if (bIcon) + bmi = (BITMAPINFO *)bits; + else /* get the hotspot */ + { + POINT16 *pt = (POINT16 *)bits; + hotspot = *pt; + bmi = (BITMAPINFO *)(pt + 1); + } + + return CURSORICON_CreateIconFromBMI( bmi, hotspot, bIcon, dwVersion, + width, height, cFlag ); +} + + +/********************************************************************** * CreateIconFromResource (USER32.@) */ HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize, @@ -891,6 +904,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, DWORD filesize = 0; HICON hIcon = 0; LPBYTE bits; + POINT16 hotspot; TRACE("loading %s\n", debugstr_w( filename )); @@ -926,8 +940,11 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, if ( entry->dwDIBOffset + entry->dwDIBSize > filesize ) goto end; - hIcon = CreateIconFromResourceEx( &bits[entry->dwDIBOffset], entry->dwDIBSize, - !fCursor, 0x00030000, width, height, loadflags ); + hotspot.x = entry->xHotspot; + hotspot.y = entry->yHotspot; + hIcon = CURSORICON_CreateIconFromBMI( (BITMAPINFO *)&bits[entry->dwDIBOffset], + hotspot, !fCursor, 0x00030000, + width, height, loadflags ); end: TRACE("loaded %s -> %p\n", debugstr_w( filename ), hIcon ); UnmapViewOfFile( bits ); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 6b16560..c36adce 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -814,7 +814,6 @@ static void test_LoadImage(void) /* Test loading an icon as a cursor. */ SetLastError(0xdeadbeef); handle = LoadImageA(NULL, "icon.ico", IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); - todo_wine ok(handle != NULL, "LoadImage() failed.\n"); error = GetLastError(); ok(error == 0, "Last error: %u\n", error); @@ -822,7 +821,6 @@ static void test_LoadImage(void) /* Test the icon information. */ SetLastError(0xdeadbeef); ret = GetIconInfo(handle, &icon_info); - todo_wine ok(ret, "GetIconInfo() failed.\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error); @@ -839,7 +837,6 @@ static void test_LoadImage(void) /* Clean up. */ SetLastError(0xdeadbeef); ret = DestroyCursor(handle); - todo_wine ok(ret, "DestroyCursor() failed.\n"); error = GetLastError(); ok(error == 0xdeadbeef, "Last error: %u\n", error);

1 0

Alexandre Julliard : winetest: Build the test list from the makefile instead of make_makefiles.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: deccfeec9ad808f436efd8fb4746211c7db17243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deccfeec9ad808f436efd8fb4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 28 12:17:42 2008 +0200 winetest: Build the test list from the makefile instead of make_makefiles. --- .gitignore | 87 +--------------------------------------- programs/winetest/Makefile.in | 11 ++++- programs/winetest/winetest.rc | 88 +---------------------------------------- tools/make_makefiles | 32 +------------- 4 files changed, 15 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=deccfeec9ad808f436efd…

1 0

Alexandre Julliard : configure: Build the winetest dependencies in configure instead of make_makefiles.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 67828b60e046aacb63b5eee2664201e6d94752a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67828b60e046aacb63b5eee26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 28 12:09:46 2008 +0200 configure: Build the winetest dependencies in configure instead of make_makefiles. --- configure | 18 +++- configure.ac | 14 +++ programs/winetest/Makefile.in | 260 +---------------------------------------- tools/make_makefiles | 18 +--- 4 files changed, 37 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67828b60e046aacb63b5e…

1 0

Adam Petaccia : gdiplus: Test for GdipGetFamily.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 1bf919717dabc0920e82985b58fe895cd373f93e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf919717dabc0920e82985b5… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:21:45 2008 -0400 gdiplus: Test for GdipGetFamily. --- dlls/gdiplus/tests/font.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 3d30a86..3a009f4 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -41,12 +41,13 @@ static const char *debugstr_w(LPCWSTR str) static void test_createfont(void) { - GpFontFamily* fontfamily = NULL; + GpFontFamily* fontfamily = NULL, *fontfamily2; GpFont* font = NULL; GpStatus stat; Unit unit; UINT i; REAL size; + WCHAR familyname[LF_FACESIZE]; stat = GdipCreateFontFamilyFromName(nonexistent, NULL, &fontfamily); expect (FontFamilyNotFound, stat); @@ -65,6 +66,17 @@ static void test_createfont(void) expect (Ok, stat); expect (UnitPoint, unit); + stat = GdipGetFamily(font, &fontfamily2); +todo_wine + expect(Ok, stat); + stat = GdipGetFamilyName(fontfamily2, familyname, 0); + expect(Ok, stat); +todo_wine + ok (lstrcmpiW(arial, familyname) == 0, "Expected arial, got %s\n", + debugstr_w(familyname)); + stat = GdipDeleteFontFamily(fontfamily2); + expect(Ok, stat); + /* Test to see if returned size is based on unit (its not) */ GdipGetFontSize(font, &size); ok (size == 12, "Expected 12, got %f\n", size);

1 0

Adam Petaccia : gdiplus: Test for GdipGetFontStyle.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 837dae3f730b970119e1114098ebe6f0f138dd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=837dae3f730b970119e111409… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:21:49 2008 -0400 gdiplus: Test for GdipGetFontStyle. --- dlls/gdiplus/tests/font.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 3a009f4..a6431bb 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -104,6 +104,7 @@ static void test_logfont(void) GpStatus stat; GpGraphics *graphics; HDC hdc = GetDC(0); + INT style; GdipCreateFromHDC(hdc, &graphics); memset(&lfw, 0, sizeof(LOGFONTW)); @@ -173,6 +174,14 @@ todo_wine { expect(0, lfw2.lfQuality); expect(0, lfw2.lfPitchAndFamily); +todo_wine +{ + stat = GdipGetFontStyle(font, &style); + expect(Ok, stat); + ok (style == (FontStyleItalic | FontStyleUnderline | FontStyleStrikeout), + "Expected , got %d\n", style); +} + GdipDeleteFont(font); GdipDeleteGraphics(graphics);

1 0

Adam Petaccia : gdiplus: Implement GdipGetFamily.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 69b6e0bde2f920d1c56c2177081ecc2a6df9e346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b6e0bde2f920d1c56c21770… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:21:56 2008 -0400 gdiplus: Implement GdipGetFamily. --- dlls/gdiplus/font.c | 7 +++++-- dlls/gdiplus/tests/font.c | 2 -- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a38fb0b..f7638e7 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -265,9 +265,12 @@ GpStatus WINGDIPAPI GdipCreateFontFromDC(HDC hdc, GpFont **font) */ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) { - FIXME("stub: %p %p\n", font, family); + TRACE("%p %p\n", font, family); - return NotImplemented; + if (!(font && family)) + return InvalidParameter; + + return GdipCreateFontFamilyFromName(font->lfw.lfFaceName, NULL, family); } /****************************************************************************** diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index a6431bb..c0658c2 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -67,11 +67,9 @@ static void test_createfont(void) expect (UnitPoint, unit); stat = GdipGetFamily(font, &fontfamily2); -todo_wine expect(Ok, stat); stat = GdipGetFamilyName(fontfamily2, familyname, 0); expect(Ok, stat); -todo_wine ok (lstrcmpiW(arial, familyname) == 0, "Expected arial, got %s\n", debugstr_w(familyname)); stat = GdipDeleteFontFamily(fontfamily2);

1 0

Adam Petaccia : gdiplus: Implement GdipGetFontStyle.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: ce40fde689d4a5caed079b18d8712513e8b26611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce40fde689d4a5caed079b18d… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:22:00 2008 -0400 gdiplus: Implement GdipGetFontStyle. --- dlls/gdiplus/font.c | 31 +++++++++++++++++++++++++++++-- dlls/gdiplus/tests/font.c | 3 --- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index f7638e7..9839a45 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -298,11 +298,38 @@ GpStatus WINGDIPAPI GdipGetFontSize(GpFont *font, REAL *size) return Ok; } +/******************************************************************************* + * GdipGetFontStyle [GDIPLUS.@] + * + * Gets the font's style, returned in bitwise OR of FontStyle enumeration + * + * PARAMS + * font [I] font to request from + * style [O] resulting pointer to a FontStyle enumeration + * + * RETURNS + * SUCCESS: Ok + * FAILURE: InvalidParameter + */ GpStatus WINGDIPAPI GdipGetFontStyle(GpFont *font, INT *style) { - FIXME("stub: %p %p\n", font, style); + TRACE("%p %p\n", font, style); - return NotImplemented; + if (!(font && style)) + return InvalidParameter; + + if (font->lfw.lfWeight > 400) + *style = FontStyleBold; + else + *style = 0; + if (font->lfw.lfItalic) + *style |= FontStyleItalic; + if (font->lfw.lfUnderline) + *style |= FontStyleUnderline; + if (font->lfw.lfStrikeOut) + *style |= FontStyleStrikeout; + + return Ok; } /******************************************************************************* diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index c0658c2..b396141 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -172,13 +172,10 @@ todo_wine { expect(0, lfw2.lfQuality); expect(0, lfw2.lfPitchAndFamily); -todo_wine -{ stat = GdipGetFontStyle(font, &style); expect(Ok, stat); ok (style == (FontStyleItalic | FontStyleUnderline | FontStyleStrikeout), "Expected , got %d\n", style); -} GdipDeleteFont(font);

1 0

Adam Petaccia : gdiplus: Implement GdipGetFontHeight.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 5361f074a3b10be995920a81848c9e243bd9fe9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5361f074a3b10be995920a818… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:22:04 2008 -0400 gdiplus: Implement GdipGetFontHeight. --- dlls/gdiplus/font.c | 25 +++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- include/gdiplusflat.h | 2 ++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 9839a45..9d37077 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -384,6 +384,31 @@ GpStatus WINGDIPAPI GdipCloneFont(GpFont *font, GpFont **cloneFont) } /******************************************************************************* + * GdipGetFontHeight [GDIPLUS.@] + * PARAMS + * font [I] Font to retrieve height from + * graphics [I] The current graphics context + * height [O] Resulting height + * RETURNS + * SUCCESS: Ok + * FAILURE: Another element of GpStatus + * + * NOTES + * Forwards to GdipGetFontHeightGivenDPI + */ +GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, + GDIPCONST GpGraphics *graphics, REAL *height) +{ + REAL dpi; + + TRACE("%p %p %p\n", font, graphics, height); + + dpi = GetDeviceCaps(graphics->hdc, LOGPIXELSY); + + return GdipGetFontHeightGivenDPI(font, dpi, height); +} + +/******************************************************************************* * GdipGetFontHeightGivenDPI [GDIPLUS.@] * PARAMS * font [I] Font to retrieve DPI from diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3766dc1..95add0d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -267,7 +267,7 @@ @ stdcall GdipGetFamilyName(ptr ptr long) @ stdcall GdipGetFontCollectionFamilyCount(ptr ptr) @ stdcall GdipGetFontCollectionFamilyList(ptr long ptr ptr) -@ stub GdipGetFontHeight +@ stdcall GdipGetFontHeight(ptr ptr ptr) @ stdcall GdipGetFontHeightGivenDPI(ptr long ptr) @ stdcall GdipGetFontSize(ptr ptr) @ stdcall GdipGetFontStyle(ptr ptr) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 320f02d..8a1e8f7 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -438,6 +438,8 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont*, GpFontFamily**); GpStatus WINGDIPAPI GdipGetFontUnit(GpFont*, Unit*); GpStatus WINGDIPAPI GdipGetFontSize(GpFont*, REAL*); GpStatus WINGDIPAPI GdipGetFontStyle(GpFont*, INT*); +GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont*, GDIPCONST GpGraphics*, + REAL*); GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont*, REAL, REAL*); GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR*,

1 0

Adam Petaccia : gdiplus: Don't create a font if there is no facename.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: 74c8117a4b2d8978a9dde96961a65c61ba090686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c8117a4b2d8978a9dde9696… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:22:12 2008 -0400 gdiplus: Don't create a font if there is no facename. --- dlls/gdiplus/font.c | 3 +++ dlls/gdiplus/tests/font.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 9d37077..ef62ccb 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -169,6 +169,9 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, if(!logfont || !font) return InvalidParameter; + if (logfont->lfFaceName[0] == 0) + return NotTrueTypeFont; + *font = GdipAlloc(sizeof(GpFont)); if(!*font) return OutOfMemory; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index b396141..ab6d28c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -112,9 +112,7 @@ static void test_logfont(void) lfw.lfFaceName[0] = 0; stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); -todo_wine { expect(NotTrueTypeFont, stat); -} memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR));

1 0

Adam Petaccia : gdiplus: GdipGetFontHeightGivenDPI: Return a valid value for UnitPixel.
by Alexandre Julliard 28 Aug '08

28 Aug '08

Module: wine Branch: master Commit: f5e9a01cce31d70c7587ba0c476331e3671c88c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e9a01cce31d70c7587ba0c4… Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Wed Aug 27 17:22:22 2008 -0400 gdiplus: GdipGetFontHeightGivenDPI: Return a valid value for UnitPixel. --- dlls/gdiplus/font.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ef62ccb..3a9d36d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -428,12 +428,22 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, */ GpStatus WINGDIPAPI GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, REAL *height) { + TRACE("%p (%s), %f, %p\n", font, + debugstr_w(font->lfw.lfFaceName), dpi, height); + if (!(font && height)) return InvalidParameter; - FIXME("%p (%s), %f, %p\n", font, - debugstr_w(font->lfw.lfFaceName), dpi, height); + switch (font->unit) + { + case UnitPixel: + *height = font->emSize; + break; + default: + FIXME("Unhandled unit type: %d\n", font->unit); + return NotImplemented; + } - return NotImplemented; + return Ok; } /***********************************************************************

1 0