January 2006 - Wine-Commits

H. Verbeet : wined3d: Create a common WineD3D base class, IWineD3DBase.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: 7c8a4d2174599fa4af311578776967dfc10533c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c8a4d2174599fa4af31157… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Jan 17 15:58:22 2006 +0100 wined3d: Create a common WineD3D base class, IWineD3DBase. --- include/wine/wined3d_interface.h | 149 +++++++++++++++++++++++++++----------- 1 files changed, 106 insertions(+), 43 deletions(-)

1 0

lostwages/templates/en fun_projects.template
by Jeremy Newman Jan. 17, 2006

Jan. 17, 2006

ChangeSet ID: 22345 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/17 09:27:11 Modified files: templates/en : fun_projects.template Log message: Tom Wickline <twickline(a)gmail.com> Aric Cyr as worker on wined3d use wgl Patch: http://cvs.winehq.org/patch.py?id=22345 Old revision New revision Changes Path 1.29 1.30 +4 -4 lostwages/templates/en/fun_projects.template Index: lostwages/templates/en/fun_projects.template diff -u -p lostwages/templates/en/fun_projects.template:1.29 lostwages/templates/en/fun_projects.template:1.30 --- lostwages/templates/en/fun_projects.template:1.29 17 Jan 2006 15:27:11 -0000 +++ lostwages/templates/en/fun_projects.template 17 Jan 2006 15:27:11 -0000 @@ -428,15 +428,15 @@ Investigate if we could make a WINE based GIMP plugin which can handle Photoshop plugins. - <h3 class=todo>wined3d use wgl</h3> + <h3 class=inprogress>wined3d use wgl</h3> Make wined3d (or d3d8) use wgl (windows opengl) instead of glx. (just search for glx commands and replace then with the wgl equivalents) Doing so would enable wine's d3d to run on windows in place of the windows driver and without the rest of WINE which would greatly help in debugging. It would also allow wined3d to use the wgl implementation in wine.</p> <ul> - <li>workers: <i>wanted</i> - <li>status: <i>to do</i> - <li>updated: Jun 22, 2005 + <li>workers: <i>Aric Cyr</i> + <li>status: <i>debug phase</i> + <li>updated: Jan 12, 2006 </ul> <h2>Miscellaneous Projects</h2>

1 0

