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
8df456cc
Commit
8df456cc
authored
Aug 27, 2019
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Aug 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
odbccp32: Correct error when driver cannot be found.
Signed-off-by:
Alistair Leslie-Hughes
<
leslie_alistair@hotmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fc8996cc
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
odbccp32.c
dlls/odbccp32/odbccp32.c
+1
-1
misc.c
dlls/odbccp32/tests/misc.c
+26
-0
No files found.
dlls/odbccp32/odbccp32.c
View file @
8df456cc
...
...
@@ -288,7 +288,7 @@ static HMODULE load_config_driver(const WCHAR *driver)
if
(
ret
!=
ERROR_SUCCESS
)
{
HeapFree
(
GetProcessHeap
(),
0
,
filename
);
push_error
(
ODBC_ERROR_
INVALID_DSN
,
odbc_error_invalid_dsn
);
push_error
(
ODBC_ERROR_
COMPONENT_NOT_FOUND
,
odbc_error_component_not_found
);
return
NULL
;
}
...
...
dlls/odbccp32/tests/misc.c
View file @
8df456cc
...
...
@@ -741,6 +741,31 @@ static void test_SQLValidDSNW(void)
ok
(
ret
,
"got %d
\n
"
,
ret
);
}
static
void
test_SQLConfigDataSource
(
void
)
{
BOOL
ret
;
ret
=
SQLConfigDataSource
(
0
,
ODBC_ADD_DSN
,
"SQL Server"
,
"DSN=WINEMQIS
\0
Database=MQIS
\0\0
"
);
ok
(
ret
,
"got %d
\n
"
,
ret
);
ret
=
SQLConfigDataSource
(
0
,
ODBC_REMOVE_DSN
,
"SQL Server"
,
"DSN=WINEMQIS
\0\0
"
);
ok
(
ret
,
"got %d
\n
"
,
ret
);
ret
=
SQLConfigDataSource
(
0
,
ODBC_REMOVE_DSN
,
"SQL Server"
,
"DSN=WINEMQIS
\0\0
"
);
if
(
!
ret
)
{
RETCODE
ret
;
DWORD
err
;
ret
=
SQLInstallerError
(
1
,
&
err
,
NULL
,
0
,
NULL
);
ok
(
ret
==
SQL_SUCCESS_WITH_INFO
,
"got %d
\n
"
,
ret
);
todo_wine
ok
(
err
==
ODBC_ERROR_INVALID_DSN
,
"got %u
\n
"
,
err
);
}
ret
=
SQLConfigDataSource
(
0
,
ODBC_ADD_DSN
,
"ODBC driver"
,
"DSN=ODBC data source
\0\0
"
);
todo_wine
ok
(
!
ret
,
"got %d
\n
"
,
ret
);
todo_wine
check_error
(
ODBC_ERROR_COMPONENT_NOT_FOUND
);
}
START_TEST
(
misc
)
{
test_SQLConfigMode
();
...
...
@@ -754,4 +779,5 @@ START_TEST(misc)
test_SQLGetInstalledDrivers
();
test_SQLValidDSN
();
test_SQLValidDSNW
();
test_SQLConfigDataSource
();
}
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