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
358ce067
Commit
358ce067
authored
May 21, 2006
by
Detlef Riekenberg
Committed by
Alexandre Julliard
May 22, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winspool: Remove cross calls W->A for the "Printers" registry path.
parent
5de733e4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
12 deletions
+9
-12
info.c
dlls/winspool/info.c
+9
-12
No files found.
dlls/winspool/info.c
View file @
358ce067
...
@@ -120,9 +120,6 @@ static INT (WINAPI *GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput,
...
@@ -120,9 +120,6 @@ static INT (WINAPI *GDI_CallExtDeviceMode16)( HWND hwnd, LPDEVMODEA lpdmOutput,
LPDEVMODEA
lpdmInput
,
LPSTR
lpszProfile
,
LPDEVMODEA
lpdmInput
,
LPSTR
lpszProfile
,
DWORD
fwMode
);
DWORD
fwMode
);
static
const
char
Printers
[]
=
"System
\\
CurrentControlSet
\\
control
\\
Print
\\
Printers
\\
"
;
static
const
WCHAR
DriversW
[]
=
{
'S'
,
'y'
,
's'
,
't'
,
'e'
,
'm'
,
'\\'
,
static
const
WCHAR
DriversW
[]
=
{
'S'
,
'y'
,
's'
,
't'
,
'e'
,
'm'
,
'\\'
,
'C'
,
'u'
,
'r'
,
'r'
,
'e'
,
'n'
,
't'
,
'C'
,
'o'
,
'n'
,
't'
,
'r'
,
'o'
,
'l'
,
'S'
,
'e'
,
't'
,
'\\'
,
'C'
,
'u'
,
'r'
,
'r'
,
'e'
,
'n'
,
't'
,
'C'
,
'o'
,
'n'
,
't'
,
'r'
,
'o'
,
'l'
,
'S'
,
'e'
,
't'
,
'\\'
,
'c'
,
'o'
,
'n'
,
't'
,
'r'
,
'o'
,
'l'
,
'\\'
,
'c'
,
'o'
,
'n'
,
't'
,
'r'
,
'o'
,
'l'
,
'\\'
,
...
@@ -350,7 +347,7 @@ static BOOL CUPS_LoadPrinters(void)
...
@@ -350,7 +347,7 @@ static BOOL CUPS_LoadPrinters(void)
DYNCUPS
(
cupsPrintFile
);
DYNCUPS
(
cupsPrintFile
);
#undef DYNCUPS
#undef DYNCUPS
if
(
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
!=
if
(
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
!=
ERROR_SUCCESS
)
{
ERROR_SUCCESS
)
{
ERR
(
"Can't create Printers key
\n
"
);
ERR
(
"Can't create Printers key
\n
"
);
return
FALSE
;
return
FALSE
;
...
@@ -479,7 +476,7 @@ PRINTCAP_ParseEntry(char *pent,BOOL isfirst) {
...
@@ -479,7 +476,7 @@ PRINTCAP_ParseEntry(char *pent,BOOL isfirst) {
}
}
HeapFree
(
GetProcessHeap
(),
0
,
devline
);
HeapFree
(
GetProcessHeap
(),
0
,
devline
);
if
(
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
!=
if
(
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
!=
ERROR_SUCCESS
)
{
ERROR_SUCCESS
)
{
ERR
(
"Can't create Printers key
\n
"
);
ERR
(
"Can't create Printers key
\n
"
);
ret
=
FALSE
;
ret
=
FALSE
;
...
@@ -609,7 +606,7 @@ void WINSPOOL_LoadSystemPrinters(void)
...
@@ -609,7 +606,7 @@ void WINSPOOL_LoadSystemPrinters(void)
/* This ensures that all printer entries have a valid Name value. If causes
/* This ensures that all printer entries have a valid Name value. If causes
problems later if they don't. If one is found to be missed we create one
problems later if they don't. If one is found to be missed we create one
and set it equal to the name of the key */
and set it equal to the name of the key */
if
(
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
==
ERROR_SUCCESS
)
{
if
(
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
==
ERROR_SUCCESS
)
{
if
(
RegQueryInfoKeyA
(
hkeyPrinters
,
NULL
,
NULL
,
NULL
,
&
num
,
NULL
,
NULL
,
if
(
RegQueryInfoKeyA
(
hkeyPrinters
,
NULL
,
NULL
,
NULL
,
&
num
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
)
==
ERROR_SUCCESS
)
{
NULL
,
NULL
,
NULL
,
NULL
,
NULL
)
==
ERROR_SUCCESS
)
{
for
(
i
=
0
;
i
<
num
;
i
++
)
{
for
(
i
=
0
;
i
<
num
;
i
++
)
{
...
@@ -921,7 +918,7 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey)
...
@@ -921,7 +918,7 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey)
if
(
!
name
)
return
ERROR_INVALID_HANDLE
;
if
(
!
name
)
return
ERROR_INVALID_HANDLE
;
if
((
ret
=
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
))
!=
if
((
ret
=
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
))
!=
ERROR_SUCCESS
)
ERROR_SUCCESS
)
return
ret
;
return
ret
;
...
@@ -1931,7 +1928,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
...
@@ -1931,7 +1928,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter)
SetLastError
(
ERROR_INVALID_PARAMETER
);
SetLastError
(
ERROR_INVALID_PARAMETER
);
return
0
;
return
0
;
}
}
if
(
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
!=
if
(
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
!=
ERROR_SUCCESS
)
{
ERROR_SUCCESS
)
{
ERR
(
"Can't create Printers key
\n
"
);
ERR
(
"Can't create Printers key
\n
"
);
return
0
;
return
0
;
...
@@ -2204,7 +2201,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter)
...
@@ -2204,7 +2201,7 @@ BOOL WINAPI DeletePrinter(HANDLE hPrinter)
SetLastError
(
ERROR_INVALID_HANDLE
);
SetLastError
(
ERROR_INVALID_HANDLE
);
return
FALSE
;
return
FALSE
;
}
}
if
(
RegOpenKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
==
ERROR_SUCCESS
)
{
if
(
RegOpenKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
==
ERROR_SUCCESS
)
{
WINSPOOL_SHDeleteKeyW
(
hkeyPrinters
,
lpNameW
);
WINSPOOL_SHDeleteKeyW
(
hkeyPrinters
,
lpNameW
);
RegCloseKey
(
hkeyPrinters
);
RegCloseKey
(
hkeyPrinters
);
}
}
...
@@ -3035,7 +3032,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
...
@@ -3035,7 +3032,7 @@ static BOOL WINSPOOL_GetPrinter(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter,
return
FALSE
;
return
FALSE
;
}
}
if
(
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
!=
if
(
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
!=
ERROR_SUCCESS
)
{
ERROR_SUCCESS
)
{
ERR
(
"Can't create Printers key
\n
"
);
ERR
(
"Can't create Printers key
\n
"
);
return
FALSE
;
return
FALSE
;
...
@@ -3186,7 +3183,7 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName,
...
@@ -3186,7 +3183,7 @@ static BOOL WINSPOOL_EnumPrinters(DWORD dwType, LPWSTR lpszName,
return
FALSE
;
return
FALSE
;
}
}
if
(
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
!=
if
(
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
!=
ERROR_SUCCESS
)
{
ERROR_SUCCESS
)
{
ERR
(
"Can't create Printers key
\n
"
);
ERR
(
"Can't create Printers key
\n
"
);
return
FALSE
;
return
FALSE
;
...
@@ -3568,7 +3565,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment,
...
@@ -3568,7 +3565,7 @@ static BOOL WINSPOOL_GetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment,
SetLastError
(
ERROR_INVALID_LEVEL
);
SetLastError
(
ERROR_INVALID_LEVEL
);
return
FALSE
;
return
FALSE
;
}
}
if
(
RegCreateKey
A
(
HKEY_LOCAL_MACHINE
,
Printers
,
&
hkeyPrinters
)
!=
if
(
RegCreateKey
W
(
HKEY_LOCAL_MACHINE
,
PrintersW
,
&
hkeyPrinters
)
!=
ERROR_SUCCESS
)
{
ERROR_SUCCESS
)
{
ERR
(
"Can't create Printers key
\n
"
);
ERR
(
"Can't create Printers key
\n
"
);
return
FALSE
;
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