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
bea70326
Commit
bea70326
authored
Feb 13, 2012
by
Detlef Riekenberg
Committed by
Alexandre Julliard
Feb 13, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comdlg32: Exclude the driver path from the result.
parent
ca69cc60
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
printdlg.c
dlls/comdlg32/printdlg.c
+4
-0
printdlg.c
dlls/comdlg32/tests/printdlg.c
+0
-5
No files found.
dlls/comdlg32/printdlg.c
View file @
bea70326
...
...
@@ -322,6 +322,8 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName,
char
buf
[
260
];
DWORD
dwBufLen
=
sizeof
(
buf
);
DeviceDriverName
=
strrchr
(
DeviceDriverName
,
'\\'
)
+
1
;
size
=
strlen
(
DeviceDriverName
)
+
1
+
strlen
(
DeviceName
)
+
1
+
strlen
(
OutputPort
)
+
1
...
...
@@ -365,6 +367,8 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName,
WCHAR
bufW
[
260
];
DWORD
dwBufLen
=
sizeof
(
bufW
)
/
sizeof
(
WCHAR
);
DeviceDriverName
=
strrchrW
(
DeviceDriverName
,
'\\'
)
+
1
;
size
=
sizeof
(
WCHAR
)
*
lstrlenW
(
DeviceDriverName
)
+
2
+
sizeof
(
WCHAR
)
*
lstrlenW
(
DeviceName
)
+
2
+
sizeof
(
WCHAR
)
*
lstrlenW
(
OutputPort
)
+
2
...
...
dlls/comdlg32/tests/printdlg.c
View file @
bea70326
...
...
@@ -200,9 +200,7 @@ static void test_PrintDlgA(void)
/* The Driver Entry does not include a Path */
ptr
=
strrchr
(
driver
,
'\\'
);
todo_wine
{
ok
(
ptr
==
NULL
,
"got %p for '%s' (expected NULL for a simple name)
\n
"
,
ptr
,
driver
);
}
/* The Driver Entry does not have an extension (fixed to ".drv") */
ptr
=
strrchr
(
driver
,
'.'
);
...
...
@@ -220,11 +218,8 @@ static void test_PrintDlgA(void)
res
,
GetLastError
(),
ptr
,
buffer
);
if
(
ptr
)
ptr
[
0
]
=
'\0'
;
todo_wine
{
ok
(
lstrcmpiA
(
driver
,
buffer
)
==
0
,
"got driver '%s' (expected '%s')
\n
"
,
driver
,
buffer
);
}
}
GlobalUnlock
(
pDlg
->
hDevNames
);
...
...
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