Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
bd7db0a9
Commit
bd7db0a9
authored
Jul 31, 2012
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jul 31, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Added basic test for IDWriteFont created from LOGFONTW.
parent
0ccdda12
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
118 additions
and
3 deletions
+118
-3
configure
configure
+2
-1
configure.ac
configure.ac
+2
-1
Makefile.in
dlls/dwrite/Makefile.in
+2
-1
gdiinterop.c
dlls/dwrite/gdiinterop.c
+3
-0
Makefile.in
dlls/dwrite/tests/Makefile.in
+7
-0
font.c
dlls/dwrite/tests/font.c
+100
-0
dwrite.idl
include/dwrite.idl
+2
-0
No files found.
configure
View file @
bd7db0a9
...
...
@@ -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
...
...
configure.ac
View file @
bd7db0a9
...
...
@@ -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)
...
...
dlls/dwrite/Makefile.in
View file @
bd7db0a9
MODULE
=
dwrite.dll
MODULE
=
dwrite.dll
IMPORTLIB
=
dwrite
C_SRCS
=
\
gdiinterop.c
\
...
...
dlls/dwrite/gdiinterop.c
View file @
bd7db0a9
...
...
@@ -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
;
}
...
...
dlls/dwrite/tests/Makefile.in
0 → 100644
View file @
bd7db0a9
TESTDLL
=
dwrite.dll
IMPORTS
=
dwrite
C_SRCS
=
\
font.c
@MAKE_TEST_RULES@
dlls/dwrite/tests/font.c
0 → 100644
View file @
bd7db0a9
/*
* 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
);
}
include/dwrite.idl
View file @
bd7db0a9
...
...
@@ -1392,3 +1392,5 @@ interface IDWriteFactory : IUnknown
FLOAT
baseline_y
,
IDWriteGlyphRunAnalysis
**
analysis
)
;
}
cpp_quote
(
"HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE,REFIID,IUnknown**);"
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment