introduce LibmsiResult

1 files changed, 88 insertions, 88 deletions

diff --git a/tests/testrecord.c b/tests/testrecord.c
index 42ae3eb..f3e96b1 100644
--- a/tests/testrecord.c
+++ b/tests/testrecord.c
@@ -65,9 +65,9 @@ static void test_msirecord(void)
     r = libmsi_record_get_integer(0,0);
     ok(r == MSI_NULL_INTEGER, "got integer from invalid record\n");
     r = libmsi_record_set_int(0,0,0);
-    ok(r == ERROR_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
+    ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
     r = libmsi_record_set_int(0,-1,0);
-    ok(r == ERROR_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
+    ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_set_int returned wrong error\n");
     SetLastError(0);
     h = libmsi_record_create(-1);
     ok(h==0, "created record with -1 elements\n");
@@ -76,7 +76,7 @@ static void test_msirecord(void)
     /* doesn't set LastError */
     ok(GetLastError()==0, "libmsi_record_create set last error\n");
     r = libmsi_record_clear_data(0);
-    ok(r == ERROR_INVALID_HANDLE, "libmsi_record_clear_data returned wrong error\n");
+    ok(r == LIBMSI_RESULT_INVALID_HANDLE, "libmsi_record_clear_data returned wrong error\n");
     r = libmsi_record_get_field_size(0,0);
     ok(r == 0, "libmsi_record_get_field_size returned wrong error\n");
 
@@ -97,23 +97,23 @@ static void test_msirecord(void)
     sz = sizeof buf;
     strcpy(buf,"x");
     r = libmsi_record_get_string(h, 0, buf, &sz);
-    ok(r==ERROR_SUCCESS, "failed to get null string\n");
+    ok(r==LIBMSI_RESULT_SUCCESS, "failed to get null string\n");
     ok(sz==0, "null string too long\n");
     ok(buf[0]==0, "null string not set\n");
 
     /* same record, but add an integer to it */
     r = libmsi_record_set_int(h, 0, 0);
-    ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 0\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set integer at 0 to 0\n");
     r = libmsi_record_is_null(h,0);
     ok(r==0, "new record is null after setting an integer\n");
     r = libmsi_record_get_field_size(h,0);
     ok(r==sizeof(unsigned), "size of integer record is 4\n");
     r = libmsi_record_set_int(h, 0, 1);
-    ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 1\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set integer at 0 to 1\n");
     r = libmsi_record_set_int(h, 1, 1);
-    ok(r == ERROR_INVALID_PARAMETER, "set integer at 1\n");
+    ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "set integer at 1\n");
     r = libmsi_record_set_int(h, -1, 0);
-    ok(r == ERROR_INVALID_PARAMETER, "set integer at -1\n");
+    ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "set integer at -1\n");
     r = libmsi_record_is_null(h,0);
     ok(r==0, "new record is null after setting an integer\n");
     r = libmsi_record_get_integer(h, 0);
@@ -121,7 +121,7 @@ static void test_msirecord(void)
 
     /* same record, but add a null or empty string to it */
     r = libmsi_record_set_string(h, 0, NULL);
-    ok(r == ERROR_SUCCESS, "Failed to set null string at 0\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set null string at 0\n");
     r = libmsi_record_is_null(h, 0);
     ok(r == true, "null string not null field\n");
     r = libmsi_record_get_field_size(h, 0);
