October 2008 - Wine-Commits

Jacek Caban : jscript: Added String.indexOf implementation.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 43c7907f31d4d316418331bb7e6b3d4d65d4569c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c7907f31d4d316418331bb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 09:57:03 2008 -0500 jscript: Added String.indexOf implementation. --- dlls/jscript/string.c | 65 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 17 ++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 11ef882..ba4c82d 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -323,8 +323,69 @@ static HRESULT String_fontsize(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DWORD length, pos = 0; + const WCHAR *str; + BSTR search_str; + INT ret = -1; + HRESULT hres; + + TRACE("\n"); + + if(is_class(dispex, JSCLASS_STRING)) { + StringInstance *string = (StringInstance*)dispex; + + str = string->str; + length = string->length; + }else { + FIXME("not String this\n"); + return E_NOTIMPL; + } + + if(!arg_cnt(dp)) { + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = -1; + } + return S_OK; + } + + hres = to_string(dispex->ctx, get_arg(dp,0), ei, &search_str); + if(FAILED(hres)) + return hres; + + if(arg_cnt(dp) >= 2) { + VARIANT ival; + + hres = to_integer(dispex->ctx, get_arg(dp,1), ei, &ival); + if(SUCCEEDED(hres)) { + if(V_VT(&ival) == VT_I4) + pos = V_VT(&ival) > 0 ? V_I4(&ival) : 0; + else + pos = V_R8(&ival) > 0.0 ? length : 0; + if(pos > length) + pos = length; + } + } + + if(SUCCEEDED(hres)) { + const WCHAR *ptr; + + ptr = strstrW(str+pos, search_str); + if(ptr) + ret = ptr - str; + else + ret = -1; + } + + SysFreeString(search_str); + if(FAILED(hres)) + return hres; + + if(retv) { + V_VT(retv) = VT_I4; + V_I4(retv) = ret; + } + return S_OK; } static HRESULT String_italics(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index aef7c2b..153c1f5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -179,6 +179,23 @@ ok(r === "-ret-", "r = " + r + " expected '-ret-'"); r = "-[test]-".replace("[test]", replaceFunc3, "test"); ok(r === "-ret-", "r = " + r + " expected '-ret-'"); +tmp = "abcd".indexOf("bc",0); +ok(tmp === 1, "indexOf = " + tmp); +tmp = "abcd".indexOf("bc",1); +ok(tmp === 1, "indexOf = " + tmp); +tmp = "abcd".indexOf("bc"); +ok(tmp === 1, "indexOf = " + tmp); +tmp = "abcd".indexOf("ac"); +ok(tmp === -1, "indexOf = " + tmp); +tmp = "abcd".indexOf("bc",2); +ok(tmp === -1, "indexOf = " + tmp); +tmp = "abcd".indexOf("a",0); +ok(tmp === 0, "indexOf = " + tmp); +tmp = "abcd".indexOf("bc",0,"test"); +ok(tmp === 1, "indexOf = " + tmp); +tmp = "abcd".indexOf(); +ok(tmp == -1, "indexOf = " + tmp); + var arr = new Array(); ok(typeof(arr) === "object", "arr () is not object"); ok((arr.length === 0), "arr.length is not 0");

1 0

James Hawkins : msi: Add tests for dropping tables with multiple columns.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 7cd6736886cce719705236c504d5d04e05cc771a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd6736886cce719705236c50… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Oct 7 01:50:02 2008 -0500 msi: Add tests for dropping tables with multiple columns. --- dlls/msi/tests/db.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index c0a821a..162c4e3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6316,7 +6316,9 @@ static void test_dbtopackage(void) static void test_droptable(void) { MSIHANDLE hdb, hview, hrec; + CHAR buf[MAX_PATH]; LPCSTR query; + DWORD size; UINT r; r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); @@ -6331,17 +6333,54 @@ static void test_droptable(void) ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); query = "SELECT * FROM `_Tables` WHERE `Name` = 'One'"; - r = do_query(hdb, query, &hrec); + r = MsiDatabaseOpenViewA(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, "One"), "Expected \"One\", got \"%s\"\n", buf); MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); query = "SELECT * FROM `_Columns` WHERE `Table` = 'One'"; - r = do_query(hdb, query, &hrec); + r = MsiDatabaseOpenViewA(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, "One"), "Expected \"One\", 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 = "DROP `One`"; r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, @@ -6397,6 +6436,98 @@ static void test_droptable(void) r = do_query(hdb, query, &hrec); ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + query = "CREATE TABLE `One` ( `B` INT, `C` INT PRIMARY KEY `B` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `One`"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + query = "SELECT * FROM `_Tables` WHERE `Name` = 'One'"; + r = MsiDatabaseOpenViewA(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, "One"), "Expected \"One\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + MsiViewClose(hview); + MsiCloseHandle(hview); + + query = "SELECT * FROM `_Columns` WHERE `Table` = 'One'"; + r = MsiDatabaseOpenViewA(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, "One"), "Expected \"One\", 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, "B"), "Expected \"B\", 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, "One"), "Expected \"One\", got \"%s\"\n", buf); + + r = MsiRecordGetInteger(hrec, 2); + ok(r == 2, "Expected 2, 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, "C"), "Expected \"C\", 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 = "DROP TABLE One"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `One`"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_BAD_QUERY_SYNTAX, + "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + + query = "SELECT * FROM `_Tables` WHERE `Name` = 'One'"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + query = "SELECT * FROM `_Columns` WHERE `Table` = 'One'"; + r = do_query(hdb, query, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + MsiCloseHandle(hdb); DeleteFileA(msifile); }

1 0

James Hawkins : msi: Remove a break that kept other columns from getting the table name.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: aa230a626717f75d9804a244a468729f774f6b22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa230a626717f75d9804a244a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Oct 7 01:49:06 2008 -0500 msi: Remove a break that kept other columns from getting the table name. --- dlls/msi/create.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 9a5c97b..0c61c76 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -177,10 +177,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, col->table = strdupW(table); if( !col->temporary ) - { temp = FALSE; - break; - } } /* fill the structure */

