August 2006 - Wine-commits - list.winehq.org

James Hawkins : msi: Add tests for the AppSearch action.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 80740e72e7410a7560644fa83b8af3c20802441d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80740e72e7410a7560644fa… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 21 17:33:49 2006 -0700 msi: Add tests for the AppSearch action. --- dlls/msi/tests/package.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 133 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 01e6eaa..7856a62 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -110,6 +110,43 @@ static UINT create_remove_file_table( MS "PRIMARY KEY `FileKey`)" ); } +static UINT create_appsearch_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `AppSearch` (" + "`Property` CHAR(72) NOT NULL, " + "`Signature_` CHAR(72) NOT NULL " + "PRIMARY KEY `Property`, `Signature_`)" ); +} + +static UINT create_reglocator_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `RegLocator` (" + "`Signature_` CHAR(72) NOT NULL, " + "`Root` SHORT NOT NULL, " + "`Key` CHAR(255) NOT NULL, " + "`Name` CHAR(255), " + "`Type` SHORT " + "PRIMARY KEY `Signature_`)" ); +} + +static UINT create_signature_table( MSIHANDLE hdb ) +{ + return run_query( hdb, + "CREATE TABLE `Signature` (" + "`Signature` CHAR(72) NOT NULL, " + "`FileName` CHAR(255) NOT NULL, " + "`MinVersion` CHAR(20), " + "`MaxVersion` CHAR(20), " + "`MinSize` LONG, " + "`MaxSize` LONG, " + "`MinDate` LONG, " + "`MaxDate` LONG, " + "`Languages` CHAR(255) " + "PRIMARY KEY `Signature`)" ); +} + static UINT add_component_entry( MSIHANDLE hdb, const char *values ) { char insert[] = "INSERT INTO `Component` " @@ -173,6 +210,55 @@ static UINT add_file_entry( MSIHANDLE hd return r; } +static UINT add_appsearch_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `AppSearch` " + "(`Property`, `Signature_`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + +static UINT add_reglocator_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `RegLocator` " + "(`Signature_`, `Root`, `Key`, `Name`, `Type`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + +static UINT add_signature_entry( MSIHANDLE hdb, const char *values ) +{ + char insert[] = "INSERT INTO `Signature` " + "(`Signature`, `FileName`, `MinVersion`, `MaxVersion`," + " `MinSize`, `MaxSize`, `MinDate`, `MaxDate`, `Languages`) " + "VALUES( %s )"; + char *query; + UINT sz, r; + + sz = strlen(values) + sizeof insert; + query = HeapAlloc(GetProcessHeap(),0,sz); + sprintf(query,insert,values); + r = run_query( hdb, query ); + HeapFree(GetProcessHeap(), 0, query); + return r; +} + static UINT set_summary_info(MSIHANDLE hdb) { UINT res; @@ -2178,6 +2264,52 @@ static void test_removefiles(void) DeleteFileA(msifile); } +static void test_appsearch(void) +{ + MSIHANDLE hpkg; + UINT r; + MSIHANDLE hdb; + CHAR prop[MAX_PATH]; + DWORD size = MAX_PATH; + + hdb = create_package_db(); + ok ( hdb, "failed to create package database\n" ); + + r = create_appsearch_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create AppSearch table: %d\n", r ); + + r = add_appsearch_entry( hdb, "'WEBBROWSERPROG', 'NewSignature1'" ); + ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + + r = create_reglocator_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + + r = add_reglocator_entry( hdb, "'NewSignature1', 0, 'htmlfile\\shell\\open\\command', '', 1" ); + ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + + r = create_signature_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create Signature table: %d\n", r ); + + r = add_signature_entry( hdb, "'NewSignature1', 'FileName', '', '', '', '', '', '', ''" ); + ok( r == ERROR_SUCCESS, "cannot create Signature table: %d\n", r ); + + hpkg = package_from_db( hdb ); + ok( hpkg, "failed to create package\n"); + + r = MsiDoAction( hpkg, "AppSearch" ); + ok( r == ERROR_SUCCESS, "AppSearch failed: %d\n", r); + + r = MsiGetPropertyA( hpkg, "WEBBROWSERPROG", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + todo_wine + { + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + } + + MsiCloseHandle( hpkg ); + DeleteFileA(msifile); +} + START_TEST(package) { test_createpackage(); @@ -2193,4 +2325,5 @@ START_TEST(package) test_states(); test_getproperty(); test_removefiles(); + test_appsearch(); }

1 0

Paul Vriens : crypt32: Print parameters and add some documentation.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: a96ef0bac881c21786957d4abbde3baa84bf00e9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a96ef0bac881c21786957d4… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Aug 21 16:16:06 2006 +0200 crypt32: Print parameters and add some documentation. --- dlls/crypt32/main.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 9b94adf..3e6b0e5 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -206,17 +206,51 @@ #undef CRYPT_SIPADDPROV return TRUE; } +/*********************************************************************** + * CryptSIPRetrieveSubjectGuid (CRYPT32.@) + * + * Determine the right SIP GUID for the given file. + * + * PARAMS + * FileName [I] Filename. + * hFileIn [I] Optional handle to the file. + * pgSubject [O] The SIP's GUID. + * + * RETURNS + * Success: TRUE. pgSubject contains the SIP GUID. + * Failure: FALSE. (Look at GetLastError()). + * + */ BOOL WINAPI CryptSIPRetrieveSubjectGuid (LPCWSTR FileName, HANDLE hFileIn, GUID *pgSubject) { - FIXME("stub!\n"); + FIXME("(%s %p %p) stub!\n", wine_dbgstr_w(FileName), hFileIn, pgSubject); return FALSE; } +/*********************************************************************** + * CryptSIPLoad (CRYPT32.@) + * + * Load the functions for the given SIP. + * + * PARAMS + * pgSubject [I] The GUID. + * dwFlags [I] Flags. + * pSipDispatch [I] The loaded functions. + * + * RETURNS + * Success: TRUE. pSipDispatch contains the functions. + * Failure: FALSE. (Look at GetLastError()). + * + * NOTES + * Testing shows that (somehow) the table of functions is cached between + * calls. + * + */ BOOL WINAPI CryptSIPLoad (const GUID *pgSubject, DWORD dwFlags, SIP_DISPATCH_INFO *pSipDispatch) { - FIXME("stub!\n"); + FIXME("(%s %ld %p) stub!\n", debugstr_guid(pgSubject), dwFlags, pSipDispatch); return FALSE; }

1 0

James Hawkins : msi: Add handling for MsiEvaluateCondition' s substring operators.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 6a520c0b6d6eb92c92f8172e58f41e01d7c59032 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a520c0b6d6eb92c92f8172… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 21 16:27:38 2006 -0700 msi: Add handling for MsiEvaluateCondition's substring operators. --- dlls/msi/cond.y | 67 ++++++++++++++++++++++++++++++++++------- dlls/msi/tests/package.c | 75 +++++++++------------------------------------- 2 files changed, 70 insertions(+), 72 deletions(-) diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y index 6226e29..fda2c69 100644 --- a/dlls/msi/cond.y +++ b/dlls/msi/cond.y @@ -396,8 +396,61 @@ static WCHAR *strstriW( const WCHAR *str return r; } +static BOOL str_is_number( LPCWSTR str ) +{ + int i; + + for (i = 0; i < lstrlenW( str ); i++) + if (!isdigitW(str[i])) + return FALSE; + + return TRUE; +} + +static INT compare_substring( LPCWSTR a, INT operator, LPCWSTR b ) +{ + int lhs, rhs; + + /* substring operators return 0 if LHS is missing */ + if (!a || !*a) + return 0; + + /* substring operators return 1 if RHS is missing */ + if (!b || !*b) + return 1; + + /* if both strings contain only numbers, use integer comparison */ + lhs = atoiW(a); + rhs = atoiW(b); + if (str_is_number(a) && str_is_number(b)) + return compare_int( lhs, operator, rhs ); + + switch (operator) + { + case COND_SS: + return strstrW( a, b ) ? 1 : 0; + case COND_ISS: + return strstriW( a, b ) ? 1 : 0; + case COND_LHS: + return 0 == strncmpW( a, b, lstrlenW( b ) ); + case COND_RHS: + return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + case COND_ILHS: + return 0 == strncmpiW( a, b, lstrlenW( b ) ); + case COND_IRHS: + return 0 == lstrcmpiW( a + (lstrlenW( a ) - lstrlenW( b )), b ); + default: + ERR("invalid substring operator\n"); + return 0; + } + return 0; +} + static INT compare_string( LPCWSTR a, INT operator, LPCWSTR b ) { + if (operator >= COND_SS && operator <= COND_RHS) + return compare_substring( a, operator, b ); + /* null and empty string are equivalent */ if (!a) a = szEmpty; if (!b) b = szEmpty; @@ -417,8 +470,6 @@ static INT compare_string( LPCWSTR a, IN return -1 != lstrcmpW( a, b ); case COND_LE: return 1 != lstrcmpW( a, b ); - case COND_SS: /* substring */ - return strstrW( a, b ) ? 1 : 0; case COND_ILT: return -1 == lstrcmpiW( a, b ); case COND_IGT: @@ -431,16 +482,8 @@ static INT compare_string( LPCWSTR a, IN return -1 != lstrcmpiW( a, b ); case COND_ILE: return 1 != lstrcmpiW( a, b ); - case COND_ISS: - return strstriW( a, b ) ? 1 : 0; - case COND_LHS: - case COND_RHS: - case COND_ILHS: - case COND_IRHS: - ERR("unimplemented string comparison\n"); - break; default: - ERR("invalid integer operator\n"); + ERR("invalid string operator\n"); return 0; } return 0; @@ -508,10 +551,10 @@ static int COND_GetOperator( COND_input { {'>','=',0}, COND_GE }, { {'>','<',0}, COND_SS }, { {'<','<',0}, COND_LHS }, - { {'>',0}, COND_GT }, { {'<','>',0}, COND_NE }, { {'<','=',0}, COND_LE }, { {'>','>',0}, COND_RHS }, + { {'>',0}, COND_GT }, { {'<',0}, COND_LT }, { {0}, 0 } }; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a2d5459..01e6eaa 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1043,10 +1043,7 @@ static void test_condition(void) MsiSetProperty(hpkg, "one", "1234"); MsiSetProperty(hpkg, "two", "1"); r = MsiEvaluateCondition(hpkg, "one >< two"); - todo_wine - { - ok( r == MSICONDITION_FALSE, "wrong return val\n"); - } + ok( r == MSICONDITION_FALSE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "one 1234"); MsiSetProperty(hpkg, "two", "1"); @@ -1056,10 +1053,7 @@ static void test_condition(void) MsiSetProperty(hpkg, "one", "hithere"); MsiSetProperty(hpkg, "two", "hi"); r = MsiEvaluateCondition(hpkg, "one << two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "hi"); MsiSetProperty(hpkg, "two", "hithere"); @@ -1069,10 +1063,7 @@ static void test_condition(void) MsiSetProperty(hpkg, "one", "hi"); MsiSetProperty(hpkg, "two", "hi"); r = MsiEvaluateCondition(hpkg, "one << two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "abcdhithere"); MsiSetProperty(hpkg, "two", "hi"); @@ -1087,10 +1078,7 @@ static void test_condition(void) MsiSetProperty(hpkg, "one", "hithere"); MsiSetProperty(hpkg, "two", ""); r = MsiEvaluateCondition(hpkg, "one << two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiSetProperty(hpkg, "one", ""); MsiSetProperty(hpkg, "two", ""); @@ -1105,90 +1093,57 @@ static void test_condition(void) MsiSetProperty(hpkg, "one", "1234 one"); MsiSetProperty(hpkg, "two", "1"); r = MsiEvaluateCondition(hpkg, "one << two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "hithere"); MsiSetProperty(hpkg, "two", "there"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "hithere"); MsiSetProperty(hpkg, "two", "hi"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_FALSE, "wrong return val\n"); - } + ok( r == MSICONDITION_FALSE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "there"); MsiSetProperty(hpkg, "two", "hithere"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_FALSE, "wrong return val\n"); - } + ok( r == MSICONDITION_FALSE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "there"); MsiSetProperty(hpkg, "two", "there"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "abcdhithere"); MsiSetProperty(hpkg, "two", "hi"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_FALSE, "wrong return val\n"); - } + ok( r == MSICONDITION_FALSE, "wrong return val\n"); MsiSetProperty(hpkg, "one", ""); MsiSetProperty(hpkg, "two", "there"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_FALSE, "wrong return val\n"); - } + ok( r == MSICONDITION_FALSE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "there"); MsiSetProperty(hpkg, "two", ""); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiSetProperty(hpkg, "one", ""); MsiSetProperty(hpkg, "two", ""); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_FALSE, "wrong return val\n"); - } + ok( r == MSICONDITION_FALSE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "1234"); MsiSetProperty(hpkg, "two", "4"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_FALSE, "wrong return val\n"); - } + ok( r == MSICONDITION_FALSE, "wrong return val\n"); MsiSetProperty(hpkg, "one", "one 1234"); MsiSetProperty(hpkg, "two", "4"); r = MsiEvaluateCondition(hpkg, "one >> two"); - todo_wine - { - ok( r == MSICONDITION_TRUE, "wrong return val\n"); - } + ok( r == MSICONDITION_TRUE, "wrong return val\n"); MsiCloseHandle( hpkg ); DeleteFile(msifile);