@@ -129,11 +129,11 @@ static void test_msirecord(void)
     buf[0] = 0;
     sz = sizeof buf;
     r = libmsi_record_get_string(h, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Failed to get string at 0\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to get string at 0\n");
     ok(buf[0] == 0, "libmsi_record_get_string returned the wrong string\n");
     ok(sz == 0, "libmsi_record_get_string returned the wrong length\n");
     r = libmsi_record_set_string(h, 0, "");
-    ok(r == ERROR_SUCCESS, "Failed to set empty string at 0\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set empty string at 0\n");
     r = libmsi_record_is_null(h, 0);
     ok(r == true, "null string not null field\n");
     r = libmsi_record_get_field_size(h, 0);
@@ -141,13 +141,13 @@ static void test_msirecord(void)
     buf[0] = 0;
     sz = sizeof buf;
     r = libmsi_record_get_string(h, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Failed to get string at 0\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to get string at 0\n");
     ok(buf[0] == 0, "libmsi_record_get_string returned the wrong string\n");
     ok(sz == 0, "libmsi_record_get_string returned the wrong length\n");
 
     /* same record, but add a string to it */
     r = libmsi_record_set_string(h,0,str);
-    ok(r == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     r = libmsi_record_get_integer(h, 0);
     ok(r == MSI_NULL_INTEGER, "should get invalid integer\n");
     r = libmsi_record_get_field_size(h,0);
@@ -155,13 +155,13 @@ static void test_msirecord(void)
     buf[0]=0;
     sz = sizeof buf;
     r = libmsi_record_get_string(h,0,buf,&sz);
-    ok(r == ERROR_SUCCESS, "Failed to get string at 0\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to get string at 0\n");
     ok(0==strcmp(buf,str), "libmsi_record_get_string returned the wrong string\n");
     ok(sz == sizeof str-1, "libmsi_record_get_string returned the wrong length\n");
     buf[0]=0;
     sz = sizeof str - 2;
     r = libmsi_record_get_string(h,0,buf,&sz);
-    ok(r == ERROR_MORE_DATA, "small buffer should yield ERROR_MORE_DATA\n");
+    ok(r == LIBMSI_RESULT_MORE_DATA, "small buffer should yield LIBMSI_RESULT_MORE_DATA\n");
     ok(sz == sizeof str-1, "libmsi_record_get_string returned the wrong length\n");
     ok(0==strncmp(buf,str,sizeof str-3), "libmsi_record_get_string returned the wrong string\n");
     ok(buf[sizeof str - 3]==0, "string wasn't nul terminated\n");
@@ -169,7 +169,7 @@ static void test_msirecord(void)
     buf[0]=0;
     sz = sizeof str;
     r = libmsi_record_get_string(h,0,buf,&sz);
-    ok(r == ERROR_SUCCESS, "wrong error\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "wrong error\n");
     ok(sz == sizeof str-1, "libmsi_record_get_string returned the wrong length\n");
     ok(0==strcmp(buf,str), "libmsi_record_get_string returned the wrong string\n");
 
@@ -177,110 +177,110 @@ static void test_msirecord(void)
     memset(buf, 0, sizeof buf);
     sz = 5;
     r = libmsi_record_get_string(h,0,buf,&sz);
-    ok(r == ERROR_MORE_DATA, "wrong error\n");
+    ok(r == LIBMSI_RESULT_MORE_DATA, "wrong error\n");
     ok(sz == 5, "libmsi_record_get_string returned the wrong length\n");
     ok(0==memcmp(buf,str,4), "libmsi_record_get_string returned the wrong string\n");
 
     sz = 0;
     buf[0] = 'x';
     r = libmsi_record_get_string(h,0,buf,&sz);
-    ok(r == ERROR_MORE_DATA, "wrong error\n");
+    ok(r == LIBMSI_RESULT_MORE_DATA, "wrong error\n");
     ok(sz == 5, "libmsi_record_get_string returned the wrong length\n");
     ok('x'==buf[0], "libmsi_record_get_string returned the wrong string\n");
 
     /* same record, check we can wipe all the data */
     r = libmsi_record_clear_data(h);
-    ok(r == ERROR_SUCCESS, "Failed to clear record\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to clear record\n");
     r = libmsi_record_clear_data(h);
-    ok(r == ERROR_SUCCESS, "Failed to clear record again\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to clear record again\n");
     r = libmsi_record_is_null(h,0);
     ok(r, "cleared record wasn't null\n");
 
     /* same record, try converting strings to integers */
     i = libmsi_record_set_string(h,0,"42");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == 42, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"-42");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == -42, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0," 42");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == MSI_NULL_INTEGER, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"42 ");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == MSI_NULL_INTEGER, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"42.0");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == MSI_NULL_INTEGER, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"0x42");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == MSI_NULL_INTEGER, "should get invalid integer\n");
     i = libmsi_record_set_string(h,0,"1000000000000000");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == -1530494976, "should get truncated integer\n");
     i = libmsi_record_set_string(h,0,"2147483647");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == 2147483647, "should get maxint\n");
     i = libmsi_record_set_string(h,0,"-2147483647");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == -2147483647, "should get -maxint-1\n");
     i = libmsi_record_set_string(h,0,"4294967297");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == 1, "should get one\n");
     i = libmsi_record_set_string(h,0,"foo");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == MSI_NULL_INTEGER, "should get zero\n");
     i = libmsi_record_set_string(h,0,"");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == MSI_NULL_INTEGER, "should get zero\n");
     i = libmsi_record_set_string(h,0,"+1");