1 0

James Hawkins : msi: Remove the columns in reverse order.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 374c042880b9cd216bf4ef88a745b0d6c0611e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=374c042880b9cd216bf4ef88a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Oct 7 01:49:49 2008 -0500 msi: Remove the columns in reverse order. --- dlls/msi/table.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 4f320b6..edd0519 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -943,7 +943,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, UINT r, i, n=0, table_id, count, maxcount = *sz; MSITABLE *table = NULL; - TRACE("%s\n", debugstr_w(szTableName)); + TRACE("%s %d\n", debugstr_w(szTableName), *sz); /* first check if there is a default table with that name */ r = get_defaulttablecolumns( db, szTableName, colinfo, sz ); @@ -2055,11 +2055,12 @@ static UINT TABLE_drop(struct tagMSIVIEW *view) MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSIVIEW *tables = NULL; MSIRECORD *rec = NULL; - UINT i, r, row; + UINT r, row; + INT i; TRACE("dropping table %s\n", debugstr_w(tv->name)); - for (i = 0; i < tv->table->col_count; i++) + for (i = tv->table->col_count - 1; i >= 0; i--) { r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, tv->table->colinfo[i].number);

1 0

Dmitry Timoshkov : winex11.drv: Use the monitor work area to decide whether a window should be made managed .
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 15c820611824bd67300547627a72f2d85f44afde URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c820611824bd67300547627… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 7 12:14:52 2008 +0900 winex11.drv: Use the monitor work area to decide whether a window should be made managed. --- dlls/winex11.drv/window.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b9b2059..0ca0836 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -105,11 +105,17 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec if (style & WS_THICKFRAME) return TRUE; if (style & WS_POPUP) { + HMONITOR hmon; + MONITORINFO mi; + /* popup with sysmenu == caption are managed */ if (style & WS_SYSMENU) return TRUE; /* full-screen popup windows are managed */ - if (window_rect->left <= 0 && window_rect->right >= screen_width && - window_rect->top <= 0 && window_rect->bottom >= screen_height) + hmon = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + mi.cbSize = sizeof( mi ); + GetMonitorInfoW( hmon, &mi ); + if (window_rect->left <= mi.rcWork.left && window_rect->right >= mi.rcWork.right && + window_rect->top <= mi.rcWork.top && window_rect->bottom >= mi.rcWork.bottom) return TRUE; } /* application windows are managed */

1 0

