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
c50a368e
Commit
c50a368e
authored
Dec 27, 2008
by
Huw Davies
Committed by
Alexandre Julliard
Dec 27, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comdlg32: Use [G|S]etPropW instead of [G|S]etPropA.
parent
00c574d1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
14 deletions
+13
-14
printdlg.c
dlls/comdlg32/printdlg.c
+13
-14
No files found.
dlls/comdlg32/printdlg.c
View file @
c50a368e
...
...
@@ -79,7 +79,9 @@ static const WCHAR pd32_collateW[] = { 'P', 'D', '3', '2', '_', 'C', 'O', 'L', '
static
const
WCHAR
pd32_nocollateW
[]
=
{
'P'
,
'D'
,
'3'
,
'2'
,
'_'
,
'N'
,
'O'
,
'C'
,
'O'
,
'L'
,
'L'
,
'A'
,
'T'
,
'E'
,
0
};
static
const
WCHAR
pd32_portraitW
[]
=
{
'P'
,
'D'
,
'3'
,
'2'
,
'_'
,
'P'
,
'O'
,
'R'
,
'T'
,
'R'
,
'A'
,
'I'
,
'T'
,
0
};
static
const
WCHAR
pd32_landscapeW
[]
=
{
'P'
,
'D'
,
'3'
,
'2'
,
'_'
,
'L'
,
'A'
,
'N'
,
'D'
,
'S'
,
'C'
,
'A'
,
'P'
,
'E'
,
0
};
static
const
WCHAR
propW
[]
=
{
'_'
,
'_'
,
'W'
,
'I'
,
'N'
,
'E'
,
'_'
,
'P'
,
'R'
,
'I'
,
'N'
,
'T'
,
'D'
,
'L'
,
'G'
,
'D'
,
'A'
,
'T'
,
'A'
,
0
};
static
const
WCHAR
printdlg_prop
[]
=
{
'_'
,
'_'
,
'W'
,
'I'
,
'N'
,
'E'
,
'_'
,
'P'
,
'R'
,
'I'
,
'N'
,
'T'
,
'D'
,
'L'
,
'G'
,
'D'
,
'A'
,
'T'
,
'A'
,
0
};
static
const
WCHAR
pagesetupdlg_prop
[]
=
{
'_'
,
'_'
,
'W'
,
'I'
,
'N'
,
'E'
,
'_'
,
'P'
,
'A'
,
'G'
,
'E'
,
'S'
,
'E'
,
'T'
,
'U'
,
'P'
,
'D'
,
'L'
,
'G'
,
'D'
,
'A'
,
'T'
,
'A'
,
0
};
/***********************************************************************
* PRINTDLG_OpenDefaultPrinter
...
...
@@ -1854,12 +1856,12 @@ static INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam,
INT_PTR
res
=
FALSE
;
if
(
uMsg
!=
WM_INITDIALOG
)
{
PrintStructures
=
GetProp
A
(
hDlg
,
"__WINE_PRINTDLGDATA"
);
PrintStructures
=
GetProp
W
(
hDlg
,
printdlg_prop
);
if
(
!
PrintStructures
)
return
FALSE
;
}
else
{
PrintStructures
=
(
PRINT_PTRA
*
)
lParam
;
SetPropA
(
hDlg
,
"__WINE_PRINTDLGDATA"
,
PrintStructures
);
SetPropW
(
hDlg
,
printdlg_prop
,
PrintStructures
);
if
(
!
check_printer_setup
(
hDlg
))
{
EndDialog
(
hDlg
,
FALSE
);
...
...
@@ -1903,12 +1905,12 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam,
INT_PTR
res
=
FALSE
;
if
(
uMsg
!=
WM_INITDIALOG
)
{
PrintStructures
=
GetPropW
(
hDlg
,
pr
opW
);
PrintStructures
=
GetPropW
(
hDlg
,
pr
intdlg_prop
);
if
(
!
PrintStructures
)
return
FALSE
;
}
else
{
PrintStructures
=
(
PRINT_PTRW
*
)
lParam
;
SetPropW
(
hDlg
,
propW
,
PrintStructures
);
SetPropW
(
hDlg
,
printdlg_prop
,
PrintStructures
);
if
(
!
check_printer_setup
(
hDlg
))
{
EndDialog
(
hDlg
,
FALSE
);
...
...
@@ -3215,7 +3217,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return
CallWindowProcA
(
lpfnStaticWndProc
,
hWnd
,
uMsg
,
wParam
,
lParam
);
/* Processing WM_PAINT message */
pda
=
GetProp
A
(
hWnd
,
"__WINE_PAGESETUPDLGDATA"
);
pda
=
GetProp
W
(
hWnd
,
pagesetupdlg_prop
);
if
(
!
pda
)
{
WARN
(
"__WINE_PAGESETUPDLGDATA prop not set?
\n
"
);
return
FALSE
;
...
...
@@ -3311,8 +3313,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
hDrawWnd
=
GetDlgItem
(
hDlg
,
rct1
);
TRACE
(
"set property to %p
\n
"
,
pda
);
SetPropA
(
hDlg
,
"__WINE_PAGESETUPDLGDATA"
,
pda
);
SetPropA
(
hDrawWnd
,
"__WINE_PAGESETUPDLGDATA"
,
pda
);
SetPropW
(
hDlg
,
pagesetupdlg_prop
,
pda
);
SetPropW
(
hDrawWnd
,
pagesetupdlg_prop
,
pda
);
GetWindowRect
(
hDrawWnd
,
&
pda
->
rtDrawRect
);
/* Calculating rect in client coordinates where paper draws */
ScreenToClient
(
hDlg
,
(
LPPOINT
)
&
pda
->
rtDrawRect
);
ScreenToClient
(
hDlg
,
(
LPPOINT
)(
&
pda
->
rtDrawRect
.
right
));
...
...
@@ -3404,7 +3406,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
PRINTDLG_PS_ChangePaperPrev
(
pda
);
return
TRUE
;
}
else
{
pda
=
GetProp
A
(
hDlg
,
"__WINE_PAGESETUPDLGDATA"
);
pda
=
GetProp
W
(
hDlg
,
pagesetupdlg_prop
);
if
(
!
pda
)
{
WARN
(
"__WINE_PAGESETUPDLGDATA prop not set?
\n
"
);
return
FALSE
;
...
...
@@ -3424,9 +3426,6 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
static
INT_PTR
CALLBACK
PageDlgProcW
(
HWND
hDlg
,
UINT
uMsg
,
WPARAM
wParam
,
LPARAM
lParam
)
{
static
const
WCHAR
__WINE_PAGESETUPDLGDATA
[]
=
{
'_'
,
'_'
,
'W'
,
'I'
,
'N'
,
'E'
,
'_'
,
'P'
,
'A'
,
'G'
,
'E'
,
'S'
,
'E'
,
'T'
,
'U'
,
'P'
,
'D'
,
'L'
,
'G'
,
'D'
,
'A'
,
'T'
,
'A'
,
0
};
PageSetupDataW
*
pdw
;
BOOL
res
=
FALSE
;
...
...
@@ -3434,7 +3433,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
res
=
TRUE
;
pdw
=
(
PageSetupDataW
*
)
lParam
;
pdw
->
curdlg
=
*
pdw
->
dlgw
;
SetPropW
(
hDlg
,
__WINE_PAGESETUPDLGDATA
,
pdw
);
SetPropW
(
hDlg
,
pagesetupdlg_prop
,
pdw
);
if
(
pdw
->
dlgw
->
Flags
&
PSD_ENABLEPAGESETUPHOOK
)
{
res
=
pdw
->
dlgw
->
lpfnPageSetupHook
(
hDlg
,
uMsg
,
wParam
,(
LPARAM
)
pdw
->
dlgw
);
if
(
!
res
)
{
...
...
@@ -3490,7 +3489,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
return
TRUE
;
}
else
{
pdw
=
GetPropW
(
hDlg
,
__WINE_PAGESETUPDLGDATA
);
pdw
=
GetPropW
(
hDlg
,
pagesetupdlg_prop
);
if
(
!
pdw
)
{
WARN
(
"__WINE_PAGESETUPDLGDATA prop not set?
\n
"
);
return
FALSE
;
...
...
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