May 2009 - Wine-commits - list.winehq.org

Francois Gouget : msi/tests: Tweak the get_user_sid() functions to simplify their use.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 623dad0963e4423a56c4260b4b220c4e011daa89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=623dad0963e4423a56c4260b4… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:41:30 2009 +0200 msi/tests: Tweak the get_user_sid() functions to simplify their use. Now the function deals with all errors and win_skips() itself. --- dlls/msi/tests/install.c | 49 +++++++++++++++++---------------------------- dlls/msi/tests/package.c | 25 ++++++++++++++--------- 2 files changed, 34 insertions(+), 40 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 933a145..2e03bf4 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1346,26 +1346,35 @@ static BOOL check_win9x(void) return FALSE; } -static void get_user_sid(LPSTR *usersid) +static LPSTR get_user_sid(LPSTR *usersid) { HANDLE token; BYTE buf[1024]; DWORD size; PTOKEN_USER user; - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + static HMODULE hadvapi32 = NULL; static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); *usersid = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); - if (!pConvertSidToStringSidA) - return; + if (!hadvapi32) + { + hadvapi32 = GetModuleHandleA("advapi32.dll"); + pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + if (!pConvertSidToStringSidA) + { + win_skip("ConvertSidToStringSidA is not available\n"); + return NULL; + } + } OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + ok(*usersid != NULL, "pConvertSidToStringSidA failed lre=%d\n", GetLastError()); CloseHandle(token); + return *usersid; } static BOOL check_record(MSIHANDLE rec, UINT field, LPCSTR val) @@ -2511,12 +2520,8 @@ static void test_publish_registerproduct(void) static const CHAR userugkey[] = "Software\\Microsoft\\Installer\\UpgradeCodes" "\\51AAE0C44620A5E4788506E91F249BD2"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } get_date_str(date); GetTempPath(MAX_PATH, temp); @@ -2756,12 +2761,8 @@ static void test_publish_publishproduct(void) static const CHAR machprod[] = "Installer\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB"; static const CHAR machup[] = "Installer\\UpgradeCodes\\51AAE0C44620A5E4788506E91F249BD2"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } GetTempPath(MAX_PATH, temp); @@ -2952,12 +2953,8 @@ static void test_publish_publishfeatures(void) static const CHAR classfeat[] = "Software\\Classes\\Installer\\Features" "\\84A88FD7F6998CE40A22FB59F6B9C2BB"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); @@ -3114,12 +3111,8 @@ static void test_publish_registeruser(void) "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\" "UserData\\%s\\Products\\84A88FD7F6998CE40A22FB59F6B9C2BB\\InstallProperties"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } get_owner_company(&owner, &company); @@ -3197,12 +3190,8 @@ static void test_publish_processcomponents(void) static const CHAR compkey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Components"; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } CreateDirectoryA("msitest", NULL); create_file("msitest\\maximus", 500); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 308a9cc..21795d5 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -34,26 +34,35 @@ char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); -static void get_user_sid(LPSTR *usersid) +static LPSTR get_user_sid(LPSTR *usersid) { HANDLE token; BYTE buf[1024]; DWORD size; PTOKEN_USER user; - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + static HMODULE hadvapi32 = NULL; static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); *usersid = NULL; - pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); - if (!pConvertSidToStringSidA) - return; + if (!hadvapi32) + { + hadvapi32 = GetModuleHandleA("advapi32.dll"); + pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + if (!pConvertSidToStringSidA) + { + win_skip("ConvertSidToStringSidA is not available\n"); + return NULL; + } + } OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); GetTokenInformation(token, TokenUser, buf, size, &size); user = (PTOKEN_USER)buf; pConvertSidToStringSidA(user->User.Sid, usersid); + ok(*usersid != NULL, "pConvertSidToStringSidA failed lre=%d\n", GetLastError()); CloseHandle(token); + return *usersid; } /* RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -7336,12 +7345,8 @@ static void test_appsearch_complocator(void) DWORD size; UINT r; - get_user_sid(&usersid); - if (!usersid) - { - skip("ConvertSidToStringSidA is not available\n"); + if (!get_user_sid(&usersid)) return; - } create_test_file("FileName1"); create_test_file("FileName4");

1 0

Francois Gouget : riched20: Make ME_GetCursorCoordinates() static and remove ME_MustBeWrapped() as it is unused.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 3d6c53b972258c37038a6ba4023a162f178a05ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6c53b972258c37038a6ba40… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:45:31 2009 +0200 riched20: Make ME_GetCursorCoordinates() static and remove ME_MustBeWrapped() as it is unused. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.h | 3 --- dlls/riched20/run.c | 12 ------------ 3 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 2151e43..1cb44bc 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -168,7 +168,7 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) } -void +static void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, int *x, int *y, int *height) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8568420..0929e82 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -171,9 +171,6 @@ void ME_InsertTextFromCursor(ME_TextEditor *editor, int nCursor, void ME_InsertEndRowFromCursor(ME_TextEditor *editor, int nCursor); BOOL ME_ArrowKey(ME_TextEditor *ed, int nVKey, BOOL extend, BOOL ctrl); -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para); -void ME_GetCursorCoordinates(ME_TextEditor *editor, ME_Cursor *pCursor, - int *x, int *y, int *height); int ME_GetCursorOfs(ME_TextEditor *editor, int nCursor); void ME_GetSelection(ME_TextEditor *editor, int *from, int *to); int ME_CountParagraphsBetween(ME_TextEditor *editor, int from, int to); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 9778ea9..cf6c1fc 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -725,18 +725,6 @@ void ME_CalcRunExtent(ME_Context *c, const ME_Paragraph *para, int startx, ME_Ru } /****************************************************************************** - * ME_MustBeWrapped - * - * This should ensure that the given paragraph is wrapped so that its screen - * row structure may be used. But it doesn't, yet. - */ -void ME_MustBeWrapped(ME_Context *c, ME_DisplayItem *para) -{ - assert(para->type == diParagraph); - /* FIXME */ -} - -/****************************************************************************** * ME_SetSelectionCharFormat * * Applies a style change, either to a current selection, or to insert cursor

1 0

Francois Gouget : riched20: RTF{G, S}et{In, Out}putName() are unused so remove them as well as the corresponding _RTF_Info fields.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 1914d256a6e055f243bf2ad8ea10406538e956cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1914d256a6e055f243bf2ad8e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 26 00:47:29 2009 +0200 riched20: RTF{G,S}et{In,Out}putName() are unused so remove them as well as the corresponding _RTF_Info fields. --- dlls/riched20/reader.c | 37 ------------------------------------- dlls/riched20/rtf.h | 7 ------- 2 files changed, 0 insertions(+), 44 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index fa1ef79..10aa19e 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -226,10 +226,6 @@ void RTFInit(RTF_Info *info) info->rtfTextBuf[0] = info->pushedTextBuf[0] = '\0'; } - heap_free (info->inputName); - heap_free (info->outputName); - info->inputName = info->outputName = NULL; - for (i = 0; i < rtfMaxClass; i++) RTFSetClassCallback (info, i, NULL); for (i = 0; i < rtfMaxDestination; i++) @@ -278,39 +274,6 @@ void RTFInit(RTF_Info *info) } /* - * Set or get the input or output file name. These are never guaranteed - * to be accurate, only insofar as the calling program makes them so. - */ - -void RTFSetInputName(RTF_Info *info, const char *name) -{ - info->inputName = RTFStrSave (name); - if (info->inputName == NULL) - ERR ("RTFSetInputName: out of memory\n"); -} - - -char *RTFGetInputName(const RTF_Info *info) -{ - return (info->inputName); -} - - -void RTFSetOutputName(RTF_Info *info, const char *name) -{ - info->outputName = RTFStrSave (name); - if (info->outputName == NULL) - ERR ("RTFSetOutputName: out of memory\n"); -} - - -char *RTFGetOutputName(const RTF_Info *info) -{ - return (info->outputName); -} - - -/* * Install or return a writer callback for a destination type */ diff --git a/dlls/riched20/rtf.h b/dlls/riched20/rtf.h index 6de440f..e8cfb34 100644 --- a/dlls/riched20/rtf.h +++ b/dlls/riched20/rtf.h @@ -1152,9 +1152,6 @@ struct _RTF_Info { int unicodeLength; /* The length of ANSI representation of Unicode characters */ int codePage; /* Current codepage for text conversion */ - char *inputName; - char *outputName; - ME_InStream *stream; ME_TextEditor *editor; @@ -1191,10 +1188,6 @@ struct _RTF_Info { void RTFInit (RTF_Info *); void RTFDestroy(RTF_Info *info); -void RTFSetInputName (RTF_Info *, const char *); -char *RTFGetInputName (const RTF_Info *); -void RTFSetOutputName (RTF_Info *, const char *); -char *RTFGetOutputName (const RTF_Info *); void RTFSetDestinationCallback (RTF_Info *, int, RTFFuncPtr); void RTFRead (RTF_Info *); int RTFGetToken (RTF_Info *); /* writer should rarely need this */

1 0

Piotr Caban : jscript: Added implementation of Math_atan.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 79151a2adfac6ee58a8a4047837a21e36bfa400c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79151a2adfac6ee58a8a40478… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 22:05:21 2009 +0200 jscript: Added implementation of Math_atan. --- dlls/jscript/math.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 27 +++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f027441..f67a83d 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -202,8 +202,22 @@ static HRESULT Math_asin(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, atan(num_val(&v))); + return S_OK; } static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 09d85d1..2b338a9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -692,6 +692,33 @@ ok(isNaN(tmp), "Math.asin(Infinity) is not NaN"); tmp = Math.asin(-Infinity); ok(isNaN(tmp), "Math.asin(-Infinity) is not NaN"); +tmp = Math.atan(0); +ok(Math.floor(tmp*100) === 0, "Math.atan(0) = " + tmp); + +tmp = Math.atan(1); +ok(Math.floor(tmp*100) === 78, "Math.atan(1) = " + tmp); + +tmp = Math.atan(-1); +ok(Math.floor(tmp*100) === -79, "Math.atan(-1) = " + tmp); + +tmp = Math.atan(true); +ok(Math.floor(tmp*100) === 78, "Math.atan(true) = " + tmp); + +tmp = Math.atan(false); +ok(Math.floor(tmp*100) === 0, "Math.atan(false) = " + tmp); + +tmp = Math.atan(); +ok(isNaN(tmp), "Math.atan() is not NaN"); + +tmp = Math.atan(NaN); +ok(isNaN(tmp), "Math.atan(NaN) is not NaN"); + +tmp = Math.atan(Infinity); +ok(Math.floor(tmp*100) === 157, "Math.atan(Infinity) = " + tmp); + +tmp = Math.atan(-Infinity); +ok(Math.floor(tmp*100) === -158, "Math.atan(Infinity) = " + tmp); + var func = function (a) { var a = 1; if(a) return;

1 0

Piotr Caban : jscript: Added Math_atan2 implementation.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: d940755c71b0454ec0a07a9db6d24758c23f96b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d940755c71b0454ec0a07a9db… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon May 25 22:05:35 2009 +0200 jscript: Added Math_atan2 implementation. --- dlls/jscript/math.c | 22 ++++++++++++++++++- dlls/jscript/tests/api.js | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index f67a83d..2c45f8f 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -223,8 +223,26 @@ static HRESULT Math_atan(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS * static HRESULT Math_atan2(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v1, v2; + HRESULT hres; + + TRACE("\n"); + + if(arg_cnt(dp)<2) { + if(retv) num_set_nan(retv); + return S_OK; + } + + hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &v1); + if(FAILED(hres)) + return hres; + + hres = to_number(dispex->ctx, get_arg(dp, 1), ei, &v2); + if(FAILED(hres)) + return hres; + + if(retv) num_set_val(retv, atan2(num_val(&v1), num_val(&v2))); + return S_OK; } /* ECMA-262 3rd Edition 15.8.2.6 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2b338a9..3da1cc7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -719,6 +719,54 @@ ok(Math.floor(tmp*100) === 157, "Math.atan(Infinity) = " + tmp); tmp = Math.atan(-Infinity); ok(Math.floor(tmp*100) === -158, "Math.atan(Infinity) = " + tmp); +tmp = Math.atan2(0, 0); +ok(Math.floor(tmp*100) === 0, "Math.atan2(0, 0) = " + tmp); + +tmp = Math.atan2(0, 1); +ok(Math.floor(tmp*100) === 0, "Math.atan2(0, 1) = " + tmp); + +tmp = Math.atan2(0, Infinity); +ok(Math.floor(tmp*100) === 0, "Math.atan2(0, Infinity) = " + tmp); + +tmp = Math.atan2(0, -1); +ok(Math.floor(tmp*100) === 314, "Math.atan2(0, -1) = " + tmp); + +tmp = Math.atan2(0, -Infinity); +ok(Math.floor(tmp*100) === 314, "Math.atan2(0, -Infinity) = " + tmp); + +tmp = Math.atan2(1, 0); +ok(Math.floor(tmp*100) === 157, "Math.atan2(1, 0) = " + tmp); + +tmp = Math.atan2(Infinity, 0); +ok(Math.floor(tmp*100) === 157, "Math.atan2(Infinity, 0) = " + tmp); + +tmp = Math.atan2(-1, 0); +ok(Math.floor(tmp*100) === -158, "Math.atan2(-1, 0) = " + tmp); + +tmp = Math.atan2(-Infinity, 0); +ok(Math.floor(tmp*100) === -158, "Math.atan2(-Infinity, 0) = " + tmp); + +tmp = Math.atan2(1, 1); +ok(Math.floor(tmp*100) === 78, "Math.atan2(1, 1) = " + tmp); + +tmp = Math.atan2(-1, -1); +ok(Math.floor(tmp*100) === -236, "Math.atan2(-1, -1) = " + tmp); + +tmp = Math.atan2(-1, 1); +ok(Math.floor(tmp*100) === -79, "Math.atan2(-1, 1) = " + tmp); + +tmp = Math.atan2(Infinity, Infinity); +ok(Math.floor(tmp*100) === 78, "Math.atan2(Infinity, Infinity) = " + tmp); + +tmp = Math.atan2(Infinity, -Infinity, 1); +ok(Math.floor(tmp*100) === 235, "Math.atan2(Infinity, -Infinity, 1) = " + tmp); + +tmp = Math.atan2(); +ok(isNaN(tmp), "Math.atan2() is not NaN"); + +tmp = Math.atan2(1); +ok(isNaN(tmp), "Math.atan2(1) is not NaN"); + var func = function (a) { var a = 1; if(a) return;

1 0

Nikolay Sivov : comctl32/mru: Fix test failures on Win9x.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 713898df0c4424e28056aaf308ba9efa1147181f URL: http://source.winehq.org/git/wine.git/?a=commit;h=713898df0c4424e28056aaf30… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 25 23:51:54 2009 +0400 comctl32/mru: Fix test failures on Win9x. --- dlls/comctl32/tests/mru.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index ea05e02..c4da87b 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -430,9 +430,9 @@ static void test_CreateMRUListLazyA(void) HKEY hKey; CREATEMRULISTA listA = { 0 }; - if (!pCreateMRUListLazyA) + if (!pCreateMRUListLazyA || !pFreeMRUList) { - win_skip("CreateMRUListLazyA entry point 157 not found\n"); + win_skip("CreateMRUListLazyA or FreeMRUList entry points not found\n"); return; } @@ -455,7 +455,9 @@ static void test_CreateMRUListLazyA(void) listA.hKey = hKey; listA.lpszSubKey = NULL; hMRU = pCreateMRUListLazyA(&listA, 0, 0, 0); - ok(hMRU == NULL, "Expected NULL handle, got %p\n", hMRU); + ok(hMRU == NULL || broken(hMRU != NULL), /* Win9x */ + "Expected NULL handle, got %p\n", hMRU); + if (hMRU) pFreeMRUList(hMRU); } static void test_EnumMRUList(void)