1 0

James Hawkins : msi: Add tests for MsiEvaluateCondition' s substring operators.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 762a13eb348010b140f3c779e0a0147dd87fd979 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=762a13eb348010b140f3c77… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Aug 21 16:27:17 2006 -0700 msi: Add tests for MsiEvaluateCondition's substring operators. --- dlls/msi/tests/package.c | 185 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 185 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 7aca319..a2d5459 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1005,6 +1005,191 @@ static void test_condition(void) r = MsiEvaluateCondition(hpkg, "bandalmael<>0"); ok( r == MSICONDITION_TRUE, "wrong return val\n"); + MsiSetProperty(hpkg, "one", "hi"); + MsiSetProperty(hpkg, "two", "hithere"); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "hithere"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "hello"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "hellohithere"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", ""); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "hi"); + MsiSetProperty(hpkg, "two", ""); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", ""); + MsiSetProperty(hpkg, "two", ""); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "1234"); + MsiSetProperty(hpkg, "two", "1"); + r = MsiEvaluateCondition(hpkg, "one >< two"); + todo_wine + { + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "one 1234"); + MsiSetProperty(hpkg, "two", "1"); + r = MsiEvaluateCondition(hpkg, "one >< two"); + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "hithere"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one << two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "hi"); + MsiSetProperty(hpkg, "two", "hithere"); + r = MsiEvaluateCondition(hpkg, "one << two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "hi"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one << two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "abcdhithere"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one << two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", ""); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one << two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "hithere"); + MsiSetProperty(hpkg, "two", ""); + r = MsiEvaluateCondition(hpkg, "one << two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", ""); + MsiSetProperty(hpkg, "two", ""); + r = MsiEvaluateCondition(hpkg, "one << two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "1234"); + MsiSetProperty(hpkg, "two", "1"); + r = MsiEvaluateCondition(hpkg, "one << two"); + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + + MsiSetProperty(hpkg, "one", "1234 one"); + MsiSetProperty(hpkg, "two", "1"); + r = MsiEvaluateCondition(hpkg, "one << two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "hithere"); + MsiSetProperty(hpkg, "two", "there"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "hithere"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "there"); + MsiSetProperty(hpkg, "two", "hithere"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "there"); + MsiSetProperty(hpkg, "two", "there"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "abcdhithere"); + MsiSetProperty(hpkg, "two", "hi"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", ""); + MsiSetProperty(hpkg, "two", "there"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "there"); + MsiSetProperty(hpkg, "two", ""); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", ""); + MsiSetProperty(hpkg, "two", ""); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "1234"); + MsiSetProperty(hpkg, "two", "4"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_FALSE, "wrong return val\n"); + } + + MsiSetProperty(hpkg, "one", "one 1234"); + MsiSetProperty(hpkg, "two", "4"); + r = MsiEvaluateCondition(hpkg, "one >> two"); + todo_wine + { + ok( r == MSICONDITION_TRUE, "wrong return val\n"); + } + MsiCloseHandle( hpkg ); DeleteFile(msifile); }

