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

Detlef Riekenberg : winetest: Add support for --version, --help and /?.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 1f07bc02c1112e763f675df187391c403a4ee711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f07bc02c1112e763f675df18… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 16:21:00 2009 +0200 winetest: Add support for --version, --help and /?. --- programs/winetest/main.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a07e3d9..72b41c6 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -774,14 +774,16 @@ usage (void) { fprintf (stderr, "Usage: winetest [OPTION]... [TESTS]\n\n" -" -c console mode, no GUI\n" -" -e preserve the environment\n" -" -h print this message and exit\n" -" -p shutdown when the tests are done\n" -" -q quiet mode, no output at all\n" -" -o FILE put report into FILE, do not submit\n" -" -s FILE submit FILE, do not run tests\n" -" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); +" --help print this message and exit\n" +" --version print the build version and exit\n" +" -c console mode, no GUI\n" +" -e preserve the environment\n" +" -h print this message and exit\n" +" -p shutdown when the tests are done\n" +" -q quiet mode, no output at all\n" +" -o FILE put report into FILE, do not submit\n" +" -s FILE submit FILE, do not run tests\n" +" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); } int main( int argc, char *argv[] ) @@ -797,7 +799,15 @@ int main( int argc, char *argv[] ) for (i = 1; argv[i]; i++) { - if (argv[i][0] != '-' || argv[i][2]) { + if (!strcmp(argv[i], "--help")) { + usage (); + exit (0); + } + else if (!strcmp(argv[i], "--version")) { + printf("%-12.12s\n", build_id[0] ? build_id : "unknown"); + exit (0); + } + else if ((argv[i][0] != '-' && argv[i][0] != '/') || argv[i][2]) { if (nb_filters == sizeof(filters)/sizeof(filters[0])) { report (R_ERROR, "Too many test filters specified");

1 0

Detlef Riekenberg : winetest: Add option -x to extract all test.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: dc0beeb976d76e1e72365f996cf102482c607a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0beeb976d76e1e72365f996… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Apr 17 22:02:26 2009 +0200 winetest: Add option -x to extract all test. --- programs/winetest/main.c | 56 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 53 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 72b41c6..6cee70c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -769,6 +769,48 @@ static BOOL WINAPI ctrl_handler(DWORD ctrl_type) return FALSE; } + +static BOOL CALLBACK +extract_only_proc (HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam) +{ + const char *target_dir = (const char *)lParam; + char filename[MAX_PATH]; + + if (test_filtered_out( lpszName, NULL )) return TRUE; + + strcpy(filename, lpszName); + CharLowerA(filename); + + extract_test( &wine_tests[nr_of_files], target_dir, filename ); + nr_of_files++; + return TRUE; +} + +static void extract_only (const char *target_dir) +{ + BOOL res; + + report (R_DIR, target_dir); + res = CreateDirectoryA( target_dir, NULL ); + if (!res && GetLastError() != ERROR_ALREADY_EXISTS) + report (R_FATAL, "Could not create directory: %s (%d)", target_dir, GetLastError ()); + + nr_of_files = 0; + report (R_STATUS, "Counting tests"); + if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), EnumTestFileProc, (LPARAM)&nr_of_files)) + report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); + + wine_tests = xmalloc (nr_of_files * sizeof wine_tests[0] ); + + report (R_STATUS, "Extracting tests"); + report (R_PROGRESS, 0, nr_of_files); + nr_of_files = 0; + if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), extract_only_proc, (LPARAM)target_dir)) + report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); + + report (R_DELTA, 0, "Extracting: Done"); +} + static void usage (void) { @@ -783,12 +825,14 @@ usage (void) " -q quiet mode, no output at all\n" " -o FILE put report into FILE, do not submit\n" " -s FILE submit FILE, do not run tests\n" -" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n"); +" -t TAG include TAG of characters [-.0-9a-zA-Z] in the report\n" +" -x DIR Extract tests to DIR (default: .\\wct) and exit\n"); } int main( int argc, char *argv[] ) { char *logname = NULL; + const char *extract = NULL; const char *cp, *submit = NULL; int reset_env = 1; int poweroff = 0; @@ -797,7 +841,7 @@ int main( int argc, char *argv[] ) if (!LoadStringA( 0, IDS_BUILD_ID, build_id, sizeof(build_id) )) build_id[0] = 0; - for (i = 1; argv[i]; i++) + for (i = 1; i < argc && argv[i]; i++) { if (!strcmp(argv[i], "--help")) { usage (); @@ -867,13 +911,19 @@ int main( int argc, char *argv[] ) exit (2); } break; + case 'x': + if (!(extract = argv[++i])) + extract = ".\\wct"; + + extract_only (extract); + break; default: report (R_ERROR, "invalid option: -%c", argv[i][1]); usage (); exit (2); } } - if (!submit) { + if (!submit && !extract) { report (R_STATUS, "Starting up"); if (!running_on_visible_desktop ())

1 0

Igor Tarasov : comctl32: Fix typo in TOOLBAR_SetButtonSize code.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 74baffb2542813d73340cf070e9ef82b4ab74823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74baffb2542813d73340cf070… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Sun Apr 19 17:49:18 2009 +0500 comctl32: Fix typo in TOOLBAR_SetButtonSize code. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index faac97c..cf54df7 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4531,7 +4531,7 @@ TOOLBAR_SetButtonSize (HWND hwnd, LPARAM lParam) * 22 high. Demonstarted in ControlSpy Toolbar. GLA 3/02 */ if (cx == 0) cx = 24; - if (cy == 0) cx = 22; + if (cy == 0) cy = 22; cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight);

1 0

Christian Costa : winedump: When generating preamble, use 4 spaces instead of tabs. Remove extra break.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: d5f3d6f7590a3e1aa4995437fe016930f2363105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f3d6f7590a3e1aa4995437f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 20 21:26:53 2009 +0200 winedump: When generating preamble, use 4 spaces instead of tabs. Remove extra break. --- tools/winedump/output.c | 41 ++++++++++++++++++++++++----------------- 1 files changed, 24 insertions(+), 17 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 2b9d1ae..c2a69d3 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -233,35 +233,42 @@ void output_c_preamble (void) if (VERBOSE) puts ("Creating a forwarding DLL"); - fputs ("\nHMODULE hDLL=0;\t/* DLL to call */\n\n", cfile); + fputs ("\nHMODULE hDLL=0; /* DLL to call */\n\n", cfile); } fprintf (cfile, "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID " "lpvReserved)\n{\n" - "\tTRACE(\"(0x%%p, %%d, %%p)\\n\", hinstDLL, fdwReason, lpvReserved);\n" - "\n\tswitch (fdwReason)\n\t{\n" - "\t\tcase DLL_WINE_PREATTACH:\n" - "\t\t\treturn FALSE; /* prefer native version */\n" - "\t\tcase DLL_PROCESS_ATTACH:\n"); + " TRACE(\"(0x%%p, %%d, %%p)\\n\", hinstDLL, fdwReason, lpvReserved);\n\n" + " switch (fdwReason)\n" + " {\n" + " case DLL_WINE_PREATTACH:\n" + " return FALSE; /* prefer native version */\n" + " case DLL_PROCESS_ATTACH:\n"); if (globals.forward_dll) - fprintf (cfile, "\t\t\thDLL = LoadLibraryA(\"%s\");\n" - "\t\t\tTRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", - globals.forward_dll, globals.forward_dll); + fprintf (cfile, + " DLL = LoadLibraryA(\"%s\");\n" + " TRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", + globals.forward_dll, globals.forward_dll); else - fprintf (cfile, "\t\t\t/* FIXME: Initialisation */\n" - "\t\t\tDisableThreadLibraryCalls(hinstDLL);\n\t\t\tbreak;\n"); + fprintf (cfile, + " DisableThreadLibraryCalls(hinstDLL);\n"); - fprintf (cfile, "\t\t\tbreak;\n\t\tcase DLL_PROCESS_DETACH:\n"); + fprintf (cfile, + " break;\n" + " case DLL_PROCESS_DETACH:\n"); if (globals.forward_dll) - fprintf (cfile, "\t\t\tFreeLibrary(hDLL);\n" - "\t\t\tTRACE(\"Forwarding DLL (%s) freed\\n\");\n", - globals.forward_dll); + fprintf (cfile, + " FreeLibrary(hDLL);\n" + " TRACE(\"Forwarding DLL (%s) freed\\n\");\n", + globals.forward_dll); - fprintf (cfile, "\t\t\tbreak;\n\t\tdefault:\n\t\t\tbreak;\n\t}\n\n" - "\treturn TRUE;\n}\n\n\n"); + fprintf (cfile, + " break;\n" + " }\n\n" + " return TRUE;\n}\n"); }

