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
be5ca1be
Commit
be5ca1be
authored
Aug 24, 2023
by
Piotr Caban
Committed by
Alexandre Julliard
Aug 24, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
localspl: Try fallback print processor if datatype is not supported.
parent
3a477206
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
51 additions
and
11 deletions
+51
-11
provider.c
dlls/localspl/provider.c
+51
-11
No files found.
dlls/localspl/provider.c
View file @
be5ca1be
...
...
@@ -277,6 +277,7 @@ typedef struct {
handle_header_t
header
;
printer_info_t
*
info
;
WCHAR
*
name
;
WCHAR
*
print_proc
;
WCHAR
*
datatype
;
DEVMODEW
*
devmode
;
job_info_t
*
doc
;
...
...
@@ -1833,6 +1834,8 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename,
PRINTER_DEFAULTSW
*
def
)
{
printer_t
*
printer
;
HKEY
hroot
,
hkey
;
LSTATUS
status
;
printer
=
calloc
(
1
,
sizeof
(
*
printer
));
if
(
!
printer
)
...
...
@@ -1860,6 +1863,20 @@ static HANDLE printer_alloc_handle(const WCHAR *name, const WCHAR *basename,
if
(
def
&&
def
->
pDevMode
)
printer
->
devmode
=
dup_devmode
(
def
->
pDevMode
);
hroot
=
open_driver_reg
(
env_arch
.
envname
);
if
(
hroot
)
{
status
=
RegOpenKeyW
(
hroot
,
name
,
&
hkey
);
RegCloseKey
(
hroot
);
if
(
status
==
ERROR_SUCCESS
)
{
printer
->
print_proc
=
reg_query_value
(
hkey
,
L"Print Processor"
);
RegCloseKey
(
hkey
);
}
}
if
(
!
printer
->
print_proc
)
printer
->
print_proc
=
wcsdup
(
L"winprint"
);
return
(
HANDLE
)
printer
;
}
...
...
@@ -3411,7 +3428,7 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in
{
printer_t
*
printer
=
(
printer_t
*
)
hprinter
;
DOC_INFO_1W
*
info
=
(
DOC_INFO_1W
*
)
doc_info
;
BOOL
datatype_valid
;
BOOL
datatype_valid
=
FALSE
;
WCHAR
*
datatype
;
printproc_t
*
pp
;
...
...
@@ -3470,13 +3487,23 @@ static DWORD WINAPI fpStartDocPrinter(HANDLE hprinter, DWORD level, BYTE *doc_in
if
(
!
pp
)
{
WARN
(
"failed to load %s print processor
\n
"
,
debugstr_w
(
printer
->
info
->
print_proc
));
pp
=
print_proc_load
(
L"winprint"
);
}
else
{
datatype_valid
=
print_proc_check_datatype
(
pp
,
datatype
);
print_proc_unload
(
pp
);
}
if
(
!
datatype_valid
)
{
pp
=
print_proc_load
(
printer
->
print_proc
);
if
(
!
pp
)
return
0
;
datatype_valid
=
print_proc_check_datatype
(
pp
,
datatype
);
print_proc_unload
(
pp
);
}
if
(
!
datatype_valid
)
{
TRACE
(
"%s datatype not supported by %s
\n
"
,
debugstr_w
(
datatype
),
...
...
@@ -3728,11 +3755,11 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id)
{
printer_t
*
printer
=
(
printer_t
*
)
hprinter
;
WCHAR
output
[
1024
],
name
[
1024
],
*
datatype
;
BOOL
datatype_valid
=
FALSE
,
ret
=
TRUE
;
PRINTPROCESSOROPENDATA
pp_data
;
const
WCHAR
*
port_name
,
*
port
;
job_info_t
*
job
;
printproc_t
*
pp
;
BOOL
ret
=
TRUE
;
HANDLE
hpp
;
HKEY
hkey
;
...
...
@@ -3775,23 +3802,35 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id)
RegCloseKey
(
hkey
);
}
if
(
job
->
datatype
)
datatype
=
job
->
datatype
;
else
if
(
printer
->
datatype
)
datatype
=
printer
->
datatype
;
else
datatype
=
printer
->
info
->
datatype
;
pp
=
print_proc_load
(
printer
->
info
->
print_proc
);
if
(
!
pp
)
{
WARN
(
"failed to load %s print processor
\n
"
,
debugstr_w
(
printer
->
info
->
print_proc
));
pp
=
print_proc_load
(
L"winprint"
);
}
else
{
datatype_valid
=
print_proc_check_datatype
(
pp
,
datatype
);
if
(
!
datatype_valid
)
print_proc_unload
(
pp
);
}
if
(
!
datatype_valid
)
{
pp
=
print_proc_load
(
printer
->
print_proc
);
if
(
!
pp
)
return
FALSE
;
if
(
job
->
datatype
)
datatype
=
job
->
datatype
;
else
if
(
printer
->
datatype
)
datatype
=
printer
->
datatype
;
else
datatype
=
printer
->
info
->
datatype
;
datatype_valid
=
print_proc_check_datatype
(
pp
,
datatype
);
}
if
(
!
print_proc_check_datatype
(
pp
,
datatype
)
)
if
(
!
datatype_valid
)
{
WARN
(
"%s datatype not supported by %s
\n
"
,
debugstr_w
(
datatype
),
debugstr_w
(
printer
->
info
->
print_proc
));
...
...
@@ -3981,6 +4020,7 @@ static BOOL WINAPI fpClosePrinter(HANDLE hprinter)
release_printer_info
(
printer
->
info
);
free
(
printer
->
name
);
free
(
printer
->
print_proc
);
free
(
printer
->
datatype
);
free
(
printer
->
devmode
);
free
(
printer
);
...
...
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