September 2006 - Wine-Commits

Benjamin Arai : oleaut32: Fixes for function variant:VarPow.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: fbf9cba6833701ddcd201138dec1ad0d6c1ee756 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fbf9cba6833701ddcd20113… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Sep 7 19:04:17 2006 -0700 oleaut32: Fixes for function variant:VarPow. --- dlls/oleaut32/variant.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b800770..30161e0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5049,21 +5049,70 @@ HRESULT WINAPI VarPow(LPVARIANT left, LP { HRESULT hr; VARIANT dl,dr; + VARTYPE resvt = VT_EMPTY; + VARTYPE leftvt,rightvt; + VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - hr = VariantChangeType(&dl,left,0,VT_R8); + VariantInit(&dl); + VariantInit(&dr); + + leftvt = V_VT(left)&VT_TYPEMASK; + rightvt = V_VT(right)&VT_TYPEMASK; + leftExtraFlags = V_VT(left)&(~VT_TYPEMASK); + rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); + + if (leftExtraFlags != rightExtraFlags) + return DISP_E_BADVARTYPE; + ExtraFlags = leftExtraFlags; + + /* Native VarPow always returns a error when using any extra flags */ + if (ExtraFlags != 0) + return DISP_E_BADVARTYPE; + + /* Determine return type */ + else if (leftvt == VT_NULL || rightvt == VT_NULL) { + V_VT(result) = VT_NULL; + return S_OK; + } + else if ((leftvt == VT_EMPTY || leftvt == VT_I2 || + leftvt == VT_I4 || leftvt == VT_R4 || + leftvt == VT_R8 || leftvt == VT_CY || + leftvt == VT_DATE || leftvt == VT_BSTR || + leftvt == VT_BOOL || leftvt == VT_DECIMAL || + (leftvt >= VT_I1 && leftvt <= VT_UINT)) && + (rightvt == VT_EMPTY || rightvt == VT_I2 || + rightvt == VT_I4 || rightvt == VT_R4 || + rightvt == VT_R8 || rightvt == VT_CY || + rightvt == VT_DATE || rightvt == VT_BSTR || + rightvt == VT_BOOL || rightvt == VT_DECIMAL || + (rightvt >= VT_I1 && rightvt <= VT_UINT))) + resvt = VT_R8; + else + return DISP_E_BADVARTYPE; + + hr = VariantChangeType(&dl,left,0,resvt); if (!SUCCEEDED(hr)) { ERR("Could not change passed left argument to VT_R8, handle it differently.\n"); + VariantClear(&dl); return E_FAIL; } - hr = VariantChangeType(&dr,right,0,VT_R8); + + hr = VariantChangeType(&dr,right,0,resvt); if (!SUCCEEDED(hr)) { ERR("Could not change passed right argument to VT_R8, handle it differently.\n"); + VariantClear(&dl); + VariantClear(&dr); return E_FAIL; } + V_VT(result) = VT_R8; V_R8(result) = pow(V_R8(&dl),V_R8(&dr)); + + VariantClear(&dl); + VariantClear(&dr); + return S_OK; }

1 0

Benjamin Arai : oleaut32: Conformance test for function variant:VarAnd.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 9e3e591bf24d4adcf3ce9aefb68eaad9c29f0009 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e3e591bf24d4adcf3ce9ae… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Sep 7 17:51:38 2006 -0700 oleaut32: Conformance test for function variant:VarAnd. --- dlls/oleaut32/tests/vartest.c | 676 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 676 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9e3e591bf24d4adcf3c…

1 0

