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
d0b63086
Commit
d0b63086
authored
May 13, 2005
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't convert the template name to Unicode, it's not used by the
dialog anyway. Clear the window property on WM_DESTROY.
parent
40cb9826
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
11 deletions
+1
-11
fontdlg.c
dlls/commdlg/fontdlg.c
+1
-11
No files found.
dlls/commdlg/fontdlg.c
View file @
d0b63086
...
...
@@ -1024,18 +1024,15 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
LRESULT
CFn_WMDestroy
(
HWND
hwnd
,
WPARAM
wParam
,
LPARAM
lParam
,
LPCHOOSEFONTW
lpcfw
)
{
LPCHOOSEFONTA
lpcfa
;
LPCSTR
lpTemplateName
;
LPSTR
lpszStyle
;
LPLOGFONTA
lpLogFonta
;
int
len
;
lpcfa
=
GetPropW
(
hwnd
,
strWineFontData_a
);
lpLogFonta
=
lpcfa
->
lpLogFont
;
lpTemplateName
=
lpcfa
->
lpTemplateName
;
lpszStyle
=
lpcfa
->
lpszStyle
;
memcpy
(
lpcfa
,
lpcfw
,
sizeof
(
CHOOSEFONTA
));
lpcfa
->
lpLogFont
=
lpLogFonta
;
lpcfa
->
lpTemplateName
=
lpTemplateName
;
lpcfa
->
lpszStyle
=
lpszStyle
;
memcpy
(
lpcfa
->
lpLogFont
,
lpcfw
->
lpLogFont
,
sizeof
(
LOGFONTA
));
WideCharToMultiByte
(
CP_ACP
,
0
,
lpcfw
->
lpLogFont
->
lfFaceName
,
...
...
@@ -1047,9 +1044,9 @@ LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpc
HeapFree
(
GetProcessHeap
(),
0
,
lpcfw
->
lpszStyle
);
}
HeapFree
(
GetProcessHeap
(),
0
,
(
LPBYTE
)
lpcfw
->
lpTemplateName
);
HeapFree
(
GetProcessHeap
(),
0
,
lpcfw
->
lpLogFont
);
HeapFree
(
GetProcessHeap
(),
0
,
lpcfw
);
SetPropW
(
hwnd
,
strWineFontData
,
0
);
return
TRUE
;
}
...
...
@@ -1141,13 +1138,6 @@ INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
MultiByteToWideChar
(
CP_ACP
,
0
,
lpcfa
->
lpszStyle
,
-
1
,
lpcfw
->
lpszStyle
,
len
);
}
if
((
lpcfa
->
Flags
&
CF_ENABLETEMPLATE
)
&&
lpcfa
->
lpTemplateName
)
{
len
=
MultiByteToWideChar
(
CP_ACP
,
0
,
lpcfa
->
lpTemplateName
,
-
1
,
NULL
,
0
);
lpcfw
->
lpTemplateName
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
*
sizeof
(
WCHAR
));
MultiByteToWideChar
(
CP_ACP
,
0
,
lpcfa
->
lpTemplateName
,
-
1
,
(
LPWSTR
)
lpcfw
->
lpTemplateName
,
len
);
}
if
(
!
CFn_WMInitDialog
(
hDlg
,
wParam
,
lParam
,
lpcfw
))
{
TRACE
(
"CFn_WMInitDialog returned FALSE
\n
"
);
...
...
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