wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

André Hentschel : Wine 1.5.10 freigegeben
by Jeremy Newman 31 Jul '12

31 Jul '12

Module: website Branch: master Commit: 746cf68ad916156b57a91d6b42e556cd4e4ab572 URL: http://source.winehq.org/git/website.git/?a=commit;h=746cf68ad916156b57a91d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 31 21:43:00 2012 +0200 Wine 1.5.10 freigegeben --- news/de/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/de/2012073101.xml b/news/de/2012073101.xml new file mode 100644 index 0000000..551ca99 --- /dev/null +++ b/news/de/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>31. Juli 2012</date> +<title>Wine 1.5.10 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.10 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.10">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko Engine, basierend auf Firefox 14.</li> + <li>Unterstützung für OpenGL in der DIB Engine mit libOSMesa.</li> + <li>Off-screen Rendering nun Standard in Direct3D.</li> + <li>Ein wenig mehr WMI Infrastruktur.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.10
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: website Branch: master Commit: 8cc845da2af2edd27bcf2c9397c2c8ba706da837 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cc845da2af2edd27bcf2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:17:50 2012 +0200 Wine release 1.5.10 --- news/en/2012073101.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2012073101.xml b/news/en/2012073101.xml new file mode 100644 index 0000000..d9f944c --- /dev/null +++ b/news/en/2012073101.xml @@ -0,0 +1,16 @@ +<news> +<date>July 31, 2012</date> +<title>Wine 1.5.10 Released</title> +<body> + The Wine development release 1.5.10 is now available. + <a href="{$root}/announce/1.5.10">What's new</a> in this release: +<ul> + <li>New version of the Gecko engine based on Firefox 14.</li> + <li>Support for OpenGL in the DIB engine using libOSMesa.</li> + <li>Off-screen rendering is now the default in Direct3D.</li> + <li>Some more WMI infrastructure.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.10.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.10 : Alexandre Julliard : Release 1.5.10
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: refs/tags/wine-1.5.10 Tag: 584c1cb0f4b312a4ee3c34fc0cadf8c4ec00e47a URL: http://source.winehq.org/git/wine.git/?a=tag;h=584c1cb0f4b312a4ee3c34fc0cad… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:08:12 2012 +0200 Release 1.5.10

1 0

Alexandre Julliard : Release 1.5.10.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 9177c088306723d10475839c2fcf56fd30e1b611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9177c088306723d10475839c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 21:08:12 2012 +0200 Release 1.5.10. --- ANNOUNCE | 813 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 438 insertions(+), 395 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9177c088306723d104758…

1 0