James Hawkins : msi: Resolve file source paths dynamically, as the source directory can be changed.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: d15fddf6f5865940586f1e422ae1cb39b8944ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15fddf6f5865940586f1e422… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 6 22:26:20 2008 -0500 msi: Resolve file source paths dynamically, as the source directory can be changed. --- dlls/msi/action.c | 31 +++++++---------------------- dlls/msi/files.c | 26 +++++++++++++++--------- dlls/msi/helpers.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 3 +- dlls/msi/package.c | 3 ++ dlls/msi/tests/install.c | 43 ++++++++++++++++++++++++++++++++++++++++- 6 files changed, 118 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d15fddf6f5865940586f1…

1 0

Jacek Caban : msi: Added MsiInstallMissingComponentW stub implementation.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 417134709db0c1338c56e319fa66d6f997b7664b URL: http://source.winehq.org/git/wine.git/?a=commit;h=417134709db0c1338c56e319f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 16:05:25 2008 -0500 msi: Added MsiInstallMissingComponentW stub implementation. --- dlls/msi/msi.c | 9 +++++++++ dlls/msi/msi.spec | 2 +- include/msi.h | 4 ++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7432aee..a35f460 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3033,3 +3033,12 @@ UINT WINAPI MsiSetExternalUIRecord( INSTALLUI_HANDLER_RECORD puiHandler, ppuiPrevHandler); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * MsiInstallMissingComponentW [MSI.@] + */ +UINT WINAPI MsiInstallMissingComponentW(LPCWSTR szProduct, LPCWSTR szComponent, INSTALLSTATE eInstallState) +{ + FIXME("(%s %s %d\n", debugstr_w(szProduct), debugstr_w(szComponent), eInstallState); + return ERROR_SUCCESS; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 3794383..925cfde 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -77,7 +77,7 @@ 81 stdcall MsiGetUserInfoA(str ptr ptr ptr ptr ptr ptr) 82 stdcall MsiGetUserInfoW(wstr ptr ptr ptr ptr ptr ptr) 83 stub MsiInstallMissingComponentA -84 stub MsiInstallMissingComponentW +84 stdcall MsiInstallMissingComponentW(wstr wstr long) 85 stub MsiInstallMissingFileA 86 stub MsiInstallMissingFileW 87 stdcall MsiInstallProductA(str str) diff --git a/include/msi.h b/include/msi.h index 20dca3a..cf125ef 100644 --- a/include/msi.h +++ b/include/msi.h @@ -603,6 +603,10 @@ UINT WINAPI MsiDatabaseMergeA(MSIHANDLE, MSIHANDLE, LPCSTR); UINT WINAPI MsiDatabaseMergeW(MSIHANDLE, MSIHANDLE, LPCWSTR); #define MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge) +UINT WINAPI MsiInstallMissingComponentA(LPCSTR, LPCSTR, INSTALLSTATE); +UINT WINAPI MsiInstallMissingComponentW(LPCWSTR, LPCWSTR, INSTALLSTATE); +#define MsiInstallMissingComponent WINELIB_NAME_AW(MsiInstallMissingComponent) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void);

1 0