1 0

Mike McCormack : itss: Simplify the class factory.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 73137390b042cd652426089b7ecb7863b379ca8e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73137390b042cd652426089… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Aug 22 17:17:23 2006 +0900 itss: Simplify the class factory. --- dlls/itss/itss.c | 83 +++++++++++++----------------------------------------- 1 files changed, 20 insertions(+), 63 deletions(-) diff --git a/dlls/itss/itss.c b/dlls/itss/itss.c index b4b2a5e..6bc312e 100644 --- a/dlls/itss/itss.c +++ b/dlls/itss/itss.c @@ -67,32 +67,17 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, * ITSS ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - - LONG ref; + const IClassFactoryVtbl *lpVtbl; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; -struct object_creation_info -{ - const CLSID *clsid; - LPCSTR szClassName; - HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); -}; - -static const struct object_creation_info object_creation[] = -{ - { &CLSID_ITStorage, "ITStorage", ITSS_create }, - { &CLSID_ITSProtocol, "ITSProtocol", ITS_IParseDisplayName_create }, -}; - static HRESULT WINAPI ITSSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IClassFactory)) + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); *ppobj = This; @@ -105,22 +90,14 @@ ITSSCF_QueryInterface(LPCLASSFACTORY ifa static ULONG WINAPI ITSSCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - return InterlockedIncrement(&This->ref); + InterlockedIncrement(&dll_count); + return 2; } static ULONG WINAPI ITSSCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - - ULONG ref = InterlockedDecrement(&This->ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); - } - - return ref; + InterlockedDecrement(&dll_count); + return 1; } @@ -130,8 +107,8 @@ static HRESULT WINAPI ITSSCF_CreateInsta IClassFactoryImpl *This = (IClassFactoryImpl *)iface; HRESULT hres; LPUNKNOWN punk; - - TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); + + TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); *ppobj = NULL; hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); @@ -146,7 +123,7 @@ static HRESULT WINAPI ITSSCF_LockServer( { TRACE("(%p)->(%d)\n", iface, dolock); - if(dolock) + if (dolock) InterlockedIncrement(&dll_count); else InterlockedDecrement(&dll_count); @@ -163,49 +140,29 @@ static const IClassFactoryVtbl ITSSCF_Vt ITSSCF_LockServer }; +static const IClassFactoryImpl ITStorage_factory = { &ITSSCF_Vtbl, ITSS_create }; +static const IClassFactoryImpl ITSProtocol_factory = { &ITSSCF_Vtbl, ITS_IParseDisplayName_create }; /*********************************************************************** * DllGetClassObject (ITSS.@) */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - DWORD i; - IClassFactoryImpl *factory; - - TRACE("%s %s %p\n",debugstr_guid(rclsid), debugstr_guid(iid), ppv); - - if ( !IsEqualGUID( &IID_IClassFactory, iid ) - && ! IsEqualGUID( &IID_IUnknown, iid) ) - return E_NOINTERFACE; + const IClassFactoryImpl *factory; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) - { - if (IsEqualGUID(object_creation[i].clsid, rclsid)) - break; - } + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (IsEqualGUID(&CLSID_ITStorage, rclsid)) + factory = &ITStorage_factory; + else if (IsEqualGUID(&CLSID_ITSProtocol, rclsid)) + factory = &ITSProtocol_factory; + else { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; } - TRACE("Creating a class factory for %s\n",object_creation[i].szClassName); - - factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); - if (factory == NULL) return E_OUTOFMEMORY; - - factory->ITF_IClassFactory.lpVtbl = &ITSSCF_Vtbl; - factory->ref = 1; - - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - - *ppv = &(factory->ITF_IClassFactory); - InterlockedIncrement(&dll_count); - - TRACE("(%p) <- %p\n", ppv, &(factory->ITF_IClassFactory) ); - - return S_OK; + return IUnknown_QueryInterface( (IUnknown*) factory, iid, ppv ); } /*****************************************************************************/