Benjamin Arai : oleaut32: Fixes for function variant:VarAnd.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 3abb454c707ad6cb91dc23cb59e5ca5a5871bac2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3abb454c707ad6cb91dc23c… Author: Benjamin Arai <me(a)benjaminarai.com> Date: Thu Sep 7 17:50:03 2006 -0700 oleaut32: Fixes for function variant:VarAnd. --- dlls/oleaut32/variant.c | 232 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 170 insertions(+), 62 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 60bb807..b800770 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2872,80 +2872,188 @@ #undef _VARCMP */ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - HRESULT rc = E_FAIL; + HRESULT hres = S_OK; + VARTYPE resvt = VT_EMPTY; + VARTYPE leftvt,rightvt; + VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; + VARIANT varLeft, varRight; + + VariantInit(&varLeft); + VariantInit(&varRight); TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - if ((V_VT(left)&VT_TYPEMASK) == VT_BOOL && - (V_VT(right)&VT_TYPEMASK) == VT_BOOL) { + leftvt = V_VT(left)&VT_TYPEMASK; + rightvt = V_VT(right)&VT_TYPEMASK; + leftExtraFlags = V_VT(left)&(~VT_TYPEMASK); + rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); - V_VT(result) = VT_BOOL; - if (V_BOOL(left) && V_BOOL(right)) { - V_BOOL(result) = VARIANT_TRUE; - } else { - V_BOOL(result) = VARIANT_FALSE; - } - rc = S_OK; + if (leftExtraFlags != rightExtraFlags) + return DISP_E_BADVARTYPE; + ExtraFlags = leftExtraFlags; - } else { - /* Integers */ - BOOL lOk = TRUE; - BOOL rOk = TRUE; - LONGLONG lVal = -1; - LONGLONG rVal = -1; - LONGLONG res = -1; - int resT = 0; /* Testing has shown I2 & I2 == I2, all else - becomes I4, even unsigned ints (incl. UI2) */ - - lOk = TRUE; - switch (V_VT(left)&VT_TYPEMASK) { - case VT_I1 : lVal = V_I1(left); resT=VT_I4; break; - case VT_I2 : lVal = V_I2(left); resT=VT_I2; break; - case VT_I4 : - case VT_INT : lVal = V_I4(left); resT=VT_I4; break; - case VT_UI1 : lVal = V_UI1(left); resT=VT_I4; break; - case VT_UI2 : lVal = V_UI2(left); resT=VT_I4; break; - case VT_UI4 : - case VT_UINT : lVal = V_UI4(left); resT=VT_I4; break; - case VT_BOOL : rVal = V_BOOL(left); resT=VT_I4; break; - default: lOk = FALSE; - } + /* Native VarAnd always returns a error when using any extra + * flags or if the variant combination is I8 and INT. + */ + if ((leftvt == VT_I8 && rightvt == VT_INT) || + (leftvt == VT_INT && rightvt == VT_I8) || + ExtraFlags != 0) + return DISP_E_BADVARTYPE; - rOk = TRUE; - switch (V_VT(right)&VT_TYPEMASK) { - case VT_I1 : rVal = V_I1(right); resT=VT_I4; break; - case VT_I2 : rVal = V_I2(right); resT=max(VT_I2, resT); break; - case VT_I4 : - case VT_INT : rVal = V_I4(right); resT=VT_I4; break; - case VT_UI1 : rVal = V_UI1(right); resT=VT_I4; break; - case VT_UI2 : rVal = V_UI2(right); resT=VT_I4; break; - case VT_UI4 : - case VT_UINT : rVal = V_UI4(right); resT=VT_I4; break; - case VT_BOOL : rVal = V_BOOL(right); resT=VT_I4; break; - default: rOk = FALSE; - } + /* Determine return type */ + else if (leftvt == VT_I8 || rightvt == VT_I8) + resvt = VT_I8; + else if (leftvt == VT_I4 || rightvt == VT_I4 || + leftvt == VT_UINT || rightvt == VT_UINT || + leftvt == VT_INT || rightvt == VT_INT || + leftvt == VT_UINT || rightvt == VT_UINT || + leftvt == VT_R4 || rightvt == VT_R4 || + leftvt == VT_R8 || rightvt == VT_R8 || + leftvt == VT_CY || rightvt == VT_CY || + leftvt == VT_DATE || rightvt == VT_DATE || + leftvt == VT_I1 || rightvt == VT_I1 || + leftvt == VT_UI2 || rightvt == VT_UI2 || + leftvt == VT_UI4 || rightvt == VT_UI4 || + leftvt == VT_UI8 || rightvt == VT_UI8 || + leftvt == VT_DECIMAL || rightvt == VT_DECIMAL) + resvt = VT_I4; + else if (leftvt == VT_UI1 || rightvt == VT_UI1 || + leftvt == VT_I2 || rightvt == VT_I2 || + leftvt == VT_EMPTY || rightvt == VT_EMPTY) + if ((leftvt == VT_NULL && rightvt == VT_UI1) || + (leftvt == VT_UI1 && rightvt == VT_NULL) || + (leftvt == VT_UI1 && rightvt == VT_UI1)) + resvt = VT_UI1; + else + resvt = VT_I2; + else if (leftvt == VT_BOOL || rightvt == VT_BOOL || + (leftvt == VT_BSTR && rightvt == VT_BSTR)) + resvt = VT_BOOL; + else if (leftvt == VT_NULL || rightvt == VT_NULL || + leftvt == VT_BSTR || rightvt == VT_BSTR) + resvt = VT_NULL; + else + return DISP_E_BADVARTYPE; - if (lOk && rOk) { - res = (lVal & rVal); - V_VT(result) = resT; - switch (resT) { - case VT_I2 : V_I2(result) = res; break; - case VT_I4 : V_I4(result) = res; break; - default: - FIXME("Unexpected result variant type %x\n", resT); - V_I4(result) = res; + if (leftvt == VT_NULL || rightvt == VT_NULL) + { + /* + * Special cases for when left variant is VT_NULL + * (NULL & 0 = NULL, NULL & value = value) + */ + if (leftvt == VT_NULL) + { + VARIANT_BOOL b; + switch(rightvt) + { + case VT_I1: if (V_I1(right)) resvt = VT_NULL; break; + case VT_UI1: if (V_UI1(right)) resvt = VT_NULL; break; + case VT_I2: if (V_I2(right)) resvt = VT_NULL; break; + case VT_UI2: if (V_UI2(right)) resvt = VT_NULL; break; + case VT_I4: if (V_I4(right)) resvt = VT_NULL; break; + case VT_UI4: if (V_UI4(right)) resvt = VT_NULL; break; + case VT_I8: if (V_I8(right)) resvt = VT_NULL; break; + case VT_UI8: if (V_UI8(right)) resvt = VT_NULL; break; + case VT_INT: if (V_INT(right)) resvt = VT_NULL; break; + case VT_UINT: if (V_UINT(right)) resvt = VT_NULL; break; + case VT_BOOL: if (V_BOOL(right)) resvt = VT_NULL; break; + case VT_R4: if (V_R4(right)) resvt = VT_NULL; break; + case VT_R8: if (V_R8(right)) resvt = VT_NULL; break; + case VT_CY: + if(V_CY(right).int64) + resvt = VT_NULL; + break; + case VT_DECIMAL: + if (DEC_HI32(&V_DECIMAL(right)) || + DEC_LO64(&V_DECIMAL(right))) + resvt = VT_NULL; + break; + case VT_BSTR: + hres = VarBoolFromStr(V_BSTR(right), + LOCALE_USER_DEFAULT, VAR_LOCALBOOL, &b); + if (FAILED(hres)) + return hres; + else if (b) + V_VT(result) = VT_NULL; + else + { + V_VT(result) = VT_BOOL; + V_BOOL(result) = b; + } + goto VarAnd_Exit; } - rc = S_OK; - - } else { - FIXME("VarAnd stub\n"); } + V_VT(result) = resvt; + goto VarAnd_Exit; } - TRACE("returning 0x%8lx (%s%s),%ld\n", rc, debugstr_VT(result), - debugstr_VF(result), V_VT(result) == VT_I4 ? V_I4(result) : V_I2(result)); - return rc; + hres = VariantCopy(&varLeft, left); + if (FAILED(hres)) goto VarAnd_Exit; + + hres = VariantCopy(&varRight, right); + if (FAILED(hres)) goto VarAnd_Exit; + + if (resvt == VT_I4 && V_VT(&varLeft) == VT_UI4) + V_VT(&varLeft) = VT_I4; /* Don't overflow */ + else + { + double d; + + if (V_VT(&varLeft) == VT_BSTR && + FAILED(VarR8FromStr(V_BSTR(&varLeft), + LOCALE_USER_DEFAULT, 0, &d))) + hres = VariantChangeType(&varLeft,&varLeft, + VARIANT_LOCALBOOL, VT_BOOL); + if (SUCCEEDED(hres) && V_VT(&varLeft) != resvt) + hres = VariantChangeType(&varLeft,&varLeft,0,resvt); + if (FAILED(hres)) goto VarAnd_Exit; + } + + if (resvt == VT_I4 && V_VT(&varRight) == VT_UI4) + V_VT(&varRight) = VT_I4; /* Don't overflow */ + else + { + double d; + + if (V_VT(&varRight) == VT_BSTR && + FAILED(VarR8FromStr(V_BSTR(&varRight), + LOCALE_USER_DEFAULT, 0, &d))) + hres = VariantChangeType(&varRight, &varRight, + VARIANT_LOCALBOOL, VT_BOOL); + if (SUCCEEDED(hres) && V_VT(&varRight) != resvt) + hres = VariantChangeType(&varRight, &varRight, 0, resvt); + if (FAILED(hres)) goto VarAnd_Exit; + } + + V_VT(result) = resvt; + switch(resvt) + { + case VT_I8: + V_I8(result) = V_I8(&varLeft) & V_I8(&varRight); + break; + case VT_I4: + V_I4(result) = V_I4(&varLeft) & V_I4(&varRight); + break; + case VT_I2: + V_I2(result) = V_I2(&varLeft) & V_I2(&varRight); + break; + case VT_UI1: + V_UI1(result) = V_UI1(&varLeft) & V_UI1(&varRight); + break; + case VT_BOOL: + V_BOOL(result) = V_BOOL(&varLeft) & V_BOOL(&varRight); + break; + default: + FIXME("Couldn't bitwise AND variant types %d,%d\n", + leftvt,rightvt); + } + +VarAnd_Exit: + VariantClear(&varLeft); + VariantClear(&varRight); + + return hres; } /**********************************************************************

