Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
f45baaa1
Commit
f45baaa1
authored
Apr 21, 2023
by
Piotr Caban
Committed by
Alexandre Julliard
Apr 22, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdi32: Store palette in EMR_EOF record.
parent
b9b159e5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
60 additions
and
7 deletions
+60
-7
emfdc.c
dlls/gdi32/emfdc.c
+60
-7
No files found.
dlls/gdi32/emfdc.c
View file @
f45baaa1
...
@@ -41,6 +41,9 @@ struct emf
...
@@ -41,6 +41,9 @@ struct emf
HBRUSH
dc_brush
;
HBRUSH
dc_brush
;
HPEN
dc_pen
;
HPEN
dc_pen
;
BOOL
path
;
BOOL
path
;
DWORD
palette_size
;
DWORD
palette_used
;
PALETTEENTRY
*
palette
;
};
};
#define HANDLE_LIST_INC 20
#define HANDLE_LIST_INC 20
...
@@ -394,6 +397,40 @@ static void emfdc_delete_object( HDC hdc, HGDIOBJ obj )
...
@@ -394,6 +397,40 @@ static void emfdc_delete_object( HDC hdc, HGDIOBJ obj )
emf
->
cur_handles
--
;
emf
->
cur_handles
--
;
}
}
static
BOOL
emfdc_add_palette_entry
(
struct
emf
*
emf
,
PALETTEENTRY
*
entry
)
{
int
i
;
for
(
i
=
0
;
i
<
emf
->
palette_used
;
i
++
)
{
if
(
emf
->
palette
[
i
].
peRed
==
entry
->
peRed
&&
emf
->
palette
[
i
].
peGreen
==
entry
->
peGreen
&&
emf
->
palette
[
i
].
peBlue
==
entry
->
peBlue
)
return
TRUE
;
}
if
(
emf
->
palette_size
==
emf
->
palette_used
)
{
if
(
!
emf
->
palette_size
)
{
emf
->
palette
=
HeapAlloc
(
GetProcessHeap
(),
0
,
8
*
sizeof
(
*
emf
->
palette
)
);
if
(
!
emf
->
palette
)
return
FALSE
;
emf
->
palette_size
=
8
;
}
else
{
void
*
new_palette
=
HeapReAlloc
(
GetProcessHeap
(),
0
,
emf
->
palette
,
2
*
emf
->
palette_size
*
sizeof
(
*
emf
->
palette
)
);
if
(
!
new_palette
)
return
FALSE
;
emf
->
palette
=
new_palette
;
emf
->
palette_size
*=
2
;
}
}
emf
->
palette
[
emf
->
palette_used
++
]
=
*
entry
;
return
TRUE
;
}
static
DWORD
emfdc_create_brush
(
struct
emf
*
emf
,
HBRUSH
brush
)
static
DWORD
emfdc_create_brush
(
struct
emf
*
emf
,
HBRUSH
brush
)
{
{
DWORD
index
=
0
;
DWORD
index
=
0
;
...
@@ -663,7 +700,10 @@ static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal )
...
@@ -663,7 +700,10 @@ static DWORD emfdc_create_palette( struct emf *emf, HPALETTE hPal )
return
0
;
return
0
;
for
(
i
=
0
;
i
<
hdr
->
lgpl
.
palNumEntries
;
i
++
)
for
(
i
=
0
;
i
<
hdr
->
lgpl
.
palNumEntries
;
i
++
)
{
hdr
->
lgpl
.
palPalEntry
[
i
].
peFlags
=
0
;
hdr
->
lgpl
.
palPalEntry
[
i
].
peFlags
=
0
;
emfdc_add_palette_entry
(
emf
,
hdr
->
lgpl
.
palPalEntry
+
i
);
}
hdr
->
emr
.
iType
=
EMR_CREATEPALETTE
;
hdr
->
emr
.
iType
=
EMR_CREATEPALETTE
;
hdr
->
emr
.
nSize
=
offsetof
(
EMRCREATEPALETTE
,
lgpl
.
palPalEntry
[
hdr
->
lgpl
.
palNumEntries
]
);
hdr
->
emr
.
nSize
=
offsetof
(
EMRCREATEPALETTE
,
lgpl
.
palPalEntry
[
hdr
->
lgpl
.
palNumEntries
]
);
...
@@ -2344,6 +2384,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr )
...
@@ -2344,6 +2384,7 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr )
struct
emf
*
emf
=
get_dc_emf
(
dc_attr
);
struct
emf
*
emf
=
get_dc_emf
(
dc_attr
);
UINT
index
;
UINT
index
;
HeapFree
(
GetProcessHeap
(),
0
,
emf
->
palette
);
HeapFree
(
GetProcessHeap
(),
0
,
emf
->
emh
);
HeapFree
(
GetProcessHeap
(),
0
,
emf
->
emh
);
for
(
index
=
0
;
index
<
emf
->
handles_size
;
index
++
)
for
(
index
=
0
;
index
<
emf
->
handles_size
;
index
++
)
if
(
emf
->
handles
[
index
])
if
(
emf
->
handles
[
index
])
...
@@ -2465,6 +2506,9 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect,
...
@@ -2465,6 +2506,9 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect,
emf
->
dc_brush
=
0
;
emf
->
dc_brush
=
0
;
emf
->
dc_pen
=
0
;
emf
->
dc_pen
=
0
;
emf
->
path
=
FALSE
;
emf
->
path
=
FALSE
;
emf
->
palette_size
=
0
;
emf
->
palette_used
=
0
;
emf
->
palette
=
NULL
;
emf
->
emh
->
iType
=
EMR_HEADER
;
emf
->
emh
->
iType
=
EMR_HEADER
;
emf
->
emh
->
nSize
=
size
;
emf
->
emh
->
nSize
=
size
;
...
@@ -2533,10 +2577,11 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect,
...
@@ -2533,10 +2577,11 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect,
*/
*/
HENHMETAFILE
WINAPI
CloseEnhMetaFile
(
HDC
hdc
)
HENHMETAFILE
WINAPI
CloseEnhMetaFile
(
HDC
hdc
)
{
{
UINT
size
,
palette_size
;
HENHMETAFILE
hmf
;
HENHMETAFILE
hmf
;
struct
emf
*
emf
;
struct
emf
*
emf
;
DC_ATTR
*
dc_attr
;
DC_ATTR
*
dc_attr
;
EMREOF
emr
;
EMREOF
*
emr
;
HANDLE
mapping
=
0
;
HANDLE
mapping
=
0
;
TRACE
(
"(%p)
\n
"
,
hdc
);
TRACE
(
"(%p)
\n
"
,
hdc
);
...
@@ -2544,18 +2589,26 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc )
...
@@ -2544,18 +2589,26 @@ HENHMETAFILE WINAPI CloseEnhMetaFile( HDC hdc )
if
(
!
(
dc_attr
=
get_dc_attr
(
hdc
))
||
!
get_dc_emf
(
dc_attr
))
return
0
;
if
(
!
(
dc_attr
=
get_dc_attr
(
hdc
))
||
!
get_dc_emf
(
dc_attr
))
return
0
;
emf
=
get_dc_emf
(
dc_attr
);
emf
=
get_dc_emf
(
dc_attr
);
palette_size
=
emf
->
palette_used
*
sizeof
(
*
emf
->
palette
);
size
=
sizeof
(
*
emr
)
+
palette_size
;
if
(
!
(
emr
=
HeapAlloc
(
GetProcessHeap
(),
0
,
size
)))
return
0
;
if
(
dc_attr
->
save_level
)
if
(
dc_attr
->
save_level
)
RestoreDC
(
hdc
,
1
);
RestoreDC
(
hdc
,
1
);
if
(
emf
->
dc_brush
)
DeleteObject
(
emf
->
dc_brush
);
if
(
emf
->
dc_brush
)
DeleteObject
(
emf
->
dc_brush
);
if
(
emf
->
dc_pen
)
DeleteObject
(
emf
->
dc_pen
);
if
(
emf
->
dc_pen
)
DeleteObject
(
emf
->
dc_pen
);
emr
.
emr
.
iType
=
EMR_EOF
;
emr
.
emr
.
nSize
=
sizeof
(
emr
);
emr
->
emr
.
iType
=
EMR_EOF
;
emr
.
nPalEntries
=
0
;
emr
->
emr
.
nSize
=
size
;
emr
.
offPalEntries
=
FIELD_OFFSET
(
EMREOF
,
nSizeLast
);
emr
->
nPalEntries
=
emf
->
palette_used
;
emr
.
nSizeLast
=
emr
.
emr
.
nSize
;
emr
->
offPalEntries
=
FIELD_OFFSET
(
EMREOF
,
nSizeLast
);
emfdc_record
(
emf
,
&
emr
.
emr
);
memcpy
(
(
BYTE
*
)
emr
+
emr
->
offPalEntries
,
emf
->
palette
,
palette_size
);
/* Set nSizeLast */
((
DWORD
*
)((
BYTE
*
)
emr
+
size
))[
-
1
]
=
size
;
emfdc_record
(
emf
,
&
emr
->
emr
);
HeapFree
(
GetProcessHeap
(),
0
,
emr
);
emf
->
emh
->
rclBounds
=
dc_attr
->
emf_bounds
;
emf
->
emh
->
rclBounds
=
dc_attr
->
emf_bounds
;
...
...
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