#include <stdio.h>
#include <windows.h>
+#include <objidl.h>
#include <msi.h>
#include <msidefs.h>
#include <msiquery.h>
-#include <objidl.h>
-
#include "wine/test.h"
static const char *msifile = "winetest-db.msi";
/* test a valid feature descriptor */
desc = "']gAVn-}f(ZXfeAR6.jiFollowTheWhiteRabbit>3w2x^IGfe?CxI5heAvk.";
len = 0;
+ prod[0] = feature[0] = comp[0] = 0;
r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len);
ok(r == ERROR_SUCCESS, "returned an error\n");
ok(len == strlen(desc), "length was wrong\n");
r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len);
ok(r == ERROR_INVALID_PARAMETER, "returned wrong error\n");
+ /* test a feature descriptor with < instead of > */
+ desc = "']gAVn-}f(ZXfeAR6.jiFollowTheWhiteRabbit<3w2x^IGfe?CxI5heAvk.";
+ len = 0;
+ prod[0] = feature[0] = 0;
+ comp[0] = 0x55;
+ r = pMsiDecomposeDescriptorA(desc, prod, feature, comp, &len);
+ ok(r == ERROR_SUCCESS, "returned an error\n");
+ ok(len == 41, "got %u\n", len);
+ ok(!strcmp(prod,"{90110409-6000-11D3-8CFE-0150048383C9}"), "got '%s'\n", prod);
+ ok(!strcmp(feature,"FollowTheWhiteRabbit"), "got '%s'\n", feature);
+ ok(!comp[0], "got '%s'\n", comp);
+
+ len = 0;
+ prod[0] = feature[0] = 0;
+ comp[0] = 0x55;
+ r = pMsiDecomposeDescriptorA("yh1BVN)8A$!!!!!MKKSkAlwaysInstalledIntl_1033<", prod, feature, comp, &len);
+ ok(r == ERROR_SUCCESS, "got %u\n", r);
+ ok(len == 45, "got %u\n", len);
+ ok(!strcmp(prod, "{90150000-006E-0409-0000-0000000FF1CE}"), "got '%s'\n", prod);
+ ok(!strcmp(feature, "AlwaysInstalledIntl_1033"), "got '%s'\n", feature);
+ ok(!comp[0], "got '%s'\n", comp);
+
/*
* Test a valid feature descriptor with the
* maximum number of characters and some trailing characters.
r = run_query( hdb, 0,
"CREATE TABLE `Properties` "
"( `Property` CHAR(255), "
- " `Value` CHAR(1), "
- " `Intvalue` INT, "
- " `Integervalue` INTEGER, "
- " `Shortvalue` SHORT, "
- " `Longvalue` LONG, "
- " `Longcharvalue` LONGCHAR "
- " PRIMARY KEY `Property`)" );
+ " `Value` CHAR(1), "
+ " `Intvalue` INT, "
+ " `Integervalue` INTEGER, "
+ " `Shortvalue` SHORT, "
+ " `Longvalue` LONG, "
+ " `Longcharvalue` LONGCHAR, "
+ " `Charvalue` CHAR, "
+ " `Localizablevalue` CHAR LOCALIZABLE "
+ " PRIMARY KEY `Property`)" );
ok( r == ERROR_SUCCESS , "Failed to create table\n" );
/* check the column types */
ok( check_record( rec, 5, "I2"), "wrong record type\n");
ok( check_record( rec, 6, "I4"), "wrong record type\n");
ok( check_record( rec, 7, "S0"), "wrong record type\n");
+ ok( check_record( rec, 8, "S0"), "wrong record type\n");
+ ok( check_record( rec, 9, "L0"), "wrong record type\n");
MsiCloseHandle( rec );
ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n");
ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n");
ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n");
+ ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 8 ), "_columns table wrong\n");
+ ok( 0x1f00 == get_columns_table_type(hdb, "Properties", 9 ), "_columns table wrong\n");
/* now try the names */
rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES );
ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n");
ok( check_record( rec, 6, "Longvalue"), "wrong record type\n");
ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n");
+ ok( check_record( rec, 8, "Charvalue"), "wrong record type\n");
+ ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n");
MsiCloseHandle( rec );
MsiViewClose( view );
MsiCloseHandle( view );
+ /* try again */
+ create_file( "test1.txt" );
+
+ rec = MsiCreateRecord( 2 );
+ MsiRecordSetStringA( rec, 1, "data1" );
+
+ r = MsiRecordSetStreamA( rec, 2, "test1.txt" );
+ ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r );
+
+ DeleteFileA( "test1.txt" );
+
+ r = MsiDatabaseOpenViewA( hdb,
+ "INSERT INTO `_Streams` ( `Name`, `Data` ) VALUES ( ?, ? )", &view );
+ ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r );
+
+ r = MsiViewExecute( view, rec );
+ ok( r == ERROR_FUNCTION_FAILED, "got %u\n", r );
+
+ MsiCloseHandle( rec );
+ MsiViewClose( view );
+ MsiCloseHandle( view );
+
r = MsiDatabaseOpenViewA( hdb,
"SELECT `Name`, `Data` FROM `_Streams` WHERE `Name` = 'data'", &view );
ok( r == ERROR_SUCCESS, "Failed to open database view: %d\n", r);
memset(buf, 0, MAX_PATH);
r = MsiRecordReadStream( rec, 2, buf, &size );
ok( r == ERROR_SUCCESS, "Failed to get stream: %d\n", r);
- todo_wine ok( !lstrcmpA(buf, "test2.txt\n"), "Expected 'test2.txt\\n', got %s\n", buf);
+ ok( !lstrcmpA(buf, "test2.txt\n"), "Expected 'test2.txt\\n', got %s\n", buf);
MsiCloseHandle( rec );
MsiViewClose( view );
ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r);
DeleteFileA( "test.txt" );
+ /* try a name that exceeds maximum OLE stream name length */
+ query = "INSERT INTO `Binary` ( `Name`, `ID`, `Data` ) VALUES ( 'encryption.dll.CB4E6205_F99A_4C51_ADD4_184506EFAB87', 10000, ? )";
+ r = run_query( hdb, rec, query );
+ ok( r == ERROR_SUCCESS, "Insert into Binary table failed: %d\n", r );
+
+ r = MsiCloseHandle( rec );
+ ok( r == ERROR_SUCCESS , "Failed to close record handle\n" );
+
+ r = MsiDatabaseCommit( hdb );
+ ok( r == ERROR_FUNCTION_FAILED , "got %u\n", r );
+
+ r = MsiCloseHandle( hdb );
+ ok( r == ERROR_SUCCESS , "Failed to close database\n" );
+
+ r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb );
+ ok( r == ERROR_SUCCESS , "Failed to open database\n" );
+
+ query = "CREATE TABLE `Binary` ( `Name` CHAR(72) NOT NULL, `ID` INT NOT NULL, `Data` OBJECT PRIMARY KEY `Name`, `ID`)";
+ r = run_query( hdb, 0, query );
+ ok( r == ERROR_SUCCESS, "Cannot create Binary table: %d\n", r );
+
+ create_file( "test.txt" );
+ rec = MsiCreateRecord( 1 );
+ r = MsiRecordSetStreamA( rec, 1, "test.txt" );
+ ok( r == ERROR_SUCCESS, "Failed to add stream data to the record: %d\n", r );
+ DeleteFileA( "test.txt" );
+
query = "INSERT INTO `Binary` ( `Name`, `ID`, `Data` ) VALUES ( 'filename1', 1, ? )";
r = run_query( hdb, rec, query );
ok( r == ERROR_SUCCESS, "Insert into Binary table failed: %d\n", r );
+ query = "INSERT INTO `Binary` ( `Name`, `ID`, `Data` ) VALUES ( 'filename1', 1, ? )";
+ r = run_query( hdb, rec, query );
+ ok( r == ERROR_FUNCTION_FAILED, "got %u\n", r );
+
r = MsiCloseHandle( rec );
ok( r == ERROR_SUCCESS , "Failed to close record handle\n" );
DeleteFileA(msifile);
}
-#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2k */
+#define MY_NVIEWS 4000 /* Largest installer I've seen uses < 2000 */
static void test_handle_limit(void)
{
int i;
r = MsiDatabaseApplyTransformA( hdb, mstfile, 0 );
ok( r == ERROR_SUCCESS, "return code %d, should be ERROR_SUCCESS\n", r );
- MsiDatabaseCommit( hdb );
+ r = MsiDatabaseCommit( hdb );
+ ok( r == ERROR_SUCCESS , "Failed to commit database\n" );
/* check new values */
hrec = 0;
size = MAX_PATH;
r = MsiRecordGetStringA(rec, 1, result, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(!lstrlenA(result), "Expected an empty string, got %s\n", result);
+ ok(!result[0], "Expected an empty string, got %s\n", result);
MsiCloseHandle(rec);
size = MAX_PATH;
r = MsiRecordGetStringA(rec, 1, result, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- ok(!lstrlenA(result), "Expected an empty string, got %s\n", result);
+ ok(!result[0], "Expected an empty string, got %s\n", result);
MsiCloseHandle(rec);
create_file_data("forcecodepage.idt", "\r\n\r\n9999\t_ForceCodepage\r\n", 0);
r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt");
- ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_SUCCESS, got %d\n", r);
+ ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r);
MsiCloseHandle(hdb);
DeleteFileA(msifile);
r = run_query(href, 0, query);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
- /* column sting types don't match exactly */
+ /* column string types don't match exactly */
r = MsiDatabaseMergeA(hdb, href, "MergeErrors");
ok(r == ERROR_SUCCESS,
"Expected ERROR_SUCCESS, got %d\n", r);
projects / reactos.git / blobdiff