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
60ff8d17
Commit
60ff8d17
authored
Apr 04, 2007
by
Paul Vriens
Committed by
Alexandre Julliard
Apr 04, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
odbccp32: Don't print *pcbPathOut as it can be NULL (Coverity).
parent
5688ffb7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
2 deletions
+53
-2
odbccp32.c
dlls/odbccp32/odbccp32.c
+2
-2
misc.c
dlls/odbccp32/tests/misc.c
+51
-0
No files found.
dlls/odbccp32/odbccp32.c
View file @
60ff8d17
...
@@ -523,7 +523,7 @@ BOOL WINAPI SQLInstallDriverManagerW(LPWSTR lpszPath, WORD cbPathMax,
...
@@ -523,7 +523,7 @@ BOOL WINAPI SQLInstallDriverManagerW(LPWSTR lpszPath, WORD cbPathMax,
WCHAR
path
[
MAX_PATH
];
WCHAR
path
[
MAX_PATH
];
clear_errors
();
clear_errors
();
TRACE
(
"(%p %d %
d)
\n
"
,
lpszPath
,
cbPathMax
,
*
pcbPathOut
);
TRACE
(
"(%p %d %
p)
\n
"
,
lpszPath
,
cbPathMax
,
pcbPathOut
);
len
=
GetSystemDirectoryW
(
path
,
MAX_PATH
);
len
=
GetSystemDirectoryW
(
path
,
MAX_PATH
);
...
@@ -546,7 +546,7 @@ BOOL WINAPI SQLInstallDriverManager(LPSTR lpszPath, WORD cbPathMax,
...
@@ -546,7 +546,7 @@ BOOL WINAPI SQLInstallDriverManager(LPSTR lpszPath, WORD cbPathMax,
WCHAR
path
[
MAX_PATH
];
WCHAR
path
[
MAX_PATH
];
clear_errors
();
clear_errors
();
TRACE
(
"(%p %d %
d)
\n
"
,
lpszPath
,
cbPathMax
,
*
pcbPathOut
);
TRACE
(
"(%p %d %
p)
\n
"
,
lpszPath
,
cbPathMax
,
pcbPathOut
);
ret
=
SQLInstallDriverManagerW
(
path
,
MAX_PATH
,
&
cbOut
);
ret
=
SQLInstallDriverManagerW
(
path
,
MAX_PATH
,
&
cbOut
);
if
(
ret
)
if
(
ret
)
...
...
dlls/odbccp32/tests/misc.c
View file @
60ff8d17
...
@@ -74,8 +74,59 @@ static void test_SQLInstallerError(void)
...
@@ -74,8 +74,59 @@ static void test_SQLInstallerError(void)
ok
(
sql_ret
==
SQL_SUCCESS_WITH_INFO
,
"SQLInstallerError(null addresses) failed with %d instead of SQL_SUCCESS_WITH_INFO
\n
"
,
sql_ret
);
ok
(
sql_ret
==
SQL_SUCCESS_WITH_INFO
,
"SQLInstallerError(null addresses) failed with %d instead of SQL_SUCCESS_WITH_INFO
\n
"
,
sql_ret
);
}
}
static
void
test_SQLInstallDriverManager
(
void
)
{
BOOL
bool_ret
;
RETCODE
sql_ret
;
DWORD
error_code
;
CHAR
target_path
[
MAX_PATH
];
WORD
path_out
;
/* NULL check */
bool_ret
=
SQLInstallDriverManager
(
NULL
,
0
,
NULL
);
sql_ret
=
SQLInstallerErrorW
(
1
,
&
error_code
,
NULL
,
0
,
NULL
);
ok
(
!
bool_ret
,
"SQLInstallDriverManager unexpectedly succeeded
\n
"
);
todo_wine
ok
(
sql_ret
==
SQL_SUCCESS_WITH_INFO
&&
error_code
==
ODBC_ERROR_INVALID_BUFF_LEN
,
"Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN
\n
"
);
/* Length smaller then MAX_PATH */
bool_ret
=
SQLInstallDriverManager
(
target_path
,
MAX_PATH
/
2
,
NULL
);
sql_ret
=
SQLInstallerErrorW
(
1
,
&
error_code
,
NULL
,
0
,
NULL
);
todo_wine
{
ok
(
!
bool_ret
,
"SQLInstallDriverManager unexpectedly succeeded
\n
"
);
ok
(
sql_ret
==
SQL_SUCCESS_WITH_INFO
&&
error_code
==
ODBC_ERROR_INVALID_BUFF_LEN
,
"Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN
\n
"
);
}
path_out
=
0xcafe
;
bool_ret
=
SQLInstallDriverManager
(
target_path
,
MAX_PATH
/
2
,
&
path_out
);
sql_ret
=
SQLInstallerErrorW
(
1
,
&
error_code
,
NULL
,
0
,
NULL
);
todo_wine
{
ok
(
!
bool_ret
,
"SQLInstallDriverManager unexpectedly succeeded
\n
"
);
ok
(
sql_ret
==
SQL_SUCCESS_WITH_INFO
&&
error_code
==
ODBC_ERROR_INVALID_BUFF_LEN
,
"Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN
\n
"
);
ok
(
path_out
==
0xcafe
,
"Expected path_out to not have changed
\n
"
);
}
/* Length OK */
bool_ret
=
SQLInstallDriverManager
(
target_path
,
MAX_PATH
,
NULL
);
sql_ret
=
SQLInstallerErrorW
(
1
,
&
error_code
,
NULL
,
0
,
NULL
);
ok
(
bool_ret
,
"SQLInstallDriverManager unexpectedly failed
\n
"
);
ok
(
sql_ret
==
SQL_NO_DATA
,
"Expected SQL_NO_DATA, got %d
\n
"
,
sql_ret
);
path_out
=
0xcafe
;
bool_ret
=
SQLInstallDriverManager
(
target_path
,
MAX_PATH
,
&
path_out
);
sql_ret
=
SQLInstallerErrorW
(
1
,
&
error_code
,
NULL
,
0
,
NULL
);
ok
(
bool_ret
,
"SQLInstallDriverManager unexpectedly failed
\n
"
);
ok
(
sql_ret
==
SQL_NO_DATA
,
"Expected SQL_NO_DATA, got %d
\n
"
,
sql_ret
);
/* path_out should in practice be less then 0xcafe */
ok
(
path_out
!=
0xcafe
,
"Expected path_out to show the correct amount of bytes
\n
"
);
}
START_TEST
(
misc
)
START_TEST
(
misc
)
{
{
test_SQLConfigMode
();
test_SQLConfigMode
();
test_SQLInstallerError
();
test_SQLInstallerError
();
test_SQLInstallDriverManager
();
}
}
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