-    ok(i == ERROR_SUCCESS, "Failed to set string at 0\n");
+    ok(i == LIBMSI_RESULT_SUCCESS, "Failed to set string at 0\n");
     i = libmsi_record_get_integer(h, 0);
     ok(i == MSI_NULL_INTEGER, "should get zero\n");
 
     /* same record, try converting integers to strings */
     r = libmsi_record_set_int(h, 0, 32);
-    ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set integer at 0 to 32\n");
     sz = 1;
     r = libmsi_record_get_string(h, 0, NULL, &sz);
-    ok(r == ERROR_SUCCESS, "failed to get string from integer\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to get string from integer\n");
     ok(sz == 2, "length wrong\n");
     buf[0]=0;
     sz = sizeof buf;
     r = libmsi_record_get_string(h, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "failed to get string from integer\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to get string from integer\n");
     ok(0==strcmp(buf,"32"), "failed to get string from integer\n");
     r = libmsi_record_set_int(h, 0, -32);
-    ok(r == ERROR_SUCCESS, "Failed to set integer at 0 to 32\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to set integer at 0 to 32\n");
     buf[0]=0;
     sz = 1;
     r = libmsi_record_get_string(h, 0, NULL, &sz);
-    ok(r == ERROR_SUCCESS, "failed to get string from integer\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to get string from integer\n");
     ok(sz == 3, "length wrong\n");
     sz = sizeof buf;
     r = libmsi_record_get_string(h, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "failed to get string from integer\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to get string from integer\n");
     ok(0==strcmp(buf,"-32"), "failed to get string from integer\n");
     buf[0]=0;
 
     /* same record, now try streams */
     r = libmsi_record_load_stream(h, 0, NULL);
-    ok(r == ERROR_INVALID_PARAMETER, "set NULL stream\n");
+    ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "set NULL stream\n");
     sz = sizeof buf;
     r = libmsi_record_save_stream(h, 0, buf, &sz);
-    ok(r == ERROR_INVALID_DATATYPE, "read non-stream type\n");
+    ok(r == LIBMSI_RESULT_INVALID_DATATYPE, "read non-stream type\n");
     ok(sz == sizeof buf, "set sz\n");
     r = libmsi_record_get_field_size( h, -1);
     ok(r == 0,"libmsi_record_get_field_size returned wrong size\n");
@@ -289,7 +289,7 @@ static void test_msirecord(void)
 
     /* same record, now close it */
     r = libmsi_unref(h);
-    ok(r == ERROR_SUCCESS, "Failed to close handle\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to close handle\n");
 
     /* now try streams in a new record - need to create a file to play with */
     r = create_temp_file(filename); 
@@ -300,56 +300,56 @@ static void test_msirecord(void)
     h = libmsi_record_create(2);
     ok(h, "couldn't create a two field record\n");
     r = libmsi_record_load_stream(h, 0, filename);
-    ok(r == ERROR_INVALID_PARAMETER, "added stream to field 0\n");
+    ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "added stream to field 0\n");
     r = libmsi_record_load_stream(h, 1, filename);
-    ok(r == ERROR_SUCCESS, "failed to add stream to record\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to add stream to record\n");
     r = libmsi_record_save_stream(h, 1, buf, NULL);
-    ok(r == ERROR_INVALID_PARAMETER, "should return error\n");
+    ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "should return error\n");
     DeleteFile(filename); /* Windows 98 doesn't like this at all, so don't check return. */
     r = libmsi_record_save_stream(h, 1, NULL, NULL);
-    ok(r == ERROR_INVALID_PARAMETER, "should return error\n");
+    ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "should return error\n");
     sz = sizeof buf;
     r = libmsi_record_save_stream(h, 1, NULL, &sz);
