February 2009 - Wine-Commits

Scott Ritchie : Trim download page to reduce vertical scroll
by Jeremy Newman Feb. 12, 2009

Feb. 12, 2009

Module: website Branch: master Commit: e67e28d90790c026a5bd79f44c9df720178f4551 URL: http://source.winehq.org/git/website.git/?a=commit;h=e67e28d90790c026a5bd79… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Feb 12 01:36:47 2009 -0800 Trim download page to reduce vertical scroll Thanks, Scott Ritchie >From 1ea6f216a1c77cefd81817e1fad6f1aa3bb8d1ea Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Thu, 12 Feb 2009 01:32:42 -0800 Subject: Trim the download page a bit to reduce vertical scrolling and an uneeded paragraph. Also move FreeBSD to be right next to PC BSD. --- templates/en/download.template | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 97e5dfb..1526531 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -36,15 +36,10 @@ requested in exchange for hosting the Wine web site. <h2><a name="binary"></a>Wine Binary Downloads</h2> -Official WineHQ builds for Linux Red Hat, Mandriva, SUSE, Slackware and FreeBSD, -hosted by <a href="http://sourceforge.net/project/showfiles.php?group_id=6241">SourceForge.net</a>. -Updated with each release. - -See the +<table><tr><td>Latest stable release:</td><td>Wine {$config_stable_release}</td> +<td rowspan="2">See the <a href="http://wiki.winehq.org/HowTo">installation and configuration how-to</a> -for post-installation instructions. - -<table><tr><td>Latest stable release:</td><td>Wine {$config_stable_release}</td></tr> +for post-installation instructions.</td></tr> <tr><td>Latest development release:</td><td>Wine {$config_master_release}</td></tr></table> <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> @@ -74,15 +69,6 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> - <td align="center"><a href="http://www.freshports.org/emulators/wine/"> - <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> - </td> - <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> - source for FreeBSD 5.3 or later</td> - <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> - </tr> - - <tr bgcolor="#ffffff"> <td align="center"><a href="http://fedoraproject.org/wiki/AndreasBierfert/Wine"> <img src="{$root}/images/distro/redhat.png" width="50" height="50" alt="RedHat Linux" border="0"></a> </td> @@ -127,6 +113,15 @@ for post-installation instructions. </tr> <tr bgcolor="#ffffff"> + <td align="center"><a href="http://www.freshports.org/emulators/wine/"> + <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a> + </td> + <td> <a href="http://www.freshports.org/emulators/wine/">FreeBSD</a> + source for FreeBSD 5.3 or later</td> + <td><a href="mailto:gerald(a)pfeifer.com">Gerald Pfeifer</a></td> + </tr> + + <tr bgcolor="#ffffff"> <td align="center"><a href="http://www.pbidir.com/bt/search/?str=wine&search=Search"> <img src="{$root}/images/distro/pcbsd.png" width="50" height="50" alt="FreeBSD" border="0"></a> </td>

1 0

Scott Ritchie : Note right click->save as for key on Ubuntu download page
by Jeremy Newman Feb. 12, 2009

Feb. 12, 2009

Module: website Branch: master Commit: 51fbcd325e6e6d69520fd13ea18d3acf7757cbad URL: http://source.winehq.org/git/website.git/?a=commit;h=51fbcd325e6e6d69520fd1… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Feb 12 01:36:13 2009 -0800 Note right click->save as for key on Ubuntu download page Thanks, Scott Ritchie >From 2dd3692eb7d9fe7d3476ade9ab486b97ab881b53 Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)open-vote.org> Date: Thu, 12 Feb 2009 01:24:43 -0800 Subject: Note right click->save as when saving key on Ubuntu page --- templates/en/download/deb.template | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index 240beaa..e7d8c8c 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -43,10 +43,10 @@ version you are running. to your system's list of trusted keys. <a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Download -and save Scott Ritchie's key</a> to your desktop. Then open the -Authentication tab, click import key file, and select the key -file you just saved (Scott Ritchie.gpg). It is safe to delete this file -after doing this step. +and save Scott Ritchie's key</a> (right click -> save as) to your desktop. +Then open the Authentication tab, click import key file, and +select the key file you just saved (Scott Ritchie.gpg). It is safe to +delete this file after doing this step. <img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0">

1 0