1 0

Nicolas Le Cam : wininet/tests: Fix HttpSendRequestW test on IE5.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 295d6773c0ebf6add2b8063b018750f7d39d9a5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=295d6773c0ebf6add2b8063b0… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Apr 20 21:56:59 2009 +0200 wininet/tests: Fix HttpSendRequestW test on IE5. --- dlls/wininet/tests/http.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a573e14..773b4c6 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -771,7 +771,7 @@ static void InternetOpenUrlA_test(void) char buffer[0x400]; DWORD size, readbytes, totalbytes=0; BOOL ret; - + myhinternet = InternetOpen("Winetest",0,NULL,NULL,INTERNET_FLAG_NO_CACHE_WRITE); ok((myhinternet != 0), "InternetOpen failed, error %u\n",GetLastError()); size = 0x400; @@ -1038,7 +1038,7 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Warning hearder reported as Existing\n"); - + ok(HttpAddRequestHeaders(hRequest,"Warning:test1",-1,HTTP_ADDREQ_FLAG_ADD), "Failed to add new header\n"); @@ -1184,7 +1184,7 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Third Header Should Not Exist\n"); - + ok(HttpAddRequestHeaders(hRequest,"Warning:test4",-1,HTTP_ADDREQ_FLAG_ADD_IF_NEW)==0, "HTTP_ADDREQ_FLAG_ADD_IF_NEW replaced existing header\n"); index = 0; @@ -1274,7 +1274,7 @@ static void HttpHeaders_test(void) strcpy(buffer,"Warning"); ok(HttpQueryInfo(hRequest,HTTP_QUERY_CUSTOM|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer,&len,&index)==0,"Third Header Should Not Exist\n"); - + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); @@ -1849,7 +1849,9 @@ static void test_HttpSendRequestW(int port) ret = HttpSendRequestW(req, header, ~0u, NULL, 0); error = GetLastError(); ok(!ret, "HttpSendRequestW succeeded\n"); - ok(error == ERROR_IO_PENDING || broken(error == ERROR_HTTP_HEADER_NOT_FOUND), /* IE6 */ + ok(error == ERROR_IO_PENDING || + broken(error == ERROR_HTTP_HEADER_NOT_FOUND) || /* IE6 */ + broken(error == ERROR_INVALID_PARAMETER), /* IE5 */ "got %u expected ERROR_IO_PENDING\n", error); InternetCloseHandle(req);

1 0

Florian Köberle : comctl32/tests: Test expanding of a invisible sub tree.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 123dc34aecda9e79ebb0d7b984ae48eb2f4f0de2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123dc34aecda9e79ebb0d7b98… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Apr 21 12:03:41 2009 +0200 comctl32/tests: Test expanding of a invisible sub tree. --- dlls/comctl32/tests/treeview.c | 76 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5f310b5..8939a77 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -748,6 +748,79 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa return 0L; } +static void TestExpandInvisible(void) +{ + static CHAR nodeText[][5] = {"0", "1", "2", "3", "4"}; + TVINSERTSTRUCTA ins; + HTREEITEM node[5]; + RECT dummyRect; + BOOL nodeVisible; + + /* The test builds the following tree and expands then node 1, while node 0 is collapsed. + * + * 0 + * |- 1 + * | |- 2 + * | |- 3 + * |- 4 + * + */ + + TreeView_DeleteAllItems(hTree); + + ins.hParent = TVI_ROOT; + ins.hInsertAfter = TVI_ROOT; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = nodeText[0]; + node[0] = TreeView_InsertItem(hTree, &ins); + assert(node[0]); + + ins.hInsertAfter = TVI_LAST; + U(ins).item.mask = TVIF_TEXT; + ins.hParent = node[0]; + + U(ins).item.pszText = nodeText[1]; + node[1] = TreeView_InsertItem(hTree, &ins); + assert(node[1]); + U(ins).item.pszText = nodeText[4]; + node[4] = TreeView_InsertItem(hTree, &ins); + assert(node[4]); + + ins.hParent = node[1]; + + U(ins).item.pszText = nodeText[2]; + node[2] = TreeView_InsertItem(hTree, &ins); + assert(node[2]); + U(ins).item.pszText = nodeText[3]; + node[3] = TreeView_InsertItem(hTree, &ins); + assert(node[3]); + + + nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); + ok(!nodeVisible, "Node 1 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); + ok(!nodeVisible, "Node 2 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); + ok(!nodeVisible, "Node 3 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); + ok(!nodeVisible, "Node 4 should not be visible.\n"); + + ok(TreeView_Expand(hTree, node[1], TVE_EXPAND), "Expand of node 1 failed.\n"); + + nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); + ok(!nodeVisible, "Node 1 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); +todo_wine + ok(!nodeVisible, "Node 2 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); +todo_wine + ok(!nodeVisible, "Node 3 should not be visible.\n"); + nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); +todo_wine + ok(!nodeVisible, "Node 4 should not be visible.\n"); +} + + START_TEST(treeview) { HMODULE hComctl32; @@ -814,6 +887,9 @@ START_TEST(treeview) /* Clears all the previous items */ TestCallback(); + /* Clears all the previous items */ + TestExpandInvisible(); + PostMessageA(hMainWnd, WM_CLOSE, 0, 0); while(GetMessageA(&msg,0,0,0)) { TranslateMessage(&msg);

1 0

Florian Köberle : comctl32: Fix expanding of invisible sub trees.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 5a6f956187027e1c2e3f2644ee103b7aa3d2ee87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6f956187027e1c2e3f2644e… Author: Florian Köberle <florian(a)fkoeberle.de> Date: Tue Apr 21 12:03:42 2009 +0200 comctl32: Fix expanding of invisible sub trees. --- dlls/comctl32/tests/treeview.c | 3 - dlls/comctl32/treeview.c | 83 ++++++++++++++++++++------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 8939a77..05a5237 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -810,13 +810,10 @@ static void TestExpandInvisible(void) nodeVisible = TreeView_GetItemRect(hTree, node[1], &dummyRect, FALSE); ok(!nodeVisible, "Node 1 should not be visible.\n"); nodeVisible = TreeView_GetItemRect(hTree, node[2], &dummyRect, FALSE); -todo_wine ok(!nodeVisible, "Node 2 should not be visible.\n"); nodeVisible = TreeView_GetItemRect(hTree, node[3], &dummyRect, FALSE); -todo_wine ok(!nodeVisible, "Node 3 should not be visible.\n"); nodeVisible = TreeView_GetItemRect(hTree, node[4], &dummyRect, FALSE); -todo_wine ok(!nodeVisible, "Node 4 should not be visible.\n"); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 43ae7b6..4aa5725 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3292,56 +3292,59 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, if (bExpandPartial) FIXME("TVE_EXPANDPARTIAL not implemented\n"); - TREEVIEW_RecalculateVisibleOrder(infoPtr, wineItem); - TREEVIEW_UpdateSubTree(infoPtr, wineItem); - TREEVIEW_UpdateScrollBars(infoPtr); - - scrollRect.left = 0; - scrollRect.bottom = infoPtr->treeHeight; - scrollRect.right = infoPtr->clientWidth; - if (nextItem) + if (ISVISIBLE(wineItem)) { - scrollDist = nextItem->rect.top - orgNextTop; - scrollRect.top = orgNextTop; + TREEVIEW_RecalculateVisibleOrder(infoPtr, wineItem); + TREEVIEW_UpdateSubTree(infoPtr, wineItem); + TREEVIEW_UpdateScrollBars(infoPtr); - ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, - NULL, NULL, SW_ERASE | SW_INVALIDATE); - TREEVIEW_Invalidate (infoPtr, wineItem); - } else { - scrollRect.top = wineItem->rect.top; - InvalidateRect(infoPtr->hwnd, &scrollRect, FALSE); - } + scrollRect.left = 0; + scrollRect.bottom = infoPtr->treeHeight; + scrollRect.right = infoPtr->clientWidth; + if (nextItem) + { + scrollDist = nextItem->rect.top - orgNextTop; + scrollRect.top = orgNextTop; + + ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL, + NULL, NULL, SW_ERASE | SW_INVALIDATE); + TREEVIEW_Invalidate (infoPtr, wineItem); + } else { + scrollRect.top = wineItem->rect.top; + InvalidateRect(infoPtr->hwnd, &scrollRect, FALSE); + } - /* Scroll up so that as many children as possible are visible. - * This fails when expanding causes an HScroll bar to appear, but we - * don't know that yet, so the last item is obscured. */ - if (wineItem->firstChild != NULL) - { - int nChildren = wineItem->lastChild->visibleOrder - - wineItem->firstChild->visibleOrder + 1; + /* Scroll up so that as many children as possible are visible. + * This fails when expanding causes an HScroll bar to appear, but we + * don't know that yet, so the last item is obscured. */ + if (wineItem->firstChild != NULL) + { + int nChildren = wineItem->lastChild->visibleOrder + - wineItem->firstChild->visibleOrder + 1; - int visible_pos = wineItem->visibleOrder - - infoPtr->firstVisible->visibleOrder; + int visible_pos = wineItem->visibleOrder + - infoPtr->firstVisible->visibleOrder; - int rows_below = TREEVIEW_GetVisibleCount(infoPtr) - visible_pos - 1; + int rows_below = TREEVIEW_GetVisibleCount(infoPtr) - visible_pos - 1; - if (visible_pos > 0 && nChildren > rows_below) - { - int scroll = nChildren - rows_below; + if (visible_pos > 0 && nChildren > rows_below) + { + int scroll = nChildren - rows_below; - if (scroll > visible_pos) - scroll = visible_pos; + if (scroll > visible_pos) + scroll = visible_pos; - if (scroll > 0) - { - TREEVIEW_ITEM *newFirstVisible - = TREEVIEW_GetListItem(infoPtr, infoPtr->firstVisible, - scroll); + if (scroll > 0) + { + TREEVIEW_ITEM *newFirstVisible + = TREEVIEW_GetListItem(infoPtr, infoPtr->firstVisible, + scroll); - TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); - } - } + TREEVIEW_SetFirstVisible(infoPtr, newFirstVisible, TRUE); + } + } + } } return TRUE;

