October 2006 - Wine-Commits

Kai Blin : secur32: Add include guard to hmac_md5.h.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 344ce9e69b776aa63570fe03715526e83b1849f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344ce9e69b776aa63570fe037… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Oct 19 14:31:23 2006 +0200 secur32: Add include guard to hmac_md5.h. --- dlls/secur32/hmac_md5.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/hmac_md5.h b/dlls/secur32/hmac_md5.h index 81e4dd6..29e3a33 100644 --- a/dlls/secur32/hmac_md5.h +++ b/dlls/secur32/hmac_md5.h @@ -18,6 +18,9 @@ * This file holds the declarations needed for HMAC-MD5. */ +#ifndef _HMAC_MD5_H_ +#define _HMAC_MD5_H_ + #include <string.h> typedef struct @@ -41,3 +44,4 @@ void MD5Final( MD5_CTX *ctx ); void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len); void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len); void HMACMD5Final(HMAC_MD5_CTX *ctx, unsigned char *digest); +#endif /*_HMAC_MD5_H_*/

1 0

Christoph Frick : gdi32: Add wglShareList to gdi32.spec.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 85af727fd8891764d83cd4e444beb011966190a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85af727fd8891764d83cd4e44… Author: Christoph Frick <frick(a)sc-networks.de> Date: Fri Oct 20 09:46:31 2006 +0200 gdi32: Add wglShareList to gdi32.spec. --- dlls/gdi/gdi32.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index 06d8995..cf08bdf 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -503,6 +503,7 @@ # @ stdcall wglGetCurrentContext() @ stdcall wglGetCurrentDC() @ stdcall wglMakeCurrent(long long) +@ stdcall wglShareLists(long long) @ stdcall wglUseFontBitmapsA(long long long long) @ stdcall wglUseFontBitmapsW(long long long long)

1 0

