wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Aric Stewart : imm: More correctly handle the presence of the default IME input window on IME open and close .
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 0e5d5b37ec73688504d7fc3edad6c0ed1969af63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5d5b37ec73688504d7fc3ed… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 8 10:30:39 2008 -0600 imm: More correctly handle the presence of the default IME input window on IME open and close. --- dlls/imm32/imm.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4acbde3..c5fc71e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -192,19 +192,17 @@ static void ImmInternalSetOpenStatus(BOOL fOpen) { TRACE("Setting internal state to %s\n",(fOpen)?"OPEN":"CLOSED"); - root_context->IMC.fOpen = fOpen; - root_context->bInternalState = fOpen; - - if (fOpen == FALSE) - { + if (root_context->IMC.fOpen && fOpen == FALSE) + { ShowWindow(hwndDefault,SW_HIDE); ImmDestroyIMCC(root_context->IMC.hCompStr); root_context->IMC.hCompStr = NULL; } - else - ShowWindow(hwndDefault, SW_SHOWNOACTIVATE); - ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); + root_context->IMC.fOpen = fOpen; + root_context->bInternalState = fOpen; + + ImmInternalSendIMENotify(IMN_SETOPENSTATUS, 0); } static int updateField(DWORD origLen, DWORD origOffset, DWORD currentOffset,

1 0

Vitaliy Margolen : dinput: Skip old mouse movement events.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 31876695120f2fe6b4ecf60d73c36472607e5bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31876695120f2fe6b4ecf60d7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Fri Feb 8 08:01:42 2008 -0700 dinput: Skip old mouse movement events. --- dlls/dinput/mouse.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 35ddc0b..72fbbf6 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -64,6 +64,7 @@ struct SysMouseImpl BOOL need_warp; DWORD last_warped; + DWORD last_event_time; /* This is for mouse reporting. */ DIMOUSESTATE2 m_state; }; @@ -280,6 +281,9 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA { POINT pt, pt1; + /* Skip old movement events */ + if (This->last_event_time - hook->time < 2000) break; + GetCursorPos(&pt); This->m_state.lX += pt.x = hook->pt.x - pt.x; This->m_state.lY += pt.y = hook->pt.y - pt.y; @@ -355,6 +359,8 @@ static void dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARA wdata, hook->time, This->base.dinput->evsequence++); } + This->last_event_time = hook->time; + LeaveCriticalSection(&This->base.crit); }

1 0

James Hawkins : msi: Test the remaining installer properties returned by MsiGetProductInfo.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: f461a8d4c1dc488a426259eafccb2eb124aa6595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f461a8d4c1dc488a426259eaf… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:18:56 2008 -0600 msi: Test the remaining installer properties returned by MsiGetProductInfo. --- dlls/msi/tests/msi.c | 534 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 533 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f461a8d4c1dc488a42625…

1 0

