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
f078d5b4
Commit
f078d5b4
authored
Sep 01, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Fix buffer size parameter in GetFontFileData for 64-bit.
parent
f69bb9d6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
gdiinterop.c
dlls/dwrite/gdiinterop.c
+1
-1
font.c
dlls/gdi32/tests/font.c
+1
-1
text.c
dlls/gdi32/text.c
+1
-1
font.c
dlls/win32u/font.c
+1
-1
gdi.c
dlls/wow64win/gdi.c
+1
-1
ntgdi.h
include/ntgdi.h
+1
-1
No files found.
dlls/dwrite/gdiinterop.c
View file @
f078d5b4
...
@@ -758,7 +758,7 @@ struct font_fileinfo
...
@@ -758,7 +758,7 @@ struct font_fileinfo
/* Undocumented gdi32 exports, used to access actually selected font information */
/* Undocumented gdi32 exports, used to access actually selected font information */
extern
BOOL
WINAPI
GetFontRealizationInfo
(
HDC
hdc
,
struct
font_realization_info
*
info
);
extern
BOOL
WINAPI
GetFontRealizationInfo
(
HDC
hdc
,
struct
font_realization_info
*
info
);
extern
BOOL
WINAPI
GetFontFileInfo
(
DWORD
instance_id
,
DWORD
file_index
,
struct
font_fileinfo
*
info
,
SIZE_T
size
,
SIZE_T
*
needed
);
extern
BOOL
WINAPI
GetFontFileInfo
(
DWORD
instance_id
,
DWORD
file_index
,
struct
font_fileinfo
*
info
,
SIZE_T
size
,
SIZE_T
*
needed
);
extern
BOOL
WINAPI
GetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
offset
,
void
*
buff
,
DWORD
buff_size
);
extern
BOOL
WINAPI
GetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
offset
,
void
*
buff
,
SIZE_T
buff_size
);
static
HRESULT
WINAPI
gdiinterop_CreateFontFaceFromHdc
(
IDWriteGdiInterop1
*
iface
,
static
HRESULT
WINAPI
gdiinterop_CreateFontFaceFromHdc
(
IDWriteGdiInterop1
*
iface
,
HDC
hdc
,
IDWriteFontFace
**
fontface
)
HDC
hdc
,
IDWriteFontFace
**
fontface
)
...
...
dlls/gdi32/tests/font.c
View file @
f078d5b4
...
@@ -46,7 +46,7 @@ static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *);
...
@@ -46,7 +46,7 @@ static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *);
static
BOOL
(
WINAPI
*
pGdiRealizationInfo
)(
HDC
hdc
,
DWORD
*
);
static
BOOL
(
WINAPI
*
pGdiRealizationInfo
)(
HDC
hdc
,
DWORD
*
);
static
BOOL
(
WINAPI
*
pGetFontRealizationInfo
)(
HDC
hdc
,
DWORD
*
);
static
BOOL
(
WINAPI
*
pGetFontRealizationInfo
)(
HDC
hdc
,
DWORD
*
);
static
BOOL
(
WINAPI
*
pGetFontFileInfo
)(
DWORD
,
DWORD
,
void
*
,
SIZE_T
,
SIZE_T
*
);
static
BOOL
(
WINAPI
*
pGetFontFileInfo
)(
DWORD
,
DWORD
,
void
*
,
SIZE_T
,
SIZE_T
*
);
static
BOOL
(
WINAPI
*
pGetFontFileData
)(
DWORD
,
DWORD
,
UINT64
,
void
*
,
DWORD
);
static
BOOL
(
WINAPI
*
pGetFontFileData
)(
DWORD
,
DWORD
,
UINT64
,
void
*
,
SIZE_T
);
static
HMODULE
hgdi32
=
0
;
static
HMODULE
hgdi32
=
0
;
static
const
MAT2
mat
=
{
{
0
,
1
},
{
0
,
0
},
{
0
,
0
},
{
0
,
1
}
};
static
const
MAT2
mat
=
{
{
0
,
1
},
{
0
,
0
},
{
0
,
0
},
{
0
,
1
}
};
...
...
dlls/gdi32/text.c
View file @
f078d5b4
...
@@ -2015,7 +2015,7 @@ BOOL WINAPI EnableEUDC( BOOL enable )
...
@@ -2015,7 +2015,7 @@ BOOL WINAPI EnableEUDC( BOOL enable )
* GetFontFileData (GDI32.@)
* GetFontFileData (GDI32.@)
*/
*/
BOOL
WINAPI
GetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
offset
,
BOOL
WINAPI
GetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
offset
,
void
*
buff
,
DWORD
buff_size
)
void
*
buff
,
SIZE_T
buff_size
)
{
{
return
NtGdiGetFontFileData
(
instance_id
,
file_index
,
&
offset
,
buff
,
buff_size
);
return
NtGdiGetFontFileData
(
instance_id
,
file_index
,
&
offset
,
buff
,
buff_size
);
}
}
...
...
dlls/win32u/font.c
View file @
f078d5b4
...
@@ -7008,7 +7008,7 @@ BOOL WINAPI NtGdiGetRasterizerCaps( RASTERIZER_STATUS *status, UINT size )
...
@@ -7008,7 +7008,7 @@ BOOL WINAPI NtGdiGetRasterizerCaps( RASTERIZER_STATUS *status, UINT size )
* NtGdiGetFontFileData (win32u.@)
* NtGdiGetFontFileData (win32u.@)
*/
*/
BOOL
WINAPI
NtGdiGetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
*
offset
,
BOOL
WINAPI
NtGdiGetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
*
offset
,
void
*
buff
,
DWORD
buff_size
)
void
*
buff
,
SIZE_T
buff_size
)
{
{
struct
gdi_font
*
font
;
struct
gdi_font
*
font
;
DWORD
tag
=
0
,
size
;
DWORD
tag
=
0
,
size
;
...
...
dlls/wow64win/gdi.c
View file @
f078d5b4
...
@@ -1136,7 +1136,7 @@ NTSTATUS WINAPI wow64_NtGdiGetFontFileData( UINT *args )
...
@@ -1136,7 +1136,7 @@ NTSTATUS WINAPI wow64_NtGdiGetFontFileData( UINT *args )
DWORD
file_index
=
get_ulong
(
&
args
);
DWORD
file_index
=
get_ulong
(
&
args
);
UINT64
*
offset
=
get_ptr
(
&
args
);
UINT64
*
offset
=
get_ptr
(
&
args
);
void
*
buff
=
get_ptr
(
&
args
);
void
*
buff
=
get_ptr
(
&
args
);
DWORD
buff_size
=
get_ulong
(
&
args
);
SIZE_T
buff_size
=
get_ulong
(
&
args
);
return
NtGdiGetFontFileData
(
instance_id
,
file_index
,
offset
,
buff
,
buff_size
);
return
NtGdiGetFontFileData
(
instance_id
,
file_index
,
offset
,
buff
,
buff_size
);
}
}
...
...
include/ntgdi.h
View file @
f078d5b4
...
@@ -341,7 +341,7 @@ INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap );
...
@@ -341,7 +341,7 @@ INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap );
BOOL
WINAPI
NtGdiGetDeviceGammaRamp
(
HDC
hdc
,
void
*
ptr
);
BOOL
WINAPI
NtGdiGetDeviceGammaRamp
(
HDC
hdc
,
void
*
ptr
);
DWORD
WINAPI
NtGdiGetFontData
(
HDC
hdc
,
DWORD
table
,
DWORD
offset
,
void
*
buffer
,
DWORD
length
);
DWORD
WINAPI
NtGdiGetFontData
(
HDC
hdc
,
DWORD
table
,
DWORD
offset
,
void
*
buffer
,
DWORD
length
);
BOOL
WINAPI
NtGdiGetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
*
offset
,
BOOL
WINAPI
NtGdiGetFontFileData
(
DWORD
instance_id
,
DWORD
file_index
,
UINT64
*
offset
,
void
*
buff
,
DWORD
buff_size
);
void
*
buff
,
SIZE_T
buff_size
);
BOOL
WINAPI
NtGdiGetFontFileInfo
(
DWORD
instance_id
,
DWORD
file_index
,
struct
font_fileinfo
*
info
,
BOOL
WINAPI
NtGdiGetFontFileInfo
(
DWORD
instance_id
,
DWORD
file_index
,
struct
font_fileinfo
*
info
,
SIZE_T
size
,
SIZE_T
*
needed
);
SIZE_T
size
,
SIZE_T
*
needed
);
DWORD
WINAPI
NtGdiGetFontUnicodeRanges
(
HDC
hdc
,
GLYPHSET
*
lpgs
);
DWORD
WINAPI
NtGdiGetFontUnicodeRanges
(
HDC
hdc
,
GLYPHSET
*
lpgs
);
...
...
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