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
5753e22d
Commit
5753e22d
authored
Feb 17, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Feb 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Implement InvalidateLayout().
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9efd1350
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
4 deletions
+40
-4
layout.c
dlls/dwrite/layout.c
+5
-2
analyzer.c
dlls/dwrite/tests/analyzer.c
+1
-1
layout.c
dlls/dwrite/tests/layout.c
+34
-1
No files found.
dlls/dwrite/layout.c
View file @
5753e22d
...
@@ -3586,8 +3586,11 @@ static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout3 *ifac
...
@@ -3586,8 +3586,11 @@ static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout3 *ifac
static
HRESULT
WINAPI
dwritetextlayout3_InvalidateLayout
(
IDWriteTextLayout3
*
iface
)
static
HRESULT
WINAPI
dwritetextlayout3_InvalidateLayout
(
IDWriteTextLayout3
*
iface
)
{
{
struct
dwrite_textlayout
*
This
=
impl_from_IDWriteTextLayout3
(
iface
);
struct
dwrite_textlayout
*
This
=
impl_from_IDWriteTextLayout3
(
iface
);
FIXME
(
"(%p): stub
\n
"
,
This
);
return
E_NOTIMPL
;
TRACE
(
"(%p)
\n
"
,
This
);
This
->
recompute
=
RECOMPUTE_EVERYTHING
;
return
S_OK
;
}
}
static
HRESULT
WINAPI
dwritetextlayout3_SetLineSpacing
(
IDWriteTextLayout3
*
iface
,
DWRITE_LINE_SPACING
const
*
spacing
)
static
HRESULT
WINAPI
dwritetextlayout3_SetLineSpacing
(
IDWriteTextLayout3
*
iface
,
DWRITE_LINE_SPACING
const
*
spacing
)
...
...
dlls/dwrite/tests/analyzer.c
View file @
5753e22d
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include "initguid.h"
#include "initguid.h"
#include "windows.h"
#include "windows.h"
#include "dwrite_
2
.h"
#include "dwrite_
3
.h"
#include "wine/test.h"
#include "wine/test.h"
...
...
dlls/dwrite/tests/layout.c
View file @
5753e22d
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
#include <limits.h>
#include <limits.h>
#include "windows.h"
#include "windows.h"
#include "dwrite_
2
.h"
#include "dwrite_
3
.h"
#include "wine/test.h"
#include "wine/test.h"
...
@@ -4853,6 +4853,38 @@ todo_wine
...
@@ -4853,6 +4853,38 @@ todo_wine
IDWriteFactory_Release
(
factory
);
IDWriteFactory_Release
(
factory
);
}
}
static
void
test_InvalidateLayout
(
void
)
{
static
const
WCHAR
strW
[]
=
{
'a'
,
0
};
IDWriteTextLayout3
*
layout3
;
IDWriteTextLayout
*
layout
;
IDWriteTextFormat
*
format
;
IDWriteFactory
*
factory
;
HRESULT
hr
;
factory
=
create_factory
();
hr
=
IDWriteFactory_CreateTextFormat
(
factory
,
tahomaW
,
NULL
,
DWRITE_FONT_WEIGHT_NORMAL
,
DWRITE_FONT_STYLE_NORMAL
,
DWRITE_FONT_STRETCH_NORMAL
,
10
.
0
f
,
enusW
,
&
format
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IDWriteFactory_CreateTextLayout
(
factory
,
strW
,
1
,
format
,
1000
.
0
f
,
1000
.
0
f
,
&
layout
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
IDWriteTextLayout_QueryInterface
(
layout
,
&
IID_IDWriteTextLayout3
,
(
void
**
)
&
layout3
);
if
(
hr
==
S_OK
)
{
hr
=
IDWriteTextLayout3_InvalidateLayout
(
layout3
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
IDWriteTextLayout3_Release
(
layout3
);
}
else
win_skip
(
"IDWriteTextLayout3::InvalidateLayout() is not supported.
\n
"
);
IDWriteTextLayout_Release
(
layout
);
IDWriteTextFormat_Release
(
format
);
IDWriteFactory_Release
(
factory
);
}
START_TEST
(
layout
)
START_TEST
(
layout
)
{
{
IDWriteFactory
*
factory
;
IDWriteFactory
*
factory
;
...
@@ -4900,6 +4932,7 @@ START_TEST(layout)
...
@@ -4900,6 +4932,7 @@ START_TEST(layout)
test_SetLastLineWrapping
();
test_SetLastLineWrapping
();
test_SetOpticalAlignment
();
test_SetOpticalAlignment
();
test_SetUnderline
();
test_SetUnderline
();
test_InvalidateLayout
();
IDWriteFactory_Release
(
factory
);
IDWriteFactory_Release
(
factory
);
}
}
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