diff options
| -rw-r--r-- | include/libmsi-types.h | 49 | ||||
| -rw-r--r-- | libmsi/libmsi-summary-info.c | 68 | ||||
| -rw-r--r-- | tests/testdatabase.c | 30 | ||||
| -rw-r--r-- | tests/testsuite.at | 2 | ||||
| -rw-r--r-- | tests/testsuminfo.c | 86 | ||||
| -rw-r--r-- | tools/msibuild.c | 24 | ||||
| -rw-r--r-- | tools/msiinfo.c | 36 |
7 files changed, 147 insertions, 148 deletions
diff --git a/include/libmsi-types.h b/include/libmsi-types.h index ca7e04e..de17424 100644 --- a/include/libmsi-types.h +++ b/include/libmsi-types.h @@ -126,31 +126,30 @@ typedef enum LibmsiDBState LIBMSI_DB_STATE_WRITE = 1 } LibmsiDBState; -#define MSI_PID_DICTIONARY (0) -#define MSI_PID_CODEPAGE (0x1) -#define MSI_PID_FIRST_USABLE 2 -#define MSI_PID_TITLE 2 -#define MSI_PID_SUBJECT 3 -#define MSI_PID_AUTHOR 4 -#define MSI_PID_KEYWORDS 5 -#define MSI_PID_COMMENTS 6 -#define MSI_PID_TEMPLATE 7 -#define MSI_PID_LASTAUTHOR 8 -#define MSI_PID_REVNUMBER 9 -#define MSI_PID_EDITTIME 10 -#define MSI_PID_LASTPRINTED 11 -#define MSI_PID_CREATE_DTM 12 -#define MSI_PID_LASTSAVE_DTM 13 -#define MSI_PID_PAGECOUNT 14 -#define MSI_PID_WORDCOUNT 15 -#define MSI_PID_CHARCOUNT 16 -#define MSI_PID_THUMBNAIL 17 -#define MSI_PID_APPNAME 18 -#define MSI_PID_SECURITY 19 - -#define MSI_PID_MSIVERSION MSI_PID_PAGECOUNT -#define MSI_PID_MSISOURCE MSI_PID_WORDCOUNT -#define MSI_PID_MSIRESTRICT MSI_PID_CHARCOUNT +typedef enum LibmsiProperty +{ + LIBMSI_PROPERTY_DICTIONARY = 0, + LIBMSI_PROPERTY_CODEPAGE = 1, + LIBMSI_PROPERTY_TITLE = 2, + LIBMSI_PROPERTY_SUBJECT = 3, + LIBMSI_PROPERTY_AUTHOR = 4, + LIBMSI_PROPERTY_KEYWORDS = 5, + LIBMSI_PROPERTY_COMMENTS = 6, + LIBMSI_PROPERTY_TEMPLATE = 7, + LIBMSI_PROPERTY_LASTAUTHOR = 8, + LIBMSI_PROPERTY_UUID = 9, + LIBMSI_PROPERTY_EDITTIME = 10, + LIBMSI_PROPERTY_LASTPRINTED = 11, + LIBMSI_PROPERTY_CREATED_TM = 12, + LIBMSI_PROPERTY_LASTSAVED_TM = 13, + LIBMSI_PROPERTY_VERSION = 14, + LIBMSI_PROPERTY_SOURCE = 15, + LIBMSI_PROPERTY_RESTRICT = 16, + LIBMSI_PROPERTY_THUMBNAIL = 17, + LIBMSI_PROPERTY_APPNAME = 18, + LIBMSI_PROPERTY_SECURITY = 19 +} LibmsiProperty; + G_END_DECLS diff --git a/libmsi/libmsi-summary-info.c b/libmsi/libmsi-summary-info.c index 00a10e3..6e237dd 100644 --- a/libmsi/libmsi-summary-info.c +++ b/libmsi/libmsi-summary-info.c @@ -159,29 +159,29 @@ static unsigned get_type( unsigned uiProperty ) { switch( uiProperty ) { - case MSI_PID_CODEPAGE: + case LIBMSI_PROPERTY_CODEPAGE: return OLEVT_I2; - case MSI_PID_SUBJECT: - case MSI_PID_AUTHOR: - case MSI_PID_KEYWORDS: - case MSI_PID_COMMENTS: - case MSI_PID_TEMPLATE: - case MSI_PID_LASTAUTHOR: - case MSI_PID_REVNUMBER: - case MSI_PID_APPNAME: - case MSI_PID_TITLE: + case LIBMSI_PROPERTY_SUBJECT: + case LIBMSI_PROPERTY_AUTHOR: + case LIBMSI_PROPERTY_KEYWORDS: + case LIBMSI_PROPERTY_COMMENTS: + case LIBMSI_PROPERTY_TEMPLATE: + case LIBMSI_PROPERTY_LASTAUTHOR: + case LIBMSI_PROPERTY_UUID: + case LIBMSI_PROPERTY_APPNAME: + case LIBMSI_PROPERTY_TITLE: return OLEVT_LPSTR; - case MSI_PID_LASTPRINTED: - case MSI_PID_CREATE_DTM: - case MSI_PID_LASTSAVE_DTM: + case LIBMSI_PROPERTY_LASTPRINTED: + case LIBMSI_PROPERTY_CREATED_TM: + case LIBMSI_PROPERTY_LASTSAVED_TM: return OLEVT_FILETIME; - case MSI_PID_WORDCOUNT: - case MSI_PID_CHARCOUNT: - case MSI_PID_SECURITY: - case MSI_PID_PAGECOUNT: + case LIBMSI_PROPERTY_SOURCE: + case LIBMSI_PROPERTY_RESTRICT: + case LIBMSI_PROPERTY_SECURITY: + case LIBMSI_PROPERTY_VERSION: return OLEVT_I4; } return OLEVT_EMPTY; @@ -771,29 +771,29 @@ static unsigned parse_prop( const WCHAR *prop, const WCHAR *value, unsigned *pid *pid = atoiW( prop ); switch (*pid) { - case MSI_PID_CODEPAGE: - case MSI_PID_WORDCOUNT: - case MSI_PID_CHARCOUNT: - case MSI_PID_SECURITY: - case MSI_PID_PAGECOUNT: + case LIBMSI_PROPERTY_CODEPAGE: + case LIBMSI_PROPERTY_SOURCE: + case LIBMSI_PROPERTY_RESTRICT: + case LIBMSI_PROPERTY_SECURITY: + case LIBMSI_PROPERTY_VERSION: *int_value = atoiW( value ); break; - case MSI_PID_LASTPRINTED: - case MSI_PID_CREATE_DTM: - case MSI_PID_LASTSAVE_DTM: + case LIBMSI_PROPERTY_LASTPRINTED: + case LIBMSI_PROPERTY_CREATED_TM: + case LIBMSI_PROPERTY_LASTSAVED_TM: parse_filetime( value, ft_value ); break; - case MSI_PID_SUBJECT: - case MSI_PID_AUTHOR: - case MSI_PID_KEYWORDS: - case MSI_PID_COMMENTS: - case MSI_PID_TEMPLATE: - case MSI_PID_LASTAUTHOR: - case MSI_PID_REVNUMBER: - case MSI_PID_APPNAME: - case MSI_PID_TITLE: + case LIBMSI_PROPERTY_SUBJECT: + case LIBMSI_PROPERTY_AUTHOR: + case LIBMSI_PROPERTY_KEYWORDS: + case LIBMSI_PROPERTY_COMMENTS: + case LIBMSI_PROPERTY_TEMPLATE: + case LIBMSI_PROPERTY_LASTAUTHOR: + case LIBMSI_PROPERTY_UUID: + case LIBMSI_PROPERTY_APPNAME: + case LIBMSI_PROPERTY_TITLE: *str_value = strdupWtoA(value); break; diff --git a/tests/testdatabase.c b/tests/testdatabase.c index b7d3739..38d1267 100644 --- a/tests/testdatabase.c +++ b/tests/testdatabase.c @@ -1154,7 +1154,7 @@ static void test_streamtable(void) r = libmsi_database_get_summary_info( hdb, 1, &hsi ); ok( r == LIBMSI_RESULT_SUCCESS, "Failed to get summary information handle: %u\n", r ); - r = libmsi_summary_info_set_property( hsi, MSI_PID_SECURITY, LIBMSI_PROPERTY_TYPE_INT, 2, NULL, NULL ); + r = libmsi_summary_info_set_property( hsi, LIBMSI_PROPERTY_SECURITY, LIBMSI_PROPERTY_TYPE_INT, 2, NULL, NULL ); ok( r == LIBMSI_RESULT_SUCCESS, "Failed to set property: %u\n", r ); r = libmsi_summary_info_persist( hsi ); @@ -1768,13 +1768,13 @@ static void test_suminfo_import(void) ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(count == 14, "Expected 14, got %u\n", count); - r = libmsi_summary_info_get_property(hsi, MSI_PID_CODEPAGE, &type, &int_value, NULL, NULL, NULL); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_CODEPAGE, &type, &int_value, NULL, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_INT, "Expected VT_I2, got %u\n", type); ok(int_value == 1252, "Expected 1252, got %d\n", int_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_TITLE, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_TITLE, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(size == 18, "Expected 18, got %u\n", size); @@ -1782,72 +1782,72 @@ static void test_suminfo_import(void) "Expected \"Installer Database\", got %s\n", str_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_SUBJECT, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_SUBJECT, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "Installer description"), "Expected \"Installer description\", got %s\n", str_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_AUTHOR, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_AUTHOR, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "WineHQ"), "Expected \"WineHQ\", got %s\n", str_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_KEYWORDS, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_KEYWORDS, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "Installer"), "Expected \"Installer\", got %s\n", str_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_COMMENTS, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_COMMENTS, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "Installer comments"), "Expected \"Installer comments\", got %s\n", str_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_TEMPLATE, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_TEMPLATE, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "Intel;1033,2057"), "Expected \"Intel;1033,2057\", got %s\n", str_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_REVNUMBER, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_UUID, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "{12345678-1234-1234-1234-123456789012}"), "Expected \"{12345678-1234-1234-1234-123456789012}\", got %s\n", str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_CREATE_DTM, &type, NULL, &ft_value, NULL, NULL); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_CREATED_TM, &type, NULL, &ft_value, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_FILETIME, "Expected VT_FILETIME, got %u\n", type); - r = libmsi_summary_info_get_property(hsi, MSI_PID_LASTSAVE_DTM, &type, NULL, &ft_value, NULL, NULL); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_LASTSAVED_TM, &type, NULL, &ft_value, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_FILETIME, "Expected VT_FILETIME, got %u\n", type); - r = libmsi_summary_info_get_property(hsi, MSI_PID_PAGECOUNT, &type, &int_value, NULL, NULL, NULL); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_VERSION, &type, &int_value, NULL, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_INT, "Expected VT_I4, got %u\n", type); ok(int_value == 200, "Expected 200, got %d\n", int_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_WORDCOUNT, &type, &int_value, NULL, NULL, NULL); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_SOURCE, &type, &int_value, NULL, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_INT, "Expected VT_I4, got %u\n", type); ok(int_value == 2, "Expected 2, got %d\n", int_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_SECURITY, &type, &int_value, NULL, NULL, NULL); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_SECURITY, &type, &int_value, NULL, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_INT, "Expected VT_I4, got %u\n", type); ok(int_value == 2, "Expected 2, got %d\n", int_value); size = sizeof(str_value); - r = libmsi_summary_info_get_property(hsi, MSI_PID_APPNAME, &type, NULL, NULL, str_value, &size); + r = libmsi_summary_info_get_property(hsi, LIBMSI_PROPERTY_APPNAME, &type, NULL, NULL, str_value, &size); ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %u\n", r); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "Expected VT_LPSTR, got %u\n", type); ok(!strcmp(str_value, "Vim"), "Expected \"Vim\", got %s\n", str_value); diff --git a/tests/testsuite.at b/tests/testsuite.at index eb6dcec..c20a60e 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -99,7 +99,7 @@ AT_CHECK_MSIBUILD([out.msi -s 'Project name']) AT_CHECK_MSIINFO([suminfo out.msi], [ignore], [stdout]) AT_CHECK([[ UUID='\{[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\}' - grep -E "^Revision number: $UUID\$" stdout]], [0], + grep -E "^Revision number \\(UUID\\): $UUID\$" stdout]], [0], [ignore]) AT_CLEANUP diff --git a/tests/testsuminfo.c b/tests/testsuminfo.c index a024025..3395013 100644 --- a/tests/testsuminfo.c +++ b/tests/testsuminfo.c @@ -75,7 +75,7 @@ static void test_suminfo(void) r = libmsi_summary_info_get_property(hsuminfo, -1, NULL, NULL, NULL, 0, NULL); ok(r == LIBMSI_RESULT_UNKNOWN_PROPERTY, "libmsi_summary_info_get_property wrong error\n"); - r = libmsi_summary_info_get_property(hsuminfo, MSI_PID_SECURITY+1, NULL, NULL, NULL, 0, NULL); + r = libmsi_summary_info_get_property(hsuminfo, LIBMSI_PROPERTY_SECURITY+1, NULL, NULL, NULL, 0, NULL); ok(r == LIBMSI_RESULT_UNKNOWN_PROPERTY, "libmsi_summary_info_get_property wrong error\n"); type = -1; @@ -93,22 +93,22 @@ static void test_suminfo(void) buf[0]='x'; buf[1]=0; sz = 0x10; - r = libmsi_summary_info_get_property(hsuminfo, MSI_PID_REVNUMBER, &type, &val, NULL, buf, &sz); + r = libmsi_summary_info_get_property(hsuminfo, LIBMSI_PROPERTY_UUID, &type, &val, NULL, buf, &sz); ok(r == LIBMSI_RESULT_SUCCESS, "getpropcount failed\n"); ok(buf[0]=='x', "cleared buffer\n"); ok(sz == 0x10, "count wasn't zero\n"); ok(type == LIBMSI_PROPERTY_TYPE_EMPTY, "should be empty\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Mike"); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, "JungAh"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, "JungAh"); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "JungAh"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "JungAh"); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error\n"); g_object_unref(hsuminfo); @@ -120,45 +120,45 @@ static void test_suminfo(void) r = libmsi_summary_info_set_property(hsuminfo, 0, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, NULL); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, NULL); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_CODEPAGE, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, NULL); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Mike"); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_AUTHOR, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "JungAh"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_AUTHOR, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "JungAh"); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_KEYWORDS, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_KEYWORDS, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Mike"); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_COMMENTS, LIBMSI_PROPERTY_TYPE_FILETIME, 0, NULL, "JungAh"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_COMMENTS, LIBMSI_PROPERTY_TYPE_FILETIME, 0, NULL, "JungAh"); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TEMPLATE, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TEMPLATE, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Mike"); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_LASTAUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, NULL); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_LASTAUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, NULL); ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_LASTSAVE_DTM, LIBMSI_PROPERTY_TYPE_FILETIME, 0, NULL, NULL); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_LASTSAVED_TM, LIBMSI_PROPERTY_TYPE_FILETIME, 0, NULL, NULL); ok(r == LIBMSI_RESULT_INVALID_PARAMETER, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_LASTAUTHOR, VT_LPWSTR, 0, NULL, "h\0i\0\0"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_LASTAUTHOR, VT_LPWSTR, 0, NULL, "h\0i\0\0"); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_REVNUMBER, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Jungah"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_UUID, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, "Jungah"); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_PAGECOUNT, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, NULL); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_VERSION, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, NULL); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Mike"); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property failed\n"); sz = 2; strcpy(buf,"x"); - r = libmsi_summary_info_get_property(hsuminfo, MSI_PID_TITLE, &type, NULL, NULL, buf, &sz ); + r = libmsi_summary_info_get_property(hsuminfo, LIBMSI_PROPERTY_TITLE, &type, NULL, NULL, buf, &sz ); ok(r == LIBMSI_RESULT_MORE_DATA, "libmsi_summary_info_set_property failed\n"); ok(sz == 4, "count was wrong\n"); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "type was wrong\n"); @@ -166,16 +166,16 @@ static void test_suminfo(void) sz = 4; strcpy(buf,"x"); - r = libmsi_summary_info_get_property(hsuminfo, MSI_PID_TITLE, &type, NULL, NULL, buf, &sz ); + r = libmsi_summary_info_get_property(hsuminfo, LIBMSI_PROPERTY_TITLE, &type, NULL, NULL, buf, &sz ); ok(r == LIBMSI_RESULT_MORE_DATA, "libmsi_summary_info_set_property failed\n"); ok(sz == 4, "count was wrong\n"); ok(type == LIBMSI_PROPERTY_TYPE_STRING, "type was wrong\n"); ok(!strcmp(buf,"Mik"), "buffer was wrong\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "JungAh"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "JungAh"); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property failed\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "Mike"); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error\n"); g_object_unref(hsuminfo); @@ -184,19 +184,19 @@ static void test_suminfo(void) r = libmsi_database_get_summary_info(hdb, 10, &hsuminfo); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "JungAh"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "JungAh"); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property failed\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, NULL); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_CODEPAGE, LIBMSI_PROPERTY_TYPE_STRING, 1, NULL, NULL); ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, NULL, NULL); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_CODEPAGE, LIBMSI_PROPERTY_TYPE_INT, 1, &ft, "Mike"); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property wrong error\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property wrong error\n"); r = libmsi_summary_info_persist(hsuminfo); @@ -215,7 +215,7 @@ static void test_suminfo(void) r = libmsi_database_get_summary_info(hdb, 1, &hsuminfo); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed\n"); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_set_property wrong error\n"); r = libmsi_summary_info_persist(hsuminfo); @@ -232,7 +232,7 @@ static void test_suminfo(void) r = libmsi_database_get_summary_info(hdb, 0, &hsuminfo); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed %u\n", r); - r = libmsi_summary_info_set_property(hsuminfo, MSI_PID_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); + r = libmsi_summary_info_set_property(hsuminfo, LIBMSI_PROPERTY_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 1, &ft, "Mike"); todo_wine ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property wrong error, %u\n", r); r = libmsi_summary_info_persist(hsuminfo); @@ -307,47 +307,47 @@ static void test_create_database_binary(void) ok( r == S_OK, "failed to set class\n"); propspec[0].ulKind = PRSPEC_PROPID; - propspec[0].propid = MSI_PID_TITLE; + propspec[0].propid = LIBMSI_PROPERTY_TITLE; propvar[0].vt = LIBMSI_PROPERTY_TYPE_STRING; propvar[0].pszVal = LOSE_CONST("test title"); propspec[1].ulKind = PRSPEC_PROPID; - propspec[1].propid = MSI_PID_SUBJECT; + propspec[1].propid = LIBMSI_PROPERTY_SUBJECT; propvar[1].vt = LIBMSI_PROPERTY_TYPE_STRING; propvar[1].pszVal = LOSE_CONST("msi suminfo / property storage test"); propspec[2].ulKind = PRSPEC_PROPID; - propspec[2].propid = MSI_PID_AUTHOR; + propspec[2].propid = LIBMSI_PROPERTY_AUTHOR; propvar[2].vt = LIBMSI_PROPERTY_TYPE_STRING; propvar[2].pszVal = LOSE_CONST("mike_m"); propspec[3].ulKind = PRSPEC_PROPID; - propspec[3].propid = MSI_PID_TEMPLATE; + propspec[3].propid = LIBMSI_PROPERTY_TEMPLATE; propvar[3].vt = LIBMSI_PROPERTY_TYPE_STRING; propvar[3].pszVal = LOSE_CONST(";1033"); /* actually the string table's codepage */ propspec[4].ulKind = PRSPEC_PROPID; - propspec[4].propid = MSI_PID_REVNUMBER; + propspec[4].propid = LIBMSI_PROPERTY_UUID; propvar[4].vt = LIBMSI_PROPERTY_TYPE_STRING; propvar[4].pszVal = LOSE_CONST("{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}"); propspec[5].ulKind = PRSPEC_PROPID; - propspec[5].propid = MSI_PID_PAGECOUNT; + propspec[5].propid = LIBMSI_PROPERTY_VERSION; propvar[5].vt = LIBMSI_PROPERTY_TYPE_INT; propvar[5].lVal = 100; propspec[6].ulKind = PRSPEC_PROPID; - propspec[6].propid = MSI_PID_WORDCOUNT; + propspec[6].propid = LIBMSI_PROPERTY_SOURCE; propvar[6].vt = LIBMSI_PROPERTY_TYPE_INT; propvar[6].lVal = 0; - /* MSDN says that MSI_PID_LASTPRINTED should be a VT_FILETIME... */ + /* MSDN says that LIBMSI_PROPERTY_LASTPRINTED should be a VT_FILETIME... */ propspec[7].ulKind = PRSPEC_PROPID; - propspec[7].propid = MSI_PID_LASTPRINTED; + propspec[7].propid = LIBMSI_PROPERTY_LASTPRINTED; propvar[7].vt = LIBMSI_PROPERTY_TYPE_STRING; propvar[7].pszVal = LOSE_CONST("7/1/1999 5:17"); - r = IPropertyStorage_WriteMultiple( ps, 8, propspec, propvar, MSI_PID_FIRST_USABLE ); + r = IPropertyStorage_WriteMultiple( ps, 8, propspec, propvar, PID_FIRST_USABLE ); ok( r == S_OK, "failed to write properties\n"); IPropertyStorage_Commit( ps, STGC_DEFAULT ); @@ -382,7 +382,7 @@ static void test_summary_binary(void) ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_database_get_summary_info failed\n"); /* - * Check what reading MSI_PID_LASTPRINTED does... + * Check what reading LIBMSI_PROPERTY_LASTPRINTED does... * The string value is written to the msi file * but it appears that we're not allowed to read it back again. * We can still read its type though...? @@ -390,7 +390,7 @@ static void test_summary_binary(void) sz = sizeof sval; sval[0] = 0; type = 0; - r = libmsi_summary_info_get_property(hsuminfo, MSI_PID_LASTPRINTED, &type, NULL, NULL, sval, &sz); + r = libmsi_summary_info_get_property(hsuminfo, LIBMSI_PROPERTY_LASTPRINTED, &type, NULL, NULL, sval, &sz); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_get_property failed\n"); ok(!strcmp(sval, "") || !strcmp(sval, "7"), "Expected empty string or \"7\", got \"%s\"\n", sval); @@ -400,7 +400,7 @@ static void test_summary_binary(void) } ival = -1; - r = libmsi_summary_info_get_property(hsuminfo, MSI_PID_WORDCOUNT, &type, &ival, NULL, NULL, NULL); + r = libmsi_summary_info_get_property(hsuminfo, LIBMSI_PROPERTY_SOURCE, &type, &ival, NULL, NULL, NULL); ok(r == LIBMSI_RESULT_SUCCESS, "libmsi_summary_info_get_property failed\n"); todo_wine ok( ival == 0, "value incorrect\n"); @@ -410,7 +410,7 @@ static void test_summary_binary(void) ok(r == LIBMSI_RESULT_SUCCESS, "getpropcount failed\n"); todo_wine ok(count == 10, "prop count incorrect\n"); - r = libmsi_summary_info_set_property( hsuminfo, MSI_PID_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Mike" ); + r = libmsi_summary_info_set_property( hsuminfo, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Mike" ); ok(r == LIBMSI_RESULT_FUNCTION_FAILED, "libmsi_summary_info_set_property failed %u\n", r); r = libmsi_summary_info_persist( hsuminfo ); diff --git a/tools/msibuild.c b/tools/msibuild.c index a61485a..c462750 100644 --- a/tools/msibuild.c +++ b/tools/msibuild.c @@ -33,23 +33,23 @@ static void init_suminfo(LibmsiSummaryInfo *si) { - libmsi_summary_info_set_property(si, MSI_PID_TITLE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_TITLE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Installation Database"); - libmsi_summary_info_set_property(si, MSI_PID_KEYWORDS, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_KEYWORDS, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "Installer, MSI"); - libmsi_summary_info_set_property(si, MSI_PID_TEMPLATE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_TEMPLATE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, ";1033"); - libmsi_summary_info_set_property(si, MSI_PID_APPNAME, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_APPNAME, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, "libmsi msibuild"); - libmsi_summary_info_set_property(si, MSI_PID_MSIVERSION, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_VERSION, LIBMSI_PROPERTY_TYPE_INT, 200, NULL, NULL); - libmsi_summary_info_set_property(si, MSI_PID_MSISOURCE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_SOURCE, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, NULL); - libmsi_summary_info_set_property(si, MSI_PID_MSIRESTRICT, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_RESTRICT, LIBMSI_PROPERTY_TYPE_INT, 0, NULL, NULL); #ifdef HAVE_LIBUUID @@ -60,7 +60,7 @@ static void init_suminfo(LibmsiSummaryInfo *si) uustr[0] = '{'; uuid_unparse_upper(uu, uustr + 1); strcat(uustr, "}"); - libmsi_summary_info_set_property(si, MSI_PID_REVNUMBER, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_UUID, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, uustr); } #endif @@ -141,21 +141,21 @@ static int import_table(char *table) static int add_summary_info(const char *name, const char *author, const char *template, const char *uuid) { - libmsi_summary_info_set_property(si, MSI_PID_SUBJECT, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_SUBJECT, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, name); if (author) { - libmsi_summary_info_set_property(si, MSI_PID_AUTHOR, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_AUTHOR, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, author); } if (template) { - libmsi_summary_info_set_property(si, MSI_PID_TEMPLATE, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_TEMPLATE, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, template); } if (uuid) { - libmsi_summary_info_set_property(si, MSI_PID_REVNUMBER, + libmsi_summary_info_set_property(si, LIBMSI_PROPERTY_UUID, LIBMSI_PROPERTY_TYPE_STRING, 0, NULL, uuid); } diff --git a/tools/msiinfo.c b/tools/msiinfo.c index 5a6dfc8..2a53f7d 100644 --- a/tools/msiinfo.c +++ b/tools/msiinfo.c @@ -324,24 +324,24 @@ static int cmd_suminfo(struct Command *cmd, int argc, char **argv) print_libmsi_error(r); } - print_suminfo(si, MSI_PID_TITLE, "Title"); - print_suminfo(si, MSI_PID_SUBJECT, "Subject"); - print_suminfo(si, MSI_PID_AUTHOR, "Author"); - print_suminfo(si, MSI_PID_KEYWORDS, "Keywords"); - print_suminfo(si, MSI_PID_COMMENTS, "Comments"); - print_suminfo(si, MSI_PID_TEMPLATE, "Template"); - print_suminfo(si, MSI_PID_LASTAUTHOR, "Last author"); - print_suminfo(si, MSI_PID_REVNUMBER, "Revision number"); - print_suminfo(si, MSI_PID_EDITTIME, "Edittime"); - print_suminfo(si, MSI_PID_LASTPRINTED, "Last printed"); - print_suminfo(si, MSI_PID_CREATE_DTM, "Created"); - print_suminfo(si, MSI_PID_LASTSAVE_DTM, "Last saved"); - print_suminfo(si, MSI_PID_MSIVERSION, "Version"); - print_suminfo(si, MSI_PID_MSISOURCE, "Source"); - print_suminfo(si, MSI_PID_MSIRESTRICT, "Restrict"); - print_suminfo(si, MSI_PID_THUMBNAIL, "Thumbnail"); - print_suminfo(si, MSI_PID_APPNAME, "Application"); - print_suminfo(si, MSI_PID_SECURITY, "Security"); + print_suminfo(si, LIBMSI_PROPERTY_TITLE, "Title"); + print_suminfo(si, LIBMSI_PROPERTY_SUBJECT, "Subject"); + print_suminfo(si, LIBMSI_PROPERTY_AUTHOR, "Author"); + print_suminfo(si, LIBMSI_PROPERTY_KEYWORDS, "Keywords"); + print_suminfo(si, LIBMSI_PROPERTY_COMMENTS, "Comments"); + print_suminfo(si, LIBMSI_PROPERTY_TEMPLATE, "Template"); + print_suminfo(si, LIBMSI_PROPERTY_LASTAUTHOR, "Last author"); + print_suminfo(si, LIBMSI_PROPERTY_UUID, "Revision number (UUID)"); + print_suminfo(si, LIBMSI_PROPERTY_EDITTIME, "Edittime"); + print_suminfo(si, LIBMSI_PROPERTY_LASTPRINTED, "Last printed"); + print_suminfo(si, LIBMSI_PROPERTY_CREATED_TM, "Created"); + print_suminfo(si, LIBMSI_PROPERTY_LASTSAVED_TM, "Last saved"); + print_suminfo(si, LIBMSI_PROPERTY_VERSION, "Version"); + print_suminfo(si, LIBMSI_PROPERTY_SOURCE, "Source"); + print_suminfo(si, LIBMSI_PROPERTY_RESTRICT, "Restrict"); + print_suminfo(si, LIBMSI_PROPERTY_THUMBNAIL, "Thumbnail"); + print_suminfo(si, LIBMSI_PROPERTY_APPNAME, "Application"); + print_suminfo(si, LIBMSI_PROPERTY_SECURITY, "Security"); g_object_unref(db); g_object_unref(si); |