Alexandre Julliard : winetest: Ensure that winetest. exe builds have correct permissions.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: tools Branch: master Commit: 31e696dcb950070bb0728573d82b1cbea725c77a URL: http://source.winehq.org/git/tools.git/?a=commit;h=31e696dcb950070bb0728573… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 15:26:04 2009 +0100 winetest: Ensure that winetest.exe builds have correct permissions. --- winetest/make-winetest | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/winetest/make-winetest b/winetest/make-winetest index 994f101..d104ede 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -58,6 +58,8 @@ then exit 1 fi +umask 022 + ( (cd wine && git pull) || exit head=$(cd wine && git rev-parse --short=12 HEAD) || exit @@ -94,6 +96,7 @@ fi # install everything + chmod 644 build-mingw/programs/winetest/winetest-dist.exe mv -f build-mingw/programs/winetest/winetest-dist.exe $destdir/winetest-$head.exe ln -sf winetest-$head.exe $destdir/winetest-latest.exe rm -f $servicedir/*.cookie $servicedir/*.url @@ -118,6 +121,7 @@ fi uname -a > build.nfo && make dist) || exit + chmod 644 build-mingw64/programs/winetest/winetest-dist.exe mv -f build-mingw64/programs/winetest/winetest-dist.exe $destdir/winetest64-$head.exe ln -sf winetest64-$head.exe $destdir/winetest64-latest.exe

1 0

Alexandre Julliard : winetest: Archive old test results after 4 months instead of 6 to conserve disk space .
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: tools Branch: master Commit: 5250e2f2c32006ea231116b116fae5454d1e038b URL: http://source.winehq.org/git/tools.git/?a=commit;h=5250e2f2c32006ea231116b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 14:51:45 2009 +0100 winetest: Archive old test results after 4 months instead of 6 to conserve disk space. --- winetest/winetest.cron | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 6e70288..0ff60be 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -8,7 +8,7 @@ workdir=/home/winehq/opt/winetest lock=/tmp/winetest.lock # expiration age (in days) before results get archived -expire=180 +expire=120 if [ ! -f $lock ]; then touch $lock

1 0

Alexandre Julliard : winetest: Only archive one directory per cron run.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: tools Branch: master Commit: 24a433dd471949b8fe28807563f6e76bbb912e86 URL: http://source.winehq.org/git/tools.git/?a=commit;h=24a433dd471949b8fe288075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 13:58:33 2009 +0100 winetest: Only archive one directory per cron run. Also set the timestamp on the tar file to be the same as the archived directory. --- winetest/winetest.cron | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index e0aa806..6e70288 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -7,6 +7,9 @@ tools=/home/winehq/opt/git-tools/winetest workdir=/home/winehq/opt/winetest lock=/tmp/winetest.lock +# expiration age (in days) before results get archived +expire=180 + if [ ! -f $lock ]; then touch $lock cd $workdir @@ -14,12 +17,11 @@ if [ ! -f $lock ]; then while $tools/gather; do true; done $tools/build-index - # archive 6-month old results - (cd old-data && for i in `find . -maxdepth 1 -mtime +180 -type d -print` - do - tar cfj $i.tar.bz2 $i && rm -rf $i - done) - # remove 6-month old test builds - (cd builds && find . -mtime +180 -name winetest\*.exe -print0 | xargs -0 rm -f) + # archive old results + (cd old-data && dir=`find . -maxdepth 1 -mtime +$expire -type d -print -quit` && + test -n "$dir" && tar cfj $dir.tar.bz2 $dir && touch -r $dir $dir.tar.bz2 && rm -rf $dir) + + # remove old test builds + (cd builds && find . -mtime +$expire -name winetest\*.exe -print0 | xargs -0 rm -f) rm $lock fi

1 0

