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
d106b3c4
Commit
d106b3c4
authored
May 03, 2022
by
Alistair Leslie-Hughes
Committed by
Alexandre Julliard
May 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msado15: Implement _Recordset get_EditMode.
Signed-off-by:
Alistair Leslie-Hughes
<
leslie_alistair@hotmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a34669b2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
2 deletions
+24
-2
recordset.c
dlls/msado15/recordset.c
+10
-2
msado15.c
dlls/msado15/tests/msado15.c
+14
-0
No files found.
dlls/msado15/recordset.c
View file @
d106b3c4
...
@@ -48,6 +48,7 @@ struct recordset
...
@@ -48,6 +48,7 @@ struct recordset
CursorLocationEnum
cursor_location
;
CursorLocationEnum
cursor_location
;
CursorTypeEnum
cursor_type
;
CursorTypeEnum
cursor_type
;
IRowset
*
row_set
;
IRowset
*
row_set
;
EditModeEnum
editmode
;
};
};
struct
fields
struct
fields
...
@@ -1575,8 +1576,14 @@ static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnu
...
@@ -1575,8 +1576,14 @@ static HRESULT WINAPI recordset_put_AbsolutePage( _Recordset *iface, PositionEnu
static
HRESULT
WINAPI
recordset_get_EditMode
(
_Recordset
*
iface
,
EditModeEnum
*
mode
)
static
HRESULT
WINAPI
recordset_get_EditMode
(
_Recordset
*
iface
,
EditModeEnum
*
mode
)
{
{
FIXME
(
"%p, %p
\n
"
,
iface
,
mode
);
struct
recordset
*
recordset
=
impl_from_Recordset
(
iface
);
return
E_NOTIMPL
;
TRACE
(
"%p, %p
\n
"
,
iface
,
mode
);
if
(
recordset
->
state
==
adStateClosed
)
return
MAKE_ADO_HRESULT
(
adErrObjectClosed
);
if
(
recordset
->
index
<
0
)
return
MAKE_ADO_HRESULT
(
adErrNoCurrentRecord
);
*
mode
=
recordset
->
editmode
;
return
S_OK
;
}
}
static
HRESULT
WINAPI
recordset_get_Filter
(
_Recordset
*
iface
,
VARIANT
*
criteria
)
static
HRESULT
WINAPI
recordset_get_Filter
(
_Recordset
*
iface
,
VARIANT
*
criteria
)
...
@@ -2123,6 +2130,7 @@ HRESULT Recordset_create( void **obj )
...
@@ -2123,6 +2130,7 @@ HRESULT Recordset_create( void **obj )
recordset
->
cursor_location
=
adUseServer
;
recordset
->
cursor_location
=
adUseServer
;
recordset
->
cursor_type
=
adOpenForwardOnly
;
recordset
->
cursor_type
=
adOpenForwardOnly
;
recordset
->
row_set
=
NULL
;
recordset
->
row_set
=
NULL
;
recordset
->
editmode
=
adEditNone
;
*
obj
=
&
recordset
->
Recordset_iface
;
*
obj
=
&
recordset
->
Recordset_iface
;
TRACE
(
"returning iface %p
\n
"
,
*
obj
);
TRACE
(
"returning iface %p
\n
"
,
*
obj
);
...
...
dlls/msado15/tests/msado15.c
View file @
d106b3c4
...
@@ -60,6 +60,7 @@ static void test_Recordset(void)
...
@@ -60,6 +60,7 @@ static void test_Recordset(void)
BSTR
name
;
BSTR
name
;
HRESULT
hr
;
HRESULT
hr
;
VARIANT
bookmark
;
VARIANT
bookmark
;
EditModeEnum
editmode
;
hr
=
CoCreateInstance
(
&
CLSID_Recordset
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID__Recordset
,
(
void
**
)
&
recordset
);
hr
=
CoCreateInstance
(
&
CLSID_Recordset
,
NULL
,
CLSCTX_INPROC_SERVER
,
&
IID__Recordset
,
(
void
**
)
&
recordset
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
...
@@ -110,6 +111,10 @@ static void test_Recordset(void)
...
@@ -110,6 +111,10 @@ static void test_Recordset(void)
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
ok
(
cursor
==
adOpenForwardOnly
,
"got %d
\n
"
,
cursor
);
ok
(
cursor
==
adOpenForwardOnly
,
"got %d
\n
"
,
cursor
);
editmode
=
-
1
;
hr
=
_Recordset_get_EditMode
(
recordset
,
&
editmode
);
ok
(
hr
==
MAKE_ADO_HRESULT
(
adErrObjectClosed
),
"got %08lx
\n
"
,
hr
);
VariantInit
(
&
bookmark
);
VariantInit
(
&
bookmark
);
hr
=
_Recordset_get_Bookmark
(
recordset
,
&
bookmark
);
hr
=
_Recordset_get_Bookmark
(
recordset
,
&
bookmark
);
ok
(
hr
==
MAKE_ADO_HRESULT
(
adErrObjectClosed
),
"got %08lx
\n
"
,
hr
);
ok
(
hr
==
MAKE_ADO_HRESULT
(
adErrObjectClosed
),
"got %08lx
\n
"
,
hr
);
...
@@ -197,6 +202,10 @@ static void test_Recordset(void)
...
@@ -197,6 +202,10 @@ static void test_Recordset(void)
ok
(
is_eof
(
recordset
),
"not eof
\n
"
);
ok
(
is_eof
(
recordset
),
"not eof
\n
"
);
ok
(
is_bof
(
recordset
),
"not bof
\n
"
);
ok
(
is_bof
(
recordset
),
"not bof
\n
"
);
editmode
=
-
1
;
hr
=
_Recordset_get_EditMode
(
recordset
,
&
editmode
);
ok
(
hr
==
MAKE_ADO_HRESULT
(
adErrNoCurrentRecord
),
"got %08lx
\n
"
,
hr
);
hr
=
_Recordset_Open
(
recordset
,
missing
,
missing
,
adOpenStatic
,
adLockBatchOptimistic
,
adCmdUnspecified
);
hr
=
_Recordset_Open
(
recordset
,
missing
,
missing
,
adOpenStatic
,
adLockBatchOptimistic
,
adCmdUnspecified
);
ok
(
hr
==
MAKE_ADO_HRESULT
(
adErrObjectOpen
),
"got %08lx
\n
"
,
hr
);
ok
(
hr
==
MAKE_ADO_HRESULT
(
adErrObjectOpen
),
"got %08lx
\n
"
,
hr
);
...
@@ -223,6 +232,11 @@ static void test_Recordset(void)
...
@@ -223,6 +232,11 @@ static void test_Recordset(void)
ok
(
!
is_eof
(
recordset
),
"eof
\n
"
);
ok
(
!
is_eof
(
recordset
),
"eof
\n
"
);
ok
(
!
is_bof
(
recordset
),
"bof
\n
"
);
ok
(
!
is_bof
(
recordset
),
"bof
\n
"
);
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
);
rec_count
=
-
1
;
rec_count
=
-
1
;
hr
=
_Recordset_get_RecordCount
(
recordset
,
&
rec_count
);
hr
=
_Recordset_get_RecordCount
(
recordset
,
&
rec_count
);
ok
(
hr
==
S_OK
,
"got %08lx
\n
"
,
hr
);
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