James Hawkins : msi: Return ERROR_INVALID_PARAMETER if szProduct is invalid .
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: ff0dc44f2dd3c48bf47b9b20be913cc2b97d56cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0dc44f2dd3c48bf47b9b20b… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:16:49 2008 -0600 msi: Return ERROR_INVALID_PARAMETER if szProduct is invalid. --- dlls/msi/msi.c | 6 +++++- dlls/msi/tests/msi.c | 21 ++++++--------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 643f9cc..93a4e0f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -567,6 +567,7 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, UINT r; HKEY hkey; LPWSTR val = NULL; + WCHAR squished_pc[GUID_SIZE]; TRACE("%s %s %p %p\n", debugstr_w(szProduct), debugstr_w(szAttribute), szValue, pcchValueBuf); @@ -575,7 +576,10 @@ static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, * FIXME: Values seem scattered/duplicated in the registry. Is there a system? */ - if ((szValue->str.w && !pcchValueBuf) || !szProduct || !szProduct[0] || !szAttribute) + if ((szValue->str.w && !pcchValueBuf) || !szProduct || !szAttribute) + return ERROR_INVALID_PARAMETER; + + if (!squash_guid(szProduct, squished_pc)) return ERROR_INVALID_PARAMETER; /* check for special properties */ diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index d64f35e..71461a4 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -2080,11 +2080,8 @@ static void test_MsiGetProductInfo(void) sz = MAX_PATH; lstrcpyA(buf, "apple"); r = MsiGetProductInfoA("garbage", INSTALLPROPERTY_HELPLINK, buf, &sz); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz); @@ -2093,11 +2090,8 @@ static void test_MsiGetProductInfo(void) lstrcpyA(buf, "apple"); r = MsiGetProductInfoA("6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D", INSTALLPROPERTY_HELPLINK, buf, &sz); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz); @@ -2116,11 +2110,8 @@ static void test_MsiGetProductInfo(void) lstrcpyA(buf, "apple"); r = MsiGetProductInfoA("A938G02JF-2NF3N93-VN3-2NNF-3KGKALDNF93", INSTALLPROPERTY_HELPLINK, buf, &sz); - todo_wine - { - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - } + ok(r == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", r); ok(!lstrcmpA(buf, "apple"), "Expected buf to be unchanged, got %s\n", buf); ok(sz == MAX_PATH, "Expected MAX_PATH, got %d\n", sz);

1 0

James Hawkins : msi: Add tests for MsiGetProductInfo.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 33c1e6ef56595110f654b9745b681348dec668a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c1e6ef56595110f654b9745… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:16:13 2008 -0600 msi: Add tests for MsiGetProductInfo. --- dlls/msi/tests/msi.c | 460 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 460 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c1e6ef56595110f654b…

1 0

James Hawkins : msi: Successfully return an empty string when requesting a record index beyond the record 's size.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 0d56df214bd88de0ddbe98bc08c95dfb8bece810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d56df214bd88de0ddbe98bc0… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:15:13 2008 -0600 msi: Successfully return an empty string when requesting a record index beyond the record's size. --- dlls/msi/record.c | 16 ++++++++++++++-- dlls/msi/tests/record.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 8a69591..7a9c9e0 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -338,7 +338,13 @@ UINT MSI_RecordGetStringA(MSIRECORD *rec, UINT iField, TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue); if( iField > rec->count ) - return ERROR_INVALID_PARAMETER; + { + if ( szValue && *pcchValue > 0 ) + szValue[0] = 0; + + *pcchValue = 0; + return ERROR_SUCCESS; + } ret = ERROR_SUCCESS; switch( rec->fields[iField].type ) @@ -414,7 +420,13 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, TRACE("%p %d %p %p\n", rec, iField, szValue, pcchValue); if( iField > rec->count ) - return ERROR_INVALID_PARAMETER; + { + if ( szValue && *pcchValue > 0 ) + szValue[0] = 0; + + *pcchValue = 0; + return ERROR_SUCCESS; + } ret = ERROR_SUCCESS; switch( rec->fields[iField].type ) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 1f72d12..471fc9c 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -351,7 +351,35 @@ static void test_msirecord(void) DeleteFile(filename); /* Delete it for sure, when everything else is closed. */ } +static void test_MsiRecordGetString(void) +{ + MSIHANDLE rec; + CHAR buf[MAX_PATH]; + DWORD sz; + UINT r; + + rec = MsiCreateRecord(2); + ok(rec != 0, "Expected a valid handle\n"); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 1, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expected 0, got %d\n", sz); + + sz = MAX_PATH; + lstrcpyA(buf, "apple"); + r = MsiRecordGetString(rec, 10, buf, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + ok(sz == 0, "Expected 0, got %d\n", sz); + + MsiCloseHandle(rec); +} + START_TEST(record) { test_msirecord(); + test_MsiRecordGetString(); }

1 0

James Hawkins : msi: Don' t check for the existence of the msi package when running a concurrent install .
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 2750ed167f745a981b284dc37434863bf38ee666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2750ed167f745a981b284dc37… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:11:36 2008 -0600 msi: Don't check for the existence of the msi package when running a concurrent install. --- dlls/msi/custom.c | 6 ------ dlls/msi/tests/install.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 0b887d5..53cdf68 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -857,12 +857,6 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, lstrcatW(package_path, backslash); lstrcatW(package_path, source); - if (GetFileAttributesW(package_path) == INVALID_FILE_ATTRIBUTES) - { - ERR("Source package does not exist: %s\n", debugstr_w(package_path)); - return ERROR_FUNCTION_FAILED; - } - TRACE("Installing package %s concurrently\n", debugstr_w(package_path)); info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 88c8cb5..47ef2f0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -352,7 +352,7 @@ static const CHAR ci_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" static const CHAR ci_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" "s72\ti2\tS64\tS0\tS255\n" "CustomAction\tAction\n" - "RunInstall\t23\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; + "RunInstall\t87\tmsitest\\concurrent.msi\tMYPROP=[UILevel]\t\n"; static const CHAR ci_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" @@ -1848,9 +1848,15 @@ static void test_concurrentinstall(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); - /* Delete the files in the temp (current) folder */ - DeleteFile(msifile); DeleteFile(path); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile(msifile); DeleteFile("msitest\\msitest\\augustus"); DeleteFile("msitest\\maximus"); RemoveDirectory("msitest\\msitest");

1 0

James Hawkins : msi: Handle the special table _ForceCodepage in MsiDatabaseExport.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: a8d87a86ccf81c5b529c0e7d57c77e92aaac56c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d87a86ccf81c5b529c0e7d5… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:13:44 2008 -0600 msi: Handle the special table _ForceCodepage in MsiDatabaseExport. --- dlls/msi/database.c | 25 ++++++++++++++++++- dlls/msi/tests/db.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 64ee1a5..65db00b 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -849,12 +849,29 @@ static UINT msi_export_row( MSIRECORD *row, void *arg ) return msi_export_record( arg, row, 1 ); } +static UINT msi_export_forcecodepage( HANDLE handle ) +{ + DWORD sz; + + static const char data[] = "\r\n\r\n0\t_ForceCodepage\r\n"; + + FIXME("Read the codepage from the strings table!\n"); + + sz = lstrlenA(data) + 1; + if (!WriteFile(handle, data, sz, &sz, NULL)) + return ERROR_FUNCTION_FAILED; + + return ERROR_SUCCESS; +} + UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, LPCWSTR folder, LPCWSTR file ) { static const WCHAR query[] = { 's','e','l','e','c','t',' ','*',' ','f','r','o','m',' ','%','s',0 }; static const WCHAR szbs[] = { '\\', 0 }; + static const WCHAR forcecodepage[] = { + '_','F','o','r','c','e','C','o','d','e','p','a','g','e',0 }; MSIRECORD *rec = NULL; MSIQUERY *view = NULL; LPWSTR filename; @@ -882,6 +899,12 @@ UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, if (handle == INVALID_HANDLE_VALUE) return ERROR_FUNCTION_FAILED; + if (!lstrcmpW( table, forcecodepage )) + { + r = msi_export_forcecodepage( handle ); + goto done; + } + r = MSI_OpenQuery( db, &view, query, table ); if (r == ERROR_SUCCESS) { @@ -915,8 +938,8 @@ UINT MSI_DatabaseExport( MSIDATABASE *db, LPCWSTR table, msiobj_release( &view->hdr ); } +done: CloseHandle( handle ); - return r; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 2e7b6a2..468f486 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5701,6 +5701,70 @@ static void test_noquotes(void) DeleteFileA(msifile); } +static void read_file_data(LPCSTR filename, LPSTR buffer) +{ + OFSTRUCT ofs; + HFILE file; + DWORD read; + + file = OpenFile(filename, &ofs, OF_READ); + ZeroMemory(buffer, MAX_PATH); + ReadFile((HANDLE)file, buffer, MAX_PATH, &read, NULL); + CloseHandle((HANDLE)file); +} + +static void test_forcecodepage(void) +{ + MSIHANDLE hdb; + const char *query; + char buffer[MAX_PATH]; + UINT r; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `_ForceCodepage`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "CREATE TABLE `Table` ( `A` CHAR(72) NOT NULL PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `_ForceCodepage`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `_ForceCodepage`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + MsiCloseHandle(hdb); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_DIRECT, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `_ForceCodepage`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + r = MsiDatabaseExport(hdb, "_ForceCodepage", CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + read_file_data("forcecodepage.idt", buffer); + ok(!lstrcmpA(buffer, "\r\n\r\n0\t_ForceCodepage\r\n"), + "Expected \"\r\n\r\n0\t_ForceCodepage\r\n\", got \"%s\"", buffer); + + MsiCloseHandle(hdb); + DeleteFileA(msifile); + DeleteFileA("forcecodepage.idt"); +} + START_TEST(db) { test_msidatabase(); @@ -5735,4 +5799,5 @@ START_TEST(db) test_quotes(); test_carriagereturn(); test_noquotes(); + test_forcecodepage(); }