1 0

Nikolay Sivov : comctl32/listview: Basic LVM_GETVIEWRECT tests.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: e7a07aa3fbb83ed06858d6d52a2300bd0bd85c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a07aa3fbb83ed06858d6d52… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 02:09:39 2009 +0400 comctl32/listview: Basic LVM_GETVIEWRECT tests. --- dlls/comctl32/tests/listview.c | 52 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index cd171cb..39224da 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2444,6 +2444,57 @@ static void test_hittest(void) DestroyWindow(hwnd); } +static void test_getviewrect(void) +{ + HWND hwnd; + DWORD r; + RECT rect; + LVITEMA item; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + /* empty */ + r = SendMessage(hwnd, LVM_GETVIEWRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + + insert_column(hwnd, 0); + insert_column(hwnd, 1); + + memset(&item, 0, sizeof(item)); + item.iItem = 0; + item.iSubItem = 0; + SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + + r = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 0, MAKELPARAM(100, 0)); + expect(TRUE, r); + r = SendMessage(hwnd, LVM_SETCOLUMNWIDTH, 1, MAKELPARAM(120, 0)); + expect(TRUE, r); + + rect.left = rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETVIEWRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + /* left is set to (2e31-1) - XP SP2 */ +todo_wine { + expect(0, rect.right); + expect(0, rect.top); + expect(0, rect.bottom); +} + + /* switch to LVS_ICON */ + SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~LVS_REPORT); + + rect.left = rect.right = rect.top = rect.bottom = -1; + r = SendMessage(hwnd, LVM_GETVIEWRECT, 0, (LPARAM)&rect); + expect(TRUE, r); + expect(0, rect.left); + todo_wine expect(104, rect.right); + expect(0, rect.top); + expect(73, rect.bottom); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2488,6 +2539,7 @@ START_TEST(listview) test_nosortheader(); test_setredraw(); test_hittest(); + test_getviewrect(); DestroyWindow(hwndparent); }