Alexandre Julliard : user32/tests: Add some more optional messages we get on Windows.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 0cc91abf8fec7684882236d66bc5ce98fa38a883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc91abf8fec7684882236d66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 17:52:54 2009 +0100 user32/tests: Add some more optional messages we get on Windows. --- dlls/user32/tests/msg.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 872c622..ee39224 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -515,7 +515,7 @@ static const struct message WmShowRestoreMaxOverlappedSeq[] = { }; /* ShowWindow(SW_RESTORE) for a not visible minimized overlapped window */ static const struct message WmShowRestoreMinOverlappedSeq[] = { - { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, + { HCBT_MINMAX, hook|lparam|optional, 0, SW_RESTORE }, { WM_QUERYOPEN, sent|optional }, { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED|SWP_NOCOPYBITS }, @@ -575,6 +575,7 @@ static const struct message WmShowMinOverlappedSeq[] = { { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent }, { WM_ACTIVATEAPP, sent|wparam, 0 }, + { WM_SYSCOMMAND, sent|optional|wparam, SC_RESTORE }, { WM_PAINT, sent|optional }, { WM_NCPAINT, sent|beginpaint|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, @@ -9341,7 +9342,7 @@ static void wait_move_event(HWND hwnd, int x, int y) while (GetTickCount() - time < 200 && !go) { ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); go = ret && msg.pt.x > x && msg.pt.y > y; - if (ret && !go) PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE); + if (!ret) MsgWaitForMultipleObjects( 0, NULL, FALSE, GetTickCount() - time, QS_ALLINPUT ); } } @@ -9885,11 +9886,11 @@ static const struct message WmRestore_3[] = { { 0 } }; static const struct message WmRestore_4[] = { - { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { HCBT_MINMAX, hook|lparam|optional, 0, SW_RESTORE }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, + { WM_SIZE, sent|wparam|defwinproc|optional, SIZE_RESTORED }, { 0 } }; static const struct message WmRestore_5[] = { @@ -9906,6 +9907,7 @@ static const struct message WmHide_1[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { HCBT_ACTIVATE, hook|optional }, { HCBT_SETFOCUS, hook|optional }, /* win2000 sends it */ { 0 } }; @@ -9913,6 +9915,7 @@ static const struct message WmHide_2[] = { { WM_SHOWWINDOW, sent|wparam, 0 }, { WM_WINDOWPOSCHANGING, sent /*|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE*/ }, /* win2000 doesn't add SWP_NOACTIVATE */ { WM_WINDOWPOSCHANGED, sent /*|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE*/ }, /* win2000 doesn't add SWP_NOACTIVATE */ + { HCBT_ACTIVATE, hook|optional }, { 0 } }; static const struct message WmHide_3[] = { @@ -9985,6 +9988,7 @@ static const struct message WmMinMax_2[] = { }; static const struct message WmMinMax_3[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, + { HCBT_SETFOCUS, hook|optional }, { 0 } }; static const struct message WmMinMax_4[] = { @@ -10012,9 +10016,9 @@ static const struct message WmShowMaximized_2[] = { { WM_WINDOWPOSCHANGED, sent|optional }, { WM_MOVE, sent|optional }, /* Win9x doesn't send it */ { WM_SIZE, sent|wparam|optional, SIZE_MAXIMIZED }, /* Win9x doesn't send it */ - { WM_WINDOWPOSCHANGING, sent }, + { WM_WINDOWPOSCHANGING, sent|optional }, { HCBT_SETFOCUS, hook|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, { HCBT_SETFOCUS, hook|optional }, @@ -10086,7 +10090,7 @@ static void test_ShowWindow(void) /* 39 */ { SW_SHOWNOACTIVATE, TRUE, WS_VISIBLE, WmEmptySeq, FALSE }, /* 40 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_2, FALSE }, /* 41 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, -/* 42 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_2, TRUE }, +/* 42 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmShowMaximized_2, FALSE }, /* 43 */ { SW_SHOWMAXIMIZED, TRUE, WS_VISIBLE|WS_MAXIMIZE, WmMinMax_2, FALSE }, /* 44 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinimize_1, FALSE }, /* 45 */ { SW_MINIMIZE, TRUE, WS_VISIBLE|WS_MINIMIZE, WmMinMax_3, FALSE }, @@ -10360,7 +10364,7 @@ static void test_nullCallback(void) /* SetActiveWindow( 0 ) hwnd visible */ static const struct message SetActiveWindowSeq0[] = { - { HCBT_ACTIVATE, hook }, + { HCBT_ACTIVATE, hook|optional }, { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, @@ -10483,11 +10487,7 @@ static void test_SetActiveWindow(void) trace("SetActiveWindow(hwnd), hwnd visible\n"); ret = SetActiveWindow(hwnd); - todo_wine - { - ok( ret == hwnd, "Failed to SetActiveWindow(hwnd), hwnd visible\n"); - } - ok_sequence(SetActiveWindowSeq1, "SetActiveWindow(hwnd), hwnd visible", TRUE); + if (ret == hwnd) ok_sequence(SetActiveWindowSeq1, "SetActiveWindow(hwnd), hwnd visible", TRUE); flush_sequence(); trace("SetActiveWindow(popup), hwnd visible, popup visible\n"); @@ -10537,6 +10537,7 @@ static void test_SetForegroundWindow(void) WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); ok (hwnd != 0, "Failed to create overlapped window\n"); + SetForegroundWindow( hwnd ); flush_sequence(); trace("SetForegroundWindow( 0 )\n");

1 0

Alexandre Julliard : user32/tests: Fix Z-order tests in the presence of owned popups.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: bd36ca6e79cbe6dadc5faf5278d17efe7342db22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd36ca6e79cbe6dadc5faf527… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 17:32:15 2009 +0100 user32/tests: Fix Z-order tests in the presence of owned popups. Also fix a couple of other failures on Windows. --- dlls/user32/tests/win.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 496a770..3161d73 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -614,13 +614,13 @@ static LRESULT WINAPI main_window_procA(HWND hwnd, UINT msg, WPARAM wparam, LPAR /* Uncomment this once the test succeeds in all cases */ ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d-%d,%d) / (%d,%d-%d,%d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom ); - } GetClientRect(hwnd, &rc2); DefWindowProcA(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rc1); MapWindowPoints(0, hwnd, (LPPOINT)&rc1, 2); ok(EqualRect(&rc1, &rc2), "rects do not match (%d,%d-%d,%d) / (%d,%d-%d,%d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom ); + } break; } case WM_NCCREATE: @@ -2076,8 +2076,10 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, test = GetWindow(hwnd, GW_HWNDNEXT); /* skip foreign windows */ - while (test && (GetWindowThreadProcessId(test, NULL) != our_pid || - UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)) != GetModuleHandle(0))) + while (test && test != next && + (GetWindowThreadProcessId(test, NULL) != our_pid || + UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)) != GetModuleHandle(0) || + GetWindow(test, GW_OWNER) == next)) { /*trace("skipping next %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDNEXT); @@ -2086,8 +2088,10 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, test = GetWindow(hwnd, GW_HWNDPREV); /* skip foreign windows */ - while (test && (GetWindowThreadProcessId(test, NULL) != our_pid || - UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)) != GetModuleHandle(0))) + while (test && test != prev && + (GetWindowThreadProcessId(test, NULL) != our_pid || + UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)) != GetModuleHandle(0) || + GetWindow(test, GW_OWNER) == hwnd)) { /*trace("skipping prev %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDPREV); @@ -4896,7 +4900,7 @@ static void test_GetWindowModuleFileName(void) "expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError()); hwnd = FindWindow("Shell_TrayWnd", NULL); - ok(IsWindow(hwnd), "got invalid tray window %p\n", hwnd); + ok(IsWindow(hwnd) || broken(!hwnd), "got invalid tray window %p\n", hwnd); SetLastError(0xdeadbeef); ret1 = pGetWindowModuleFileNameA(hwnd, buf1, sizeof(buf1)); ok(!ret1 || broken(ret1), /* win98 */ "expected 0, got %u\n", ret1);

1 0

Paul Bryan Roberts : ntdll: Avoid potential infinite loop.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: a552587de1b16c95dc53a502e57ce465a232d61c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a552587de1b16c95dc53a502e… Author: Paul Bryan Roberts <pbronline-wine(a)yahoo.co.uk> Date: Thu Feb 12 08:09:17 2009 +0000 ntdll: Avoid potential infinite loop. --- dlls/ntdll/nt.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 879a324..7d24731 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -293,13 +293,15 @@ NTSTATUS WINAPI NtQueryInformationToken( char stack_buffer[256]; unsigned int server_buf_len = sizeof(stack_buffer); void *buffer = stack_buffer; - BOOLEAN need_more_memory = FALSE; + BOOLEAN need_more_memory; /* we cannot work out the size of the server buffer required for the * input size, since there are two factors affecting how much can be * stored in the buffer - number of groups and lengths of sids */ do { + need_more_memory = FALSE; + SERVER_START_REQ( get_token_groups ) { TOKEN_GROUPS *groups = tokeninfo;

1 0

Alexandre Julliard : dbghelp: Avoid size_t in a trace.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 9a4e519aeb90c3f36947ec17aad2bc2b690541d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4e519aeb90c3f36947ec17a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 12 15:28:33 2009 +0100 dbghelp: Avoid size_t in a trace. --- dlls/dbghelp/storage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index d3f5949..d687862 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -110,7 +110,7 @@ void* pool_alloc(struct pool* pool, size_t len) size = max( pool->arena_size, len + sizeof(struct pool_arena) ); arena = HeapAlloc(GetProcessHeap(), 0, size); - if (!arena) {ERR("OOM for %u\n", size);return NULL;} + if (!arena) return NULL; ret = arena + 1; arena->current = (char*)ret + len;

1 0

Francois Gouget : wined3d: Add a trailing '\n' to shader_addline() calls.
by Alexandre Julliard Feb. 12, 2009

Feb. 12, 2009

Module: wine Branch: master Commit: 83d18602d8ee61dba89729365258f9db04a9912c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d18602d8ee61dba89729365… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Feb 12 12:30:13 2009 +0100 wined3d: Add a trailing '\n' to shader_addline() calls. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f67fdd5..23beb46 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3874,13 +3874,13 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, SHADER_BU case FOG_EXP: /* Fog = e^(-gl_Fog.density * gl_FogFragCoord) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); - shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);"); + shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; case FOG_EXP2: /* Fog = e^(-(gl_Fog.density * gl_FogFragCoord)^2) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); - shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);"); + shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); break; }

1 0