1 0

Stefan Leichter : ntdll/tests: Print 64bit integers as two 32 bit integers.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 97f85e497a97ee88ddc2ba4e46f359b49a5b7612 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97f85e497a97ee88ddc2ba4… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Sep 8 10:49:16 2006 +0200 ntdll/tests: Print 64bit integers as two 32 bit integers. --- dlls/ntdll/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a647301..72f3dd9 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -650,7 +650,7 @@ static void test_query_process_io(void) ok( sizeof(pii) == ReturnLength, "Inconsistent length %ld\n", ReturnLength); /* Check if we have some return values */ - trace("OtherOperationCount : %lld\n", pii.OtherOperationCount); + trace("OtherOperationCount : 0x%lx%08lx\n", (DWORD)(pii.OtherOperationCount >> 32), (DWORD)pii.OtherOperationCount); todo_wine { ok( pii.OtherOperationCount > 0, "Expected an OtherOperationCount > 0\n");

1 0

Mike McCormack : msi: Add more tests for temporary columns.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 0fc2bd760c5029084b7d54081c32ac2746f27041 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0fc2bd760c5029084b7d540… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 18:55:57 2006 +0900 msi: Add more tests for temporary columns. --- dlls/msi/tests/db.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index aea08a3..3635f59 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1917,9 +1917,11 @@ static void test_join(void) static void test_temporary_table(void) { MSICONDITION cond; - MSIHANDLE hdb; + MSIHANDLE hdb = 0, view = 0, rec; const char *query; UINT r; + char buf[0x10]; + DWORD sz; cond = MsiDatabaseIsTablePersistent(0, NULL); todo_wine ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); @@ -1992,6 +1994,42 @@ static void test_temporary_table(void) query = "CREATE TABLE `T5` ( `B` SHORT NOT NULL TEMP, `C` CHAR(255) TEMP PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to add table\n"); + + query = "select * from `T`"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "failed to query table\n"); + r = MsiViewGetColumnInfo(view, MSICOLINFO_TYPES, &rec); + ok(r == ERROR_SUCCESS, "failed to get column info\n"); + + sz = sizeof buf; + r = MsiRecordGetString(rec, 1, buf, &sz); + ok(r == ERROR_SUCCESS, "failed to get string\n"); + todo_wine ok( 0 == strcmp("G255", buf), "wrong column type\n"); + + sz = sizeof buf; + r = MsiRecordGetString(rec, 2, buf, &sz); + ok(r == ERROR_SUCCESS, "failed to get string\n"); + todo_wine ok( 0 == strcmp("j2", buf), "wrong column type\n"); + + MsiCloseHandle( rec ); + MsiCloseHandle( view ); + + /* query the table data */ + rec = 0; + r = do_query(hdb, "select * from `_Tables` where `Name` = 'T'", &rec); + ok( r == ERROR_SUCCESS, "temporary table exists in _Tables\n"); + MsiCloseHandle( rec ); + + todo_wine { + /* query the column data */ + rec = 0; + r = do_query(hdb, "select * from `_Columns` where `Table` = 'T' AND `Name` = 'B'", &rec); + ok( r == ERROR_NO_MORE_ITEMS, "temporary table exists in _Columns\n"); + + r = do_query(hdb, "select * from `_Columns` where `Table` = 'T' AND `Name` = 'C'", &rec); + ok( r == ERROR_NO_MORE_ITEMS, "temporary table exists in _Columns\n"); + } + MsiCloseHandle( hdb ); DeleteFile(msifile);

