December 2008 - Wine-Commits

Alexandre Julliard : user32/tests: Added some tests for behavior of 64-bit user handles.
by Alexandre Julliard Dec. 9, 2008

Dec. 9, 2008

Module: wine Branch: master Commit: ad4605fc61953497de9a4dde9c023269f02139af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4605fc61953497de9a4dde9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 14:02:48 2008 +0100 user32/tests: Added some tests for behavior of 64-bit user handles. --- dlls/user32/tests/win.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 00e30bc..ffbb8d2 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5311,6 +5311,43 @@ static void test_thick_child_size(HWND parentWindow) ok(UnregisterClass(className, GetModuleHandleA(0)),"UnregisterClass call failed\n"); } +static void test_handles( HWND full_hwnd ) +{ + HWND hwnd = full_hwnd; + BOOL ret; + RECT rect; + + SetLastError( 0xdeadbeef ); + ret = GetWindowRect( hwnd, &rect ); + ok( ret, "GetWindowRect failed for %p err %u\n", hwnd, GetLastError() ); + +#ifdef _WIN64 + if ((ULONG_PTR)full_hwnd >> 32) + hwnd = (HWND)((ULONG_PTR)full_hwnd & ~0u); + else + hwnd = (HWND)((ULONG_PTR)full_hwnd | ((ULONG_PTR)~0u << 32)); + SetLastError( 0xdeadbeef ); + ret = GetWindowRect( hwnd, &rect ); + ok( ret, "GetWindowRect failed for %p err %u\n", hwnd, GetLastError() ); + + hwnd = (HWND)(((ULONG_PTR)full_hwnd & ~0u) | ((ULONG_PTR)0x1234 << 32)); + SetLastError( 0xdeadbeef ); + ret = GetWindowRect( hwnd, &rect ); + ok( ret, "GetWindowRect failed for %p err %u\n", hwnd, GetLastError() ); + + hwnd = (HWND)(((ULONG_PTR)full_hwnd & 0xffff) | ((ULONG_PTR)0x9876 << 16)); + SetLastError( 0xdeadbeef ); + ret = GetWindowRect( hwnd, &rect ); + ok( !ret, "GetWindowRect succeeded for %p\n", hwnd ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); + + hwnd = (HWND)(((ULONG_PTR)full_hwnd & 0xffff) | ((ULONG_PTR)0x12345678 << 16)); + SetLastError( 0xdeadbeef ); + ret = GetWindowRect( hwnd, &rect ); + ok( !ret, "GetWindowRect succeeded for %p\n", hwnd ); + ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); +#endif +} START_TEST(win) { @@ -5390,6 +5427,7 @@ START_TEST(win) test_SetForegroundWindow(hwndMain); test_shell_window(); + test_handles( hwndMain ); /* add the tests above this line */ UnhookWindowsHookEx(hhook);

1 0

Jeremy Newman : set the title of the home page
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: 5fdcde68b5a56900043d8882da4607eca8e2466b URL: http://source.winehq.org/git/website.git/?a=commit;h=5fdcde68b5a56900043d88… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 15:27:58 2008 -0600 set the title of the home page --- templates/en/home.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index fd9e5a0..a321334 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -1,5 +1,5 @@ - - + +  <div id="main_left">

1 0

Jeremy Newman : set page title correctly
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: 33b4e5f4c622c4f3cd34e3d2d72a2890d991b02e URL: http://source.winehq.org/git/website.git/?a=commit;h=33b4e5f4c622c4f3cd34e3… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 15:25:15 2008 -0600 set page title correctly --- include/themes/winehq/content.template | 2 +- include/themes/winehq/content_nobox.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/themes/winehq/content.template b/include/themes/winehq/content.template index 783c09e..baea0f6 100644 --- a/include/themes/winehq/content.template +++ b/include/themes/winehq/content.template @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>WineHQ</title> + <title>{$page_title}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> <meta HTTP-EQUIV="Pragma" CONTENT="no-cache"> diff --git a/include/themes/winehq/content_nobox.template b/include/themes/winehq/content_nobox.template index 6842545..c21b271 100644 --- a/include/themes/winehq/content_nobox.template +++ b/include/themes/winehq/content_nobox.template @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> - <title>WineHQ</title> + <title>{$page_title}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta HTTP-EQUIV="Expires" CONTENT="Mon, 06 Jan 1990 00:00:01 GMT"> <meta HTTP-EQUIV="Pragma" CONTENT="no-cache">

1 0

Jeremy Newman : add some more debug logging
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: 6b32eb513995d51ca754798f4b7ef8ad744df52c URL: http://source.winehq.org/git/website.git/?a=commit;h=6b32eb513995d51ca75479… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 15:24:59 2008 -0600 add some more debug logging --- include/html.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/html.php b/include/html.php index 3e905b2..f56348f 100644 --- a/include/html.php +++ b/include/html.php @@ -1258,14 +1258,16 @@ class html // get page name from template if (preg_match('//', $orig, $arr)) { + debug("global", "adding to title: {$arr[1]}"); $in = preg_replace('/\n/', '', $in); - $this->page_title = $arr[1]; + $this->page_title .= " - {$arr[1]}"; unset($arr); } // override the page theme if (preg_match('//', $orig, $arr)) { + debug("global", "changing theme: {$arr[1]}"); $in = preg_replace('/\n/', '', $in); $this->page_theme = $arr[1]; unset($arr); @@ -1274,6 +1276,7 @@ class html // override the page style if (preg_match('//', $orig, $arr)) { + debug("global", "changing page style: {$arr[1]}"); $in = preg_replace('/\n/', '', $in); $this->page_style = $arr[1]; unset($arr); @@ -1282,6 +1285,7 @@ class html // get page blurb template if (preg_match('//', $orig, $arr)) { + debug("global", "setting page blurb: {$arr[1]}"); $in = preg_replace('/\n/', '', $in); $this->page_blurb = $arr[1]; unset($arr);

1 0

Jeremy Newman : search box tweaks
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: bugzilla Branch: master Commit: de239140e4439768bc6462f2ebd38d8ab8fe7739 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=de239140e4439768bc646… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 15:15:13 2008 -0600 search box tweaks --- styles.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/styles.css b/styles.css index 0578028..d56a1c1 100644 --- a/styles.css +++ b/styles.css @@ -53,7 +53,9 @@ BODY { width: 250px; margin: 0; padding: 0; + font-size: 10px; } +#search_box INPUT { font-size: 12px; width: 175px; margin: 0; padding: 2px; border: 1px inset red; } /* top tabs */ #tabs {

1 0

Jeremy Newman : search box tweaks
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: appdb Branch: master Commit: 73cd969ca38139dd320a8f0dc1a03ab96a390c2c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=73cd969ca38139dd320a8f0d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 15:14:52 2008 -0600 search box tweaks --- styles.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/styles.css b/styles.css index 0e1ac42..d072472 100644 --- a/styles.css +++ b/styles.css @@ -53,7 +53,9 @@ BODY { width: 250px; margin: 0; padding: 0; + font-size: 10px; } +#search_box INPUT { font-size: 12px; width: 175px; margin: 0; padding: 2px; border: 1px inset red; } /* top tabs */ #tabs {

1 0

Jeremy Newman : search box should be a fixed pixel size to avoid rendering issues with
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: 6547597626ac9829c325233076f13a2545e48d29 URL: http://source.winehq.org/git/website.git/?a=commit;h=6547597626ac9829c32523… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 15:07:22 2008 -0600 search box should be a fixed pixel size to avoid rendering issues with other content --- styles.css | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/styles.css b/styles.css index f508270..297e898 100644 --- a/styles.css +++ b/styles.css @@ -53,7 +53,9 @@ BODY { width: 250px; margin: 0; padding: 0; + font-size: 10px; } +#search_box INPUT { font-size: 12px; width: 175px; margin: 0; padding: 2px; border: 1px inset red; } /* top tabs */ #tabs {

1 0

Jeremy Newman : let the browser decide the width of tables
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: d77835ccfa548d35659fa0366af3009283e7eb3b URL: http://source.winehq.org/git/website.git/?a=commit;h=d77835ccfa548d35659fa0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 14:55:43 2008 -0600 let the browser decide the width of tables --- templates/en/devel.template | 2 +- templates/en/download.template | 6 +++--- templates/en/help.template | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/en/devel.template b/templates/en/devel.template index d3bce93..cb0cb28 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -6,7 +6,7 @@ <p>Welcome to Wine development. On this page you will find links to our various resources available for our developers.</p> -<table width="95%" border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF" style="margin-left: 20px;"> +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF" style="margin-left: 20px;"> <tr> <td bgcolor="black"><b style="color: #FFFFFF">Option</b></td> diff --git a/templates/en/download.template b/templates/en/download.template index e6884c7..eb8cd18 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -5,7 +5,7 @@ <h2><a name="crossover"></a>Supported Wine</h2> -<table width="95%" border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> +<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> <td align="center" bgcolor="black"><b><font color="white" class="small">Product</font></b></td> @@ -47,7 +47,7 @@ for post-installation instructions.</b></p> <p><table><tr><td>Latest stable release:</td><td>Wine {$config_stable_release}</td></tr> <tr><td>Latest development release:</td><td>Wine {$config_master_release}</td></tr></table></p> -<table width="95%" border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> +<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> <td align="center" bgcolor="black"><b><font color="white" class="small">System</font></b></td> @@ -171,7 +171,7 @@ for post-installation instructions.</b></p> <h2><a name="source"></a>Wine Source Downloads</h2> -<table width="95%" border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> +<table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> <tr> <td align="center" bgcolor="black"><b><font color="white" class="small">Location</font></b></td> diff --git a/templates/en/help.template b/templates/en/help.template index 0f75fdc..075f892 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -5,7 +5,7 @@ <p>There are a variety of ways to get help in using Wine.</p> -<table width="95%" border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> +<table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> <tr> <td align="center" bgcolor="black" class="small"><b style="color: #FFFFFF">Option</b></td>

1 0

Jeremy Newman : fix forums link
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: 3161b73c9458c275dc0a079f513bbc19329ee356 URL: http://source.winehq.org/git/website.git/?a=commit;h=3161b73c9458c275dc0a07… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 14:45:12 2008 -0600 fix forums link --- templates/en/help.template | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/en/help.template b/templates/en/help.template index ebbeb40..0f75fdc 100644 --- a/templates/en/help.template +++ b/templates/en/help.template @@ -56,12 +56,13 @@ <tr bgcolor="#ffffff"> <td align="center" class="small"> - <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine"><img src="{$root}/images/forum.png" /><br />Forum</a> + <a href="http://forums.winehq.org/"><img src="{$root}/images/forum.png" /><br />Forum</a> </td> <td valign="top"> - We have a web/email based community for Wine users, which is a place that Wine users can visit to ask questions and connect - with each other. You can join this community in a variety of ways. The simplest is - Google Groups page for <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</a>. + We have a <a href="http://forums.winehq.org/">web</a>/<a href="{$root}/site/forums">email</a> based community for + Wine users, which is a place that Wine users can visit to ask questions and connect + with each other. You can join this community in a variety of ways. An alternate way to access our forums is via the + Google Groups page at <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">comp.emulators.ms-windows.wine</a>. You may also wish to explore the <a href="{$root}/site/forums">mailing lists</a> that make up that community as well. </td>

1 0

Jeremy Newman : typo
by Jeremy Newman Dec. 8, 2008

Dec. 8, 2008

Module: website Branch: master Commit: 84c3e721b78df69f13a9cf90b6e5a9884f8904f8 URL: http://source.winehq.org/git/website.git/?a=commit;h=84c3e721b78df69f13a9cf… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 8 14:42:34 2008 -0600 typo --- templates/en/home.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index c69184e..fd9e5a0 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -41,7 +41,7 @@ <input type="hidden" name="business" value="donate(a)winehq.org"> <input type="hidden" name="item_name" value="Wine donation"> </form> - <span class="subtitle">Dontate to Wine.</span> + <span class="subtitle">Donate to Wine.</span> </li> </ul>

1 0