[PATCH 0/2] MR4376: Msdasql fixes

[PATCH 1/2] include: Add DBPROPVAL_MR_* defines

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 include/dbs.idl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/dbs.idl b/include/dbs.idl
index f664518ca37..f72204b1e90 100644
--- a/include/dbs.idl
+++ b/include/dbs.idl
@@ -587,6 +587,10 @@ cpp_quote("#define DBPROPVAL_LM_READ                  __MSABI_LONG(0x00000002)")
 cpp_quote("#define DBPROPVAL_LM_INTENT                __MSABI_LONG(0x00000004)")
 cpp_quote("#define DBPROPVAL_LM_RITE                  __MSABI_LONG(0x00000008)")

+cpp_quote("#define DBPROPVAL_MR_NOTSUPPORTED          __MSABI_LONG(0x00000000)")
+cpp_quote("#define DBPROPVAL_MR_SUPPORTED             __MSABI_LONG(0x00000001)")
+cpp_quote("#define DBPROPVAL_MR_CONCURRENT            __MSABI_LONG(0x00000002)")
+
 cpp_quote("#define DB_MODE_READ                        0x01")
 cpp_quote("#define DB_MODE_WRITE                       0x02")
 cpp_quote("#define DB_MODE_READWRITE                   0x03")

[PATCH 2/2] msdasql: GetAvailableColumns correct assignment of DBCOLUMN data

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes

---
 dlls/msdasql/session.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c
index 1aa1132f40a..7cec1523f4d 100644
--- a/dlls/msdasql/session.c
+++ b/dlls/msdasql/session.c
@@ -1215,9 +1215,9 @@ static HRESULT WINAPI column_rs_GetAvailableColumns(IColumnsRowset *iface, DBORD
         return E_OUTOFMEMORY;

*count = extra_columns;
-    *columns[0] = DBCOLUMN_BASETABLENAME;
-    *columns[1] = DBCOLUMN_BASECOLUMNNAME;
-    *columns[2] = DBCOLUMN_KEYCOLUMN;
+    (*columns)[0] = DBCOLUMN_BASETABLENAME;
+    (*columns)[1] = DBCOLUMN_BASECOLUMNNAME;
+    (*columns)[2] = DBCOLUMN_KEYCOLUMN;

return S_OK;
 }