-    ok(r == ERROR_SUCCESS, "failed to read stream\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to read stream\n");
     ok(sz==26,"couldn't get size of stream\n");
     sz = 0;
     r = libmsi_record_save_stream(h, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "failed to read stream\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to read stream\n");
     ok(sz==0,"short read\n");
     sz = sizeof buf;
     r = libmsi_record_save_stream(h, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "failed to read stream\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to read stream\n");
     ok(sz==sizeof buf,"short read\n");
     ok(!strncmp(buf,"abcdefghij",10), "read the wrong thing\n");
     sz = sizeof buf;
     r = libmsi_record_save_stream(h, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "failed to read stream\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to read stream\n");
     ok(sz==sizeof buf,"short read\n");
     ok(!strncmp(buf,"klmnopqrst",10), "read the wrong thing\n");
     memset(buf,0,sizeof buf);
     sz = sizeof buf;
     r = libmsi_record_save_stream(h, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "failed to read stream\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to read stream\n");
     ok(sz==6,"short read\n");
     ok(!strcmp(buf,"uvwxyz"), "read the wrong thing\n");
     memset(buf,0,sizeof buf);
     sz = sizeof buf;
     r = libmsi_record_save_stream(h, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "failed to read stream\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to read stream\n");
     ok(sz==0,"size non-zero at end of stream\n");
     ok(buf[0]==0, "read something at end of the stream\n");
     r = libmsi_record_load_stream(h, 1, NULL);
-    ok(r == ERROR_SUCCESS, "failed to reset stream\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "failed to reset stream\n");
     sz = 0;
     r = libmsi_record_save_stream(h, 1, NULL, &sz);
-    ok(r == ERROR_SUCCESS, "bytes left wrong after reset\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "bytes left wrong after reset\n");
     ok(sz==26,"couldn't get size of stream\n");
     r = libmsi_record_get_field_size(h,1);
     ok(r == 26,"libmsi_record_get_field_size returned wrong size\n");
 
     /* now close the stream record */
     r = libmsi_unref(h);
-    ok(r == ERROR_SUCCESS, "Failed to close handle\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "Failed to close handle\n");
     DeleteFile(filename); /* Delete it for sure, when everything else is closed. */
 }
 
@@ -365,20 +365,20 @@ static void test_MsiRecordGetString(void)
 
     sz = MAX_PATH;
     r = libmsi_record_get_string(rec, 1, NULL, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n",r);
     ok(sz == 0, "Expected 0, got %d\n",sz);
 
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
 
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 10, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expected 0, got %d\n", sz);
 
@@ -388,27 +388,27 @@ static void test_MsiRecordGetString(void)
     ok(rec != 0, "Expected a valid handle\n");
 
     r = libmsi_record_set_int(rec, 1, 5);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     sz = MAX_PATH;
     r = libmsi_record_get_string(rec, 1, NULL, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n",r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n",r);
     ok(sz == 1, "Expected 1, got %d\n",sz);
 
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "5"), "Expected \"5\", got \"%s\"\n", buf);
     ok(sz == 1, "Expectd 1, got %d\n", sz);
 
     r = libmsi_record_set_int(rec, 1, -5);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "-5"), "Expected \"-5\", got \"%s\"\n", buf);
     ok(sz == 2, "Expectd 2, got %d\n", sz);
 
@@ -425,19 +425,19 @@ static void test_MsiRecordGetInteger(void)
     ok(rec != 0, "Expected a valid handle\n");
 
     r = libmsi_record_set_string(rec, 1, "5");
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     val = libmsi_record_get_integer(rec, 1);
     ok(val == 5, "Expected 5, got %d\n", val);
 
     r = libmsi_record_set_string(rec, 1, "-5");
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     val = libmsi_record_get_integer(rec, 1);
     ok(val == -5, "Expected -5, got %d\n", val);
 
     r = libmsi_record_set_string(rec, 1, "5apple");
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     val = libmsi_record_get_integer(rec, 1);
     ok(val == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", val);
@@ -464,7 +464,7 @@ static void test_fieldzero(void)
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expectd 0, got %d\n", sz);
 
@@ -475,7 +475,7 @@ static void test_fieldzero(void)
     ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r);
 
     r = libmsi_record_set_int(rec, 1, 42);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     r = libmsi_record_get_integer(rec, 0);
     ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r);
@@ -483,7 +483,7 @@ static void test_fieldzero(void)
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expectd 0, got %d\n", sz);
 
