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
ac7954b7
Commit
ac7954b7
authored
Jan 15, 2016
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 15, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dwrite: Always initialize out pointers.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d3b42a13
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
6 deletions
+14
-6
font.c
dlls/dwrite/font.c
+14
-6
No files found.
dlls/dwrite/font.c
View file @
ac7954b7
...
...
@@ -3880,9 +3880,13 @@ static const IDWriteFontFileStreamVtbl localfontfilestreamvtbl =
localfontfilestream_GetLastWriteTime
};
static
HRESULT
create_localfontfilestream
(
const
void
*
file_ptr
,
UINT64
size
,
struct
local_cached_stream
*
entry
,
IDWriteFontFileStream
**
iface
)
static
HRESULT
create_localfontfilestream
(
const
void
*
file_ptr
,
UINT64
size
,
struct
local_cached_stream
*
entry
,
IDWriteFontFileStream
**
ret
)
{
struct
dwrite_localfontfilestream
*
This
=
heap_alloc
(
sizeof
(
struct
dwrite_localfontfilestream
));
struct
dwrite_localfontfilestream
*
This
;
*
ret
=
NULL
;
This
=
heap_alloc
(
sizeof
(
struct
dwrite_localfontfilestream
));
if
(
!
This
)
return
E_OUTOFMEMORY
;
...
...
@@ -3893,7 +3897,7 @@ static HRESULT create_localfontfilestream(const void *file_ptr, UINT64 size, str
This
->
size
=
size
;
This
->
entry
=
entry
;
*
iface
=
&
This
->
IDWriteFontFileStream_iface
;
*
ret
=
&
This
->
IDWriteFontFileStream_iface
;
return
S_OK
;
}
...
...
@@ -4060,9 +4064,13 @@ static const struct IDWriteLocalFontFileLoaderVtbl localfontfileloadervtbl = {
localfontfileloader_GetLastWriteTimeFromKey
};
HRESULT
create_localfontfileloader
(
IDWriteLocalFontFileLoader
**
iface
)
HRESULT
create_localfontfileloader
(
IDWriteLocalFontFileLoader
**
ret
)
{
struct
dwrite_localfontfileloader
*
This
=
heap_alloc
(
sizeof
(
struct
dwrite_localfontfileloader
));
struct
dwrite_localfontfileloader
*
This
;
*
ret
=
NULL
;
This
=
heap_alloc
(
sizeof
(
struct
dwrite_localfontfileloader
));
if
(
!
This
)
return
E_OUTOFMEMORY
;
...
...
@@ -4070,7 +4078,7 @@ HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface)
This
->
ref
=
1
;
list_init
(
&
This
->
streams
);
*
iface
=
&
This
->
IDWriteLocalFontFileLoader_iface
;
*
ret
=
&
This
->
IDWriteLocalFontFileLoader_iface
;
return
S_OK
;
}
...
...
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