1 0

Mike McCormack : msi: Fix the TEMPORARY keyword for columns.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 77d3c59843c58aa6017a52217b7934fd71bd6301 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=77d3c59843c58aa6017a522… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 18:25:40 2006 +0900 msi: Fix the TEMPORARY keyword for columns. --- dlls/msi/sql.y | 8 ++++++-- dlls/msi/tests/db.c | 9 +++++++-- dlls/msi/tokenize.c | 3 +-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index a4e0f7e..8fa0fb3 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -108,7 +108,7 @@ static struct expr * EXPR_wildcard( void %token TK_ROW TK_RP TK_RSHIFT %token TK_SELECT TK_SEMI TK_SET TK_SHORT TK_SLASH TK_SPACE TK_STAR TK_STATEMENT %token <str> TK_STRING -%token TK_TABLE TK_TEMP TK_THEN TK_TRANSACTION TK_TRIGGER +%token TK_TABLE TK_TEMPORARY TK_THEN TK_TRANSACTION TK_TRIGGER %token TK_UMINUS TK_UNCLOSED_STRING TK_UNION TK_UNIQUE %token TK_UPDATE TK_UPLUS TK_USING %token TK_VACUUM TK_VALUES TK_VIEW @@ -171,7 +171,7 @@ oneinsert: YYABORT; $$ = insert; } - | TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_TEMP + | TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_TEMPORARY { SQL_input *sql = (SQL_input*) info; MSIVIEW *insert = NULL; @@ -304,6 +304,10 @@ column_type: { $$ = $1 | MSITYPE_LOCALIZABLE; } + | data_type_l TK_TEMPORARY + { + FIXME("temporary column\n"); + } ; data_type_l: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index fbe9909..aea08a3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1955,27 +1955,29 @@ static void test_temporary_table(void) todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "P"); ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); + } query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); - } cond = MsiDatabaseIsTablePersistent(hdb, "T"); ok( cond == MSICONDITION_FALSE, "wrong return condition\n"); - todo_wine { query = "CREATE TABLE `T2` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); + todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "T2"); ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + } query = "CREATE TABLE `T3` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) PRIMARY KEY `C`)"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); + todo_wine { cond = MsiDatabaseIsTablePersistent(hdb, "T3"); ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); @@ -1987,6 +1989,9 @@ static void test_temporary_table(void) ok( cond == MSICONDITION_NONE, "wrong return condition\n"); } + query = "CREATE TABLE `T5` ( `B` SHORT NOT NULL TEMP, `C` CHAR(255) TEMP PRIMARY KEY `C`) HOLD"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "failed to add table\n"); MsiCloseHandle( hdb ); DeleteFile(msifile); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 37c6b4a..cf0fd63 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -247,8 +247,7 @@ static const Keyword aKeywordTable[] = { { SHORT_W, TK_SHORT }, { STATEMENT_W, TK_STATEMENT }, { TABLE_W, TK_TABLE }, - { TEMP_W, TK_TEMP }, - { TEMPORARY_W, TK_TEMP }, + { TEMPORARY_W, TK_TEMPORARY }, { THEN_W, TK_THEN }, { TRANSACTION_W, TK_TRANSACTION }, { TRIGGER_W, TK_TRIGGER },