James Hawkins : msi: Add tests for integer column types.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: fcd57a3fc4e8a2a0664ba280a4fc570009aa30ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd57a3fc4e8a2a0664ba280a… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 19 18:40:09 2006 -0700 msi: Add tests for integer column types. --- dlls/msi/tests/db.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7742d06..6b71abd 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2793,6 +2793,161 @@ static void test_alter(void) DeleteFile(msifile); } +static void test_integers(void) +{ + MSIHANDLE hdb = 0, view = 0, rec = 0; + DWORD count, i; + const char *query; + UINT r; + + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + /* create a table */ + query = "CREATE TABLE `integers` ( " + "`one` SHORT, `two` INT, `three` INTEGER, `four` LONG, " + "`five` SHORT NOT NULL, `six` INT NOT NULL, " + "`seven` INTEGER NOT NULL, `eight` LONG NOT NULL " + "PRIMARY KEY `one`)"; + todo_wine + { + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewClose(view); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + } + r = MsiCloseHandle(view); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `integers`"; + r = MsiDatabaseOpenView(hdb, query, &view); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + + r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + count = MsiRecordGetFieldCount(rec); + todo_wine + { + ok(count == 8, "Expected 8, got %d\n", count); + ok(check_record(rec, 1, "one"), "Expected one\n"); + ok(check_record(rec, 2, "two"), "Expected two\n"); + ok(check_record(rec, 3, "three"), "Expected three\n"); + ok(check_record(rec, 4, "four"), "Expected four\n"); + ok(check_record(rec, 5, "five"), "Expected five\n"); + ok(check_record(rec, 6, "six"), "Expected six\n"); + ok(check_record(rec, 7, "seven"), "Expected seven\n"); + ok(check_record(rec, 8, "eight"), "Expected eight\n"); + } + MsiCloseHandle(rec); + + r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + count = MsiRecordGetFieldCount(rec); + todo_wine + { + ok(count == 8, "Expected 8, got %d\n", count); + ok(check_record(rec, 1, "I2"), "Expected I2\n"); + ok(check_record(rec, 2, "I2"), "Expected I2\n"); + ok(check_record(rec, 3, "I2"), "Expected I2\n"); + ok(check_record(rec, 4, "I4"), "Expected I4\n"); + ok(check_record(rec, 5, "i2"), "Expected i2\n"); + ok(check_record(rec, 6, "i2"), "Expected i2\n"); + ok(check_record(rec, 7, "i2"), "Expected i2\n"); + ok(check_record(rec, 8, "i4"), "Expected i4\n"); + } + MsiCloseHandle(rec); + + MsiViewClose(view); + MsiCloseHandle(view); + + /* insert values into it, NULL where NOT NULL is specified */ + query = "INSERT INTO `integers` ( `one`, `two`, `three`, `four`, `five`, `six`, `seven`, `eight` )" + "VALUES('', '', '', '', '', '', '', '')"; + todo_wine + { + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); + } + + MsiViewClose(view); + MsiCloseHandle(view); + + query = "SELECT * FROM `integers`"; + r = do_query(hdb, query, &rec); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + } + + r = MsiRecordGetFieldCount(rec); + ok(r == -1, "record count wrong: %d\n", r); + + MsiCloseHandle(rec); + + /* insert legitimate values into it */ + query = "INSERT INTO `integers` ( `one`, `two`, `three`, `four`, `five`, `six`, `seven`, `eight` )" + "VALUES('', '2', '', '4', '5', '6', '7', '8')"; + todo_wine + { + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + + query = "SELECT * FROM `integers`"; + r = do_query(hdb, query, &rec); + todo_wine + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + } + + r = MsiRecordGetFieldCount(rec); + todo_wine + { + ok(r == 8, "record count wrong: %d\n", r); + } + + i = MsiRecordGetInteger(rec, 1); + ok(i == 0x80000000, "Expected 0x80000000, got %d\n", i); + i = MsiRecordGetInteger(rec, 3); + ok(i == 0x80000000, "Expected 0x80000000, got %d\n", i); + todo_wine + { + i = MsiRecordGetInteger(rec, 2); + ok(i == 2, "Expected 2, got %d\n", i); + i = MsiRecordGetInteger(rec, 4); + ok(i == 4, "Expected 4, got %d\n", i); + i = MsiRecordGetInteger(rec, 5); + ok(i == 5, "Expected 5, got %d\n", i); + i = MsiRecordGetInteger(rec, 6); + ok(i == 6, "Expected 6, got %d\n", i); + i = MsiRecordGetInteger(rec, 7); + ok(i == 7, "Expected 7, got %d\n", i); + i = MsiRecordGetInteger(rec, 8); + ok(i == 8, "Expected 8, got %d\n", i); + } + + MsiCloseHandle(rec); + MsiViewClose(view); + MsiCloseHandle(view); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); + + r = MsiCloseHandle(hdb); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + r = DeleteFile(msifile); + ok(r == TRUE, "file didn't exist after commit\n"); +} + START_TEST(db) { test_msidatabase(); @@ -2813,4 +2968,5 @@ START_TEST(db) test_join(); test_temporary_table(); test_alter(); + test_integers(); }

1 0

James Hawkins : msi: Integer columns can have the 'NOT NULL' modifier too.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 279f8158f8b96e992f18441822cbce24df855760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=279f8158f8b96e992f1844182… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 19 17:46:17 2006 -0700 msi: Integer columns can have the 'NOT NULL' modifier too. --- dlls/msi/database.c | 4 +++- dlls/msi/tests/db.c | 9 +++------ dlls/msi/tests/install.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b793863..c36139e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -388,7 +388,9 @@ static LPWSTR msi_build_createsql_column type = type_char; sprintfW(size, size_fmt, ptr); break; - case 'I': case 'i': + case 'i': + lstrcpyW(extra, type_notnull); + case 'I': if (len == 2) type = type_int; else diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9a39451..7742d06 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1433,17 +1433,14 @@ static void test_msiimport(void) count = MsiRecordGetFieldCount(rec); ok(count == 9, "Expected 9, got %d\n", count); ok(check_record(rec, 1, "s255"), "Expected s255\n"); + ok(check_record(rec, 2, "i2"), "Expected i2\n"); + ok(check_record(rec, 3, "i2"), "Expected i2\n"); ok(check_record(rec, 4, "I2"), "Expected I2\n"); + ok(check_record(rec, 5, "i4"), "Expected i4\n"); ok(check_record(rec, 6, "I4"), "Expected I4\n"); ok(check_record(rec, 7, "S255"), "Expected S255\n"); ok(check_record(rec, 8, "S0"), "Expected S0\n"); ok(check_record(rec, 9, "s0"), "Expected s0\n"); - todo_wine - { - ok(check_record(rec, 2, "i2"), "Expected i2\n"); - ok(check_record(rec, 3, "i2"), "Expected i2\n"); - ok(check_record(rec, 5, "i4"), "Expected i4\n"); - } MsiCloseHandle(rec); query = "SELECT * FROM `TestTable`"; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index fe856f7..f5a2eeb 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -764,13 +764,13 @@ static void test_packagecoltypes(void) count = MsiRecordGetFieldCount( rec ); ok(r == ERROR_SUCCESS, "MsiViewGetColumnInfo failed\n"); ok(count == 6, "Expected 6, got %d\n", count); + ok(check_record(rec, 1, "i2"), "wrong column label\n"); + ok(check_record(rec, 2, "i4"), "wrong column label\n"); ok(check_record(rec, 4, "S255"), "wrong column label\n"); ok(check_record(rec, 5, "S32"), "wrong column label\n"); ok(check_record(rec, 6, "S72"), "wrong column label\n"); todo_wine { - ok(check_record(rec, 1, "i2"), "wrong column label\n"); - ok(check_record(rec, 2, "i4"), "wrong column label\n"); ok(check_record(rec, 3, "L64"), "wrong column label\n"); }

1 0

James Hawkins : msi: Allow more than one primary key in a table when importing a database.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: a66584e1a26b4bc12ec0ae1befa87fdd67aa0b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66584e1a26b4bc12ec0ae1be… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 19 17:30:13 2006 -0700 msi: Allow more than one primary key in a table when importing a database. --- dlls/msi/database.c | 44 +++++++++++++++++++++++++++++++---------- dlls/msi/tests/db.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 11 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 266b467..b793863 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -409,23 +409,44 @@ static LPWSTR msi_build_createsql_column return columns; } -static LPWSTR msi_build_createsql_postlude(LPWSTR primary_key) +static LPWSTR msi_build_createsql_postlude(LPWSTR *primary_keys, DWORD num_keys) { - LPWSTR postlude; - DWORD size; + LPWSTR postlude, keys, ptr; + DWORD size, key_size, i; + + static const WCHAR key_fmt[] = {'`','%','s','`',',',' ',0}; + static const WCHAR postlude_fmt[] = {'P','R','I','M','A','R','Y',' ','K','E','Y',' ','%','s',')',' ','H','O','L','D',0}; + + for (i = 0, size = 1; i < num_keys; i++) + size += lstrlenW(key_fmt) + lstrlenW(primary_keys[i]) - 2; + + keys = msi_alloc(size * sizeof(WCHAR)); + if (!keys) + return NULL; + + for (i = 0, ptr = keys; i < num_keys; i++) + { + key_size = lstrlenW(key_fmt) + lstrlenW(primary_keys[i]) -2; + sprintfW(ptr, key_fmt, primary_keys[i]); + ptr += key_size; + } - static const WCHAR postlude_fmt[] = {'P','R','I','M','A','R','Y',' ','K','E','Y',' ','`','%','s','`',')',' ','H','O','L','D',0}; + /* remove final ', ' */ + *(ptr - 2) = '\0'; - size = sizeof(postlude_fmt) + lstrlenW(primary_key) - 2; + size = lstrlenW(postlude_fmt) + size - 1; postlude = msi_alloc(size * sizeof(WCHAR)); if (!postlude) - return NULL; + goto done; + + sprintfW(postlude, postlude_fmt, keys); - sprintfW(postlude, postlude_fmt, primary_key); +done: + msi_free(keys); return postlude; } -static UINT msi_add_table_to_db(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, LPWSTR *labels, DWORD num_columns) +static UINT msi_add_table_to_db(MSIDATABASE *db, LPWSTR *columns, LPWSTR *types, LPWSTR *labels, DWORD num_labels, DWORD num_columns) { UINT r; DWORD size; @@ -435,7 +456,7 @@ static UINT msi_add_table_to_db(MSIDATAB prelude = msi_build_createsql_prelude(labels[0]); columns_sql = msi_build_createsql_columns(columns, types, num_columns); - postlude = msi_build_createsql_postlude(labels[1]); + postlude = msi_build_createsql_postlude(labels + 1, num_labels - 1); /* skip over table name */ if (!prelude || !columns_sql || !postlude) return ERROR_OUTOFMEMORY; @@ -614,6 +635,7 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, { UINT r; DWORD len, i; + DWORD num_labels; DWORD num_columns, num_records = 0; LPWSTR *columns, *types, *labels; LPWSTR path, ptr, data; @@ -640,7 +662,7 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, ptr = data; msi_parse_line( &ptr, &columns, &num_columns ); msi_parse_line( &ptr, &types, NULL ); - msi_parse_line( &ptr, &labels, NULL ); + msi_parse_line( &ptr, &labels, &num_labels ); records = msi_alloc(sizeof(LPWSTR *)); if (!records) @@ -657,7 +679,7 @@ UINT MSI_DatabaseImport(MSIDATABASE *db, return ERROR_OUTOFMEMORY; } - r = msi_add_table_to_db( db, columns, types, labels, num_columns ); + r = msi_add_table_to_db( db, columns, types, labels, num_labels, num_columns ); if (r != ERROR_SUCCESS) goto done; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5f5da33..9a39451 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1365,6 +1365,12 @@ static const CHAR test_data[] = "FirstPr "TestTable\tFirstPrimaryColumn\n" "stringage\t5\t2\t\t2147483640\t-2147483640\tanother string\tlocalizable\tduh\n"; +static const CHAR two_primary[] = "PrimaryOne\tPrimaryTwo\n" + "s255\ts255\n" + "TwoPrimary\tPrimaryOne\tPrimaryTwo\n" + "papaya\tleaf\n" + "papaya\tflower\n"; + static void write_file(const CHAR *filename, const char *data, int data_size) { DWORD size; @@ -1402,6 +1408,9 @@ static void test_msiimport(void) r = add_table_to_db(hdb, test_data); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = add_table_to_db(hdb, two_primary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "SELECT * FROM `TestTable`"; r = MsiDatabaseOpenView(hdb, query, &view); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); @@ -1465,6 +1474,51 @@ static void test_msiimport(void) MsiCloseHandle(rec); MsiCloseHandle(view); + + query = "SELECT * FROM `TwoPrimary`"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewGetColumnInfo(view, MSICOLINFO_NAMES, &rec); + count = MsiRecordGetFieldCount(rec); + ok(count == 2, "Expected 2, got %d\n", count); + ok(check_record(rec, 1, "PrimaryOne"), "Expected PrimaryOne\n"); + ok(check_record(rec, 2, "PrimaryTwo"), "Expected PrimaryTwo\n"); + + MsiCloseHandle(rec); + + r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + count = MsiRecordGetFieldCount(rec); + ok(count == 2, "Expected 2, got %d\n", count); + ok(check_record(rec, 1, "s255"), "Expected s255\n"); + ok(check_record(rec, 2, "s255"), "Expected s255\n"); + + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + ok(check_record(rec, 1, "papaya"), "Expected 'papaya'\n"); + ok(check_record(rec, 2, "leaf"), "Expected 'leaf'\n"); + + MsiCloseHandle(rec); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + ok(check_record(rec, 1, "papaya"), "Expected 'papaya'\n"); + ok(check_record(rec, 2, "flower"), "Expected 'flower'\n"); + + MsiCloseHandle(rec); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(view); MsiCloseHandle(hdb); DeleteFileA(msifile); }

1 0

James Hawkins : tools/wine.inf: Add the ProgramFilesPath registry entry.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 463cec6af69a07adb59de376427bbb2079099293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463cec6af69a07adb59de3764… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Oct 18 16:23:45 2006 -0700 tools/wine.inf: Add the ProgramFilesPath registry entry. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index e784385..d539ea8 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -157,6 +157,7 @@ HKLM,%CurrentVersion%,"CommonFilesDir",, HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersion%,"ProgramFilesDir",,"%16422%" +HKLM,%CurrentVersion%,"ProgramFilesPath",0x20000,"%%ProgramFiles%%" HKLM,%CurrentVersion%,"RegisteredOrganization",2,"Change preferred organization in ~/.wine/system.reg" HKLM,%CurrentVersion%,"RegisteredOwner",2,"Change preferred owner in ~/.wine/system.reg" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600"

1 0

James Hawkins : msi: Only initialize a component' s state if it is linked with a feature.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 929395c0f0b7dbd1978adfea5079445228b6b7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929395c0f0b7dbd1978adfea5… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 19 15:51:33 2006 -0700 msi: Only initialize a component's state if it is linked with a feature. --- dlls/msi/action.c | 58 +++++++++++++++++++-------------------------- dlls/msi/tests/install.c | 11 +++++--- dlls/msi/tests/package.c | 35 +++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 37 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e81fcb7..8d79028 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1792,6 +1792,31 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *pa { component = cl->component; + switch (component->Attributes) + { + case msidbComponentAttributesLocalOnly: + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + break; + case msidbComponentAttributesSourceOnly: + component->Action = INSTALLSTATE_SOURCE; + component->ActionRequest = INSTALLSTATE_SOURCE; + break; + case msidbComponentAttributesOptional: + component->Action = INSTALLSTATE_DEFAULT; + component->ActionRequest = INSTALLSTATE_DEFAULT; + break; + default: + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + } + + if (component->ForceLocalState) + { + component->Action = INSTALLSTATE_LOCAL; + component->ActionRequest = INSTALLSTATE_LOCAL; + } + if (!component->Enabled) { component->Action = INSTALLSTATE_UNKNOWN; @@ -1907,33 +1932,6 @@ static UINT ITERATE_CostFinalizeConditio return ERROR_SUCCESS; } -static void load_all_component_states(MSIPACKAGE *package) -{ - MSICOMPONENT *comp; - - LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) - { - switch (comp->Attributes) - { - case msidbComponentAttributesLocalOnly: - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - break; - case msidbComponentAttributesSourceOnly: - comp->Action = INSTALLSTATE_SOURCE; - comp->ActionRequest = INSTALLSTATE_SOURCE; - break; - case msidbComponentAttributesOptional: - comp->Action = INSTALLSTATE_DEFAULT; - comp->ActionRequest = INSTALLSTATE_DEFAULT; - break; - default: - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - } - } -} - /* * A lot is done in this function aside from just the costing. * The costing needs to be implemented at some point but for now I am going @@ -1972,8 +1970,6 @@ static UINT ACTION_CostFinalize(MSIPACKA msiobj_release(&view->hdr); } - load_all_component_states(package); - TRACE("File calculations\n"); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) @@ -1985,11 +1981,7 @@ static UINT ACTION_CostFinalize(MSIPACKA continue; if (file->IsCompressed) - { comp->ForceLocalState = TRUE; - comp->Action = INSTALLSTATE_LOCAL; - comp->ActionRequest = INSTALLSTATE_LOCAL; - } /* calculate target */ p = resolve_folder(package, comp->Directory, FALSE, FALSE, NULL); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3696537..fe856f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -664,10 +664,7 @@ static void test_MsiInstallProduct(void) size = MAX_PATH; type = REG_SZ; res = RegQueryValueExA(hkey, "blah", NULL, &type, (LPBYTE)path, &size); - todo_wine - { - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); - } + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); size = sizeof(num); type = REG_DWORD; @@ -690,6 +687,7 @@ static void test_MsiInstallProduct(void) static void test_MsiSetComponentState(void) { + INSTALLSTATE installed, action; MSIHANDLE package; char path[MAX_PATH]; UINT r; @@ -714,6 +712,11 @@ static void test_MsiSetComponentState(vo r = MsiDoAction(package, "CostFinalize"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + r = MsiGetComponentState(package, "dangler", &installed, &action); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(installed == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", installed); + ok(action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + r = MsiSetComponentState(package, "dangler", INSTALLSTATE_SOURCE); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f507451..feac142 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1585,6 +1585,10 @@ static void test_states(void) r = add_component_entry( hdb, "'eta', '{DD89003F-0DD4-41B8-81C0-3411A7DA2695}', 'TARGETDIR', 1, '', 'eta_file'" ); ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + /* no feature parent:msidbComponentAttributesLocalOnly */ + r = add_component_entry( hdb, "'kappa', '{D6B93DC3-8DA5-4769-9888-42BFE156BB8B}', 'TARGETDIR', 1, '', 'kappa_file'" ); + ok( r == ERROR_SUCCESS, "cannot add component: %d\n", r ); + r = create_feature_components_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create FeatureComponents table: %d\n", r ); @@ -1652,6 +1656,9 @@ static void test_states(void) r = add_file_entry( hdb, "'eta_file', 'eta', 'eta.txt', 0, '', '1033', 16384, 1" ); ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + r = add_file_entry( hdb, "'kappa_file', 'kappa', 'kappa.txt', 0, '', '1033', 8192, 1" ); + ok( r == ERROR_SUCCESS, "cannot add file: %d\n", r); + hpkg = package_from_db( hdb ); ok( hpkg, "failed to create package\n"); @@ -1755,6 +1762,13 @@ static void test_states(void) ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_UNKNOWN_COMPONENT, "Expected ERROR_UNKNOWN_COMPONENT, got %d\n", r ); + ok( state == 0xdeadbee, "Expected 0xdeadbee, got %d\n", state); + ok( action == 0xdeadbee, "Expected 0xdeadbee, got %d\n", action); + r = MsiDoAction( hpkg, "CostInitialize"); ok( r == ERROR_SUCCESS, "cost init failed\n"); @@ -1856,6 +1870,13 @@ static void test_states(void) ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + r = MsiDoAction( hpkg, "FileCost"); ok( r == ERROR_SUCCESS, "file cost failed\n"); @@ -1957,6 +1978,13 @@ static void test_states(void) ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + r = MsiDoAction( hpkg, "CostFinalize"); ok( r == ERROR_SUCCESS, "cost finalize failed: %d\n", r); @@ -2057,6 +2085,13 @@ static void test_states(void) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + + state = 0xdeadbee; + action = 0xdeadbee; + r = MsiGetComponentState(hpkg, "kappa", &state, &action); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); MsiCloseHandle( hpkg ); DeleteFileA( msifile );

1 0

James Hawkins : msi: Use the ProgramFileDir reg value instead of ProgramFilesPath.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 7330a03200d7b91150a21ed6bdf41c64548cf2bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7330a03200d7b91150a21ed6b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Oct 19 15:50:35 2006 -0700 msi: Use the ProgramFileDir reg value instead of ProgramFilesPath. --- dlls/msi/tests/install.c | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0c43dee..3696537 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -465,7 +465,6 @@ static BOOL init_function_pointers(void) static BOOL get_program_files_dir(LPSTR buf) { HKEY hkey; - CHAR temp[MAX_PATH]; DWORD type = REG_EXPAND_SZ, size; if (RegOpenKey(HKEY_LOCAL_MACHINE, @@ -473,11 +472,9 @@ static BOOL get_program_files_dir(LPSTR return FALSE; size = MAX_PATH; - if (RegQueryValueEx(hkey, "ProgramFilesPath", 0, &type, (LPBYTE)temp, &size)) + if (RegQueryValueEx(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) return FALSE; - ExpandEnvironmentStrings(temp, buf, MAX_PATH); - RegCloseKey(hkey); return TRUE; } @@ -642,21 +639,18 @@ static void test_MsiInstallProduct(void) r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { - ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); - ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); - ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); - ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); - ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); - } + ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\new", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\cabout", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\changed", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\first", FALSE), "File not installed\n"); + ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Detlef Riekenberg : localspl: Implement InitializePrintMonitor.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: 1f766011ca0e5714082e27296513c9a3c70bf437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f766011ca0e5714082e27296… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Oct 19 23:48:29 2006 +0200 localspl: Implement InitializePrintMonitor. --- dlls/localspl/localmon.c | 19 +++++++++++++------ dlls/localspl/localspl_main.c | 1 - 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 6665585..1af54c5 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -34,7 +34,6 @@ #include "winnls.h" #include "winspool.h" #include "ddk/winsplp.h" -#include "wine/unicode.h" #include "wine/debug.h" @@ -53,18 +52,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(localspl); * Failure: NULL * * NOTES - * Native localspl.dll fails, when the Section "Ports" is missing in "win.ini". + * The fixed location "HKLM\Software\Microsoft\Windows NT\CurrentVersion\Ports" + * is used to store the Ports (IniFileMapping from "win.ini", Section "Ports"). + * Native localspl.dll fails, when no valid Port-Entry is present. * */ LPMONITOREX WINAPI InitializePrintMonitor(LPWSTR regroot) { - FIXME("(%s) stub\n", debugstr_w(regroot)); + static MONITOREX mymonitorex = + { + sizeof(MONITOREX) - sizeof(DWORD) + }; + + TRACE("(%s)\n", debugstr_w(regroot)); + /* Parameter "regroot" is ignored on NT4.0 (localmon.dll) */ if (!regroot || !regroot[0]) { SetLastError(ERROR_INVALID_PARAMETER); return NULL; } - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; + TRACE("=> %p\n", &mymonitorex); + /* Native windows returns always the same pointer on success */ + return &mymonitorex; } diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index b1de446..b9ce877 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -34,7 +34,6 @@ #include "winnls.h" #include "winspool.h" #include "ddk/winsplp.h" -#include "wine/unicode.h" #include "wine/debug.h"