@@ -494,7 +494,7 @@ static void test_fieldzero(void)
     ok(r == 42, "Expected 42, got %d\n", r);
 
     r = libmsi_record_set_string(rec, 1, "bologna");
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     r = libmsi_record_get_integer(rec, 0);
     ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r);
@@ -502,7 +502,7 @@ static void test_fieldzero(void)
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, ""), "Expected \"\", got \"%s\"\n", buf);
     ok(sz == 0, "Expectd 0, got %d\n", sz);
 
@@ -512,41 +512,41 @@ static void test_fieldzero(void)
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 1, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "bologna"), "Expected \"bologna\", got \"%s\"\n", buf);
     ok(sz == 7, "Expectd 7, got %d\n", sz);
 
     libmsi_unref(rec);
 
     r = libmsi_database_open(msifile, LIBMSI_DB_OPEN_CREATE, &hdb);
-    ok(r == ERROR_SUCCESS, "libmsi_database_open failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_open failed\n");
 
     query = "CREATE TABLE `drone` ( "
            "`id` INT, `name` CHAR(32), `number` CHAR(32) "
            "PRIMARY KEY `id`)";
     r = libmsi_database_open_query(hdb, query, &hview);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     r = libmsi_query_execute(hview, 0);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     r = libmsi_query_close(hview);
-    ok(r == ERROR_SUCCESS, "libmsi_query_close failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n");
     r = libmsi_unref(hview);
-    ok(r == ERROR_SUCCESS, "libmsi_unref failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n");
 
     query = "INSERT INTO `drone` ( `id`, `name`, `number` )"
            "VALUES('1', 'Abe', '8675309')";
     r = libmsi_database_open_query(hdb, query, &hview);
-    ok(r == ERROR_SUCCESS, "libmsi_database_open_query failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_open_query failed\n");
     r = libmsi_query_execute(hview, 0);
-    ok(r == ERROR_SUCCESS, "libmsi_query_execute failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_execute failed\n");
     r = libmsi_query_close(hview);
-    ok(r == ERROR_SUCCESS, "libmsi_query_close failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_query_close failed\n");
     r = libmsi_unref(hview);
-    ok(r == ERROR_SUCCESS, "libmsi_unref failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n");
 
     rec = NULL;
     r = libmsi_database_get_primary_keys(hdb, "drone", &rec);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     r = libmsi_record_get_integer(rec, 0);
     ok(r == MSI_NULL_INTEGER, "Expected MSI_NULL_INTEGER, got %d\n", r);
@@ -554,7 +554,7 @@ static void test_fieldzero(void)
     sz = MAX_PATH;
     strcpy(buf, "apple");
     r = libmsi_record_get_string(rec, 0, buf, &sz);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     ok(!strcmp(buf, "drone"), "Expected \"drone\", got \"%s\"\n", buf);
     ok(sz == 5, "Expectd 5, got %d\n", sz);
 
@@ -564,15 +564,15 @@ static void test_fieldzero(void)
     libmsi_unref(rec);
 
     r = libmsi_database_get_primary_keys(hdb, "nosuchtable", &rec);
-    ok(r == ERROR_INVALID_TABLE, "Expected ERROR_INVALID_TABLE, got %d\n", r);
+    ok(r == LIBMSI_RESULT_INVALID_TABLE, "Expected LIBMSI_RESULT_INVALID_TABLE, got %d\n", r);
 
     query = "SELECT * FROM `drone` WHERE `id` = 1";
     r = libmsi_database_open_query(hdb, query, &hview);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     r = libmsi_query_execute(hview, 0);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
     r = libmsi_query_fetch(hview, &rec);
-    ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
+    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     r = libmsi_record_get_integer(rec, 0);
     ok(r != MSI_NULL_INTEGER && r != 0, "Expected non-NULL value, got %d\n", r);
@@ -581,7 +581,7 @@ static void test_fieldzero(void)
     ok(r == false, "Expected false, got %d\n", r);
 
     r = libmsi_unref(hview);
-    ok(r == ERROR_SUCCESS, "libmsi_unref failed\n");
+    ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_unref failed\n");
     libmsi_unref(rec);
     libmsi_unref(hdb);
     DeleteFileA(msifile);