1 0

James Hawkins : msi: Add tests for not using quotes in SQL queries.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 7d529228d397a95e4af88382f8071c909239bae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d529228d397a95e4af88382f… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 11 01:10:01 2008 -0600 msi: Add tests for not using quotes in SQL queries. --- dlls/msi/tests/db.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 201 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e912a3a..2e7b6a2 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -5501,6 +5501,206 @@ static void test_carriagereturn(void) DeleteFileA(msifile); } +static void test_noquotes(void) +{ + MSIHANDLE hdb, hview, hrec; + const char *query; + char buf[MAX_PATH]; + UINT r; + DWORD size; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE Table ( `A` CHAR(72) NOT NULL PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "CREATE TABLE `Table` ( A CHAR(72) NOT NULL PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table2` ( `A` CHAR(72) NOT NULL PRIMARY KEY A )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table3` ( A CHAR(72) NOT NULL PRIMARY KEY A )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `_Tables`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Table"), "Expected \"Table\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Table2"), "Expected \"Table2\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Table3"), "Expected \"Table3\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `_Columns`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Table"), "Expected \"Table\", got \"%s\"\n", buf); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 1, "Expected 1, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 3, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "A"), "Expected \"A\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Table2"), "Expected \"Table2\", got \"%s\"\n", buf); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 1, "Expected 1, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 3, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "A"), "Expected \"A\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "Table3"), "Expected \"Table3\", got \"%s\"\n", buf); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 1, "Expected 1, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 3, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "A"), "Expected \"A\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "INSERT INTO Table ( `A` ) VALUES ( 'hi' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "INSERT INTO `Table` ( A ) VALUES ( 'hi' )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` ( `A` ) VALUES ( hi )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "SELECT * FROM Table WHERE `A` = 'hi'"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "SELECT * FROM `Table` WHERE `A` = hi"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "SELECT * FROM Table"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "SELECT * FROM Table2"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `Table` WHERE A = 'hi'"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "hi"), "Expected \"hi\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); + + + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -5534,4 +5734,5 @@ START_TEST(db) test_deleterow(); test_quotes(); test_carriagereturn(); + test_noquotes(); }