Hans Leidekker : msi: Implement the RemoveExistingProducts standard action.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: f180de40dd7820753479f823b6cb08a34b479c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f180de40dd7820753479f823b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 31 12:25:42 2012 +0200 msi: Implement the RemoveExistingProducts standard action. --- dlls/msi/action.c | 42 ++++++++++++++--- dlls/msi/tests/action.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d452c92..1ad3bc2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7045,23 +7045,51 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) { + static const WCHAR fmtW[] = + {'m','s','i','e','x','e','c',' ','/','i',' ','%','s',' ','R','E','M','O','V','E','=','%','s',0}; MSIPACKAGE *package = param; - const WCHAR *property = MSI_RecordGetString( rec, 1 ); - WCHAR *value; + const WCHAR *property = MSI_RecordGetString( rec, 7 ); + UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + WCHAR *product, *features, *cmd; + STARTUPINFOW si; + PROCESS_INFORMATION info; + BOOL ret; - if ((value = msi_dup_property( package->db, property ))) + if (!(product = msi_dup_property( package->db, property ))) return ERROR_SUCCESS; + + deformat_string( package, MSI_RecordGetString( rec, 6 ), &features ); + + len += strlenW( product ); + if (features) + len += strlenW( features ); + else + len += sizeof(szAll) / sizeof(szAll[0]); + + if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) { - FIXME("remove %s\n", debugstr_w(value)); - msi_free( value ); + msi_free( product ); + msi_free( features ); + return ERROR_OUTOFMEMORY; } + sprintfW( cmd, fmtW, product, features ? features : szAll ); + msi_free( product ); + msi_free( features ); + + memset( &si, 0, sizeof(STARTUPINFOW) ); + ret = CreateProcessW( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info ); + msi_free( cmd ); + if (!ret) return GetLastError(); + CloseHandle( info.hThread ); + + WaitForSingleObject( info.hProcess, INFINITE ); + CloseHandle( info.hProcess ); return ERROR_SUCCESS; } static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) { static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','A','c','t','i','o','n','P','r','o','p','e','r','t','y',' ', - 'F','R','O','M',' ','U','p','g','r','a','d','e',0}; + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','U','p','g','r','a','d','e',0}; MSIQUERY *view; UINT r; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 814b49c..1fcb82d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1461,6 +1461,76 @@ static const char pa_install_exec_seq_dat[] = "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const char rep_file_dat[] = + "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "rep.txt\trep\trep.txt\t1000\t\t\t8192\t1\n"; + +static const char rep_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "rep\t\t\trep feature\t1\t2\tMSITESTDIR\t0\n"; + +static const char rep_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "rep\trep\n"; + +static const char rep_component_dat[] = + "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "rep\t{A24FAF2A-3B2E-41EF-AA78-331542E1A29D}\tMSITESTDIR\t0\t\trep.txt\n"; + +static const char rep_upgrade_dat[] = + "UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\n" + "s38\tS20\tS20\tS255\ti4\tS255\ts72\n" + "Upgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n" + "{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\t\t\t\t256\t\tPRODUCT\n"; + +static const char rep_property_dat[] = + "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "HASUIRUN\t0\n" + "INSTALLLEVEL\t3\n" + "InstallMode\tTypical\n" + "Manufacturer\tWine\n" + "PIDTemplate\t###-#######\n" + "ProductCode\t{1699F0BB-0B61-4A89-AFE4-CFD60DFD76F3}\n" + "ProductLanguage\t1033\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "UpgradeCode\t{2967C1CC-34D4-42EE-8D96-CD6836F192BF}\n" + "PRODUCT\t2F41860D-7B4C-4DA7-BED9-B64F26594C56\n" + "MSIFASTINSTALL\t1\n"; + +static const char rep_install_exec_seq_dat[] = + "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "FindRelatedProducts\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "RemoveExistingProducts\t\t1499\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveFiles\t\t1700\n" + "InstallFiles\t\t2000\n" + "UnregisterExtensionInfo\t\t3000\n" + "UnregisterMIMEInfo\t\t3500\n" + "RegisterExtensionInfo\t\t4000\n" + "RegisterMIMEInfo\t\t4500\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const char *filename; @@ -1818,6 +1888,19 @@ static const msi_table pa_tables[] = ADD_TABLE(property) }; +static const msi_table rep_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rep_component), + ADD_TABLE(rep_feature), + ADD_TABLE(rep_feature_comp), + ADD_TABLE(rep_file), + ADD_TABLE(rep_upgrade), + ADD_TABLE(rep_property), + ADD_TABLE(rep_install_exec_seq), + ADD_TABLE(media) +}; + /* based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LSTATUS action_RegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey, REGSAM access) { @@ -6125,6 +6208,42 @@ done: DeleteFile(msifile); } +static void test_remove_existing_products(void) +{ + UINT r; + + if (is_process_limited()) + { + skip("process is limited\n"); + return; + } + + create_test_files(); + create_file("msitest\\rep.txt", 1000); + create_database(msifile, rep_tables, sizeof(rep_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + goto error; + } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(!delete_pf("msitest\\rep.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); + +error: + DeleteFileA("msitest\\rep.txt"); + delete_test_files(); + DeleteFile(msifile); +} + START_TEST(action) { DWORD len; @@ -6202,6 +6321,7 @@ START_TEST(action) test_register_extension_info(); test_register_mime_info(); test_publish_assemblies(); + test_remove_existing_products(); DeleteFileA(log_file);

1 0

Dmitry Timoshkov : gdiplus: Improve precision of calculated pixel to units transformation.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 3298a3021150526f9e1fd3e030c05bf18ba3c048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3298a3021150526f9e1fd3e03… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 31 18:48:46 2012 +0900 gdiplus: Improve precision of calculated pixel to units transformation. --- dlls/gdiplus/gdiplus.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 9b43cd6..2599c58 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); static const REAL mm_per_inch = 25.4; -static const REAL inch_per_point = 1.0/72.0; +static const REAL point_per_inch = 72.0; static Status WINAPI NotificationHook(ULONG_PTR *token) { @@ -353,7 +353,7 @@ REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) case UnitDisplay: return units; case UnitPoint: - return units * dpi * inch_per_point; + return units * dpi / point_per_inch; case UnitInch: return units * dpi; case UnitDocument: @@ -376,7 +376,7 @@ REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) case UnitDisplay: return pixels; case UnitPoint: - return pixels / dpi / inch_per_point; + return pixels * point_per_inch / dpi; case UnitInch: return pixels / dpi; break;

1 0

Alexandre Julliard : gdi32: Compute the line parameters using the cropped coordinates to avoid overflows .
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 747d1631d5da53755119632ab035a0c32009a557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=747d1631d5da53755119632ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 31 16:52:02 2012 +0200 gdi32: Compute the line parameters using the cropped coordinates to avoid overflows. --- dlls/gdi32/dibdrv/objects.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f9736f6..4712dc1 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -616,7 +616,7 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end, DWORD struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); if (!get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects )) return TRUE; for (i = 0; i < clipped_rects.count; i++) { @@ -762,7 +762,7 @@ static BOOL solid_pen_line_region( dibdrv_physdev *pdev, POINT *start, POINT *en struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); if (clip_rect_to_dib( &pdev->dib, &rect )) { POINT clipped_start, clipped_end; @@ -1030,7 +1030,7 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) struct line_params line_params; POINT p1 = crop_coords( *start ), p2 = crop_coords( *end ); - init_bres_params( start, end, &clip_params, &line_params, &rect ); + init_bres_params( &p1, &p2, &clip_params, &line_params, &rect ); get_clipped_rects( &pdev->dib, &rect, pdev->clip, &clipped_rects ); for (i = 0; i < clipped_rects.count; i++) {

1 0

Jacek Caban : mshtml.idl: Added IHTMLDOMConstructorCollection declaration.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: 76cb174dca2c4cfc4a086a0a44f1a0b3c43d1d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76cb174dca2c4cfc4a086a0a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 14:27:56 2012 +0200 mshtml.idl: Added IHTMLDOMConstructorCollection declaration. --- include/mshtmdid.h | 108 +++++++++++++ include/mshtml.idl | 442 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 550 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76cb174dca2c4cfc4a086…

1 0

Jacek Caban : vbscript/tests: Use proper helpers for iface calls.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: aa68bf130ef5caadbe6ab0a9ec9527b49a3b4b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa68bf130ef5caadbe6ab0a9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 13:21:18 2012 +0200 vbscript/tests: Use proper helpers for iface calls. --- dlls/vbscript/tests/createobj.c | 44 ++++++++++++++++++++++++++------------ dlls/vbscript/tests/run.c | 34 ++++++++++++++++++++++-------- dlls/vbscript/tests/vbscript.c | 36 +++++++++++++++++++++++-------- 3 files changed, 81 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa68bf130ef5caadbe6ab…

1 0

Nikolay Sivov : dwrite: Added basic test for IDWriteFont created from LOGFONTW.
by Alexandre Julliard 31 Jul '12

31 Jul '12

Module: wine Branch: master Commit: bd7db0a9a4af1c2d3d31cd80c47c1bb011b68da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7db0a9a4af1c2d3d31cd80c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 31 08:18:02 2012 +0400 dwrite: Added basic test for IDWriteFont created from LOGFONTW. --- configure | 3 +- configure.ac | 3 +- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/gdiinterop.c | 3 + dlls/dwrite/tests/Makefile.in | 7 +++ dlls/dwrite/tests/font.c | 100 +++++++++++++++++++++++++++++++++++++++++ include/dwrite.idl | 2 + 7 files changed, 118 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 512f7e4..e0984d2 100755 --- a/configure +++ b/configure @@ -15280,7 +15280,8 @@ wine_fn_config_dll dssenh enable_dssenh wine_fn_config_test dlls/dssenh/tests dssenh_test wine_fn_config_dll dswave enable_dswave wine_fn_config_dll dwmapi enable_dwmapi implib -wine_fn_config_dll dwrite enable_dwrite +wine_fn_config_dll dwrite enable_dwrite implib +wine_fn_config_test dlls/dwrite/tests dwrite_test wine_fn_config_dll dxdiagn enable_dxdiagn po wine_fn_config_test dlls/dxdiagn/tests dxdiagn_test wine_fn_config_lib dxerr8 diff --git a/configure.ac b/configure.ac index 35c0e6c..4bd43d1 100644 --- a/configure.ac +++ b/configure.ac @@ -2624,7 +2624,8 @@ WINE_CONFIG_DLL(dssenh) WINE_CONFIG_TEST(dlls/dssenh/tests) WINE_CONFIG_DLL(dswave) WINE_CONFIG_DLL(dwmapi,,[implib]) -WINE_CONFIG_DLL(dwrite) +WINE_CONFIG_DLL(dwrite,,[implib]) +WINE_CONFIG_TEST(dlls/dwrite/tests) WINE_CONFIG_DLL(dxdiagn,,[po]) WINE_CONFIG_TEST(dlls/dxdiagn/tests) WINE_CONFIG_LIB(dxerr8) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 7d88e77..03220d1 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,4 +1,5 @@ -MODULE = dwrite.dll +MODULE = dwrite.dll +IMPORTLIB = dwrite C_SRCS = \ gdiinterop.c \ diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 7b3c589..8215185 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -57,6 +57,9 @@ static HRESULT WINAPI gdiinterop_CreateFontFromLOGFONT(IDWriteGdiInterop *iface, LOGFONTW const *logfont, IDWriteFont **font) { FIXME("(%p %p): stub\n", logfont, font); + + if (!logfont) return E_INVALIDARG; + return E_NOTIMPL; } diff --git a/dlls/dwrite/tests/Makefile.in b/dlls/dwrite/tests/Makefile.in new file mode 100644 index 0000000..f00d0e7 --- /dev/null +++ b/dlls/dwrite/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dwrite.dll +IMPORTS = dwrite + +C_SRCS = \ + font.c + +@MAKE_TEST_RULES@ diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c new file mode 100644 index 0000000..fa345e3 --- /dev/null +++ b/dlls/dwrite/tests/font.c @@ -0,0 +1,100 @@ +/* + * Font related tests + * + * Copyright 2012 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "windows.h" + +#include "initguid.h" +#include "dwrite.h" + +#include "wine/test.h" + +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + +IDWriteFactory *factory; + +static void test_CreateFontFromLOGFONT(void) +{ + static const WCHAR arialW[] = {'A','r','i','a','l',0}; + IDWriteGdiInterop *interop; + DWRITE_FONT_WEIGHT weight; + DWRITE_FONT_STYLE style; + IDWriteFont *font; + LOGFONTW logfont; + HRESULT hr; + BOOL ret; + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + EXPECT_HR(hr, S_OK); + +if (0) + /* null out parameter crashes this call */ + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, NULL); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, NULL, &font); + EXPECT_HR(hr, E_INVALIDARG); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, arialW); + + hr = IDWriteGdiInterop_CreateFontFromLOGFONT(interop, &logfont, &font); +todo_wine + EXPECT_HR(hr, S_OK); + +if (hr == S_OK) +{ + /* now check properties */ + weight = IDWriteFont_GetWeight(font); + ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); + + style = IDWriteFont_GetStyle(font); + ok(style == DWRITE_FONT_STYLE_ITALIC, "got %d\n", style); + + ret = IDWriteFont_IsSymbolFont(font); + ok(!ret, "got %d\n", ret); + + IDWriteFont_Release(font); +} + + IDWriteGdiInterop_Release(interop); +} + +START_TEST(font) +{ + HRESULT hr; + + hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_ISOLATED, &IID_IDWriteFactory, (IUnknown**)&factory); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr != S_OK) + { + win_skip("failed to create factory\n"); + return; + } + + test_CreateFontFromLOGFONT(); + + IDWriteFactory_Release(factory); +} diff --git a/include/dwrite.idl b/include/dwrite.idl index dc0e135..aff529a 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -1392,3 +1392,5 @@ interface IDWriteFactory : IUnknown FLOAT baseline_y, IDWriteGlyphRunAnalysis **analysis); } + +cpp_quote("HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE,REFIID,IUnknown**);")

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012