1 0

Nikolay Sivov : comctl32/listview: LVM_GETVIEWRECT is unsupported on LVS_REPORT style.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 6b63fce757fc92d934dd23c3f8b9b05f8f5456f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b63fce757fc92d934dd23c3f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 02:25:05 2009 +0400 comctl32/listview: LVM_GETVIEWRECT is unsupported on LVS_REPORT style. --- dlls/comctl32/listview.c | 18 +++++++++--------- dlls/comctl32/tests/listview.c | 2 -- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 129f3cb..f9b4983 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2372,6 +2372,7 @@ static BOOL LISTVIEW_Arrange(LISTVIEW_INFO *infoPtr, INT nAlignCode) /*** * DESCRIPTION: * Retrieves the bounding rectangle of all the items, not offset by Origin. + * For LVS_REPORT always returns empty rectangle. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure @@ -2412,11 +2413,6 @@ static void LISTVIEW_GetAreaRect(const LISTVIEW_INFO *infoPtr, LPRECT lprcView) lprcView->right = x * infoPtr->nItemWidth; lprcView->bottom = y * infoPtr->nItemHeight; break; - - case LVS_REPORT: - lprcView->right = infoPtr->nItemWidth; - lprcView->bottom = infoPtr->nItemCount * infoPtr->nItemHeight; - break; } } @@ -2439,10 +2435,14 @@ static BOOL LISTVIEW_GetViewRect(const LISTVIEW_INFO *infoPtr, LPRECT lprcView) TRACE("(lprcView=%p)\n", lprcView); if (!lprcView) return FALSE; - - LISTVIEW_GetOrigin(infoPtr, &ptOrigin); - LISTVIEW_GetAreaRect(infoPtr, lprcView); - OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); + + LISTVIEW_GetAreaRect(infoPtr, lprcView); + + if ((infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) + { + LISTVIEW_GetOrigin(infoPtr, &ptOrigin); + OffsetRect(lprcView, ptOrigin.x, ptOrigin.y); + } TRACE("lprcView=%s\n", wine_dbgstr_rect(lprcView)); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 39224da..13d8fde 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2475,11 +2475,9 @@ static void test_getviewrect(void) r = SendMessage(hwnd, LVM_GETVIEWRECT, 0, (LPARAM)&rect); expect(TRUE, r); /* left is set to (2e31-1) - XP SP2 */ -todo_wine { expect(0, rect.right); expect(0, rect.top); expect(0, rect.bottom); -} /* switch to LVS_ICON */ SetWindowLong(hwnd, GWL_STYLE, GetWindowLong(hwnd, GWL_STYLE) & ~LVS_REPORT);