1 0

Kai Blin : kernel: Set last error in CreateIoCompletionPort.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 86de27bad6c0ba0c3804a8365c0b2592206e2970 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86de27bad6c0ba0c3804a83… Author: Kai Blin <kai.blin(a)gmail.com> Date: Tue Aug 22 09:14:05 2006 +0200 kernel: Set last error in CreateIoCompletionPort. --- dlls/kernel/sync.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index 556cdea..16b0ed5 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -1831,6 +1831,7 @@ HANDLE WINAPI CreateIoCompletionPort(HAN { FIXME("(%p, %p, %08lx, %08lx): stub.\n", hFileHandle, hExistingCompletionPort, CompletionKey, dwNumberOfConcurrentThreads); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return NULL; }

1 0

Mikołaj Zalewski : shlwapi: Format the kilobyte file size number using locale settings.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: c18b0b7bd3b139049a4cceed2456d76348cd0de7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c18b0b7bd3b139049a4ccee… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Aug 21 23:40:36 2006 +0200 shlwapi: Format the kilobyte file size number using locale settings. The code is quite complex but I haven't found any easier way to do it (passing NULL as NUMBERFMT results in two decimal places being appended). --- dlls/shlwapi/string.c | 104 ++++++++++++++++++++++++++++++++++--------------- 1 files changed, 72 insertions(+), 32 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index aafddd0..34ab520 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -65,6 +65,63 @@ static fnpConvertINetUnicodeToMultiByte static HRESULT WINAPI _SHStrDupAA(LPCSTR,LPSTR*); static HRESULT WINAPI _SHStrDupAW(LPCWSTR,LPSTR*); + +/************************************************************************* + * FormatInt [internal] + * + * Format an integer according to the current locale + * + * RETURNS + * The number of bytes written on success or 0 on failure + */ +static int FormatInt(LONGLONG qdwValue, LPWSTR pszBuf, int cchBuf) +{ + NUMBERFMTW fmt; + WCHAR decimal[8], thousand[8]; + WCHAR grouping[64]; + WCHAR buf[24]; + WCHAR *c; + BOOL neg = (qdwValue < 0); + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt.LeadingZero, sizeof(fmt.LeadingZero)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_INEGNUMBER|LOCALE_RETURN_NUMBER, (LPWSTR)&fmt.LeadingZero, sizeof(fmt.NegativeOrder)/sizeof(WCHAR)); + fmt.NumDigits = 0; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, sizeof(decimal)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousand, sizeof(thousand)/sizeof(WCHAR)); + fmt.lpThousandSep = thousand; + fmt.lpDecimalSep = decimal; + + /* + * Converting grouping string to number as described on + * http://blogs.msdn.com/oldnewthing/archive/2006/04/18/578251.aspx + */ + fmt.Grouping = 0; + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, sizeof(grouping)/sizeof(WCHAR)); + for (c = grouping; *c; c++) + if (*c >= '0' && *c < '9') + { + fmt.Grouping *= 10; + fmt.Grouping += *c - '0'; + } + + if (fmt.Grouping % 10 == 0) + fmt.Grouping /= 10; + else + fmt.Grouping *= 10; + + c = &buf[24]; + *(--c) = 0; + do + { + *(--c) = '0' + (qdwValue%10); + qdwValue /= 10; + } while (qdwValue > 0); + if (neg) + *(--c) = '-'; + + return GetNumberFormatW(LOCALE_USER_DEFAULT, 0, c, &fmt, pszBuf, cchBuf); +} + /************************************************************************* * SHLWAPI_ChrCmpHelperA * @@ -1563,24 +1620,12 @@ HRESULT WINAPI StrRetToBSTR(STRRET *lpSt */ LPSTR WINAPI StrFormatKBSizeA(LONGLONG llBytes, LPSTR lpszDest, UINT cchMax) { - char szBuff[256], *szOut = szBuff + sizeof(szBuff) - 1; - LONGLONG ulKB = (llBytes + 1023) >> 10; - - TRACE("(0x%s,%p,%d)\n", wine_dbgstr_longlong(llBytes), lpszDest, cchMax); - - *szOut-- = '\0'; - *szOut-- = 'B'; - *szOut-- = 'K'; - *szOut-- = ' '; - - do - { - LONGLONG ulNextDigit = ulKB % 10; - *szOut-- = '0' + ulNextDigit; - ulKB = (ulKB - ulNextDigit) / 10; - } while (ulKB > 0); - - lstrcpynA(lpszDest, szOut + 1, cchMax); + WCHAR wszBuf[256]; + + if (!StrFormatKBSizeW(llBytes, wszBuf, 256)) + return NULL; + if (!WideCharToMultiByte(CP_ACP, 0, wszBuf, -1, lpszDest, cchMax, NULL, NULL)) + return NULL; return lpszDest; } @@ -1591,24 +1636,19 @@ LPSTR WINAPI StrFormatKBSizeA(LONGLONG l */ LPWSTR WINAPI StrFormatKBSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax) { - WCHAR szBuff[256], *szOut = szBuff + sizeof(szBuff)/sizeof(WCHAR) - 1; - LONGLONG ulKB = (llBytes + 1023) >> 10; + static const WCHAR kb[] = {' ','K','B',0}; + LONGLONG llKB = (llBytes + 1023) >> 10; + int len; TRACE("(0x%s,%p,%d)\n", wine_dbgstr_longlong(llBytes), lpszDest, cchMax); - *szOut-- = '\0'; - *szOut-- = 'B'; - *szOut-- = 'K'; - *szOut-- = ' '; - - do - { - LONGLONG ulNextDigit = ulKB % 10; - *szOut-- = '0' + ulNextDigit; - ulKB = (ulKB - ulNextDigit) / 10; - } while (ulKB > 0); + if (!FormatInt(llKB, lpszDest, cchMax)) + return NULL; - lstrcpynW(lpszDest, szOut + 1, cchMax); + len = lstrlenW(lpszDest); + if (cchMax - len < 4) + return NULL; + lstrcatW(lpszDest, kb); return lpszDest; }

1 0

Mikołaj Zalewski : shell32: Show file size in the details view in kilobytes.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 6cc378cc67ed0e4b30a4b354353bdb0e74e96831 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6cc378cc67ed0e4b30a4b35… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Aug 21 23:30:48 2006 +0200 shell32: Show file size in the details view in kilobytes. --- dlls/shell32/pidl.c | 2 +- dlls/shell32/recyclebin.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index c849643..e7d591f 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2082,7 +2082,7 @@ DWORD _ILGetFileSize (LPCITEMIDLIST pidl case PT_VALUE: dwSize = pdata->u.file.dwFileSize; if (pOut) - StrFormatByteSizeA(dwSize, pOut, uOutSize); + StrFormatKBSizeA(dwSize, pOut, uOutSize); return dwSize; } if (pOut) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 9270e92..1582dee 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -424,7 +424,7 @@ static HRESULT WINAPI RecycleBin_GetDeta PathRemoveFileSpecW(buffer); break; case COLUMN_SIZE: - StrFormatByteSizeW(((LONGLONG)data.nFileSizeHigh<<32)|data.nFileSizeLow, buffer, MAX_PATH); + StrFormatKBSizeW(((LONGLONG)data.nFileSizeHigh<<32)|data.nFileSizeLow, buffer, MAX_PATH); break; case COLUMN_MTIME: FormatDateTime(buffer, MAX_PATH, data.ftLastWriteTime);

1 0

Mike McCormack : shell32: Don' t add the directory name twice when recursing into subdirectories.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: 000eddbc8c57e790b29f34b7135c98cebc97d489 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=000eddbc8c57e790b29f34b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Aug 22 14:16:46 2006 +0900 shell32: Don't add the directory name twice when recursing into subdirectories. --- dlls/shell32/shlfileop.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index fccc2ac..8391ba6 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -958,17 +958,18 @@ static void copy_dir_to_dir(LPSHFILEOPST /* copy a file or directory to another directory */ static void copy_to_dir(LPSHFILEOPSTRUCTW lpFileOp, FILE_ENTRY *feFrom, FILE_ENTRY *feTo) { - WCHAR szDestPath[MAX_PATH]; - if (!PathFileExistsW(feTo->szFullPath)) SHNotifyCreateDirectoryW(feTo->szFullPath, NULL); - PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); - if (IsAttribFile(feFrom->attributes)) + { + WCHAR szDestPath[MAX_PATH]; + + PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); SHNotifyCopyFileW(feFrom->szFullPath, szDestPath, FALSE); + } else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) - copy_dir_to_dir(lpFileOp, feFrom, szDestPath); + copy_dir_to_dir(lpFileOp, feFrom, feTo->szFullPath); } static void create_dest_dirs(LPWSTR szDestDir)

1 0

Juan Lang : crypt32: Fix a misplaced parenthesis.
by Alexandre Julliard 22 Aug '06

22 Aug '06

Module: wine Branch: master Commit: d0ca58ba365baf31b497112ea984f66155386f42 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d0ca58ba365baf31b497112… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Aug 21 17:07:28 2006 -0700 crypt32: Fix a misplaced parenthesis. --- dlls/crypt32/oid.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 7b152c3..c1d3bc6 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -365,8 +365,8 @@ BOOL WINAPI CryptGetOIDFunctionAddress(H { if (HIWORD(pszOID)) { - if (HIWORD(function->entry.pszOID && - !strcasecmp(function->entry.pszOID, pszOID))) + if (HIWORD(function->entry.pszOID) && + !strcasecmp(function->entry.pszOID, pszOID)) { *ppvFuncAddr = function->entry.pvFuncAddr; *phFuncAddr = NULL; /* FIXME: what should it be? */

1 0