Paul Vriens : user32/tests: Fix failures on W2K and below.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: cf829959b1fd66f58bc0dccfc82f7f74822cac75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf829959b1fd66f58bc0dccfc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 7 07:54:52 2008 +0200 user32/tests: Fix failures on W2K and below. --- dlls/user32/tests/combo.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index d47ff20..5166007 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -273,22 +273,32 @@ static void test_WM_LBUTTONDOWN(void) LRESULT result; int i, idx; RECT rect; - WCHAR buffer[3]; + CHAR buffer[3]; static const UINT choices[] = {8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; - static const WCHAR stringFormat[] = {'%','2','d','\0'}; + static const CHAR stringFormat[] = "%2d"; + BOOL ret; + BOOL (WINAPI *pGetComboBoxInfo)(HWND, PCOMBOBOXINFO); + + pGetComboBoxInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); + if (!pGetComboBoxInfo){ + win_skip("GetComboBoxInfo is not available\n"); + return; + } hCombo = CreateWindow("ComboBox", "Combo", WS_VISIBLE|WS_CHILD|CBS_DROPDOWN, 0, 0, 200, 150, hMainWnd, (HMENU)COMBO_ID, NULL, 0); for (i = 0; i < sizeof(choices)/sizeof(UINT); i++){ - wsprintfW(buffer, stringFormat, choices[i]); - ok(SendMessageW(hCombo, CB_ADDSTRING, 0, (LPARAM)&buffer) != CB_ERR, + sprintf(buffer, stringFormat, choices[i]); + result = SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)buffer); + ok(result == i, "Failed to add item %d\n", i); } cbInfo.cbSize = sizeof(COMBOBOXINFO); - result = SendMessage(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); - ok(result, "Failed to get combobox info structure. LastError=%d\n", + SetLastError(0xdeadbeef); + ret = pGetComboBoxInfo(hCombo, &cbInfo); + ok(ret, "Failed to get combobox info structure. LastError=%d\n", GetLastError()); hEdit = cbInfo.hwndItem; hList = cbInfo.hwndList;

1 0

Paul Vriens : user32/tests: Run tests on win95 again.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 63f15d440033fa49c421fa9d8e92aad35a966a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f15d440033fa49c421fa9d8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 6 20:47:44 2008 +0200 user32/tests: Run tests on win95 again. --- dlls/user32/tests/scroll.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 62513fa..9547d54 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -132,11 +132,19 @@ static void scrollbar_test4(void) BOOL ret; SCROLLBARINFO sbi; RECT rect; + BOOL (WINAPI *pGetScrollBarInfo)(HWND, LONG, LPSCROLLBARINFO); + + pGetScrollBarInfo = (void*)GetProcAddress(GetModuleHandleA("user32.dll"), "GetScrollBarInfo"); + if (!pGetScrollBarInfo) + { + win_skip("GetScrollBarInfo is not available\n"); + return; + } /* Test GetScrollBarInfo to make sure it returns rcScrollBar in screen * coordinates. */ sbi.cbSize = sizeof(sbi); - ret = GetScrollBarInfo( hScroll, OBJID_CLIENT, &sbi); + ret = pGetScrollBarInfo( hScroll, OBJID_CLIENT, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); GetWindowRect( hScroll, &rect ); ok( ret, "The GetWindowRect() call should not fail.\n" ); @@ -153,7 +161,7 @@ static void scrollbar_test4(void) * making sure that it shifts the rcScrollBar value. */ ShowWindow( hMainWnd, SW_SHOW ); sbi.cbSize = sizeof(sbi); - ret = GetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); + ret = pGetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); GetWindowRect( hMainWnd, &rect ); ok( ret, "The GetWindowRect() call should not fail.\n" ); @@ -161,7 +169,7 @@ static void scrollbar_test4(void) rect.right-rect.left, rect.bottom-rect.top, TRUE ); rect = sbi.rcScrollBar; OffsetRect(&rect, 5, 5); - ret = GetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); + ret = pGetScrollBarInfo( hMainWnd, OBJID_HSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); ok( EqualRect(&rect, &sbi.rcScrollBar), "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n", @@ -170,7 +178,7 @@ static void scrollbar_test4(void) sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); sbi.cbSize = sizeof(sbi); - ret = GetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); + ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); GetWindowRect( hMainWnd, &rect ); ok( ret, "The GetWindowRect() call should not fail.\n" ); @@ -178,7 +186,7 @@ static void scrollbar_test4(void) rect.right-rect.left, rect.bottom-rect.top, TRUE ); rect = sbi.rcScrollBar; OffsetRect(&rect, 5, 5); - ret = GetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); + ret = pGetScrollBarInfo( hMainWnd, OBJID_VSCROLL, &sbi); ok( ret, "The GetScrollBarInfo() call should not fail.\n" ); ok( EqualRect(&rect, &sbi.rcScrollBar), "PreviousRect(%d, %d, %d, %d) != CurrentRect(%d, %d, %d, %d)\n",

1 0

Paul Vriens : kernel32/tests: Fix failures on WinMe.
by Alexandre Julliard Oct. 7, 2008

Oct. 7, 2008

Module: wine Branch: master Commit: 81f75c18409d9d9ae4843ded5220620530111e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f75c18409d9d9ae4843ded5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 6 20:36:15 2008 +0200 kernel32/tests: Fix failures on WinMe. --- dlls/kernel32/tests/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index ec2455a..0077db2 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2053,7 +2053,7 @@ static void test_EnumSystemLanguageGroupsA(void) /* No enumeration proc */ SetLastError(0); ret = pEnumSystemLanguageGroupsA(0, LGRPID_INSTALLED, 0); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("EnumSystemLanguageGroupsA is not implemented\n"); return; @@ -2179,7 +2179,7 @@ static void test_EnumUILanguageA(void) SetLastError(ERROR_SUCCESS); ret = pEnumUILanguagesA(luilocale_proc1A, 0, 0); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + if (ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("EnumUILanguagesA is not implemented\n"); return;

1 0