1 0

Mike McCormack : msi: Add a test for MsiDatabaseIsTablePersistent.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 14ab62306c0d0c5fe3d9d272fb807cd6c2b79c1b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14ab62306c0d0c5fe3d9d27… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 18:02:17 2006 +0900 msi: Add a test for MsiDatabaseIsTablePersistent. --- dlls/msi/tests/db.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9e43258..fbe9909 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -1914,6 +1914,84 @@ static void test_join(void) DeleteFile(msifile); } +static void test_temporary_table(void) +{ + MSICONDITION cond; + MSIHANDLE hdb; + const char *query; + UINT r; + + cond = MsiDatabaseIsTablePersistent(0, NULL); + todo_wine ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); + + hdb = create_db(); + ok( hdb, "failed to create db\n"); + + todo_wine { + cond = MsiDatabaseIsTablePersistent(hdb, NULL); + ok( cond == MSICONDITION_ERROR, "wrong return condition\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "_Tables"); + ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "_Columns"); + ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "_Streams"); + ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + } + + query = "CREATE TABLE `P` ( `B` SHORT NOT NULL, `C` CHAR(255) PRIMARY KEY `C`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "P"); + todo_wine ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); + + query = "CREATE TABLE `P2` ( `B` SHORT NOT NULL, `C` CHAR(255) PRIMARY KEY `C`) HOLD"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + todo_wine { + cond = MsiDatabaseIsTablePersistent(hdb, "P"); + ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); + + query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + } + + cond = MsiDatabaseIsTablePersistent(hdb, "T"); + ok( cond == MSICONDITION_FALSE, "wrong return condition\n"); + + todo_wine { + query = "CREATE TABLE `T2` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "T2"); + ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + + query = "CREATE TABLE `T3` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) PRIMARY KEY `C`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "T3"); + ok( cond == MSICONDITION_TRUE, "wrong return condition\n"); + + query = "CREATE TABLE `T4` ( `B` SHORT NOT NULL, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_FUNCTION_FAILED, "failed to add table\n"); + + cond = MsiDatabaseIsTablePersistent(hdb, "T4"); + ok( cond == MSICONDITION_NONE, "wrong return condition\n"); + } + + MsiCloseHandle( hdb ); + + DeleteFile(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -1932,4 +2010,5 @@ START_TEST(db) test_handle_limit(); test_generate_transform(); test_join(); + test_temporary_table(); }

