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
8fa02bf0
Commit
8fa02bf0
authored
Sep 27, 2023
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
Sep 27, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msado15: Update editMode in AddNew/Cancel/Update functions.
parent
5bfd2fc1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
1 deletion
+54
-1
recordset.c
dlls/msado15/recordset.c
+36
-0
msado15.c
dlls/msado15/tests/msado15.c
+18
-1
No files found.
dlls/msado15/recordset.c
View file @
8fa02bf0
...
...
@@ -1588,12 +1588,20 @@ static HRESULT WINAPI recordset_AddNew( _Recordset *iface, VARIANT field_list, V
if
(
!
resize_recordset
(
recordset
,
recordset
->
count
+
1
))
return
E_OUTOFMEMORY
;
recordset
->
index
++
;
recordset
->
editmode
=
adEditAdd
;
return
S_OK
;
}
static
HRESULT
WINAPI
recordset_CancelUpdate
(
_Recordset
*
iface
)
{
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
FIXME
(
"%p
\n
"
,
iface
);
if
(
V_DISPATCH
(
&
recordset
->
active_connection
)
==
NULL
)
return
S_OK
;
recordset
->
editmode
=
adEditNone
;
return
E_NOTIMPL
;
}
...
...
@@ -2153,7 +2161,14 @@ static HRESULT WINAPI recordset__xResync( _Recordset *iface, AffectEnum affect_r
static
HRESULT
WINAPI
recordset_Update
(
_Recordset
*
iface
,
VARIANT
fields
,
VARIANT
values
)
{
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
FIXME
(
"%p, %s, %s
\n
"
,
iface
,
debugstr_variant
(
&
fields
),
debugstr_variant
(
&
values
)
);
if
(
V_DISPATCH
(
&
recordset
->
active_connection
)
==
NULL
)
return
S_OK
;
recordset
->
editmode
=
adEditNone
;
return
E_NOTIMPL
;
}
...
...
@@ -2270,13 +2285,27 @@ static HRESULT WINAPI recordset__xClone( _Recordset *iface, _Recordset **obj )
static
HRESULT
WINAPI
recordset_UpdateBatch
(
_Recordset
*
iface
,
AffectEnum
affect_records
)
{
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
FIXME
(
"%p, %u
\n
"
,
iface
,
affect_records
);
if
(
V_DISPATCH
(
&
recordset
->
active_connection
)
==
NULL
)
return
S_OK
;
recordset
->
editmode
=
adEditNone
;
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
recordset_CancelBatch
(
_Recordset
*
iface
,
AffectEnum
affect_records
)
{
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
FIXME
(
"%p, %u
\n
"
,
iface
,
affect_records
);
if
(
V_DISPATCH
(
&
recordset
->
active_connection
)
==
NULL
)
return
S_OK
;
recordset
->
editmode
=
adEditNone
;
return
E_NOTIMPL
;
}
...
...
@@ -2350,7 +2379,14 @@ static HRESULT WINAPI recordset_Find( _Recordset *iface, BSTR criteria, LONG ski
static
HRESULT
WINAPI
recordset_Cancel
(
_Recordset
*
iface
)
{
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
FIXME
(
"%p
\n
"
,
iface
);
if
(
V_DISPATCH
(
&
recordset
->
active_connection
)
==
NULL
)
return
S_OK
;
recordset
->
editmode
=
adEditNone
;
return
E_NOTIMPL
;
}
...
...
dlls/msado15/tests/msado15.c
View file @
8fa02bf0
...
...
@@ -267,7 +267,7 @@ if (0)
editmode
=
-
1
;
hr
=
_Recordset_get_EditMode
(
recordset
,
&
editmode
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
todo_wine
ok
(
editmode
==
adEditAdd
,
"got %d
\n
"
,
editmode
);
ok
(
editmode
==
adEditAdd
,
"got %d
\n
"
,
editmode
);
rec_count
=
-
1
;
hr
=
_Recordset_get_RecordCount
(
recordset
,
&
rec_count
);
...
...
@@ -317,6 +317,23 @@ if (0)
ok
(
V_VT
(
&
val
)
==
VT_I4
,
"got %u
\n
"
,
V_VT
(
&
val
)
);
ok
(
V_I4
(
&
val
)
==
-
1
,
"got %ld
\n
"
,
V_I4
(
&
val
)
);
/* Update/Cancel doesn't update EditMode when no active connection. */
hr
=
_Recordset_Update
(
recordset
,
missing
,
missing
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
editmode
=
-
1
;
hr
=
_Recordset_get_EditMode
(
recordset
,
&
editmode
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
ok
(
editmode
==
adEditAdd
,
"got %d
\n
"
,
editmode
);
hr
=
_Recordset_Cancel
(
recordset
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
editmode
=
-
1
;
hr
=
_Recordset_get_EditMode
(
recordset
,
&
editmode
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
ok
(
editmode
==
adEditAdd
,
"got %d
\n
"
,
editmode
);
hr
=
_Recordset_AddNew
(
recordset
,
missing
,
missing
);
ok
(
hr
==
S_OK
,
"got %08lx
\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