Alexandre Julliard : shlwapi: Fixed use of wrong buffer in SHCopyKeyW.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: 37ea1c4659e3d68411982c0e8b25c470db18778b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=37ea1c4659e3d68411982c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 17 13:34:52 2006 +0100 shlwapi: Fixed use of wrong buffer in SHCopyKeyW. --- dlls/shlwapi/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 15d14f8..d1001b2 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -2351,7 +2351,7 @@ DWORD WINAPI SHCopyKeyW(HKEY hKeySrc, LP { DWORD dwNameSize = dwMaxKeyLen, dwType, dwLen = dwMaxDataLen; - dwRet = RegEnumValueW(hKeySrc, i, lpszName, &dwNameSize, NULL, &dwType, buff, &dwLen); + dwRet = RegEnumValueW(hKeySrc, i, lpszName, &dwNameSize, NULL, &dwType, lpBuff, &dwLen); if (!dwRet) dwRet = SHSetValueW(hKeyDst, NULL, lpszName, dwType, lpBuff, dwLen);

1 0

Vitaliy Margolen : winemenubuilder: Report a few more errors.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: b52874e56d6b06b46af7e631bc98d0660a21b3a3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b52874e56d6b06b46af7e63… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Tue Jan 17 13:34:31 2006 +0100 winemenubuilder: Report a few more errors. Use Heap[Alloc|Free] instead of malloc|free. --- programs/winemenubuilder/winemenubuilder.c | 29 ++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 9c0c3aa..08c0760 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -159,7 +159,10 @@ static BOOL SaveIconResAsXPM(const BITMA char *comment; if (!((pIcon->bmiHeader.biBitCount == 4) || (pIcon->bmiHeader.biBitCount == 8))) + { + WINE_FIXME("Unsupported color depth %d-bit\n", pIcon->bmiHeader.biBitCount); return FALSE; + } if (!(fXPMFile = fopen(szXPMFileName, "w"))) { @@ -168,7 +171,7 @@ static BOOL SaveIconResAsXPM(const BITMA } i = WideCharToMultiByte(CP_UNIXCP, 0, commentW, -1, NULL, 0, NULL, NULL); - comment = malloc(i); + comment = HeapAlloc(GetProcessHeap(), 0, i); WideCharToMultiByte(CP_UNIXCP, 0, commentW, -1, comment, i, NULL, NULL); nHeight = pIcon->bmiHeader.biHeight / 2; @@ -234,12 +237,12 @@ static BOOL SaveIconResAsXPM(const BITMA #undef MASK #undef COLOR - free(comment); + HeapFree(GetProcessHeap(), 0, comment); fclose(fXPMFile); return TRUE; error: - free(comment); + HeapFree(GetProcessHeap(), 0, comment); fclose(fXPMFile); unlink( szXPMFileName ); return FALSE; @@ -373,12 +376,14 @@ static int ExtractFromICO(LPCWSTR szFile goto error1; } - if (fread(&iconDir, sizeof (ICONDIR), 1, fICOFile) != 1) - goto error2; - if ((iconDir.idReserved != 0) || (iconDir.idType != 1)) + if (fread(&iconDir, sizeof (ICONDIR), 1, fICOFile) != 1 || + (iconDir.idReserved != 0) || (iconDir.idType != 1)) + { + WINE_ERR("Invalid ico file format\n"); goto error2; + } - if ((pIconDirEntry = malloc(iconDir.idCount * sizeof (ICONDIRENTRY))) == NULL) + if ((pIconDirEntry = HeapAlloc(GetProcessHeap(), 0, iconDir.idCount * sizeof (ICONDIRENTRY))) == NULL) goto error2; if (fread(pIconDirEntry, sizeof (ICONDIRENTRY), iconDir.idCount, fICOFile) != iconDir.idCount) goto error3; @@ -389,7 +394,7 @@ static int ExtractFromICO(LPCWSTR szFile nIndex = i; nMax = pIconDirEntry[i].bHeight * pIconDirEntry[i].bWidth; } - if ((pIcon = malloc(pIconDirEntry[nIndex].dwBytesInRes)) == NULL) + if ((pIcon = HeapAlloc(GetProcessHeap(), 0, pIconDirEntry[nIndex].dwBytesInRes)) == NULL) goto error3; if (fseek(fICOFile, pIconDirEntry[nIndex].dwImageOffset, SEEK_SET)) goto error4; @@ -399,16 +404,16 @@ static int ExtractFromICO(LPCWSTR szFile if(!SaveIconResAsXPM(pIcon, szXPMFileName, szFileName)) goto error4; - free(pIcon); - free(pIconDirEntry); + HeapFree(GetProcessHeap(), 0, pIcon); + HeapFree(GetProcessHeap(), 0, pIconDirEntry); fclose(fICOFile); HeapFree(GetProcessHeap(), 0, filename); return 1; error4: - free(pIcon); + HeapFree(GetProcessHeap(), 0, pIcon); error3: - free(pIconDirEntry); + HeapFree(GetProcessHeap(), 0, pIconDirEntry); error2: fclose(fICOFile); error1:

1 0

Robert Shearman : user: Fix WM_QUIT message ordering from PostQuitMessage.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: a40ce39340c028618591a73dbc4d2c6fe18ae4c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a40ce39340c028618591a73… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 17 13:14:31 2006 +0100 user: Fix WM_QUIT message ordering from PostQuitMessage. Added a new server call as PostQuitMessage should set a flag in the message queue to return the WM_QUIT message when there are no other pending messages, rather than posting a message to the thread queue as it does at the moment. --- dlls/user/message.c | 24 +++++++++++++++++- dlls/user/tests/msg.c | 52 ++++++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 15 +++++++++++- server/protocol.def | 4 +++ server/queue.c | 46 +++++++++++++++++++++++++++++++++++ server/request.h | 2 ++ server/trace.c | 8 ++++++ 7 files changed, 147 insertions(+), 4 deletions(-)

1 0

Mike McCormack : ntdll: Add a test for NtNotifyChangeDirectoryFile.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: 2e32a425db6bcb86804517761686f31169ff3b80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e32a425db6bcb868045177… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 17 13:13:29 2006 +0100 ntdll: Add a test for NtNotifyChangeDirectoryFile. --- dlls/ntdll/tests/.gitignore | 1 dlls/ntdll/tests/Makefile.in | 1 dlls/ntdll/tests/change.c | 136 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 0 deletions(-) create mode 100644 dlls/ntdll/tests/change.c diff --git a/dlls/ntdll/tests/.gitignore b/dlls/ntdll/tests/.gitignore index b2a6d71..bbe8f20 100644 --- a/dlls/ntdll/tests/.gitignore +++ b/dlls/ntdll/tests/.gitignore @@ -1,5 +1,6 @@ Makefile atom.ok +change.ok env.ok error.ok exception.ok diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index 7d4851e..519ed42 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = kernel32 CTESTS = \ atom.c \ + change.c \ env.c \ error.c \ exception.c \ diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c new file mode 100644 index 0000000..7ba527b --- /dev/null +++ b/dlls/ntdll/tests/change.c @@ -0,0 +1,136 @@ +/* + * File change notification tests + * + * Copyright 2006 Mike McCormack for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windows.h> +#include <winnt.h> +#include <winternl.h> +#include <winerror.h> +#include <stdio.h> +#include "wine/test.h" + +typedef NTSTATUS (WINAPI *fnNtNotifyChangeDirectoryFile)( + HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID, + PIO_STATUS_BLOCK,PVOID,ULONG,ULONG,BOOLEAN); +fnNtNotifyChangeDirectoryFile pNtNotifyChangeDirectoryFile; + +static void test_ntncdf(void) +{ + HMODULE hntdll = GetModuleHandle("ntdll"); + NTSTATUS r; + HANDLE hdir, hEvent; + char buffer[0x1000]; + DWORD fflags, filter = 0; + IO_STATUS_BLOCK iosb; + WCHAR path[MAX_PATH], subdir[MAX_PATH]; + static const WCHAR szBoo[] = { '\\','b','o','o',0 }; + static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + + pNtNotifyChangeDirectoryFile = (fnNtNotifyChangeDirectoryFile) + GetProcAddress(hntdll, "NtNotifyChangeDirectoryFile"); + if (!pNtNotifyChangeDirectoryFile) + return; + + r = GetTempPathW( MAX_PATH, path ); + ok( r != 0, "temp path failed\n"); + if (!r) + return; + + lstrcatW( path, szBoo ); + lstrcpyW( subdir, path ); + lstrcatW( subdir, szHoo ); + + RemoveDirectoryW( subdir ); + RemoveDirectoryW( path ); + + r = CreateDirectoryW(path, NULL); + ok( r == TRUE, "failed to create directory\n"); + + todo_wine { + r = pNtNotifyChangeDirectoryFile(NULL,NULL,NULL,NULL,NULL,NULL,0,0,0); + ok(r==STATUS_ACCESS_VIOLATION, "should return access violation\n"); + } + + fflags = FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED; + hdir = CreateFileW(path, GENERIC_READ|SYNCHRONIZE, FILE_SHARE_READ, NULL, + OPEN_EXISTING, fflags, NULL); + ok( hdir != INVALID_HANDLE_VALUE, "failed to open directory\n"); + + hEvent = CreateEvent( NULL, 0, 0, NULL ); + + todo_wine { + r = pNtNotifyChangeDirectoryFile(hdir,NULL,NULL,NULL,&iosb,NULL,0,0,0); + ok(r==STATUS_INVALID_PARAMETER, "should return invalid parameter\n"); + + r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,NULL,0,0,0); + ok(r==STATUS_INVALID_PARAMETER, "should return invalid parameter\n"); + + filter = FILE_NOTIFY_CHANGE_FILE_NAME; + filter |= FILE_NOTIFY_CHANGE_DIR_NAME; + filter |= FILE_NOTIFY_CHANGE_ATTRIBUTES; + filter |= FILE_NOTIFY_CHANGE_SIZE; + filter |= FILE_NOTIFY_CHANGE_LAST_WRITE; + filter |= FILE_NOTIFY_CHANGE_LAST_ACCESS; + filter |= FILE_NOTIFY_CHANGE_CREATION; + filter |= FILE_NOTIFY_CHANGE_SECURITY; + + r = pNtNotifyChangeDirectoryFile(hdir,hEvent,NULL,NULL,&iosb,buffer,sizeof buffer,filter,0); + ok(r==STATUS_PENDING, "should return invalid parameter\n"); + } + + r = WaitForSingleObject( hEvent, 0 ); + ok( r == STATUS_TIMEOUT, "event ready\n" ); + + r = CreateDirectoryW( subdir, NULL ); + ok( r == TRUE, "failed to create directory\n"); + + todo_wine { + r = WaitForSingleObject( hEvent, 0 ); + ok( r == WAIT_OBJECT_0, "event ready\n" ); + + r = pNtNotifyChangeDirectoryFile(hdir,0,NULL,NULL,&iosb,NULL,0,filter,0); + ok(r==STATUS_PENDING, "should return invalid parameter\n"); + + r = WaitForSingleObject( hdir, 0 ); + ok( r == STATUS_TIMEOUT, "event ready\n" ); + } + + r = RemoveDirectoryW( subdir ); + ok( r == TRUE, "failed to remove directory\n"); + + r = WaitForSingleObject( hdir, 0 ); + ok( r == WAIT_OBJECT_0, "event ready\n" ); + + todo_wine { + r = RemoveDirectoryW( path ); + ok( r == FALSE, "failed to remove directory\n"); + + CloseHandle(hdir); + + r = RemoveDirectoryW( path ); + ok( r == TRUE, "failed to remove directory\n"); + } +} + +START_TEST(change) +{ + test_ntncdf(); +}

1 0

Mike McCormack : server: Make sure to release the fd we grabbed in all cases.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: 213e01e606bc0434059fced84b2bcf349e622bcc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=213e01e606bc0434059fced… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 17 13:13:14 2006 +0100 server: Make sure to release the fd we grabbed in all cases. --- server/fd.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/server/fd.c b/server/fd.c index 90fb7af..37e0ef2 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1505,16 +1505,23 @@ int default_fd_signaled( struct object * int events, ret; struct fd *fd = get_obj_fd( obj ); - if (fd->inode) return 1; /* regular files are always signaled */ - - events = fd->fd_ops->get_poll_events( fd ); - ret = check_fd_events( fd, events ) != 0; - - if (ret) - set_fd_events( fd, 0 ); /* stop waiting on select() if we are signaled */ - else if (!list_empty( &obj->wait_queue )) - set_fd_events( fd, events ); /* restart waiting on poll() if we are no longer signaled */ + if (fd->inode) ret = 1; /* regular files are always signaled */ + else + { + events = fd->fd_ops->get_poll_events( fd ); + ret = check_fd_events( fd, events ) != 0; + if (ret) + { + /* stop waiting on select() if we are signaled */ + set_fd_events( fd, 0 ); + } + else if (!list_empty( &obj->wait_queue )) + { + /* restart waiting on poll() if we are no longer signaled */ + set_fd_events( fd, events ); + } + } release_object( fd ); return ret; }

1 0

Mike McCormack : kernel32: Create a stub implementation for PostQueuedCompletionStatus.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: 1f7c81eb368a8c5be78cef6f64e7b2010e0cad0f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f7c81eb368a8c5be78cef6… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 17 13:13:01 2006 +0100 kernel32: Create a stub implementation for PostQueuedCompletionStatus. --- dlls/kernel/kernel32.spec | 2 +- dlls/kernel/sync.c | 8 ++++++++ include/winbase.h | 1 + 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 65976a1..0454111 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -844,7 +844,7 @@ @ stdcall PeekConsoleInputA(ptr ptr long ptr) @ stdcall PeekConsoleInputW(ptr ptr long ptr) @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) -@ stub PostQueuedCompletionStatus +@ stdcall PostQueuedCompletionStatus(long long ptr ptr) @ stdcall PrepareTape(ptr long long) @ stub PrivCopyFileExW @ stub PrivMoveFileIdentityW diff --git a/dlls/kernel/sync.c b/dlls/kernel/sync.c index ef61cf0..5a2535e 100644 --- a/dlls/kernel/sync.c +++ b/dlls/kernel/sync.c @@ -1852,6 +1852,14 @@ BOOL WINAPI GetQueuedCompletionStatus( H return FALSE; } +BOOL WINAPI PostQueuedCompletionStatus( HANDLE CompletionPort, DWORD dwNumberOfBytes, + ULONG_PTR dwCompletionKey, LPOVERLAPPED lpOverlapped) +{ + FIXME("%p %ld %08lx %p\n", CompletionPort, dwNumberOfBytes, dwCompletionKey, lpOverlapped ); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /****************************************************************************** * CreateJobObjectW (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index 7b193d4..650cf96 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1810,6 +1810,7 @@ VOID WINAPI OutputDebugStringA(LP VOID WINAPI OutputDebugStringW(LPCWSTR); #define OutputDebugString WINELIB_NAME_AW(OutputDebugString) BOOL WINAPI PeekNamedPipe(HANDLE,PVOID,DWORD,PDWORD,PDWORD,PDWORD); +BOOL WINAPI PostQueuedCompletionStatus(HANDLE,DWORD,ULONG_PTR,LPOVERLAPPED); DWORD WINAPI PrepareTape(HANDLE,DWORD,BOOL); BOOL WINAPI ProcessIdToSessionId(DWORD,DWORD*); BOOL WINAPI PrivilegeCheck(HANDLE,PPRIVILEGE_SET,LPBOOL);

1 0

Mike McCormack : ntdll: Use FILE_OPEN instead of OPEN_EXISTING when calling NtCreateFile.
by Alexandre Julliard Jan. 17, 2006

Jan. 17, 2006

Module: wine Branch: refs/heads/master Commit: 9c58884161729aae445e25e15c28b87837f5cbff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c58884161729aae445e25e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 17 13:12:43 2006 +0100 ntdll: Use FILE_OPEN instead of OPEN_EXISTING when calling NtCreateFile. --- dlls/ntdll/reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index d05d9c7..aa5a6ab 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -575,7 +575,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ TRACE("(%p,%p)\n", attr, file); ret = NtCreateFile(&hive, GENERIC_READ, file, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, - OPEN_EXISTING, 0, NULL, 0); + FILE_OPEN, 0, NULL, 0); if (ret) return ret; SERVER_START_REQ( load_registry )

1 0

appdb/include testResults.php
by WineHQ Jan. 16, 2006

Jan. 16, 2006

ChangeSet ID: 22337 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/16 20:34:58 Modified files: include : testResults.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Test result count should not include queued tests. Don't display queued test results in test results table. Patch: http://cvs.winehq.org/patch.py?id=22337 Old revision New revision Changes Path 1.6 1.7 +29 -17 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.6 appdb/include/testResults.php:1.7 --- appdb/include/testResults.php:1.6 17 Jan 2006 2:34:58 -0000 +++ appdb/include/testResults.php 17 Jan 2006 2:34:58 -0000 @@ -566,23 +566,29 @@ class testData{ { $oTest = new testData($oRow->testingId); $oVersion = new version($oTest->iVersionId); - $oApp = new application($oVersion->iAppId); - $oSubmitter = new User($oTest->iSubmitterId); - if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } - echo "<tr class=\"$bgcolor\">\n"; - echo " <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n"; - echo " <td>\n"; - echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; - echo $oSubmitter->sRealname; - echo $oSubmitter->sEmail ? "</a>":""; - echo " </td>\n"; - echo " <td>".$oApp->sName."</td>\n"; - echo " <td>".$oVersion->sName."</td>\n"; - echo " <td>".$oTest->sTestedRelease."</td>\n"; - echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n"; - echo "</tr>\n\n"; - $c++; + // dont show testing results of versions that are still queued. + if ($oVersion->sQueued == 'false') + { + $oApp = new application($oVersion->iAppId); + $oSubmitter = new User($oTest->iSubmitterId); + if ($c % 2 == 1) { $bgcolor = 'color0'; } else { $bgcolor = 'color1'; } + echo "<tr class=\"$bgcolor\">\n"; + echo " <td>".print_date(mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime))."</td>\n"; + echo " <td>\n"; + echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":""; + echo $oSubmitter->sRealname; + echo $oSubmitter->sEmail ? "</a>":""; + echo " </td>\n"; + echo " <td>".$oApp->sName."</td>\n"; + echo " <td>".$oVersion->sName."</td>\n"; + echo " <td>".$oTest->sTestedRelease."</td>\n"; + echo " <td align=\"center\">[<a href=".$_SERVER['PHP_SELF']."?sub=view&iTestingId=".$oTest->iTestingId.">process</a>]</td>\n"; + echo "</tr>\n\n"; + $c++; + } } + echo "</table>","\n"; + echo html_frame_end(); } @@ -591,7 +597,13 @@ class testData{ /* Get the number of TestResults in the database */ function getNumberOfQueuedTests() { - $hResult = query_appdb("SELECT count(*) as num_tests FROM testResults WHERE queued='true';"); + $sQuery = "SELECT count(*) as num_tests + FROM testResults, appVersion + WHERE appVersion.versionId=testResults.versionId + and appVersion.queued='false' + and testResults.queued='true';"; + + $hResult = query_appdb($sQuery); if($hResult) { $row = mysql_fetch_object($hResult);

1 0