1 0

Nikolay Sivov : comctl32/listview: A couple of LVM_GETITEMPOSITION tests.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 25c775a036ed68f2f1991b0611e4876bdb99b7cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c775a036ed68f2f1991b061… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 03:47:45 2009 +0400 comctl32/listview: A couple of LVM_GETITEMPOSITION tests. --- dlls/comctl32/tests/listview.c | 73 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 13d8fde..1a1ae06 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -185,6 +185,17 @@ static const struct message single_getdispinfo_parent_seq[] = { { 0 } }; +static const struct message getitemposition_seq1[] = { + { LVM_GETITEMPOSITION, sent|id, 0, 0, LISTVIEW_ID }, + { 0 } +}; + +static const struct message getitemposition_seq2[] = { + { LVM_GETITEMPOSITION, sent|id, 0, 0, LISTVIEW_ID }, + { HDM_GETITEMRECT, sent|id, 0, 0, HEADER_ID }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -2493,6 +2504,66 @@ static void test_getviewrect(void) DestroyWindow(hwnd); } +static void test_getitemposition(void) +{ + HWND hwnd, header; + DWORD r; + POINT pt; + RECT rect; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + header = subclass_header(hwnd); + + /* LVS_REPORT, single item, no columns added */ + insert_item(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + pt.x = pt.y = -1; + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pt); + expect(TRUE, r); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq1, "get item position 1", FALSE); + + /* LVS_REPORT, single item, single column */ + insert_column(hwnd, 0); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + pt.x = pt.y = -1; + r = SendMessage(hwnd, LVM_GETITEMPOSITION, 0, (LPARAM)&pt); + expect(TRUE, r); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, getitemposition_seq2, "get item position 2", TRUE); + + memset(&rect, 0, sizeof(rect)); + SendMessage(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); + /* some padding? */ + todo_wine expect(2, pt.x); + /* offset by header height */ + expect(rect.bottom - rect.top, pt.y); + + DestroyWindow(hwnd); +} + +static void test_columnscreation(void) +{ + HWND hwnd, header; + DWORD r; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + insert_item(hwnd, 0); + + /* headers columns aren't created automatically */ + header = (HWND)SendMessage(hwnd, LVM_GETHEADER, 0, 0); + ok(IsWindow(header), "Expected header handle\n"); + r = SendMessage(header, HDM_GETITEMCOUNT, 0, 0); + expect(0, r); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -2538,6 +2609,8 @@ START_TEST(listview) test_setredraw(); test_hittest(); test_getviewrect(); + test_getitemposition(); + test_columnscreation(); DestroyWindow(hwndparent); }

