MsiOpenDatabase's szPersist parameter may be a string or a bitmask.

bd9d8a32 · Mike McCormack · Alexandre Julliard · 16ff6689 · bd9d8a32
Commit bd9d8a32 authored Nov 05, 2003 by Mike McCormack Committed by Alexandre Julliard Nov 05, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

msi.c dlls/msi/msi.c +3 -1

No files found.
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -149,7 +149,7 @@ UINT WINAPI MsiOpenDatabaseA(
        MultiByteToWideChar( CP_ACP, 0, szDBPath, -1, szwDBPath, len );
    }

-    if( szPersist )
+    if( HIWORD(szPersist) )
    {
        len = MultiByteToWideChar( CP_ACP, 0, szPersist, -1, NULL, 0 );
        szwPersist = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
@@ -157,6 +157,8 @@ UINT WINAPI MsiOpenDatabaseA(
            goto end;
        MultiByteToWideChar( CP_ACP, 0, szPersist, -1, szwPersist, len );
    }
+    else
+        szwPersist = (LPWSTR) szPersist;

    r = MsiOpenDatabaseW( szwDBPath, szwPersist, phDB );