1 0

Detlef Riekenberg : localspl/tests: Get function pointers from the monitor.
by Alexandre Julliard Oct. 20, 2006

Oct. 20, 2006

Module: wine Branch: master Commit: c4b67816159201e26770790ff015465ff66c1723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b67816159201e26770790ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 20 00:12:35 2006 +0200 localspl/tests: Get function pointers from the monitor. --- dlls/localspl/tests/localmon.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index 60d07b7..ca5ee97 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -39,6 +39,23 @@ static HMODULE hdll; static LPMONITOREX (WINAPI *pInitializePrintMonitor)(LPWSTR); static LPMONITOREX pm; +static BOOL (WINAPI *pEnumPorts)(LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); +static BOOL (WINAPI *pOpenPort)(LPWSTR, PHANDLE); +static BOOL (WINAPI *pOpenPortEx)(LPWSTR, LPWSTR, PHANDLE, struct _MONITOR *); +static BOOL (WINAPI *pStartDocPort)(HANDLE, LPWSTR, DWORD, DWORD, LPBYTE); +static BOOL (WINAPI *pWritePort)(HANDLE hPort, LPBYTE, DWORD, LPDWORD); +static BOOL (WINAPI *pReadPort)(HANDLE hPort, LPBYTE, DWORD, LPDWORD); +static BOOL (WINAPI *pEndDocPort)(HANDLE); +static BOOL (WINAPI *pClosePort)(HANDLE); +static BOOL (WINAPI *pAddPort)(LPWSTR, HWND, LPWSTR); +static BOOL (WINAPI *pAddPortEx)(LPWSTR, DWORD, LPBYTE, LPWSTR); +static BOOL (WINAPI *pConfigurePort)(LPWSTR, HWND, LPWSTR); +static BOOL (WINAPI *pDeletePort)(LPWSTR, HWND, LPWSTR); +static BOOL (WINAPI *pGetPrinterDataFromPort)(HANDLE, DWORD, LPWSTR, LPWSTR, DWORD, LPWSTR, DWORD, LPDWORD); +static BOOL (WINAPI *pSetPortTimeOuts)(HANDLE, LPCOMMTIMEOUTS, DWORD); +static BOOL (WINAPI *pXcvOpenPort)(HANDLE, LPCWSTR, ACCESS_MASK, PHANDLE phXcv); +static DWORD (WINAPI *pXcvDataPort)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD); +static BOOL (WINAPI *pXcvClosePort)(HANDLE); static WCHAR emptyW[] = {0}; static WCHAR Monitors_LocalPortW[] = { \ @@ -74,6 +91,14 @@ static void test_InitializePrintMonitor( "returned %p with %d (expected %p)\n", res, GetLastError(), pm); } +/* ########################### */ + +#define GET_MONITOR_FUNC(name) \ + if(numentries > 0) { \ + numentries--; \ + p##name = (void *) pm->Monitor.pfn##name ; \ + } + START_TEST(localmon) { @@ -89,5 +114,30 @@ START_TEST(localmon) b) upto w2k: Section "Ports" in win.ini or InitializePrintMonitor fails. */ pm = pInitializePrintMonitor(Monitors_LocalPortW); + if (pm) { + DWORD numentries; + numentries = (pm->dwMonitorSize ) / sizeof(VOID *); + /* NT4: 14, since w2k: 17 */ + ok( numentries == 14 || numentries == 17, + "dwMonitorSize (%d) => %d Functions\n", pm->dwMonitorSize, numentries); + + GET_MONITOR_FUNC(EnumPorts); + GET_MONITOR_FUNC(OpenPort); + GET_MONITOR_FUNC(OpenPortEx); + GET_MONITOR_FUNC(StartDocPort); + GET_MONITOR_FUNC(WritePort); + GET_MONITOR_FUNC(ReadPort); + GET_MONITOR_FUNC(EndDocPort); + GET_MONITOR_FUNC(ClosePort); + GET_MONITOR_FUNC(AddPort); + GET_MONITOR_FUNC(AddPortEx); + GET_MONITOR_FUNC(ConfigurePort); + GET_MONITOR_FUNC(DeletePort); + GET_MONITOR_FUNC(GetPrinterDataFromPort); + GET_MONITOR_FUNC(SetPortTimeOuts); + GET_MONITOR_FUNC(XcvOpenPort); + GET_MONITOR_FUNC(XcvDataPort); + GET_MONITOR_FUNC(XcvClosePort); + } test_InitializePrintMonitor(); }

1 0