1 0

Nikolay Sivov : comctl32/listview: Improve item position calculating in LVS_REPORT.
by Alexandre Julliard 26 May '09

26 May '09

Module: wine Branch: master Commit: 2a32ce744c43cfaf664e998d0604eaff5933df48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a32ce744c43cfaf664e998d0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 26 04:04:36 2009 +0400 comctl32/listview: Improve item position calculating in LVS_REPORT. --- dlls/comctl32/listview.c | 5 ++++- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f9b4983..79ac0e3 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1920,7 +1920,10 @@ static void LISTVIEW_GetItemOrigin(const LISTVIEW_INFO *infoPtr, INT nItem, LPPO } else /* LVS_REPORT */ { - lpptPosition->x = 0; + lpptPosition->x = REPORT_MARGINX; + /* item is always at zero indexed column */ + if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) + lpptPosition->x += LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; lpptPosition->y = nItem * infoPtr->nItemHeight; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 1a1ae06..47477a4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2538,7 +2538,7 @@ static void test_getitemposition(void) memset(&rect, 0, sizeof(rect)); SendMessage(header, HDM_GETITEMRECT, 0, (LPARAM)&rect); /* some padding? */ - todo_wine expect(2, pt.x); + expect(2, pt.x); /* offset by header height */ expect(rect.bottom - rect.top, pt.y);

1 0