1 0

Nikolay Sivov : comctl32/listview: LVM_SETITEM is unsupported on LVS_OWNERDATA.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 949e9043b94c847243422c82436eab942e663f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949e9043b94c847243422c824… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Apr 21 05:26:10 2009 -0400 comctl32/listview: LVM_SETITEM is unsupported on LVS_OWNERDATA. --- dlls/comctl32/listview.c | 7 ++++--- dlls/comctl32/tests/listview.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 3c294f2..1ba8162 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -10010,10 +10010,11 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SETINSERTMARKCOLOR: */ case LVM_SETITEMA: - return LISTVIEW_SetItemT(infoPtr, (LPLVITEMW)lParam, FALSE); - case LVM_SETITEMW: - return LISTVIEW_SetItemT(infoPtr, (LPLVITEMW)lParam, TRUE); + { + if (infoPtr->dwStyle & LVS_OWNERDATA) return FALSE; + return LISTVIEW_SetItemT(infoPtr, (LPLVITEMW)lParam, (uMsg == LVM_SETITEMW)); + } case LVM_SETITEMCOUNT: return LISTVIEW_SetItemCount(infoPtr, (INT)wParam, (DWORD)lParam); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6b68c56..b85dbfb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1651,6 +1651,24 @@ static void test_ownerdata(void) expect(TRUE, res); res = SendMessageA(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); expect(1, res); + res = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + expect(1, res); + DestroyWindow(hwnd); + + /* LVM_SETITEM is unsupported on LVS_OWNERDATA */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(res != 0, "Expected LVM_SETITEMCOUNT to succeed\n"); + res = SendMessageA(hwnd, LVM_GETITEMCOUNT, 0, 0); + expect(1, res); + memset(&item, 0, sizeof(item)); + item.mask = LVIF_STATE; + item.iItem = 0; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEM, 0, (LPARAM)&item); + expect(FALSE, res); DestroyWindow(hwnd); }