1 0

Mike McCormack : msi: Split code to create a random package name into a separate function.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 5f83069bd852be706d773f934b876c5b843b4578 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f83069bd852be706d773f9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 16:20:46 2006 +0900 msi: Split code to create a random package name into a separate function. --- dlls/msi/action.c | 63 ++++++++++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index da7d7e8..b309509 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3487,32 +3487,25 @@ end: return rc; } -static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) +static UINT msi_get_local_package_name( LPWSTR path ) { - static const WCHAR installerPathFmt[] = { - '%','s','\\','I','n','s','t','a','l','l','e','r','\\',0}; - static const WCHAR fmt[] = { - '%','s','\\', - 'I','n','s','t','a','l','l','e','r','\\', - '%','x','.','m','s','i',0}; - static const WCHAR szOriginalDatabase[] = - {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; - WCHAR windir[MAX_PATH], path[MAX_PATH], packagefile[MAX_PATH]; - INT num, start; - LPWSTR msiFilePath; - BOOL r; - - /* copy the package locally */ - num = GetTickCount() & 0xffff; - if (!num) - num = 1; - start = num; - GetWindowsDirectoryW( windir, MAX_PATH ); - snprintfW( packagefile, MAX_PATH, fmt, windir, num ); - do + static const WCHAR szInstaller[] = { + '\\','I','n','s','t','a','l','l','e','r','\\',0}; + static const WCHAR fmt[] = { '%','x','.','m','s','i',0}; + DWORD time, len, i; + HANDLE handle; + + time = GetTickCount(); + GetWindowsDirectoryW( path, MAX_PATH ); + lstrcatW( path, szInstaller ); + CreateDirectoryW( path, NULL ); + + len = lstrlenW(path); + for (i=0; i<0x10000; i++) { - HANDLE handle = CreateFileW(packagefile,GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); + snprintfW( &path[len], MAX_PATH - len, fmt, (time+i)&0xffff ); + handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); if (handle != INVALID_HANDLE_VALUE) { CloseHandle(handle); @@ -3520,13 +3513,23 @@ static UINT msi_make_package_local( MSIP } if (GetLastError() != ERROR_FILE_EXISTS && GetLastError() != ERROR_SHARING_VIOLATION) - break; - if (!(++num & 0xffff)) num = 1; - sprintfW(packagefile,fmt,num); - } while (num != start); + return ERROR_FUNCTION_FAILED; + } - snprintfW( path, MAX_PATH, installerPathFmt, windir ); - create_full_pathW(path); + return ERROR_SUCCESS; +} + +static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) +{ + static const WCHAR szOriginalDatabase[] = + {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; + WCHAR packagefile[MAX_PATH]; + LPWSTR msiFilePath; + UINT r; + + r = msi_get_local_package_name( packagefile ); + if (r != ERROR_SUCCESS) + return r; TRACE("Copying to local package %s\n",debugstr_w(packagefile));

1 0

Mike McCormack : msi: Use msi_string_lookup_id instead of msi_id2stringW where possible.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 00fdc6cb80e83a948d47dccf001d94a938d71874 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00fdc6cb80e83a948d47dcc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 12:25:11 2006 +0900 msi: Use msi_string_lookup_id instead of msi_id2stringW where possible. --- dlls/msi/table.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 51986d7..1c05e79 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -926,20 +926,7 @@ static void msi_free_colinfo( MSICOLUMNI LPWSTR MSI_makestring( MSIDATABASE *db, UINT stringid) { - UINT sz=0, r; - LPWSTR str; - - r = msi_id2stringW( db->strings, stringid, NULL, &sz ); - if( r != ERROR_SUCCESS ) - return NULL; - str = msi_alloc( sz*sizeof (WCHAR) ); - if( !str ) - return str; - r = msi_id2stringW( db->strings, stringid, str, &sz ); - if( r == ERROR_SUCCESS ) - return str; - msi_free( str ); - return NULL; + return strdupW(msi_string_lookup_id( db->strings, stringid )); } static UINT get_tablecolumns( MSIDATABASE *db, @@ -1116,7 +1103,7 @@ static UINT TABLE_fetch_stream( struct t { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; UINT ival = 0, refcol = 0, r; - LPWSTR sval; + LPCWSTR sval; LPWSTR full_name; DWORD len; static const WCHAR szDot[] = { '.', 0 }; @@ -1140,7 +1127,7 @@ static UINT TABLE_fetch_stream( struct t return r; /* lookup the string value from the string table */ - sval = MSI_makestring( tv->db, refcol ); + sval = msi_string_lookup_id( tv->db->strings, refcol ); if( !sval ) return ERROR_INVALID_PARAMETER; @@ -1154,7 +1141,6 @@ static UINT TABLE_fetch_stream( struct t if( r ) ERR("fetching stream %s, error = %d\n",debugstr_w(full_name), r); msi_free( full_name ); - msi_free( sval ); return r; }

1 0

Mike McCormack : msi: Fix the prototype of MsiDatabaseIsTablePersistent to match the SDK.
by Alexandre Julliard Sept. 8, 2006

Sept. 8, 2006

Module: wine Branch: master Commit: 665829c390d3b833f00f3dad439204023b190d53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=665829c390d3b833f00f3da… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Sep 8 18:01:54 2006 +0900 msi: Fix the prototype of MsiDatabaseIsTablePersistent to match the SDK. --- dlls/msi/msiquery.c | 4 ++-- include/msiquery.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index ba7fc1b..78614fe 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -870,7 +870,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysA(M } MSICONDITION WINAPI MsiDatabaseIsTablePersistentA( - MSIHANDLE hDatabase, LPSTR szTableName) + MSIHANDLE hDatabase, LPCSTR szTableName) { LPWSTR szwTableName = NULL; MSICONDITION r; @@ -890,7 +890,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePe } MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( - MSIHANDLE hDatabase, LPWSTR szTableName) + MSIHANDLE hDatabase, LPCWSTR szTableName) { FIXME("%lx %s\n", hDatabase, debugstr_w(szTableName)); return MSICONDITION_FALSE; diff --git a/include/msiquery.h b/include/msiquery.h index 57f7577..8ea24b6 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -273,8 +273,8 @@ UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LP UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, MSIHANDLE*); #define MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase) -MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPSTR); -MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPWSTR); +MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPCSTR); +MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPCWSTR); #define MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent) UINT WINAPI MsiSequenceA(MSIHANDLE, LPCSTR, INT);

1 0