[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source oowintool

[Damjan Jovanovic]

 connectivity/source/drivers/odbcbase/OStatement.cxx |    2 +-
 oowintool                                           |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 0a382157b19c8b1a818e98c826613c99335a05ec
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Fri Nov 17 03:04:09 2017 +0000

    64-bit ODBC's SQLGetStmtAttr() returns 64 bit values in *ValuePtr
    
    (https://docs.microsoft.com/en-us/sql/odbc/reference/odbc-64-bit-information).
    
    Patch by: me

diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 514499a5cc08..b1c0a3316d4a 100644
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -445,7 +445,7 @@ Reference< XResultSet > OStatement_Base::getResultSet (sal_Bool checkCount) thro
 
 sal_Int32 OStatement_Base::getStmtOption (short fOption) const
 {
-    sal_Int32   result = 0;
+    SQLLEN  result = 0;
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     N3SQLGetStmtAttr(m_aStatementHandle, fOption,&result,SQL_IS_INTEGER,NULL);
     return result;
commit a48c71085e3c2df62295b49250d0b116cfb4b3c4
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Fri Nov 17 02:05:43 2017 +0000

    Allow oowintool to find 32 bit VC++ in Cygwin64.
    
    Patch by: Damjan Jovanovic and Matthias Seidel
    Tested by: Matthias Seidel

diff --git a/oowintool b/oowintool
index 2b8f271bbd8c..8ebdae5dcd67 100755
--- a/oowintool
+++ b/oowintool
@@ -217,6 +217,11 @@ sub find_msvs()
 	    $ver->{'product_dir'} = $install;
 	    return $ver;
 	}
+	$install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" . $ver->{'key'});
+	if (defined $install && $install ne '') {
+	    $ver->{'product_dir'} = $install;
+	    return $ver;
+	}
     }
     die "Can't find MS Visual Studio / VC++";
 }
@@ -232,6 +237,11 @@ sub find_msvc()
 	    $ver->{'product_dir'} = $install;
 	    return $ver;
 	}
+	$install = reg_get_value("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" . $ver->{'key'});
+	if (defined $install && $install ne '') {
+	    $ver->{'product_dir'} = $install;
+	    return $ver;
+	}
     }
     die "Can't find MS Visual Studio / VC++";
 }