msi/tests: Write-strings warnings fix

Andrew Talbot Andrew.Talbot at talbotville.com
Fri Jun 16 03:00:47 CDT 2006


Changelog:
    msi/tests: Write-strings warnings fix.

diff -urN a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
--- a/dlls/msi/tests/package.c	2006-06-15 19:38:09.000000000 +0100
+++ b/dlls/msi/tests/package.c	2006-06-16 08:38:05.000000000 +0100
@@ -844,7 +844,7 @@
     DeleteFile(msifile);
 }
 
-static UINT try_query_param( MSIHANDLE hdb, LPSTR szQuery, MSIHANDLE hrec )
+static UINT try_query_param( MSIHANDLE hdb, LPCSTR szQuery, MSIHANDLE hrec )
 {
     MSIHANDLE htab = 0;
     UINT res;
@@ -872,7 +872,7 @@
     return res;
 }
 
-static UINT try_query( MSIHANDLE hdb, LPSTR szQuery )
+static UINT try_query( MSIHANDLE hdb, LPCSTR szQuery )
 {
     return try_query_param( hdb, szQuery, 0 );
 }
@@ -881,7 +881,7 @@
 {
     MSIHANDLE hdb = 0, hpack = 100;
     UINT r;
-    char *query;
+    static const CHAR *property_query, *sequence_query;
     char name[10];
 
     DeleteFile(msifile);
@@ -912,17 +912,17 @@
     }
 
     /* create a table */
-    query = "CREATE TABLE `Property` ( "
-            "`Property` CHAR(72), `Value` CHAR(0) "
-            "PRIMARY KEY `Property`)";
-    r = try_query(hdb, query);
+    property_query = "CREATE TABLE `Property` ( "
+                     "`Property` CHAR(72), `Value` CHAR(0) "
+                     "PRIMARY KEY `Property`)";
+    r = try_query(hdb, property_query);
     ok(r == ERROR_SUCCESS, "failed to create Properties table\n");
 
     todo_wine {
-    query = "CREATE TABLE `InstallExecuteSequence` ("
-            "`Action` CHAR(72), `Condition` CHAR(0), `Sequence` INTEGER "
-            "PRIMARY KEY `Action`)";
-    r = try_query(hdb, query);
+    sequence_query = "CREATE TABLE `InstallExecuteSequence` ("
+                     "`Action` CHAR(72), `Condition` CHAR(0), `Sequence` INTEGER "
+                     "PRIMARY KEY `Action`)";
+    r = try_query(hdb, sequence_query);
     ok(r == ERROR_SUCCESS, "failed to create InstallExecuteSequence table\n");
 
     sprintf(name, "#%ld", hdb);



More information about the wine-patches mailing list