Mike McCormack : msi: Fixed the prototype of MsiDatabaseIsTablePersistent.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jan 10 14:13:50 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 1acf032a99dc9734f4558c5f6a7c8976a45af30b
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=1acf032a99dc9734f4558c5f6a7c8976a45af30b

Author: Mike McCormack <mike at codeweavers.com>
Date:   Tue Jan 10 12:09:11 2006 +0100

msi: Fixed the prototype of MsiDatabaseIsTablePersistent.
Implemented MsiDatabaseIsTablePersistentA via the W function.

---

 dlls/msi/msiquery.c |   23 ++++++++++++++++++-----
 include/msiquery.h  |    4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c
index 4824d87..b841086 100644
--- a/dlls/msi/msiquery.c
+++ b/dlls/msi/msiquery.c
@@ -853,16 +853,29 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(M
     return r;
 }
 
-UINT WINAPI MsiDatabaseIsTablePersistentA(
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(
               MSIHANDLE hDatabase, LPSTR szTableName)
 {
-    FIXME("%lx %s\n", hDatabase, debugstr_a(szTableName));
-    return ERROR_CALL_NOT_IMPLEMENTED;
+    LPWSTR szwTableName = NULL;
+    MSICONDITION r;
+
+    TRACE("%lx %s\n", hDatabase, debugstr_a(szTableName));
+
+    if( szTableName )
+    {
+        szwTableName = strdupAtoW( szTableName );
+        if( !szwTableName )
+            return MSICONDITION_ERROR;
+    }
+    r = MsiDatabaseIsTablePersistentW( hDatabase, szwTableName );
+    msi_free( szwTableName );
+
+    return r;
 }
 
-UINT WINAPI MsiDatabaseIsTablePersistentW(
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(
               MSIHANDLE hDatabase, LPWSTR szTableName)
 {
     FIXME("%lx %s\n", hDatabase, debugstr_w(szTableName));
-    return ERROR_CALL_NOT_IMPLEMENTED;
+    return MSICONDITION_FALSE;
 }
diff --git a/include/msiquery.h b/include/msiquery.h
index c98c30f..09e5c16 100644
--- a/include/msiquery.h
+++ b/include/msiquery.h
@@ -256,8 +256,8 @@ UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LP
 UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, MSIHANDLE*);
 #define     MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase)
 
-UINT WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPSTR);
-UINT WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPWSTR);
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPSTR);
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPWSTR);
 #define     MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent)
 
 UINT WINAPI MsiSequenceA(MSIHANDLE, LPCSTR, INT);




More information about the wine-cvs mailing list