1 0

Roderick Colenbrander : opengl: Add WGL_EXT_pixel_format_packed_float support.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 9b889626d072bdd28ce2096cf2acedab47810037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b889626d072bdd28ce2096cf… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Apr 20 22:57:19 2009 +0200 opengl: Add WGL_EXT_pixel_format_packed_float support. --- dlls/winex11.drv/opengl.c | 19 ++++++++++++++++++- include/wine/wgl.h | 7 +++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d43f03e..7ac8cad 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -4,7 +4,7 @@ * Copyright 2000 Lionel Ulmer * Copyright 2005 Alex Woods * Copyright 2005 Raphael Junqueira - * Copyright 2006 Roderick Colenbrander + * Copyright 2006-2009 Roderick Colenbrander * Copyright 2006 Tomas Carnecky * * This library is free software; you can redistribute it and/or @@ -681,6 +681,7 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf case WGL_TYPE_RGBA_ARB: pixelattrib = GLX_RGBA_BIT; break ; /* This is the same as WGL_TYPE_RGBA_FLOAT_ATI but the GLX constants differ, only the ARB GLX one is widely supported so use that */ case WGL_TYPE_RGBA_FLOAT_ATI: pixelattrib = GLX_RGBA_FLOAT_BIT; break ; + case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: pixelattrib = GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT; break ; default: ERR("unexpected PixelType(%x)\n", pop); pop = 0; @@ -790,6 +791,11 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf TRACE("pAttr[%d] = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT: %x\n", cur, pop); break ; + case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: + pop = iWGLAttr[++cur]; + PUSH2(oGLXAttr, GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT, pop); + TRACE("pAttr[%d] = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT: %x\n", cur, pop); + break ; default: FIXME("unsupported %x WGL Attribute\n", iWGLAttr[cur]); break; @@ -839,6 +845,9 @@ static int get_render_type_from_fbconfig(Display *display, GLXFBConfig fbconfig) case GLX_RGBA_FLOAT_BIT: render_type = GLX_RGBA_FLOAT_TYPE; break; + case GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT: + render_type = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT; + break; default: ERR("Unknown render_type: %x\n", render_type); } @@ -2743,6 +2752,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF else if (tmp & GLX_COLOR_INDEX_BIT) { piValues[i] = WGL_TYPE_COLORINDEX_ARB; } else if (tmp & GLX_RGBA_FLOAT_BIT) { piValues[i] = WGL_TYPE_RGBA_FLOAT_ATI; } else if (tmp & GLX_RGBA_FLOAT_ATI_BIT) { piValues[i] = WGL_TYPE_RGBA_FLOAT_ATI; } + else if (tmp & GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT) { piValues[i] = WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT; } else { ERR("unexpected RenderType(%x)\n", tmp); piValues[i] = WGL_TYPE_RGBA_ARB; @@ -2853,6 +2863,10 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribivARB(HDC hdc, int iPixelF curGLXAttr = GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT; break; + case WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT: + curGLXAttr = GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT; + break; + case WGL_ACCUM_RED_BITS_ARB: curGLXAttr = GLX_ACCUM_RED_SIZE; break; @@ -3402,6 +3416,9 @@ static void X11DRV_WineGL_LoadExtensions(void) if(glxRequireExtension("GLX_EXT_framebuffer_sRGB")) register_extension_string("WGL_EXT_framebuffer_sRGB"); + if(glxRequireExtension("GLX_EXT_fbconfig_packed_float")) + register_extension_string("WGL_EXT_pixel_format_packed_float"); + /* The OpenGL extension GL_NV_vertex_array_range adds wgl/glX functions which aren't exported as 'real' wgl/glX extensions. */ if(strstr(WineGLInfo.glExtensions, "GL_NV_vertex_array_range") != NULL) register_extension(&WGL_NV_vertex_array_range); diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 7a2e77e..29ab536 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -182,6 +182,13 @@ # define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 #endif +/* WGL_EXT_pixel_format_packed_float */ +#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 +#ifndef GLX_EXT_fbconfig_packed_float +#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 +#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008 +#endif + /** WGL_ARB_create_context */ #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 #define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002

1 0

Michael Stefaniuc : comdlg32: Fix the Slovak translation.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 3a88ed1236c514f96b07c939447ccf4bd1cbbcff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a88ed1236c514f96b07c9394… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 00:35:13 2009 +0200 comdlg32: Fix the Slovak translation. --- dlls/comdlg32/cdlg_Sk.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/cdlg_Sk.rc b/dlls/comdlg32/cdlg_Sk.rc index 36d2a2a..7fbc5a9 100644 --- a/dlls/comdlg32/cdlg_Sk.rc +++ b/dlls/comdlg32/cdlg_Sk.rc @@ -316,13 +316,13 @@ BEGIN AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "L&eft:", stc15, 88, 172, 21, 8 - EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Right:", stc16, 159, 172, 27, 8 - EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "T&op:", stc17, 88, 192, 21, 8 - EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Bottom:", stc18, 159, 192, 23, 8 - EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER + EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Zru�i�", IDCANCEL, 126, 220, 50, 14 PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14

1 0