1 0

Alexandre Julliard : msi/tests: Fix test that depends on the order of the files in a directory.
by Alexandre Julliard 11 Feb '08

11 Feb '08

Module: wine Branch: master Commit: 2e6ec395650f1af30c6db45206f148d05d834361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6ec395650f1af30c6db4520… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 11 20:17:27 2008 +0100 msi/tests: Fix test that depends on the order of the files in a directory. --- dlls/msi/tests/install.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index b5892c0..88c8cb5 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3530,9 +3530,12 @@ static void test_movefiles(void) ok(delete_pf("msitest\\kiribati", TRUE), "File not moved\n"); ok(!delete_pf("msitest\\lebanon", TRUE), "File moved\n"); ok(!delete_pf("msitest\\lebanon", FALSE), "Directory moved\n"); - ok(!delete_pf("msitest\\apple", TRUE), "File should not exist\n"); + /* either apple or application will be moved depending on directory order */ + if (!delete_pf("msitest\\apple", TRUE)) + ok(delete_pf("msitest\\application", TRUE), "File not moved\n"); + else + ok(!delete_pf("msitest\\application", TRUE), "File should not exist\n"); ok(delete_pf("msitest\\wildcard", TRUE), "File not moved\n"); - ok(delete_pf("msitest\\application", TRUE), "File not moved\n"); ok(!delete_pf("msitest\\ape", TRUE), "File moved\n"); ok(delete_pf("msitest\\foo", TRUE), "File not moved\n"); ok(!delete_pf("msitest\\fao", TRUE), "File should not exist\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2008