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
5f8e3a0c
Commit
5f8e3a0c
authored
Nov 16, 2021
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Nov 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msdasql: Support NULL dialect in GetCommandText.
Signed-off-by:
Alistair Leslie-Hughes
<
leslie_alistair@hotmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0d29647f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
session.c
dlls/msdasql/session.c
+1
-1
provider.c
dlls/msdasql/tests/provider.c
+6
-0
No files found.
dlls/msdasql/session.c
View file @
5f8e3a0c
...
@@ -910,7 +910,7 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect,
...
@@ -910,7 +910,7 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect,
if
(
!
command
->
query
)
if
(
!
command
->
query
)
return
DB_E_NOCOMMAND
;
return
DB_E_NOCOMMAND
;
if
(
!
IsEqualGUID
(
&
DBGUID_DEFAULT
,
dialect
))
if
(
dialect
&&
!
IsEqualGUID
(
&
DBGUID_DEFAULT
,
dialect
))
{
{
*
dialect
=
DBGUID_DEFAULT
;
*
dialect
=
DBGUID_DEFAULT
;
hr
=
DB_S_DIALECTIGNORED
;
hr
=
DB_S_DIALECTIGNORED
;
...
...
dlls/msdasql/tests/provider.c
View file @
5f8e3a0c
...
@@ -265,6 +265,12 @@ if (0)
...
@@ -265,6 +265,12 @@ if (0)
hr
=
ICommandText_SetCommandText
(
comand_text
,
&
DBGUID_DEFAULT
,
L"select * from testing"
);
hr
=
ICommandText_SetCommandText
(
comand_text
,
&
DBGUID_DEFAULT
,
L"select * from testing"
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
hr
=
ICommandText_GetCommandText
(
comand_text
,
NULL
,
&
str
);
ok
(
hr
==
S_OK
,
"got 0x%08x
\n
"
,
hr
);
ok
(
!
lstrcmpW
(
L"select * from testing"
,
str
),
"got %s
\n
"
,
debugstr_w
(
str
));
HeapFree
(
GetProcessHeap
(),
0
,
str
);
/* dialect empty value */
/* dialect empty value */
hr
=
ICommandText_GetCommandText
(
comand_text
,
&
dialect
,
&
str
);
hr
=
ICommandText_GetCommandText
(
comand_text
,
&
dialect
,
&
str
);
ok
(
hr
==
DB_S_DIALECTIGNORED
,
"got 0x%08x
\n
"
,
hr
);
ok
(
hr
==
DB_S_DIALECTIGNORED
,
"got 0x%08x
\n
"
,
hr
);
...
...
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