Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cfinck] 38580: Introducing the "ReactOS Automatic Testing Utility", superseding our current syssetup/cmd/dbgprint hack for running automatic regression tests. Without any parameters, it mostly works the same as our current solution, but all in a standalone application. Adding the /w parameter will submit all results to the web service committed in my previous commit. The application would also make it possible to run Wine Tests regularly on a Windows machine and submitting the results. This wou
by cfinck＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: cfinck Date: Mon Jan 5 06:41:34 2009 New Revision: 38580 URL: http://svn.reactos.org/svn/reactos?rev=38580&view=rev Log: Introducing the "ReactOS Automatic Testing Utility", superseding our current syssetup/cmd/dbgprint hack for running automatic regression tests. Without any parameters, it mostly works the same as our current solution, but all in a standalone application. Adding the /w parameter will submit all results to the web service committed in my previous commit. The application would also make it possible to run Wine Tests regularly on a Windows machine and submitting the results. This would make sure that all Wine tests also pass under Windows. Added: trunk/rostests/rosautotest/ (with props) trunk/rostests/rosautotest/main.c (with props) trunk/rostests/rosautotest/precomp.h (with props) trunk/rostests/rosautotest/rosautotest.rbuild (with props) trunk/rostests/rosautotest/shutdown.c (with props) trunk/rostests/rosautotest/tools.c (with props) trunk/rostests/rosautotest/webservice.c (with props) trunk/rostests/rosautotest/winetests.c (with props) Modified: trunk/rostests/directory.rbuild Modified: trunk/rostests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/directory.rbuild?rev=3858… ============================================================================== --- trunk/rostests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/directory.rbuild [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -13,6 +13,9 @@ <directory name="regtests_by_casper"> <xi:include href="regtests_by_casper/directory.rbuild" /> </directory> + <directory name="rosautotest"> + <xi:include href="rosautotest/rosautotest.rbuild" /> + </directory> <directory name="tests"> <xi:include href="tests/directory.rbuild" /> </directory> Propchange: trunk/rostests/rosautotest/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 5 06:41:34 2009 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/rostests/rosautotest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.c?rev=38… ============================================================================== --- trunk/rostests/rosautotest/main.c (added) +++ trunk/rostests/rosautotest/main.c [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -1,0 +1,326 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Main implementation file + * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +typedef void (WINAPI *GETSYSINFO)(LPSYSTEM_INFO); + +APP_OPTIONS AppOptions = {0}; +HANDLE hProcessHeap; +PCHAR AuthenticationRequestString = NULL; +PCHAR SystemInfoRequestString = NULL; + +/** + * Gets a value from a specified INI file and returns it converted to ASCII. + * + * @param AppName + * The INI section to look in (lpAppName parameter passed to GetPrivateProfileStringW) + * + * @param KeyName + * The key to look for in the specified section (lpKeyName parameter passed to GetPrivateProfileStringW) + * + * @param FileName + * The path to the INI file + * + * @param ReturnedValue + * Pointer to a CHAR pointer, which will receive the read and converted value. + * The caller needs to HeapFree that value manually. + * + * @return + * Returns the string length of the read value (in characters) or zero if we didn't get any value. + */ +static DWORD +IntGetINIValueA(PCWCH AppName, PCWCH KeyName, PCWCH FileName, char** ReturnedValue) +{ + DWORD Length; + WCHAR Buffer[2048]; + + /* Load the value into a temporary Unicode buffer */ + Length = GetPrivateProfileStringW(AppName, KeyName, NULL, Buffer, sizeof(Buffer) / sizeof(WCHAR), FileName); + + if(!Length) + return 0; + + /* Convert the string to ANSI charset */ + *ReturnedValue = HeapAlloc(hProcessHeap, 0, Length + 1); + WideCharToMultiByte(CP_ACP, 0, Buffer, Length + 1, *ReturnedValue, Length + 1, NULL, NULL); + + return Length; +} + +/** + * Gets the username and password hash from the "rosautotest.ini" file if the user enabled submitting the results to the web service. + * The "rosautotest.ini" file should look like this: + * + * [Login] + * UserName=TestMan + * PasswordHash=1234567890abcdef1234567890abcdef + */ +static BOOL +IntGetConfigurationValues() +{ + const CHAR PasswordHashProp[] = "&passwordhash="; + const CHAR UserNameProp[] = "&username="; + + DWORD DataLength; + DWORD Length; + PCHAR PasswordHash; + PCHAR UserName; + WCHAR ConfigFile[MAX_PATH]; + + /* We only need this if the results are going to be submitted */ + if(!AppOptions.Submit) + return TRUE; + + /* Build the path to the configuration file */ + Length = GetWindowsDirectoryW(ConfigFile, MAX_PATH); + wcscpy(&ConfigFile[Length], L"\\rosautotest.ini"); + + /* Check if it exists */ + if(GetFileAttributesW(ConfigFile) == INVALID_FILE_ATTRIBUTES) + return FALSE; + + /* Get the required length of the authentication request string */ + DataLength = sizeof(UserNameProp) - 1; + Length = IntGetINIValueA(L"Login", L"UserName", ConfigFile, &UserName); + + if(!Length) + { + StringOut("UserName is missing in the configuration file\n"); + return FALSE; + } + + /* Some characters might need to be escaped and an escaped character takes 3 bytes */ + DataLength += 3 * Length; + + DataLength += sizeof(PasswordHashProp) - 1; + Length = IntGetINIValueA(L"Login", L"PasswordHash", ConfigFile, &PasswordHash); + + if(!Length) + { + StringOut("PasswordHash is missing in the configuration file\n"); + return FALSE; + } + + DataLength += 3 * Length; + + /* Build the string */ + AuthenticationRequestString = HeapAlloc(hProcessHeap, 0, DataLength + 1); + + strcpy(AuthenticationRequestString, UserNameProp); + EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], UserName); + + strcat(AuthenticationRequestString, PasswordHashProp); + EscapeString(&AuthenticationRequestString[strlen(AuthenticationRequestString)], PasswordHash); + + return TRUE; +} + +/** + * Determines on which platform we're running on. + * Prepares the appropriate request strings needed if we want to submit test results to the web service. + */ +static BOOL +IntGetBuildAndPlatform() +{ + const CHAR PlatformProp[] = "&platform="; + const CHAR RevisionProp[] = "&revision="; + + CHAR BuildNo[BUILDNO_LENGTH]; + CHAR Platform[PLATFORM_LENGTH]; + CHAR PlatformArchitecture[3]; + CHAR ProductType; + DWORD DataLength; + GETSYSINFO GetSysInfo; + HANDLE hKernel32; + OSVERSIONINFOEXW os; + SYSTEM_INFO si; + WCHAR WindowsDirectory[MAX_PATH]; + + /* Get the build from the define */ + _ultoa(KERNEL_VERSION_BUILD_HEX, BuildNo, 10); + + /* Check if we are running under ReactOS from the SystemRoot directory */ + GetWindowsDirectoryW(WindowsDirectory, MAX_PATH); + + if(!_wcsnicmp(&WindowsDirectory[3], L"reactos", 7)) + { + /* Yes, we are most-probably under ReactOS */ + strcpy(Platform, "reactos"); + } + else + { + /* No, then use the info from GetVersionExW */ + os.dwOSVersionInfoSize = sizeof(os); + + if(!GetVersionExW((LPOSVERSIONINFOW)&os)) + { + StringOut("GetVersionExW failed\n"); + return FALSE; + } + + if(os.dwMajorVersion < 5) + { + StringOut("Application requires at least Windows 2000!\n"); + return FALSE; + } + + if(os.wProductType == VER_NT_WORKSTATION) + ProductType = 'w'; + else + ProductType = 's'; + + /* Print all necessary identification information into the Platform string */ + sprintf(Platform, "%lu.%lu.%lu.%u.%u.%c", os.dwMajorVersion, os.dwMinorVersion, os.dwBuildNumber, os.wServicePackMajor, os.wServicePackMinor, ProductType); + } + + /* We also need to know about the processor architecture. + To retrieve this information accurately, check whether "GetNativeSystemInfo" is exported and use it then, otherwise fall back to "GetSystemInfo". */ + hKernel32 = GetModuleHandleW(L"KERNEL32.DLL"); + GetSysInfo = (GETSYSINFO)GetProcAddress(hKernel32, "GetNativeSystemInfo"); + + if(!GetSysInfo) + GetSysInfo = (GETSYSINFO)GetProcAddress(hKernel32, "GetSystemInfo"); + + GetSysInfo(&si); + + PlatformArchitecture[0] = '.'; + _ultoa(si.wProcessorArchitecture, &PlatformArchitecture[1], 10); + PlatformArchitecture[2] = 0; + strcat(Platform, PlatformArchitecture); + + /* Get the required length of the system info request string */ + DataLength = sizeof(RevisionProp) - 1; + DataLength += strlen(BuildNo); + DataLength += sizeof(PlatformProp) - 1; + DataLength += strlen(Platform); + + /* Now build the string */ + SystemInfoRequestString = HeapAlloc(hProcessHeap, 0, DataLength + 1); + strcpy(SystemInfoRequestString, RevisionProp); + strcat(SystemInfoRequestString, BuildNo); + strcat(SystemInfoRequestString, PlatformProp); + strcat(SystemInfoRequestString, Platform); + + return TRUE; +} + +/** + * Prints the application usage. + */ +static VOID +IntPrintUsage() +{ + printf("rosautotest - ReactOS Automatic Testing Utility\n"); + printf("Usage: rosautotest [options] [module] [test]\n"); + printf(" options:\n"); + printf(" /? - Shows this help\n"); + printf(" /s - Shut down the system after finishing the tests\n"); + printf(" /w - Submit the results to the webservice\n"); + printf(" Requires a \"rosautotest.ini\" with valid login data.\n"); + printf("\n"); + printf(" module:\n"); + printf(" The module to be tested (i.e. \"advapi32\")\n"); + printf(" If this parameter is specified without any test parameter,\n"); + printf(" all tests of the specified module are run.\n"); + printf("\n"); + printf(" test:\n"); + printf(" The test to be run. Needs to be a test of the specified module.\n"); +} + +/** + * Main entry point + */ +int +wmain(int argc, wchar_t* argv[]) +{ + int Result = 0; + UINT i; + + hProcessHeap = GetProcessHeap(); + + /* Parse the command line arguments */ + for(i = 1; i < (UINT)argc; i++) + { + if(argv[i][0] == '-' || argv[i][0] == '/') + { + switch(argv[i][1]) + { + case 's': + AppOptions.Shutdown = TRUE; + break; + + case 'w': + AppOptions.Submit = TRUE; + break; + + default: + Result = 1; + /* Fall through */ + + case '?': + IntPrintUsage(); + goto End; + } + } + else + { + size_t Length; + + /* Which parameter is this? */ + if(!AppOptions.Module) + { + /* Copy the parameter */ + Length = (wcslen(argv[i]) + 1) * sizeof(WCHAR); + AppOptions.Module = HeapAlloc(hProcessHeap, 0, Length); + memcpy(AppOptions.Module, argv[i], Length); + } + else if(!AppOptions.Test) + { + /* Copy the parameter converted to ASCII */ + Length = WideCharToMultiByte(CP_ACP, 0, argv[i], -1, NULL, 0, NULL, NULL); + AppOptions.Test = HeapAlloc(hProcessHeap, 0, Length); + WideCharToMultiByte(CP_ACP, 0, argv[i], -1, AppOptions.Test, Length, NULL, NULL); + } + else + { + Result = 1; + IntPrintUsage(); + goto End; + } + } + } + + if(!IntGetConfigurationValues() || !IntGetBuildAndPlatform() || !RunWineTests()) + { + Result = 1; + goto End; + } + + /* For sysreg */ + OutputDebugStringA("SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE\n"); + +End: + /* Cleanup */ + if(AppOptions.Module) + HeapFree(hProcessHeap, 0, AppOptions.Module); + + if(AppOptions.Test) + HeapFree(hProcessHeap, 0, AppOptions.Test); + + if(AuthenticationRequestString) + HeapFree(hProcessHeap, 0, AuthenticationRequestString); + + if(SystemInfoRequestString) + HeapFree(hProcessHeap, 0, SystemInfoRequestString); + + /* Shut down the system if requested */ + if(AppOptions.Shutdown && !ShutdownSystem()) + Result = 1; + + return Result; +} Propchange: trunk/rostests/rosautotest/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h (added) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -1,0 +1,81 @@ +/* Includes */ +#include <stdio.h> + +#include <windows.h> +#include <reason.h> +#include <wininet.h> + +#include <reactos/buildno.h> + +/* Defines */ +#define BUFFER_BLOCKSIZE 2048 +#define BUILDNO_LENGTH 10 +#define PLATFORM_LENGTH 25 +#define SERVER_HOSTNAME L"localhost" +#define SERVER_FILE L"testman/webservice/" + +/* Enums */ +typedef enum _TESTTYPES +{ + WineTest +} +TESTTYPES; + +/* Structs */ +typedef struct _APP_OPTIONS +{ + BOOL Shutdown; + BOOL Submit; + PWSTR Module; + PCHAR Test; +} +APP_OPTIONS, *PAPP_OPTIONS; + +typedef struct _WINE_GETSUITEID_DATA +{ + PCHAR Module; + PCHAR Test; +} +WINE_GETSUITEID_DATA, *PWINE_GETSUITEID_DATA; + +typedef struct _GENERAL_SUBMIT_DATA +{ + PCHAR TestID; + PCHAR SuiteID; +} +GENERAL_SUBMIT_DATA, *PGENERAL_SUBMIT_DATA; + +typedef struct _WINE_SUBMIT_DATA +{ + GENERAL_SUBMIT_DATA General; + PCHAR Log; +} +WINE_SUBMIT_DATA, *PWINE_SUBMIT_DATA; + +typedef struct _GENERAL_FINISH_DATA +{ + PCHAR TestID; +} +GENERAL_FINISH_DATA, *PGENERAL_FINISH_DATA; + +/* main.c */ +extern APP_OPTIONS AppOptions; +extern HANDLE hProcessHeap; +extern PCHAR AuthenticationRequestString; +extern PCHAR SystemInfoRequestString; + +/* shutdown.c */ +BOOL ShutdownSystem(); + +/* tools.c */ +VOID EscapeString(PCHAR Output, PCHAR Input); +VOID StringOut(PCHAR String); + +/* webservice.c */ +PCHAR GetTestID(TESTTYPES TestType); +PCHAR GetSuiteID(TESTTYPES TestType, const PVOID TestData); +BOOL Submit(TESTTYPES TestType, const PVOID TestData); +BOOL Finish(TESTTYPES TestType, const PVOID TestData); + +/* winetests.c */ +BOOL RunWineTests(); Propchange: trunk/rostests/rosautotest/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/rosautotest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/rosautotest.r… ============================================================================== --- trunk/rostests/rosautotest/rosautotest.rbuild (added) +++ trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="rosautotest" type="win32cui" installbase="system32" installname="rosautotest.exe" unicode="yes"> + <include base="rosautotest">.</include> + <library>advapi32</library> + <library>kernel32</library> + <library>user32</library> + <library>wininet</library> + <file>main.c</file> + <file>shutdown.c</file> + <file>tools.c</file> + <file>webservice.c</file> + <file>winetests.c</file> + <pch>precomp.h</pch> +</module> Propchange: trunk/rostests/rosautotest/rosautotest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/shutdown.c?re… ============================================================================== --- trunk/rostests/rosautotest/shutdown.c (added) +++ trunk/rostests/rosautotest/shutdown.c [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -1,0 +1,52 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Helper function for shutting down the system + * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +/** + * Shuts down the system. + * + * @return + * TRUE if everything went well, FALSE if there was a problem while trying to shut down the system. + */ +BOOL ShutdownSystem() +{ + HANDLE hToken; + TOKEN_PRIVILEGES Privileges; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) + { + StringOut("OpenProcessToken failed\n"); + return FALSE; + } + + /* Get the LUID for the Shutdown privilege */ + if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) + { + StringOut("LookupPrivilegeValue failed\n"); + return FALSE; + } + + /* Assign the Shutdown privilege to our process */ + Privileges.PrivilegeCount = 1; + Privileges.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) + { + StringOut("AdjustTokenPrivileges failed\n"); + return FALSE; + } + + /* Finally shut down the system */ + if(!ExitWindowsEx(EWX_POWEROFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) + { + StringOut("ExitWindowsEx failed\n"); + return FALSE; + } + + return TRUE; +} Propchange: trunk/rostests/rosautotest/shutdown.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/tools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.c?rev=3… ============================================================================== --- trunk/rostests/rosautotest/tools.c (added) +++ trunk/rostests/rosautotest/tools.c [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -1,0 +1,57 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Various helper functions + * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +/** + * Escapes a string according to RFC 1738. + * Required for passing parameters to the web service. + * + * @param Output + * Pointer to a CHAR array, which will receive the escaped string. + * The output buffer must be large enough to hold the full escaped string. You're on the safe side + * if you make the output buffer three times as large as the input buffer. + * + * @param Input + * Pointer to a CHAR array, which contains the input buffer to escape. + */ +VOID +EscapeString(PCHAR Output, PCHAR Input) +{ + const CHAR HexCharacters[] = "0123456789ABCDEF"; + + do + { + if(strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~", *Input) ) + { + /* It's a character we don't need to escape, just add it to the output string */ + *Output++ = *Input; + } + else + { + /* We need to escape this character */ + *Output++ = '%'; + *Output++ = HexCharacters[((UCHAR)*Input >> 4) % 16]; + *Output++ = HexCharacters[(UCHAR)*Input % 16]; + } + } while(*++Input); + + *Output = 0; +} + +/** + * Outputs a string through the standard output and the debug output. + * + * @param String + * The string to output + */ +VOID +StringOut(PCHAR String) +{ + printf(String); + OutputDebugStringA(String); +} Propchange: trunk/rostests/rosautotest/tools.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/webservice.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/webservice.c?… ============================================================================== --- trunk/rostests/rosautotest/webservice.c (added) +++ trunk/rostests/rosautotest/webservice.c [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -1,0 +1,417 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Submitting test results to the Web Service + * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +static const CHAR ActionProp[] = "action="; +static const CHAR TestIDProp[] = "&testid="; +static const CHAR TestTypeProp[] = "&testtype="; +static const CHAR WineTestType[] = "wine"; + +/** + * Sends data to the ReactOS Web Test Manager web service. + * + * @param Data + * Pointer to a CHAR pointer, which contains the data to submit as HTTP POST data. + * The buffer behind this pointer had to be allocated with HeapAlloc. + * Returns the data received by the web service after the call. + * + * @param DataLength + * Pointer to a DWORD, which contains the length of the data to submit (in bytes). + * Returns the length of the data received by the web service after the call (in bytes). + * + * @return + * TRUE if everything went well, FALSE if an error occured while submitting the request. + * In case of an error, the function will output an appropriate error message through StringOut. + */ +static BOOL +IntDoRequest(char** Data, PDWORD DataLength) +{ + const WCHAR Headers[] = L"Content-Type: application/x-www-form-urlencoded"; + + HINTERNET hHTTP; + HINTERNET hHTTPRequest; + HINTERNET hInet; + + /* Establish an internet connection to the "testman" server */ + hInet = InternetOpenW(L"rosautotest", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + + if(!hInet) + { + StringOut("InternetOpenW failed\n"); + return FALSE; + } + + hHTTP = InternetConnectW(hInet, SERVER_HOSTNAME, INTERNET_DEFAULT_HTTP_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + + if(!hHTTP) + { + StringOut("InternetConnectW failed\n"); + return FALSE; + } + + /* Post our test results to the web service */ + hHTTPRequest = HttpOpenRequestW(hHTTP, L"POST", SERVER_FILE, NULL, NULL, NULL, INTERNET_FLAG_NO_COOKIES | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_CACHE_WRITE, 0); + + if(!hHTTPRequest) + { + StringOut("HttpOpenRequestW failed\n"); + return FALSE; + } + + if(!HttpSendRequestW(hHTTPRequest, Headers, wcslen(Headers), *Data, *DataLength)) + { + StringOut("HttpSendRequestW failed\n"); + return FALSE; + } + + HeapFree(hProcessHeap, 0, *Data); + + /* Get the response */ + if(!InternetQueryDataAvailable(hHTTPRequest, DataLength, 0, 0)) + { + StringOut("InternetQueryDataAvailable failed\n"); + return FALSE; + } + + *Data = HeapAlloc(hProcessHeap, 0, *DataLength + 1); + + if(!InternetReadFile(hHTTPRequest, *Data, *DataLength, DataLength)) + { + StringOut("InternetReadFile failed\n"); + return FALSE; + } + + (*Data)[*DataLength] = 0; + + InternetCloseHandle(hHTTPRequest); + InternetCloseHandle(hHTTP); + InternetCloseHandle(hInet); + + return TRUE; +} + +/** + * Determines whether a string contains entirely numeric values. + * + * @param Input + * The string to check. + * + * @return + * TRUE if the string is entirely numeric, FALSE otherwise. + */ +static BOOL +IsNumber(PCHAR Input) +{ + do + { + if(!isdigit(*Input)) + return FALSE; + + ++Input; + } + while(*Input); + + return TRUE; +} + +/** + * Requests a Test ID from the web service for our test run. + * + * @param TestType + * Value from the TESTTYPES enum indicating the type of test we are about to submit. + * + * @return + * Returns the Test ID as a CHAR array if successful or NULL otherwise. + */ +PCHAR +GetTestID(TESTTYPES TestType) +{ + const CHAR GetTestIDAction[] = "gettestid"; + + DWORD DataLength; + PCHAR Data; + + /* Build the full request string */ + DataLength = sizeof(ActionProp) - 1 + sizeof(GetTestIDAction) - 1; + DataLength += strlen(AuthenticationRequestString) + strlen(SystemInfoRequestString); + DataLength += sizeof(TestTypeProp) - 1; + + switch(TestType) + { + case WineTest: + DataLength += sizeof(WineTestType) - 1; + break; + } + + Data = HeapAlloc(hProcessHeap, 0, DataLength + 1); + strcpy(Data, ActionProp); + strcat(Data, GetTestIDAction); + strcat(Data, AuthenticationRequestString); + strcat(Data, SystemInfoRequestString); + strcat(Data, TestTypeProp); + + switch(TestType) + { + case WineTest: + strcat(Data, WineTestType); + break; + } + + if(!IntDoRequest(&Data, &DataLength)) + return NULL; + + /* Verify that this is really a number */ + if(!IsNumber(Data)) + { + StringOut("Expected Test ID, but received:\n"); + StringOut(Data); + HeapFree(hProcessHeap, 0, Data); + return NULL; + } + + return Data; +} + +/** + * Requests a Suite ID from the web service for our module/test combination. + * + * @param TestType + * Value from the TESTTYPES enum indicating the type of test we are about to submit. + * + * @param TestData + * Pointer to a *_GETSUITEID_DATA structure appropriate for our selected test type. + * Contains other input information for this request. + * + * @return + * Returns the Suite ID as a CHAR array if successful or NULL otherwise. + */ +PCHAR +GetSuiteID(TESTTYPES TestType, const PVOID TestData) +{ + const CHAR GetSuiteIDAction[] = "getsuiteid"; + const CHAR ModuleProp[] = "&module="; + const CHAR TestProp[] = "&test="; + + DWORD DataLength; + PCHAR Data; + PWINE_GETSUITEID_DATA WineData; + + DataLength = sizeof(ActionProp) - 1 + sizeof(GetSuiteIDAction) - 1; + DataLength += strlen(AuthenticationRequestString); + DataLength += sizeof(TestTypeProp) - 1; + + switch(TestType) + { + case WineTest: + DataLength += sizeof(WineTestType) - 1; + + WineData = (PWINE_GETSUITEID_DATA)TestData; + DataLength += sizeof(ModuleProp) - 1; + DataLength += strlen(WineData->Module); + DataLength += sizeof(TestProp) - 1; + DataLength += strlen(WineData->Test); + + break; + } + + Data = HeapAlloc(hProcessHeap, 0, DataLength + 1); + strcpy(Data, ActionProp); + strcat(Data, GetSuiteIDAction); + strcat(Data, AuthenticationRequestString); + strcat(Data, TestTypeProp); + + switch(TestType) + { + case WineTest: + strcat(Data, WineTestType); + + /* Stupid GCC and MSVC: WineData is already initialized above, still it's reported as a potentially uninitialized variable :-( */ + WineData = (PWINE_GETSUITEID_DATA)TestData; + strcat(Data, ModuleProp); + strcat(Data, WineData->Module); + strcat(Data, TestProp); + strcat(Data, WineData->Test); + + break; + } + + if(!IntDoRequest(&Data, &DataLength)) + return NULL; + + /* Verify that this is really a number */ + if(!IsNumber(Data)) + { + StringOut("Expected Suite ID, but received:\n"); + StringOut(Data); + HeapFree(hProcessHeap, 0, Data); + return NULL; + } + + return Data; +} + +/** + * Submits the result of one test call to the web service. + * + * @param TestType + * Value from the TESTTYPES enum indicating the type of test we are about to submit. + * + * @param TestData + * Pointer to a *_SUBMIT_DATA structure appropriate for our selected test type. + * Contains other input information for this request. + * + * @return + * TRUE if everything went well, FALSE otherwise. + */ +BOOL +Submit(TESTTYPES TestType, const PVOID TestData) +{ + const CHAR SubmitAction[] = "submit"; + const CHAR SuiteIDProp[] = "&suiteid="; + const CHAR LogProp[] = "&log="; + + DWORD DataLength; + PCHAR Data; + PCHAR pData; + PGENERAL_SUBMIT_DATA GeneralData; + PWINE_SUBMIT_DATA WineData; + + /* Compute the full length of the POST data */ + DataLength = sizeof(ActionProp) - 1 + sizeof(SubmitAction) - 1; + DataLength += strlen(AuthenticationRequestString); + + GeneralData = (PGENERAL_SUBMIT_DATA)TestData; + DataLength += sizeof(TestIDProp) - 1; + DataLength += strlen(GeneralData->TestID); + DataLength += sizeof(SuiteIDProp) - 1; + DataLength += strlen(GeneralData->SuiteID); + + /* The rest of the POST data depends on the test type */ + DataLength += sizeof(TestTypeProp) - 1; + + switch(TestType) + { + case WineTest: + DataLength += sizeof(WineTestType) - 1; + + WineData = (PWINE_SUBMIT_DATA)TestData; + DataLength += sizeof(LogProp) - 1; + DataLength += 3 * strlen(WineData->Log); + + break; + } + + /* Now collect all the POST data */ + Data = HeapAlloc(hProcessHeap, 0, DataLength + 1); + strcpy(Data, ActionProp); + strcat(Data, SubmitAction); + strcat(Data, AuthenticationRequestString); + + strcat(Data, TestIDProp); + strcat(Data, GeneralData->TestID); + strcat(Data, SuiteIDProp); + strcat(Data, GeneralData->SuiteID); + + strcat(Data, TestTypeProp); + + switch(TestType) + { + case WineTest: + strcat(Data, WineTestType); + + /* Stupid GCC and MSVC: WineData is already initialized above, still it's reported as a potentially uninitialized variable :-( */ + WineData = (PWINE_SUBMIT_DATA)TestData; + + strcat(Data, LogProp); + pData = Data + strlen(Data); + EscapeString(pData, WineData->Log); + + break; + } + + /* DataLength still contains the maximum length of the buffer, but not the actual data length we need for the request. + Determine that one now. */ + DataLength = strlen(Data); + + /* Send all the stuff */ + if(!IntDoRequest(&Data, &DataLength)) + return FALSE; + + /* Output the response */ + StringOut("The server responded:\n"); + StringOut(Data); + StringOut("\n"); + + if(!strcmp(Data, "OK")) + return TRUE; + + return FALSE; +} + +/** + * Finishes a test run for the web service. + * + * @param TestType + * Value from the TESTTYPES enum indicating the type of test we are about to submit. + * + * @param TestData + * Pointer to a *_FINISH_DATA structure appropriate for our selected test type. + * Contains other input information for this request. + * + * @return + * TRUE if everything went well, FALSE otherwise. + */ +BOOL +Finish(TESTTYPES TestType, const PVOID TestData) +{ + const CHAR FinishAction[] = "finish"; + + DWORD DataLength; + PCHAR Data; + PGENERAL_FINISH_DATA GeneralData; + + /* Build the full request string */ + DataLength = sizeof(ActionProp) - 1 + sizeof(FinishAction) - 1; + DataLength += strlen(AuthenticationRequestString); + + GeneralData = (PGENERAL_FINISH_DATA)TestData; + DataLength += sizeof(TestIDProp) - 1; + DataLength += strlen(GeneralData->TestID); + + DataLength += sizeof(TestTypeProp) - 1; + + switch(TestType) + { + case WineTest: + DataLength += sizeof(WineTestType) - 1; + break; + } + + Data = HeapAlloc(hProcessHeap, 0, DataLength + 1); + strcpy(Data, ActionProp); + strcat(Data, FinishAction); + strcat(Data, AuthenticationRequestString); + strcat(Data, TestIDProp); + strcat(Data, GeneralData->TestID); + strcat(Data, TestTypeProp); + + switch(TestType) + { + case WineTest: + strcat(Data, WineTestType); + break; + } + + if(!IntDoRequest(&Data, &DataLength)) + return FALSE; + + if(!strcmp(Data, "OK")) + return TRUE; + + return FALSE; +} Propchange: trunk/rostests/rosautotest/webservice.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/winetests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/winetests.c?r… ============================================================================== --- trunk/rostests/rosautotest/winetests.c (added) +++ trunk/rostests/rosautotest/winetests.c [iso-8859-1] Mon Jan 5 06:41:34 2009 @@ -1,0 +1,374 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Running Wine Tests automatically + * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +/** + * Runs a specific test for a specific module. + * If we get results for a test, they are submitted to the Web Service. + * + * @param CommandLine + * Command line to run (should be the path to a module's test suite together with a parameter for the specified test) + * + * @param hReadPipe + * Handle to the Read Pipe set up in RunWineTests. + * + * @param StartupInfo + * Pointer to the StartupInfo structure set up in RunWineTests. + * + * @param GetSuiteIDData + * Pointer to the GetSuiteIDData structure set up in IntRunModuleTests. + * + * @param SubmitData + * Pointer to the SubmitData structure set up in RunWineTests. + * + * @return + * TRUE if everything went well, FALSE otherwise. + */ +static BOOL +IntRunTest(PWSTR CommandLine, HANDLE hReadPipe, LPSTARTUPINFOW StartupInfo, PWINE_GETSUITEID_DATA GetSuiteIDData, PWINE_SUBMIT_DATA SubmitData) +{ + BOOL BreakLoop = FALSE; + DWORD BytesAvailable; + DWORD LogAvailable = 0; + DWORD LogLength = 0; + DWORD LogPosition = 0; + DWORD Temp; + PCHAR Buffer; + PROCESS_INFORMATION ProcessInfo; + + if(AppOptions.Submit) + { + /* Allocate one block for the log */ + SubmitData->Log = HeapAlloc(hProcessHeap, 0, BUFFER_BLOCKSIZE); + LogAvailable = BUFFER_BLOCKSIZE; + LogLength = BUFFER_BLOCKSIZE; + } + + /* Execute the test */ + StringOut("Running Wine Test, Module: "); + StringOut(GetSuiteIDData->Module); + StringOut(", Test: "); + StringOut(GetSuiteIDData->Test); + StringOut("\n"); + + if(!CreateProcessW(NULL, CommandLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &ProcessInfo)) + { + StringOut("CreateProcessW for running the test failed\n"); + return FALSE; + } + + /* Receive all the data from the pipe */ + do + { + /* When the application finished, make sure that we peek the pipe one more time, so that we get all data. + If the following condition would be the while() condition, we might hit a race condition: + - We check for data with PeekNamedPipe -> no data available + - The application outputs its data and finishes + - WaitForSingleObject reports that the application has finished and we break the loop without receiving any data + */ + if(WaitForSingleObject(ProcessInfo.hProcess, 0) == WAIT_OBJECT_0) + BreakLoop = TRUE; + + if(!PeekNamedPipe(hReadPipe, NULL, 0, NULL, &BytesAvailable, NULL)) + { + StringOut("PeekNamedPipe failed for the test run\n"); + return FALSE; + } + + if(BytesAvailable) + { + /* There is data, so get it and output it */ + Buffer = HeapAlloc(hProcessHeap, 0, BytesAvailable + 1); + + if(!ReadFile(hReadPipe, Buffer, BytesAvailable, &Temp, NULL)) + { + StringOut("ReadFile failed for the test run\n"); + return FALSE; + } + + /* Output all test output through StringOut, even while the test is still running */ + Buffer[BytesAvailable] = 0; + StringOut(Buffer); + + if(AppOptions.Submit) + { + /* Also store it in the buffer */ + if(BytesAvailable > LogAvailable) + { + /* Allocate enough new blocks to hold all available data */ + Temp = ((BytesAvailable - LogAvailable) / BUFFER_BLOCKSIZE + 1) * BUFFER_BLOCKSIZE; + LogAvailable += Temp; + LogLength += Temp; + SubmitData->Log = HeapReAlloc(hProcessHeap, 0, SubmitData->Log, LogLength); + } + + memcpy(&SubmitData->Log[LogPosition], Buffer, BytesAvailable); + LogPosition += BytesAvailable; + LogAvailable -= BytesAvailable; + } + + HeapFree(hProcessHeap, 0, Buffer); + } + } + while(!BreakLoop); + + if(AppOptions.Submit) + { + SubmitData->Log[LogLength - LogAvailable] = 0; + + /* If we got any output, submit it to the web service */ + if(*SubmitData->Log) + { + /* We don't want to waste any ID's, so only request them if we can be sure that we have results to submit. */ + + /* Get a Test ID if we don't have one yet */ + if(!SubmitData->General.TestID) + { + SubmitData->General.TestID = GetTestID(WineTest); + + if(!SubmitData->General.TestID) + return FALSE; + } + + /* Get a Suite ID for this combination */ + SubmitData->General.SuiteID = GetSuiteID(WineTest, GetSuiteIDData); + + if(!SubmitData->General.SuiteID) + return FALSE; + + /* Submit the stuff */ + Submit(WineTest, SubmitData); + + /* Cleanup */ + HeapFree(hProcessHeap, 0, SubmitData->General.SuiteID); + } + + /* Cleanup */ + HeapFree(hProcessHeap, 0, SubmitData->Log); + } + + StringOut("\n\n"); + + return TRUE; +} + +/** + * Runs the desired tests for a specified module. + * + * @param File + * The file name of the module's test suite. + * + * @param FilePath + * The full path to the file of the module's test suite. + * + * @param hReadPipe + * Handle to the Read Pipe set up in RunWineTests. + * + * @param StartupInfo + * Pointer to the StartupInfo structure set up in RunWineTests. + * + * @param SubmitData + * Pointer to the SubmitData structure set up in RunWineTests. + * + * @return + * TRUE if everything went well, FALSE otherwise. + */ +static BOOL +IntRunModuleTests(PWSTR File, PWSTR FilePath, HANDLE hReadPipe, LPSTARTUPINFOW StartupInfo, PWINE_SUBMIT_DATA SubmitData) +{ + DWORD BytesAvailable; + DWORD Length; + DWORD Temp; + PCHAR Buffer; + PCHAR pStart; + PCHAR pEnd; + PROCESS_INFORMATION ProcessInfo; + size_t FilePosition; + WINE_GETSUITEID_DATA GetSuiteIDData; + + /* Build the full command line */ + FilePosition = wcslen(FilePath); + FilePath[FilePosition++] = ' '; + FilePath[FilePosition] = 0; + wcscat(FilePath, L"--list"); + + /* Store the tested module name */ + Length = wcschr(File, L'_') - File; + GetSuiteIDData.Module = HeapAlloc(hProcessHeap, 0, Length + 1); + WideCharToMultiByte(CP_ACP, 0, File, Length, GetSuiteIDData.Module, Length, NULL, NULL); + GetSuiteIDData.Module[Length] = 0; + + /* Start the process for getting all available tests */ + if(!CreateProcessW(NULL, FilePath, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &ProcessInfo)) + { + StringOut("CreateProcessW for getting the available tests failed\n"); + return FALSE; + } + + /* Wait till this process ended */ + if(WaitForSingleObject(ProcessInfo.hProcess, INFINITE) == WAIT_FAILED) + { + StringOut("WaitForSingleObject failed for the test list\n"); + return FALSE; + } + + /* Read the output data into a buffer */ + if(!PeekNamedPipe(hReadPipe, NULL, 0, NULL, &BytesAvailable, NULL)) + { + StringOut("PeekNamedPipe failed for the test list\n"); + return FALSE; + } + + Buffer = HeapAlloc(hProcessHeap, 0, BytesAvailable); + + if(!ReadFile(hReadPipe, Buffer, BytesAvailable, &Temp, NULL)) + { + StringOut("ReadFile failed\n"); + return FALSE; + } + + /* Jump to the first available test */ + pStart = strchr(Buffer, '\n'); + pStart += 5; + + while(pStart < (Buffer + BytesAvailable)) + { + /* Get start and end of this test name */ + pEnd = pStart; + + while(*pEnd != '\r') + ++pEnd; + + /* Store the test name */ + GetSuiteIDData.Test = HeapAlloc(hProcessHeap, 0, pEnd - pStart + 1); + memcpy(GetSuiteIDData.Test, pStart, pEnd - pStart); + GetSuiteIDData.Test[pEnd - pStart] = 0; + + /* If the user gave us a test to run, we check whether the module's test suite really provides this test. */ + if(!AppOptions.Test || (AppOptions.Test && !strcmp(AppOptions.Test, GetSuiteIDData.Test))) + { + /* Build the command line for this test */ + Length = MultiByteToWideChar(CP_ACP, 0, pStart, pEnd - pStart, NULL, 0); + MultiByteToWideChar(CP_ACP, 0, pStart, pEnd - pStart, &FilePath[FilePosition], Length * sizeof(WCHAR)); + FilePath[FilePosition + Length] = 0; + + if(!IntRunTest(FilePath, hReadPipe, StartupInfo, &GetSuiteIDData, SubmitData)) + return FALSE; + } + + /* Cleanup */ + HeapFree(hProcessHeap, 0, GetSuiteIDData.Test); + + /* Move to the next test */ + pStart = pEnd + 6; + } + + /* Cleanup */ + HeapFree(hProcessHeap, 0, GetSuiteIDData.Module); + HeapFree(hProcessHeap, 0, Buffer); + + return TRUE; +} + +/** + * Runs the Wine tests according to the options specified by the parameters. + * + * @return + * TRUE if everything went well, FALSE otherwise. + */ +BOOL +RunWineTests() +{ + GENERAL_FINISH_DATA FinishData; + HANDLE hFind; + HANDLE hReadPipe; + HANDLE hWritePipe; + SECURITY_ATTRIBUTES SecurityAttributes; + STARTUPINFOW StartupInfo = {0}; + size_t PathPosition; + WCHAR FilePath[MAX_PATH]; + WIN32_FIND_DATAW fd; + WINE_SUBMIT_DATA SubmitData = { {0} }; + + /* Create a pipe for getting the output of the tests */ + SecurityAttributes.nLength = sizeof(SecurityAttributes); + SecurityAttributes.bInheritHandle = TRUE; + SecurityAttributes.lpSecurityDescriptor = NULL; + + if(!CreatePipe(&hReadPipe, &hWritePipe, &SecurityAttributes, 0)) + { + StringOut("CreatePipe failed\n"); + return FALSE; + } + + StartupInfo.cb = sizeof(StartupInfo); + StartupInfo.dwFlags = STARTF_USESTDHANDLES; + StartupInfo.hStdOutput = hWritePipe; + + /* Build the path for finding the tests */ + if(GetWindowsDirectoryW(FilePath, MAX_PATH) > MAX_PATH - 60) + { + StringOut("Windows directory path is too long\n"); + return FALSE; + } + + wcscat(FilePath, L"\\bin\\"); + PathPosition = wcslen(FilePath); + + if(AppOptions.Module) + { + /* Find a test belonging to this module */ + wcscat(FilePath, AppOptions.Module); + wcscat(FilePath, L"_*.exe"); + } + else + { + /* Find all tests */ + wcscat(FilePath, L"*.exe"); + } + + hFind = FindFirstFileW(FilePath, &fd); + + if(hFind == INVALID_HANDLE_VALUE) + { + StringOut("FindFirstFileW failed\n"); + return FALSE; + } + + /* Run the tests */ + do + { + /* Build the full path to the test suite */ + wcscpy(&FilePath[PathPosition], fd.cFileName); + + /* Run it */ + if(!IntRunModuleTests(fd.cFileName, FilePath, hReadPipe, &StartupInfo, &SubmitData)) + return FALSE; + } + while(FindNextFileW(hFind, &fd)); + + /* Cleanup */ + FindClose(hFind); + + if(AppOptions.Submit && SubmitData.General.TestID) + { + /* We're done with the tests, so close this test run */ + FinishData.TestID = SubmitData.General.TestID; + + if(!Finish(WineTest, &FinishData)) + return FALSE; + + /* Cleanup */ + HeapFree(hProcessHeap, 0, FinishData.TestID); + } + + CloseHandle(hReadPipe); + CloseHandle(hWritePipe); + + return TRUE; +} Propchange: trunk/rostests/rosautotest/winetests.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 38579: Introducing "ReactOS Web Test Manager", an interface for finding, viewing and comparing the results of automatic regression tests B-) The interface mostly looks and works similar to the "getbuilds" one. After you've selected the tests you want to view or compare, another page will be opened showing all results in tabular form and each differences to the previous one. It is also possible to drag & drop the column headers and all associated results to get the table to look like you
by cfinck＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: cfinck Date: Mon Jan 5 06:35:05 2009 New Revision: 38579 URL: http://svn.reactos.org/svn/reactos?rev=38579&view=rev Log: Introducing "ReactOS Web Test Manager", an interface for finding, viewing and comparing the results of automatic regression tests B-) The interface mostly looks and works similar to the "getbuilds" one. After you've selected the tests you want to view or compare, another page will be opened showing all results in tabular form and each differences to the previous one. It is also possible to drag & drop the column headers and all associated results to get the table to look like you want it. You can also get a detailed overview about a particular result including the original log. But try that all for yourself, when it's on the server :-P The results need to be submitted through a web service, which is also provided by this commit. The designed application for communicating with the web service and submitting the results follows in my next commit. Added: trunk/web/reactos.org/htdocs/testman/ (with props) trunk/web/reactos.org/htdocs/testman/ajax-search.php (with props) trunk/web/reactos.org/htdocs/testman/compare.php (with props) trunk/web/reactos.org/htdocs/testman/config.inc.php (with props) trunk/web/reactos.org/htdocs/testman/css/ (with props) trunk/web/reactos.org/htdocs/testman/css/compare.css (with props) trunk/web/reactos.org/htdocs/testman/css/detail.css (with props) trunk/web/reactos.org/htdocs/testman/css/index.css (with props) trunk/web/reactos.org/htdocs/testman/detail.php (with props) trunk/web/reactos.org/htdocs/testman/index.php (with props) trunk/web/reactos.org/htdocs/testman/js/ (with props) trunk/web/reactos.org/htdocs/testman/js/compare.js.php (with props) trunk/web/reactos.org/htdocs/testman/js/detail.js.php (with props) trunk/web/reactos.org/htdocs/testman/js/index.js.php (with props) trunk/web/reactos.org/htdocs/testman/lang/ (with props) trunk/web/reactos.org/htdocs/testman/lang/de.inc.php (with props) trunk/web/reactos.org/htdocs/testman/lang/en.inc.php (with props) trunk/web/reactos.org/htdocs/testman/languages.inc.php (with props) trunk/web/reactos.org/htdocs/testman/utils.inc.php (with props) trunk/web/reactos.org/htdocs/testman/webservice/ (with props) trunk/web/reactos.org/htdocs/testman/webservice/index.php (with props) trunk/web/reactos.org/htdocs/testman/webservice/lib/ (with props) trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php (with props) trunk/web/reactos.org/resources/testman/ (with props) trunk/web/reactos.org/resources/testman/testman.sql (with props) Propchange: trunk/web/reactos.org/htdocs/testman/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 5 06:35:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/web/reactos.org/htdocs/testman/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/web/reactos.org/htdocs/testman/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/web/reactos.org/htdocs/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/aja… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/ajax-search.php (added) +++ trunk/web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,131 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: AJAX backend for the Search feature + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + header("Content-type: text/xml"); + + if(!isset($_GET["startrev"]) || !isset($_GET["endrev"]) || !isset($_GET["platform"])) + die("<error>Necessary information not specified!</error>"); + + + require_once("config.inc.php"); + require_once("utils.inc.php"); + + try + { + $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); + } + catch(PDOException $e) + { + // Give no exact error message here, so no server internals are exposed + die("<error>Could not establish the DB connection</error>"); + } + + // Prepare the WHERE clause + $where = ""; + + if($_GET["startrev"] || $_GET["startid"] || $_GET["platform"]) + { + // Begin the WHERE clause with "WHERE 1 ", so we can begin all following statements with AND :-) + $where = "WHERE 1 "; + + if($_GET["startrev"]) + $where .= "AND revision >= " . (int)$_GET["startrev"] . " AND revision <= " . (int)$_GET["endrev"] . " "; + + if($_GET["startid"]) + $where .= "AND id >= " . (int)$_GET["startid"] . " "; + + if($_GET["platform"]) + $where .= "AND platform LIKE " . $dbh->quote($_GET["platform"] . "%") . " "; + } + + // Prepare the ORDER clause + $order = "ORDER BY revision ASC, id ASC "; + + echo "<results>"; + + // First determine how many results we would get in total with this query + $stmt = $dbh->query("SELECT COUNT(*) FROM " . DB_TESTMAN . ".winetest_runs " . $where) or die("<error>Query failed #1</error>"); + $result_count = $stmt->fetchColumn(); + + if($result_count > RESULTS_PER_PAGE) + { + // The number of results exceeds the number of results per page. + // Therefore we will only output all results up to the maximum number of results per page with this call. + $result_count = RESULTS_PER_PAGE; + echo "<moreresults>1</moreresults>"; + } + else + { + echo "<moreresults>0</moreresults>"; + } + + printf("<resultcount>%d</resultcount>", $result_count); + + $first_id = 0; + $first_revision = 0; + $last_revision = 0; + $next_id = 0; + + if($result_count) + { + if($_GET["resultlist"]) + { + $stmt = $dbh->query( + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " . + "FROM " . DB_TESTMAN . ".winetest_runs r " . + "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . + $where . + $order . + "LIMIT " . RESULTS_PER_PAGE + ) or die("<error>Query failed #2</error>"); + + $first = true; + + while($row = $stmt->fetch(PDO::FETCH_ASSOC)) + { + if($first) + { + $first_id = $row["id"]; + $first_revision = $row["revision"]; + $first = false; + } + + echo "<result>"; + printf("<id>%d</id>", $row["id"]); + printf("<date>%s</date>", GetDateString($row["timestamp"])); + printf("<user>%s</user>", htmlspecialchars($row["user_name"])); + printf("<revision>%d</revision>", $row["revision"]); + printf("<platform>%s</platform>", GetPlatformString($row["platform"])); + echo "</result>"; + + $last_revision = $row["revision"]; + } + } + else + { + // Get the first and last revision belonging to this call + $stmt = $dbh->query("SELECT id, revision FROM " . DB_TESTMAN . ".winetest_runs " . $where . $order . "LIMIT 1") or die("<error>Query failed #3</error>"); + $row = $stmt->fetch(PDO::FETCH_ASSOC); + $first_id = $row["id"]; + $first_revision = $row["revision"]; + + $stmt = $dbh->query("SELECT revision FROM " . DB_TESTMAN . ".winetest_runs " . $where . $order . "LIMIT " . ($result_count - 1) . ", 1") or die("<error>Query failed #4</error>"); + $last_revision = $stmt->fetchColumn(); + } + + $stmt = $dbh->query("SELECT id FROM " . DB_TESTMAN . ".winetest_runs " . $where . $order . "LIMIT " . $result_count . ", 1") or die("<error>Query failed #5</error>"); + $next_id = $stmt->fetchColumn(); + } + + printf("<firstid>%d</firstid>", $first_id); + printf("<firstrev>%d</firstrev>", $first_revision); + printf("<lastrev>%d</lastrev>", $last_revision); + printf("<nextid>%d</nextid>", $next_id); + + echo "</results>"; +?> Propchange: trunk/web/reactos.org/htdocs/testman/ajax-search.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/compare.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/com… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/compare.php (added) +++ trunk/web/reactos.org/htdocs/testman/compare.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,263 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Compare Page + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + + charset=utf-8 without BOM +*/ + + define("ROOT_PATH", "../"); + + require_once("config.inc.php"); + require_once("utils.inc.php"); + require_once("languages.inc.php"); + require_once(ROOT_PATH . "shared/subsys_layout.php"); + + GetLanguage(); + require_once("lang/$lang.inc.php"); + + + function GetDifference(&$current_result_row, &$prev_result_row, $subject) + { + if(!$prev_result_row["id"] || $current_result_row[$subject] == $prev_result_row[$subject]) + return " "; + + $diff = $current_result_row[$subject] - $prev_result_row[$subject]; + + if($diff > 0) + return "(+$diff)"; + else + return "($diff)"; + } + + function CheckIfChanged(&$changed, &$temp, &$current) + { + if($changed) + return; + + if($temp == -1) + $temp = $current; + else if($current != $temp) + $changed = true; + } +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <title><?php echo $testman_langres["compare_title"]; ?></title> + <link rel="stylesheet" type="text/css" href="../shared/css/basic.css" /> + <link rel="stylesheet" type="text/css" href="../shared/css/reactos.css" /> + <link rel="stylesheet" type="text/css" href="css/compare.css" /> + <script type="text/javascript"> + //<![CDATA[ + <?php require_once("js/compare.js.php"); ?> + //]]> + </script> +</head> +<body onload="Load()"> + +<h2><?php echo $testman_langres["compare_title"]; ?></h2> + +<?php + if(!isset($_GET["ids"])) + die("Necessary information not specified"); + + $id_array = explode(",", $_GET["ids"]); + + if(!$id_array) + die("<i>ids</i> parameter is no array"); + + // Verify that the array only contains numeric values to prevent SQL injections + foreach($id_array as $id) + if(!is_numeric($id)) + die("<i>ids</i> parameter is not entirely numeric!"); + + if(count($id_array) > MAX_COMPARE_RESULTS) + die(sprintf($testman_langres["maxselection"], MAX_COMPARE_RESULTS)); + + if(count($id_array) > 1) + { + echo '<div>'; + printf('<input type="checkbox" id="showchanged" onclick="ShowChangedCheckbox_OnClick(this)" /> %s', $testman_langres["showchanged"]); + echo '</div><br />'; + } +?> + +<table id="legend" cellspacing="5"> + <tr> + <td id="intro"><?php echo $testman_langres["legend"]; ?>:</td> + + <td class="box" style="background: black;"></td> + <td><?php echo $testman_langres["totaltests"]; ?></td> + + <td class="box" style="background: #BF0A00;"></td> + <td><?php echo $testman_langres["failedtests"]; ?></td> + + <td class="box" style="background: #1701E4;"></td> + <td><?php echo $testman_langres["todotests"]; ?></td> + + <td class="box" style="background: #818181;"></td> + <td><?php echo $testman_langres["skippedtests"]; ?></td> + + <td class="box" style="background: green;"></td> + <td><?php echo $testman_langres["difference"]; ?></td> + </tr> +</table> + +<?php + // Establish a DB connection + try + { + $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); + } + catch(PDOException $e) + { + // Give no exact error message here, so no server internals are exposed + die("Could not establish the DB connection"); + } + + // Get all test suites for which we have at least one result in our ID list + $suites_stmt = $dbh->query( + "SELECT DISTINCT s.id, s.module, s.test " . + "FROM " . DB_TESTMAN . ".winetest_suites s " . + "JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id " . + "WHERE test_id IN (" . $_GET["ids"] . ") " . + "ORDER BY s.module ASC, s.test ASC" + ) or die("Query failed #1"); + + // Get the test results for each column + $result_stmt = array(); + $i = 0; + + foreach($id_array as $id) + { + $result_stmt[$i] = $dbh->prepare( + "SELECT e.id, e.count, e.todo, e.failures, e.skipped " . + "FROM " . DB_TESTMAN . ".winetest_suites s " . + "LEFT JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id AND e.test_id = :testid " . + "WHERE s.id IN (" . + "SELECT s.id " . + "FROM " . DB_TESTMAN . ".winetest_suites s " . + "JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id " . + "WHERE e.test_id IN (" . $_GET["ids"] . ") " . + ") " . + "ORDER BY s.module, s.test" + ); + $result_stmt[$i]->bindParam(":testid", $id); + $result_stmt[$i]->execute() or die("Query failed #2 for statement $i" . print_r($result_stmt[$i]->errorInfo(), true)); + + $i++; + } + + echo '<table id="comparetable" class="datatable" cellspacing="0" cellpadding="0">'; + echo '<thead><tr class="head">'; + printf('<th class="TestSuite">%s</th>', $testman_langres["testsuite"]); + + $stmt = $dbh->prepare( + "SELECT UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " . + "FROM " . DB_TESTMAN . ".winetest_runs r " . + "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . + "WHERE r.id = :id" + ); + + foreach($id_array as $id) + { + $stmt->bindParam(":id", $id); + $stmt->execute() or die("Query failed #3"); + $row = $stmt->fetch(PDO::FETCH_ASSOC); + + echo '<th onmousedown="ResultHead_OnMouseDown(this)">'; + printf($testman_langres["resulthead"], $row["revision"], GetPlatformString($row["platform"]), $row["user_name"], GetDateString($row["timestamp"])); + echo '</th>'; + } + + echo '</tr></thead>'; + echo '<tbody>'; + + $oddeven = false; + $unchanged = array(); + + while($suites_row = $suites_stmt->fetch(PDO::FETCH_ASSOC)) + { + printf('<tr id="suite_%s" class="%s">', $suites_row["id"], ($oddeven ? "odd" : "even")); + printf('<td onmouseover="Cell_OnMouseOver(this)" onmouseout="Cell_OnMouseOut(this)">%s:%s</td>', $suites_row["module"], $suites_row["test"]); + + $changed = false; + $prev_result_row = null; + $temp_totaltests = -1; + $temp_failedtests = -1; + $temp_todotests = -1; + $temp_skippedtests = -1; + + for($i = 0; $i < count($result_stmt); $i++) + { + $result_row = $result_stmt[$i]->fetch(PDO::FETCH_ASSOC); + + echo '<td onmouseover="Cell_OnMouseOver(this)" onmouseout="Cell_OnMouseOut(this)"'; + + if($result_row["id"]) + printf(' class="clickable" onclick="Result_OnClick(%d)"', $result_row["id"]); + + echo '>'; + + if($result_row["id"]) + { + // Check whether there are any changes within the test results of several runs + CheckIfChanged($changed, $temp_totaltests, $result_row["count"]); + CheckIfChanged($changed, $temp_failedtests, $result_row["failedtests"]); + CheckIfChanged($changed, $temp_todotests, $result_row["todo"]); + CheckIfChanged($changed, $temp_skippedtests, $result_row["skipped"]); + + echo '<table class="celltable">'; + echo '<tr>'; + printf('<td colspan="3" title="%s" class="totaltests">%d <span class="diff">%s</span></td>', $testman_langres["totaltests"], $result_row["count"], GetDifference($result_row, $prev_result_row, "count")); + echo '</tr><tr>'; + printf('<td title="%s" class="failedtests">%d <span class="diff">%s</span></td>', $testman_langres["failedtests"], $result_row["failed"], GetDifference($result_row, $prev_result_row, "failedtests")); + printf('<td title="%s" class="todotests">%d <span class="diff">%s</span></td>', $testman_langres["todotests"], $result_row["todo"], GetDifference($result_row, $prev_result_row, "todotests")); + printf('<td title="%s" class="skippedtests">%d <span class="diff">%s</span></td>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skippedtests")); + echo '</tr></table>'; + } + else + { + // Bloody IE Hack + echo " "; + } + + echo '</td>'; + + $prev_result_row = $result_row; + } + + echo '</tr>'; + + if(!$changed) + $unchanged[] = $suites_row["id"]; + + $oddeven = !$oddeven; + } + + echo '</tbody></table>'; + + // Prepare the array containing all "unchanged" rows + echo "<script type=\"text/javascript\">\n"; + echo "//<![CDATA[\n"; + echo "var UnchangedRows = Array("; + + for($i = 0; $i < count($unchanged); $i++) + { + if($i) + echo "," . $unchanged[$i]; + else + echo $unchanged[$i]; + } + + echo ");\n"; + echo "//]]>\n"; + echo "</script>"; +?> + +</body> +</html> Propchange: trunk/web/reactos.org/htdocs/testman/compare.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/config.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/con… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/config.inc.php (added) +++ trunk/web/reactos.org/htdocs/testman/config.inc.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,22 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Configuration settings + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + // DB Settings + // The user entered here must have: + // * SELECT, INSERT, UPDATE and DELETE privileges to $DB_TESTMAN + // * SELECT privileges to $DB_ROSCMS + define("DB_HOST", "localhost"); + define("DB_USER", "root"); + define("DB_PASS", ""); + + define("DB_ROSCMS", "roscms"); + define("DB_TESTMAN", "testman"); + + define("RESULTS_PER_PAGE", 100); + define("MAX_COMPARE_RESULTS", 5); +?> Propchange: trunk/web/reactos.org/htdocs/testman/config.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/testman/css/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 5 06:35:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/web/reactos.org/htdocs/testman/css/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/web/reactos.org/htdocs/testman/css/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/web/reactos.org/htdocs/testman/css/compare.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/css… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/css/compare.css (added) +++ trunk/web/reactos.org/htdocs/testman/css/compare.css [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,85 @@ +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Stylesheet for the Compare Page + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + +#legend { + border: solid 1px black; + margin-bottom: 1em; +} + +#legend #intro { + font-weight: bold; + padding-right: 10px; +} + +#legend td { + padding-right: 5px; +} + +#legend td.box { + border: solid 1px black; + padding: 0; + width: 15px; +} + +.totaltests { + color: black; +} + +.failedtests { + color: #BF0A00; +} + +.todotests { + color: #1701E4; +} + +.skippedtests { + color: #818181; +} + +.diff { + color: green; +} + +#TempBlock { + background: #5984C3; + color: white; + font-weight: bold; +} + +#comparetable th, #TempBlock { + cursor: move; + padding: 3px 8px 3px 3px; + vertical-align: bottom; +} + +#comparetable th.TestSuite { + cursor: default; + width: 200px; +} + +#comparetable td { + border-right: solid 1px #BBBBBB; + border-bottom: solid 1px #BBBBBB; + padding: 3px; +} + +#comparetable td.clickable { + cursor: pointer; +} + +.celltable { + width: 215px; +} + +.celltable td { + text-align: center; +} + +.celltable td.totaltests { + font-weight: bold; +} Propchange: trunk/web/reactos.org/htdocs/testman/css/compare.css ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/css/detail.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/css… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/css/detail.css (added) +++ trunk/web/reactos.org/htdocs/testman/css/detail.css [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,20 @@ +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Stylesheet for the Result Details Page + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + +.datatable { + width: 800px; +} + +.datatable th, .datatable td { + padding: 3px; + vertical-align: top; +} + +.datatable td.info { + font-weight: bold; + width: 200px; +} Propchange: trunk/web/reactos.org/htdocs/testman/css/detail.css ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/css/index.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/css… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/css/index.css (added) +++ trunk/web/reactos.org/htdocs/testman/css/index.css [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,59 @@ +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Stylesheet for the Index Page + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + +button { + font-weight: bold; +} + +.datatable { + cursor: pointer; +} + +#js_stuff { + /* Will be shown by the JavaScript */ + display: none; +} + +#mainbox_td, #rightbox_td { + vertical-align: top; +} + +#rightbox_td { + width: 300px; + padding-left: 7px; +} + +.datatable { + width: 100%; +} + +th.TestCheckbox { + width: 30px; +} + +#searchform tr td { + vertical-align: top; +} + +#ajax_loading_search { + font-weight: bold; + margin-left: 20px; + visibility: hidden; +} + +#infotable { + margin-top: 2em; +} + +#infotable { + width: 100%; +} + +#pagesbox { + font-weight: bold; + text-align: right; +} Propchange: trunk/web/reactos.org/htdocs/testman/css/index.css ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/detail.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/det… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/detail.php (added) +++ trunk/web/reactos.org/htdocs/testman/detail.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,123 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Result Details Page + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + + charset=utf-8 without BOM +*/ + + define("ROOT_PATH", "../"); + + require_once("config.inc.php"); + require_once("utils.inc.php"); + require_once("languages.inc.php"); + require_once(ROOT_PATH . "shared/subsys_layout.php"); + + GetLanguage(); + require_once("lang/$lang.inc.php"); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <title><?php echo $testman_langres["detail_title"]; ?></title> + <link rel="stylesheet" type="text/css" href="../shared/css/basic.css" /> + <link rel="stylesheet" type="text/css" href="../shared/css/reactos.css" /> + <link rel="stylesheet" type="text/css" href="css/detail.css" /> + <script type="text/javascript"> + //<![CDATA[ + <?php require_once("js/detail.js.php"); ?> + //]]> + </script> +</head> +<body> + +<h2><?php echo $testman_langres["detail_title"]; ?></h2> + +<?php + if(!isset($_GET["id"])) + die("Necessary information not specified"); + + // Establish a DB connection + try + { + $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); + } + catch(PDOException $e) + { + // Give no exact error message here, so no server internals are exposed + die("Could not establish the DB connection"); + } + + // Get information about this result + $stmt = $dbh->prepare( + "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, u.user_name " . + "FROM " . DB_TESTMAN . ".winetest_results e " . + "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . + "JOIN " . DB_TESTMAN . ".winetest_runs r ON e.test_id = r.id " . + "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . + "WHERE e.id = :id" + ); + $stmt->bindParam(":id", $_GET["id"]); + $stmt->execute() or die("Query failed #1"); + $row = $stmt->fetch(PDO::FETCH_ASSOC); +?> + +<table class="datatable" cellspacing="0" cellpadding="0"> + <tr class="head"> + <th colspan="2"><?php echo $testman_langres["thisresult"]; ?></th> + </tr> + + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["testsuite"]; ?>:</td> + <td><?php echo $row["module"]; ?>:<?php echo $row["test"]; ?></td> + </tr> + <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["totaltests"]; ?>:</td> + <td><?php echo $row["count"]; ?></td> + </tr> + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["failedtests"]; ?>:</td> + <td><?php echo $row["failures"]; ?></td> + </tr> + <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["todotests"]; ?>:</td> + <td><?php echo $row["todo"]; ?></td> + </tr> + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["skippedtests"]; ?>:</td> + <td><?php echo $row["skipped"]; ?></td> + </tr> + <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["log"]; ?>:</td> + <td><pre><?php echo $row["log"]; ?></pre></td> + </tr> +</table><br /> + +<table class="datatable" cellspacing="0" cellpadding="0"> + <tr class="head"> + <th colspan="2"><?php echo $testman_langres["associatedtest"]; ?></th> + </tr> + + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["revision"]; ?>:</td> + <td><?php echo $row["revision"]; ?></td> + </tr> + <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["platform"]; ?>:</td> + <td><?php echo GetPlatformString($row["platform"]); ?></td> + </tr> + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["user"]; ?>:</td> + <td><?php echo $row["user_name"]; ?></td> + </tr> + <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["date"]; ?>:</td> + <td><?php echo GetDateString($row["timestamp"]); ?></td> + </tr> +</table> + +</body> +</html> Propchange: trunk/web/reactos.org/htdocs/testman/detail.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/ind… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/index.php (added) +++ trunk/web/reactos.org/htdocs/testman/index.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,242 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Main Page + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + + charset=utf-8 without BOM +*/ + + define("ROOT_PATH", "../"); + + require_once("config.inc.php"); + require_once("utils.inc.php"); + require_once("languages.inc.php"); + require_once(ROOT_PATH . "shared/subsys_layout.php"); + require_once(ROOT_PATH . "shared/svn.php"); + + GetLanguage(); + require_once(ROOT_PATH . "shared/lang/$lang.inc.php"); + require_once("lang/$lang.inc.php"); + + $rev = GetLatestRevision(); +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <title><?php echo $testman_langres["index_title"]; ?></title> + <link rel="stylesheet" type="text/css" href="../shared/css/menu.css" /> + <link rel="stylesheet" type="text/css" href="../shared/css/reactos.css" /> + <link rel="stylesheet" type="text/css" href="css/index.css" /> + <script type="text/javascript"> + //<![CDATA[ + document.write('<style type="text/css">'); + document.write('#js_stuff {display: block;}'); + document.write('<\/style>'); + //]]> + </script> + <script type="text/javascript" src="../shared/js/ajax.js"></script> + <script type="text/javascript"> + //<![CDATA[ + <?php require_once("js/index.js.php"); ?> + //]]> + </script> +</head> +<body> + +<?php + BasicLayout($lang); + LanguageBox($lang); +?> +</td> +<td id="content"> + +<h1><?php echo $testman_langres["index_header"]; ?></h1> +<h2><?php echo $testman_langres["index_title"]; ?></h2> + +<p><?php echo $testman_langres["index_intro"]; ?></p> + +<noscript> + <div class="bubble_bg"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <b><?php echo $testman_langres["js_disclaimer"]; ?></b> + </div> + + </div> + </div> + </div> + </div> + </div> +</noscript> + +<div id="js_stuff"> + <table width="100%" cellspacing="0" cellpadding="0"> + <tr> + <td id="mainbox_td"> + <div class="bubble_bg"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <h1><?php echo $testman_langres["lastresults_header"]; ?></h1> + + <table class="datatable" cellspacing="0" cellpadding="0"> + <thead> + <tr class="head"> + <th class="TestCheckbox"></th> + <th><?php echo $testman_langres["date"]; ?></th> + <th><?php echo $testman_langres["revision"]; ?></th> + <th><?php echo $testman_langres["user"]; ?></th> + <th><?php echo $testman_langres["platform"]; ?></th> + </tr> + </thead> + <tbody> + <?php + try + { + $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); + } + catch(PDOException $e) + { + // Give no exact error message here, so no server internals are exposed + die("<error>Could not establish the DB connection</error>"); + } + + $stmt = $dbh->query( + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " . + "FROM " . DB_TESTMAN . ".winetest_runs r " . + "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . + "ORDER BY revision DESC, id DESC " . + "LIMIT 10" + ) or die("Query failed #1"); + + $oddeven = false; + $ids = array(); + + while($row = $stmt->fetch(PDO::FETCH_ASSOC)) + { + $ids[] = $row["id"]; + + printf('<tr class="%s" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">', ($oddeven ? "odd" : "even")); + printf('<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_%s" /></td>', $row["id"]); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetDateString($row["timestamp"])); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', $row["revision"]); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["user_name"])); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetPlatformString($row["platform"])); + echo "</tr>"; + + $oddeven = !$oddeven; + } + ?> + </tbody> + </table> + + <?php + // Ensure that all checkboxes are unchecked with a JavaScript (some browsers keep them checked after a reload) + echo "<script type=\"text/javascript\">\n"; + echo "//<![CDATA[\n"; + + foreach($ids as $id) + printf('document.getElementsByName("test_%s")[0].checked = false;', $id); + + echo "\n//]]>\n"; + echo "</script>"; + ?> + </div> + + </div> + </div> + </div> + </div> + </div> + + <div class="bubble_bg"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <h1><?php echo $testman_langres["search_header"]; ?></h1> + + <table id="searchform"> + <tr> + <td><?php echo $testman_langres["search_revision"]; ?>:</td> + <td> + <input type="text" id="search_revision" value="" size="12" onkeyup="SearchRevisionInput_OnKeyUp(this)" /><br /> + + <img src="../shared/images/info.gif" alt="" /> <?php printf($shared_langres["rangeinfo"], $rev, ($rev - 50), $rev); ?> + </td> + </tr> + <tr> + <td><?php echo $testman_langres["search_platform"]; ?>:</td> + <td> + <select id="search_platform" size="1"> + <option></option> + <option value="reactos">ReactOS</option> + <option value="5.0">Windows 2000</option> + <option value="5.1">Windows XP</option> + <option value="5.2">Windows XP x64/Server 2003</option> + <option value="6.0">Windows Vista/Server 2008</option> + <option value="6.1">Windows 7</option> + </select> + </td> + </tr> + </table><br /> + + <button onclick="SearchButton_OnClick()"><?php echo $testman_langres["search_button"]; ?></button> + + <span id="ajax_loading_search"> + <img src="../shared/images/ajax_loading.gif" alt="" /> <?php echo $testman_langres["searching"]; ?>... + </span> + + <div id="searchtable"> +  + </div> + </div> + + </div> + </div> + </div> + </div> + </div> + </td> + + <td id="rightbox_td"> + <div class="bubble_bg"> + <div class="rounded_ll"> + <div class="rounded_lr"> + <div class="rounded_ul"> + <div class="rounded_ur"> + + <div class="bubble"> + <div id="status"><?php printf($testman_langres["status"], "<b>0</b>"); ?></div><br /> + + <button onclick="CompareButton_OnClick()"><?php echo $testman_langres["compare_button"]; ?></button> + </div> + + </div> + </div> + </div> + </div> + </div> + </td> + </tr> + </table> +</div> + +</td> +</tr> +</table> + +</body> +</html> Propchange: trunk/web/reactos.org/htdocs/testman/index.php ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/testman/js/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 5 06:35:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/web/reactos.org/htdocs/testman/js/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/web/reactos.org/htdocs/testman/js/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/web/reactos.org/htdocs/testman/js/compare.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/js/… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/js/compare.js.php (added) +++ trunk/web/reactos.org/htdocs/testman/js/compare.js.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,333 @@ +ï»¿/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: JavaScript file for the Compare Page (parsed by PHP before) + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + + charset=utf-8 +*/ + +var CurrentLeftDragBorder; +var CurrentRightDragBorder; +var DragColumn; +var DragX; +var DragOffset; +var MaxLeftDragBorder; +var MaxRightDragBorder; +var MouseX; +var OverlappedForSwap; +var SwapColumn; +var TableRowEquiv; +var TempBlock; + +var ColumnDefaultColor = "#5984C3"; +var ColumnDragColor = "#8AA9D5"; +var ColumnOverlapColor = "#D0DDEE"; + +function Cell_OnMouseOver(elem) +{ + elem.style.background = "#FFFFCC"; +} + +function Cell_OnMouseOut(elem) +{ + if(elem.parentNode.className == "odd") + elem.style.background = "#DDDDDD"; + else + elem.style.background = "#EEEEEE"; +} + +function GetColumnIndex(th) +{ + var childs = th.parentNode.childNodes; + + for(var i = 0; i < childs.length; i++) + if(childs[i] == th) + return i; +} + +function ShowChangedCheckbox_OnClick(checkbox) +{ + var value = (checkbox.checked ? "none" : TableRowEquiv); + + for(var i = 0; i < UnchangedRows.length; i++) + document.getElementById("suite_" + UnchangedRows[i]).style.display = value; + + document.cookie = "showchanged=" + (checkbox.checked ? "1" : "0"); +} + +function AddDifferenceForColumn(th) +{ + var Index = GetColumnIndex(th); + var trs = document.getElementById("comparetable").childNodes[1].childNodes; + + // Check whether this is the first real column + if(Index == 1) + { + // Remove all difference data in this case as there is no previous element + for(var i = 0; i < trs.length; i++) + { + var tds = trs[i].childNodes[Index].getElementsByTagName("td"); + + for(var j = 0; j < tds.length; j++) + { + // \u00A0 =   + tds[j].getElementsByTagName("span")[0].firstChild.data = "\u00A0"; + } + } + + return; + } + + // No, then add the difference data accordingly + for(var i = 0; i < trs.length; i++) + { + // We can only add difference data if the current table and the previous one contain tables with result data + if(trs[i].childNodes[Index].firstChild.nodeName != "TABLE" || trs[i].childNodes[Index - 1].firstChild.nodeName != "TABLE") + continue; + + var tds = trs[i].childNodes[Index].getElementsByTagName("td"); + + for(var j = 0; j < tds.length; j++) + { + var CurrentValue = parseInt(tds[j].firstChild.data); + var PreviousValue = parseInt(trs[i].childNodes[Index - 1].getElementsByTagName("td")[j].firstChild.data); + + // Calculate the difference + var Diff = CurrentValue - PreviousValue; + + if(Diff > 0) + var DiffString = String("(+" + Diff + ")"); + else if(Diff < 0) + var DiffString = String("(" + Diff + ")"); + else + var DiffString = "\u00A0"; + + tds[j].getElementsByTagName("span")[0].firstChild.data = DiffString; + } + } +} + +function GetAbsoluteOffsetLeft(elem) +{ + var left = 0; + + while(elem) + { + left += elem.offsetLeft; + elem = elem.offsetParent; + } + + return left; +} + +function GetAbsoluteOffsetTop(elem) +{ + var top = 0; + + while(elem) + { + top += elem.offsetTop; + elem = elem.offsetParent; + } + + return top; +} + +function Document_OnMouseMove(event) +{ + // IE stores the event in window.event... + if(!event) + event = window.event; + + MouseX = event.clientX; + + // Drag if there's something to do + if(!DragColumn) + return; + + var PosX = MouseX - DragOffset; + + // Check whether the user is allowed to move anything to the current mouse position + if(PosX < CurrentLeftDragBorder || PosX > CurrentRightDragBorder) + return; + + // Check whether the user is moving to left or right + if(MouseX - DragX > 0) + var NewSwapColumn = DragColumn.nextSibling; + else if(MouseX - DragX < 0) + var NewSwapColumn = DragColumn.previousSibling; + + // If we have any other swap column, reset it to the default color + if(SwapColumn && NewSwapColumn != SwapColumn) + SwapColumn.style.background = ColumnDefaultColor; + + SwapColumn = NewSwapColumn; + + if(!SwapColumn) + return; + + SwapColumn.style.background = ColumnDragColor; + + if(!TempBlock) + { + // The only way we can "move the column header" flawlessy and compatible with all major browsers is emulating the behaviour :-) + // Therefore we create a <div> element for moving and set the column header to move invisible + TempBlock = document.createElement("div"); + + for(var i = 0; i < DragColumn.childNodes.length; i++) + TempBlock.appendChild(DragColumn.childNodes[i].cloneNode(true)); + + TempBlock.id = "TempBlock"; + TempBlock.style.position = "absolute"; + TempBlock.style.top = GetAbsoluteOffsetTop(DragColumn) + "px"; + + document.body.insertBefore(TempBlock, document.getElementById("comparetable")); + DragColumn.style.visibility = "hidden"; + } + + // Move the block + TempBlock.style.left = PosX + "px"; + + var TempOffsetLeft = GetAbsoluteOffsetLeft(TempBlock); + var SwapOffsetLeft = GetAbsoluteOffsetLeft(SwapColumn); + + // Check if the dragged column overlaps the swap column by at least the half + OverlappedForSwap = (NewSwapColumn == DragColumn.nextSibling) + ? (TempOffsetLeft + TempBlock.offsetWidth > SwapOffsetLeft + SwapColumn.offsetWidth / 2) + : (TempOffsetLeft < SwapOffsetLeft + SwapColumn.offsetWidth / 2); + + // Set the swap column to the overlap color in this case + if(OverlappedForSwap) + SwapColumn.style.background = ColumnOverlapColor; +} + +function SwapElements(elem1, elem2) +{ + // outerHTML is too unsupported, so we have to copy all column's attributes one after another + var TempClass = elem1.className; + var TempHTML = elem1.innerHTML; + var TempOnClick = elem1.onclick; + var TempOnMouseOver = elem1.onmouseover; + var TempOnMouseOut = elem1.onmouseout; + + elem1.className = elem2.className; + elem1.innerHTML = elem2.innerHTML; + elem1.onclick = elem2.onclick; + elem1.onmouseover = elem2.onmouseover; + elem1.onmouseout = elem2.onmouseout; + + elem2.className = TempClass; + elem2.innerHTML = TempHTML; + elem2.onclick = TempOnClick; + elem2.onmouseover = TempOnMouseOver; + elem2.onmouseout = TempOnMouseOut; +} + +function Document_OnMouseUp() +{ + if(!DragColumn) + return; + + // This marks the end of a Drag & Drop operation + if(SwapColumn) + { + if(OverlappedForSwap) + { + // Swap the column headers + SwapElements(DragColumn, SwapColumn); + + // Swap all cells of these columns + var DragColumnIndex = GetColumnIndex(DragColumn); + var SwapColumnIndex = GetColumnIndex(SwapColumn); + var tbody_trs = document.getElementById("comparetable").childNodes[1].childNodes; + + for(var i = 0; i < tbody_trs.length; i++) + SwapElements(tbody_trs[i].childNodes[DragColumnIndex], tbody_trs[i].childNodes[SwapColumnIndex]); + + AddDifferenceForColumn(DragColumn); + AddDifferenceForColumn(SwapColumn); + + if(DragColumnIndex > SwapColumnIndex) + var NextColumn = DragColumn.nextSibling; + else + var NextColumn = SwapColumn.nextSibling; + + if(NextColumn) + AddDifferenceForColumn(NextColumn); + } + + // Reset everything + DragColumn.style.visibility = "visible"; + document.body.removeChild(TempBlock); + SwapColumn.style.background = ColumnDefaultColor; + } + + // Cleanup + DragColumn = null; + SwapColumn = null; + TempBlock = null; +} + +function ResultHead_OnMouseDown(th) +{ + DragColumn = th; + DragX = MouseX; + DragOffset = DragX - GetAbsoluteOffsetLeft(th); + + // The drag borders are set to the previous and next "real" columns + // If there are no more "real" columns, they are set to the maximum borders + CurrentLeftDragBorder = Math.max(GetAbsoluteOffsetLeft(th.previousSibling), MaxLeftDragBorder); + + if(th.nextSibling) + CurrentRightDragBorder = Math.min(GetAbsoluteOffsetLeft(th.nextSibling), MaxRightDragBorder); + else + CurrentRightDragBorder = MaxRightDragBorder; +} + +function GetCookieValue(cookie) +{ + var cookies = document.cookie.split(";"); + + for(var i = 0; i < cookies.length; i++) + { + var data = cookies[i].split("="); + + if(data[0] == cookie) + return data[1]; + } + + return null; +} + +function Load() +{ + // Prepare the Drag & Drop feature + document.onmousemove = Document_OnMouseMove; + document.onmouseup = Document_OnMouseUp; + + var ths = document.getElementById("comparetable").firstChild.firstChild.childNodes; + MaxLeftDragBorder = GetAbsoluteOffsetLeft(ths[1]); + MaxRightDragBorder = GetAbsoluteOffsetLeft(ths[ths.length - 1]); + + // As always, IE needs a special handling (this time for the style of table rows) + if(navigator.appName == "Microsoft Internet Explorer") + TableRowEquiv = "block"; + else + TableRowEquiv = "table-row"; + + // The "showchanged" checkbox will only be available if we have more than one result + var checkbox = document.getElementById("showchanged"); + + if(checkbox) + { + // Get its value from the cookie + checkbox.checked = parseInt(GetCookieValue("showchanged")); + ShowChangedCheckbox_OnClick(checkbox); + } +} + +function Result_OnClick(id) +{ + window.open("detail.php?id=" + id); +} Propchange: trunk/web/reactos.org/htdocs/testman/js/compare.js.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/js/detail.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/js/… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/js/detail.js.php (added) +++ trunk/web/reactos.org/htdocs/testman/js/detail.js.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,29 @@ +ï»¿/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: JavaScript file for the Result Details Page (parsed by PHP before) + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + + charset=utf-8 +*/ + +function SetRowColor(elem, color) +{ + tdl = elem.getElementsByTagName("td"); + + for(var i = 0; i < tdl.length; i++) + tdl[i].style.background = color; +} + +function Row_OnMouseOver(elem) +{ + SetRowColor(elem, "#FFFFCC"); +} + +function Row_OnMouseOut(elem) +{ + if(elem.className == "odd") + SetRowColor(elem, "#DDDDDD"); + else + SetRowColor(elem, "#EEEEEE"); +} Propchange: trunk/web/reactos.org/htdocs/testman/js/detail.js.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/js/… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/js/index.js.php (added) +++ trunk/web/reactos.org/htdocs/testman/js/index.js.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,408 @@ +ï»¿/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: JavaScript file for the Index Page (parsed by PHP before) + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + + charset=utf-8 +*/ + +var CurrentPage; +var data; +var FullRange; +var inputbox_startrev; +var inputbox_endrev; +var PageCount; +var ResultCount; +var SelectedResults = new Array(); +var SelectedResultCount = 0; + +var REQUESTTYPE_FULLLOAD = 1; +var REQUESTTYPE_ADDPAGE = 2; +var REQUESTTYPE_PAGESWITCH = 3; + +function SetRowColor(elem, color) +{ + tdl = elem.getElementsByTagName("td"); + + for(var i = 0; i < tdl.length; i++) + tdl[i].style.background = color; +} + +function Result_OnMouseOver(elem) +{ + SetRowColor(elem, "#FFFFCC"); +} + +function Result_OnMouseOut(elem) +{ + if(elem.className == "odd") + SetRowColor(elem, "#DDDDDD"); + else + SetRowColor(elem, "#EEEEEE"); +} + +/** + * Make sure that all checkboxes for the result identified by the given checkbox are checked. + * Also update our SelectedResults array appropriately. + */ +function UpdateSelectedResults(checkbox) +{ + // Make sure the user doesn't select more than he's allowed to :-) + if(checkbox.checked && SelectedResultCount == <?php echo MAX_COMPARE_RESULTS; ?>) + { + alert("<?php printf(addslashes($testman_langres["maxselection"]), MAX_COMPARE_RESULTS); ?>"); + checkbox.checked = false; + return; + } + + var id = checkbox.name.substr(5); + + // Make sure all checkboxes belonging to this test show the same state + var elems = document.getElementsByName(checkbox.name); + + for(var i = 0; i < elems.length; i++) + elems[i].checked = checkbox.checked; + + if(checkbox.checked) + { + SelectedResults[id] = true; + SelectedResultCount++; + } + else + { + delete SelectedResults[id]; + SelectedResultCount--; + } + + // Update the status message + document.getElementById("status").innerHTML = "<?php printf($testman_langres["status"], '<b>" + SelectedResultCount + "<\/b>'); ?>"; +} + +/** + * Make sure that all checkboxes for the results in SelectedResults are checked. + */ +function UpdateAllCheckboxes() +{ + for(id in SelectedResults) + { + var elems = document.getElementsByName("test_" + id); + + for(var i = 0; i < elems.length; i++) + elems[i].checked = true; + } +} + +function Result_OnCheckboxClick(checkbox) +{ + UpdateSelectedResults(checkbox); +} + +function Result_OnCellClick(elem) +{ + var checkbox = elem.parentNode.firstChild.firstChild; + checkbox.checked = !checkbox.checked; + + UpdateSelectedResults(checkbox); +} + +function SearchRevisionInput_OnKeyUp(elem) +{ + var val = elem.value.replace(/[^[0-9-]/g, ""); + + // First check if something was changed by the replace function. + // If not, don't set elem.value = val. Otherwise the cursor would always jump to the last character in IE, when you press any key. + if(elem.value != val) + elem.value = val; +} + +function GetRevNums() +{ + var rev = document.getElementById("search_revision").value; + + // If the user didn't enter any revision number at all, he doesn't want to search for a specific revision + if(!rev) + { + inputbox_startrev = ""; + inputbox_endrev = ""; + return true; + } + + if(isNaN(rev) || rev < 1) + { + // Maybe the user entered a revision range + var hyphen = rev.indexOf("-"); + + if(hyphen > 0) + { + inputbox_startrev = rev.substr(0, hyphen); + inputbox_endrev = rev.substr(hyphen + 1); + } + + if(hyphen <= 0 || isNaN(inputbox_startrev) || isNaN(inputbox_endrev)) + { + alert("Invalid revision number!"); + return false; + } + } + else + { + inputbox_startrev = rev; + inputbox_endrev = rev; + } + + return true; +} + +function SearchCall() +{ + document.getElementById("ajax_loading_search").style.visibility = "visible"; + AjaxGet("ajax-search.php", "SearchCallback", data); +} + +function SearchButton_OnClick() +{ + if(!GetRevNums()) + return; + + data = new Array(); + + CurrentPage = 1; + FullRange = document.getElementById("search_revision").value; + + data["startrev"] = inputbox_startrev; + data["endrev"] = inputbox_endrev; + data["platform"] = document.getElementById("search_platform").value; + + data["resultlist"] = 1; + data["requesttype"] = REQUESTTYPE_FULLLOAD; + + SearchCall(); +} + +function SearchCallback(HttpRequest) +{ + // Check for an error + if(HttpRequest.responseXML.getElementsByTagName("error").length > 0) + { + alert(HttpRequest.responseXML.getElementsByTagName("error")[0].firstChild.data) + return; + } + + var html = ""; + + if(data["resultlist"]) + { + // Build a new infobox + html += '<table id="infotable" cellspacing="0" cellpadding="0"><tr><td id="infobox">'; + + if(data["requesttype"] == REQUESTTYPE_FULLLOAD) + { + ResultCount = parseInt(HttpRequest.responseXML.getElementsByTagName("resultcount")[0].firstChild.data); + html += '<?php printf(addslashes($testman_langres["foundresults"]), "<span id=\"resultcount\">' + ResultCount + '<\/span>"); ?>'; + } + else + { + html += document.getElementById("infobox").innerHTML; + } + + html += '<\/td>'; + + // Page number boxes + html += '<td id="pagesbox">'; + + if(CurrentPage == 1) + { + html += '« '; + html += '&lsaquo; <?php echo addslashes($shared_langres["prevpage"]); ?> '; + } + else + { + html += '<a href="javascript:FirstPage_OnClick()" title="<?php echo addslashes($shared_langres["firstpage_title"]); ?>">«<\/a> '; + html += '<a href="javascript:PrevPage_OnClick()" title="<?php echo addslashes($shared_langres["prevpage_title"]); ?>">&lsaquo; <?php echo addslashes($shared_langres["prevpage"]); ?><\/a> '; + } + + html += '<select id="pagesel" size="1" onchange="PageBox_OnChange(this)">'; + + if(data["requesttype"] == REQUESTTYPE_FULLLOAD) + { + PageCount = 1; + + html += '<option value="' + CurrentPage + '-' + HttpRequest.responseXML.getElementsByTagName("firstid")[0].firstChild.data + '"><?php echo addslashes($shared_langres["page"]); ?> ' + CurrentPage; + + if(HttpRequest.responseXML.getElementsByTagName("resultcount")[0].firstChild.data > 0) + html += ' - ' + HttpRequest.responseXML.getElementsByTagName("firstrev")[0].firstChild.data + ' ... ' + HttpRequest.responseXML.getElementsByTagName("lastrev")[0].firstChild.data + '<\/option>'; + } + else + { + html += document.getElementById("pagesel").innerHTML; + } + + html += '<\/select> '; + + if(HttpRequest.responseXML.getElementsByTagName("moreresults")[0].firstChild.data == 0) + { + html += '<?php echo addslashes($shared_langres["nextpage"]); ?> &rsaquo; '; + html += '»'; + } + else + { + html += '<a href="javascript:NextPage_OnClick()" title="<?php echo addslashes($shared_langres["nextpage_title"]); ?>"><?php echo addslashes($shared_langres["nextpage"]); ?> &rsaquo;<\/a> '; + html += '<a href="javascript:LastPage_OnClick()" title="<?php echo addslashes($shared_langres["lastpage_title"]); ?>">»<\/a>'; + } + + html += '<\/td><\/tr><\/table>'; + + // File table + html += '<table class="datatable" cellspacing="0" cellpadding="0">'; + + html += '<thead><tr class="head">'; + html += '<th class="TestCheckbox"><\/th>'; + html += '<th><?php echo addslashes($testman_langres["date"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["revision"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["user"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["platform"]); ?><\/th>'; + html += '<\/tr><\/thead>'; + html += '<tbody>'; + + var results = HttpRequest.responseXML.getElementsByTagName("result"); + + if(!results.length) + { + html += '<tr class="even"><td colspan="5"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; + } + else + { + var oddeven = false; + + for(var i = 0; i < results.length; i++) + { + var ResultID = results[i].getElementsByTagName("id")[0].firstChild.data; + var ResultDate = results[i].getElementsByTagName("date")[0].firstChild.data; + var ResultUser = results[i].getElementsByTagName("user")[0].firstChild.data; + var ResultRevision = results[i].getElementsByTagName("revision")[0].firstChild.data; + var ResultPlatform = results[i].getElementsByTagName("platform")[0].firstChild.data; + + html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">'; + html += '<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_' + ResultID + '" \/><\/td>'; + html += '<td onclick="Result_OnCellClick(this)">' + ResultDate + '<\/td>'; + html += '<td onclick="Result_OnCellClick(this)">' + ResultRevision + '<\/td>'; + html += '<td onclick="Result_OnCellClick(this)">' + ResultUser + '<\/td>'; + html += '<td onclick="Result_OnCellClick(this)">' + ResultPlatform + '<\/td>'; + html += '<\/tr>'; + + oddeven = !oddeven; + } + } + + html += '<\/tbody><\/table>'; + + document.getElementById("searchtable").innerHTML = html; + + if(data["requesttype"] == REQUESTTYPE_PAGESWITCH) + { + // Switch the selected page in the Page ComboBox + document.getElementById("pagesel").getElementsByTagName("option")[CurrentPage - 1].selected = true; + } + + UpdateAllCheckboxes(); + } + else + { + // Just add a new page to the Page combo box and the information for it + PageCount++; + ResultCount += parseInt(HttpRequest.responseXML.getElementsByTagName("resultcount")[0].firstChild.data); + + document.getElementById("resultcount").firstChild.data = ResultCount; + + // As always, we have to work around an IE bug + // If I use "innerHTML" here, the first <OPTION> start tag gets dropped in the IE... + // Therefore I have to use the DOM functions in this case. + var OptionElem = document.createElement("option"); + var OptionText = document.createTextNode('<?php echo addslashes($shared_langres["page"]); ?> ' + PageCount + ' - ' + HttpRequest.responseXML.getElementsByTagName("firstrev")[0].firstChild.data + ' ... ' + HttpRequest.responseXML.getElementsByTagName("lastrev")[0].firstChild.data); + + OptionElem.value = PageCount + "-" + HttpRequest.responseXML.getElementsByTagName("firstid")[0].firstChild.data; + OptionElem.appendChild(OptionText); + + document.getElementById("pagesel").appendChild(OptionElem); + } + + if(HttpRequest.responseXML.getElementsByTagName("moreresults")[0].firstChild.data == 1 && (data["requesttype"] == REQUESTTYPE_FULLLOAD || data["requesttype"] == REQUESTTYPE_ADDPAGE)) + { + // There are more results available in the full range. Therefore we have to start another request and add a new page. + data["resultlist"] = 0; + data["startid"] = HttpRequest.responseXML.getElementsByTagName("nextid")[0].firstChild.data; + data["requesttype"] = REQUESTTYPE_ADDPAGE; + SearchCall(); + return; + } + + document.getElementById("ajax_loading_search").style.visibility = "hidden"; +} + +function PageSwitch(NewPage, StartID) +{ + CurrentPage = NewPage; + data["resultlist"] = 1; + data["startid"] = StartID; + data["requesttype"] = REQUESTTYPE_PAGESWITCH; + + SearchCall(); +} + +function FirstPage_OnClick() +{ + var info = document.getElementById("pagesel").getElementsByTagName("option")[0].value.split("-"); + PageSwitch(info[0], info[1]); +} + +function PrevPage_OnClick() +{ + var info = document.getElementById("pagesel").getElementsByTagName("option")[CurrentPage - 2].value.split("-"); + PageSwitch(info[0], info[1]); +} + +function PageBox_OnChange(elem) +{ + var info = elem.value.split("-"); + PageSwitch(info[0], info[1]); +} + +function NextPage_OnClick() +{ + var info = document.getElementById("pagesel").getElementsByTagName("option")[CurrentPage].value.split("-"); + PageSwitch(info[0], info[1]); +} + +function LastPage_OnClick() +{ + var info = document.getElementById("pagesel").getElementsByTagName("option")[ document.getElementById("pagesel").getElementsByTagName("option").length - 1 ].value.split("-"); + PageSwitch(info[0], info[1]); +} + +function CompareButton_OnClick() +{ + var first = true; + var parameters = "ids="; + + for(id in SelectedResults) + { + if(first) + { + parameters += id; + first = false; + continue; + } + + parameters += "," + id; + } + + // If first is still true, no results were selected at all + if(first) + { + alert("<?php echo addslashes($testman_langres["noselection"]); ?>"); + return; + } + + window.open("compare.php?" + parameters); +} Propchange: trunk/web/reactos.org/htdocs/testman/js/index.js.php ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/testman/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 5 06:35:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/web/reactos.org/htdocs/testman/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/web/reactos.org/htdocs/testman/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/web/reactos.org/htdocs/testman/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/lang/de.inc.php (added) +++ trunk/web/reactos.org/htdocs/testman/lang/de.inc.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,61 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Translation + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + TRANSLATOR: Colin Finck + + charset=utf-8 without BOM +*/ + + $testman_langres = array( + // Index page + "index_header" => '<a href="http://www.reactos.org/">Startseite</a> > ReactOS Web Test Manager', + "index_title" => "ReactOS Web Test Manager", + "index_intro" => "Mit dieser OberflÃ¤che kÃ¶nnen Sie die Ergebnisse automatisch ausgefÃ¼hrter Regression-Tests suchen, anzeigen und vergleichen.", + "js_disclaimer" => "Sie mÃ¼ssen JavaScript aktivieren, um die OberflÃ¤che zu benutzen!", + + "lastresults_header" => "Letzte 10 Testergebnisse", + "date" => "Datum", + "revision" => "Revision", + "user" => "Benutzer", + "platform" => "Plattform", + + "search_header" => "Nach Testergebnissen suchen", + "search_revision" => "Revision", + "search_platform" => "Plattform", + "search_button" => "Suchen", + "searching" => "Testergebnisse werden gesucht...", + + "foundresults" => "%s Ergebnisse gefunden!", + "noresults" => "Keine Suchergebnisse!", + + "status" => "<b>%s</b> Tests zum Vergleich ausgewÃ¤hlt", + "compare_button" => "Jetzt vergleichen", + + "noselection" => "Sie haben keine Ergebnisse ausgewÃ¤hlt!", + "maxselection" => "Sie dÃ¼rfen nur bis zu %d Ergebnisse zum Vergleich auswÃ¤hlen!", + + // Compare page + "compare_title" => "Ergebnisse vergleichen", + "showchanged" => "Nur geÃ¤nderte Ergebnisse anzeigen", + + "legend" => "Legende", + "totaltests" => "Alle Tests", + "failedtests" => "Fehlgeschlagene Tests", + "todotests" => "Als TODO markierte Tests", + "skippedtests" => "Ãbersprungene Tests", + "difference" => "Unterschied zum vorherigen Ergebnis", + + "testsuite" => "Test Suite", + "resulthead" => "Revision %d<br />unter %s<br />von %s<br />am %s", + + // Result Details page + "detail_title" => "Ergebnis-Details", + + "thisresult" => "Informationen Ã¼ber dieses Ergebnis", + "log" => "Log", + "associatedtest" => "Information Ã¼ber den zugeordneten Test", + ); +?> Propchange: trunk/web/reactos.org/htdocs/testman/lang/de.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/lang/en.inc.php (added) +++ trunk/web/reactos.org/htdocs/testman/lang/en.inc.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,62 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Translation + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + TRANSLATOR: Colin Finck + + charset=utf-8 without BOM +*/ + + $testman_langres = array( + // Index page + "index_header" => '<a href="http://www.reactos.org/">Home</a> > ReactOS Web Test Manager', + "index_title" => "ReactOS Web Test Manager", + "index_intro" => "This interface enables you to find, view and compare Results of automatically performed Regression Tests.", + "js_disclaimer" => "You have to activate JavaScript to use the interface!", + + "lastresults_header" => "Last 10 Test Results", + "date" => "Date", + "revision" => "Revision", + "user" => "User", + "platform" => "Platform", + + "search_header" => "Search for Test Results", + "search_revision" => "Revision", + "rangeinfo" => "You can enter a revision number (e.g. %s) or a revision range (e.g. %s-%s)", + "search_platform" => "Platform", + "search_button" => "Search", + "searching" => "Searching for Test Results", + + "foundresults" => "Found %s Results!", + "noresults" => "No Search Results!", + + "status" => "<b>%s</b> Tests selected for comparison", + "compare_button" => "Compare Now", + + "noselection" => "You did not select any results!", + "maxselection" => "You may only select up to %d results for comparison!", + + // Compare page + "compare_title" => "Comparing Results", + "showchanged" => "Show only changed results", + + "legend" => "Legend", + "totaltests" => "Total Tests", + "failedtests" => "Failed Tests", + "todotests" => "Tests marked as TODO", + "skippedtests" => "Skipped tests", + "difference" => "Difference to the previous result", + + "testsuite" => "Test Suite", + "resulthead" => "Revision %d<br />under %s<br />by %s<br />at %s", + + // Result Details page + "detail_title" => "Result Details", + + "thisresult" => "Information about this Result", + "log" => "Log", + "associatedtest" => "Information about the associated Test", + ); +?> Propchange: trunk/web/reactos.org/htdocs/testman/lang/en.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/languages.inc.php (added) +++ trunk/web/reactos.org/htdocs/testman/languages.inc.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,14 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Language list + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + // The language names have to be saved in an UTF-8 file without the Byte-Order-Mark + $supported_languages = array( + "en" => "English", + "de" => "Deutsch (German)", + ); +?> Propchange: trunk/web/reactos.org/htdocs/testman/languages.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/web/reactos.org/htdocs/testman/utils.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/uti… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/utils.inc.php (added) +++ trunk/web/reactos.org/htdocs/testman/utils.inc.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,128 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Utility functions shared among several PHP files + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + function GetPlatformString($platform) + { + // First get the main operating system + if(substr($platform, 0, 7) == "reactos") + { + $str = "ReactOS"; + $arch = (int)substr($platform, 8); + } + else + { + sscanf($platform, "%u.%u.%u.%u.%u.%c.%u", $major, $minor, $build, $sp_major, $sp_minor, $type, $arch); + + switch($major) + { + case 5: + switch($minor) + { + case 0: + $str = "Windows 2000"; + $final_builds = array(2195); + + if($type == "s") + $str .= " Server"; + + break; + + case 1: + $str = "Windows XP"; + $final_builds = array(2600); + break; + + case 2: + $final_builds = array(3790); + + if($type == "s") + $str = "Windows Server 2003"; + else + $str = "Windows XP"; + + break; + + default: + return $platform; + } + + break; + + case 6: + switch($minor) + { + case 0: + $final_builds = array(6000, 6001); + + if($type = "s") + $str = "Windows Server 2008"; + else + $str = "Windows Vista"; + + break; + + case 1: + $final_builds = array(); + + $str = "Windows 7"; + break; + + default: + return $platform; + } + + break; + + default: + return $platform; + } + + // Check if our current build is a final build. If it's not, also show the build number. + $found = false; + + foreach($final_builds as $b) + { + if($b == $build) + { + $found = true; + break; + } + } + + if(!$found) + $str .= " - Build " . $build; + + // Add the service pack information if we have any + if($sp_major) + { + $str .= " SP" . $sp_major; + + if($sp_minor) + $str .= "." . $sp_minor; + } + } + + // Now get the processor architecture + // The values for $arch are Windows PROCESSOR_ARCHITECTURE_* constants + $str .= " - "; + + switch($arch) + { + case 0: $str .= "i386"; break; + case 9: $str .= "AMD64"; break; + default: return $platform; + } + + return $str; + } + + function GetDateString($timestamp) + { + return date("Y-m-d H:i", $timestamp); + } +?> Propchange: trunk/web/reactos.org/htdocs/testman/utils.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/testman/webservice/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 5 06:35:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/web/reactos.org/htdocs/testman/webservice/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/web/reactos.org/htdocs/testman/webservice/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/web/reactos.org/htdocs/testman/webservice/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/index.php (added) +++ trunk/web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,79 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Web Service for receiving test results from "rosautotest" + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + require_once("../config.inc.php"); + + // All classes are autoloaded through this magic function + function __autoload($class) + { + require_once("lib/$class.class.php"); + } + + // What one of these classes has to look like + interface Test + { + public function GetTestID(); + public function Submit(); + public function Finish(); + } + + + // Entry point + if(!isset($_POST["username"]) || !isset($_POST["passwordhash"]) || !isset($_POST["testtype"])) + die("Necessary information not specified!"); + + // Check the login credentials + try + { + $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); + } + catch(PDOException $e) + { + // Give no exact error message here, so no server internals are exposed + die("Could not establish the DB connection"); + } + + $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = :passwordhash AND user_account_enabled = 'yes'"); + $stmt->bindParam(":username", $_POST["username"]); + $stmt->bindParam(":passwordhash", $_POST["passwordhash"]); + $stmt->execute() or die("SQL failed #1"); + $user_id = (int)$stmt->fetchColumn(); + + if(!$user_id) + die("Invalid Login credentials!"); + + // Check if the user is permitted to submit test results + $stmt = $dbh->prepare("SELECT COUNT(*) FROM " . DB_TESTMAN . ".permitted_users WHERE user_id = :userid"); + $stmt->bindParam(":userid", $user_id); + $stmt->execute() or die("SQL failed #2"); + + if(!$stmt->fetchColumn()) + die("User is not permitted to submit test results"); + + switch($_POST["testtype"]) + { + case "wine": + $t = new WineTest(); + break; + + default: + die("Invalid test type!"); + } + + // What shall we do? + switch($_POST["action"]) + { + case "gettestid": die($t->GetTestID()); + case "getsuiteid": die($t->GetSuiteID()); + case "submit": die($t->Submit()); + case "finish": die($t->Finish()); + + default: + die("Invalid action"); + } +?> Propchange: trunk/web/reactos.org/htdocs/testman/webservice/index.php ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/htdocs/testman/webservice/lib/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 5 06:35:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/web/reactos.org/htdocs/testman/webservice/lib/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/web/reactos.org/htdocs/testman/webservice/lib/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php (added) +++ trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,112 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Class for submitting Wine Test results + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + class WineTest implements Test + { + public function GetTestID() + { + global $dbh; + global $user_id; + + if(!isset($_POST["revision"]) || !isset($_POST["platform"])) + return "Necessary sub-information not specified!"; + + // Add a new Test ID with the given information + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_runs (user_id, revision, platform) VALUES (:userid, :revision, :platform)"); + $stmt->bindParam(":userid", $user_id); + $stmt->bindParam(":revision", $_POST["revision"]); + $stmt->bindParam(":platform", $_POST["platform"]); + $stmt->execute() or die("GetTestID(): SQL failed #1"); + + return $dbh->lastInsertId(); + } + + public function GetSuiteID() + { + global $dbh; + + if(!isset($_POST["module"]) || !isset($_POST["test"])) + return "Necessary sub-information not specified!"; + + // Determine whether we already have a suite ID for this combination + $stmt = $dbh->prepare("SELECT id FROM " . DB_TESTMAN . ".winetest_suites WHERE module = :module AND test = :test"); + $stmt->bindParam(":module", $_POST["module"]); + $stmt->bindParam(":test", $_POST["test"]); + $stmt->execute() or die("GetSuiteID(): SQL failed #1"); + $id = $stmt->fetchColumn(); + + if($id) + return $id; + + // Add this combination to the table and return the ID for it + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_suites (module, test) VALUES (:module, :test)"); + $stmt->bindParam(":module", $_POST["module"]); + $stmt->bindParam(":test", $_POST["test"]); + $stmt->execute() or die("GetSuiteID(): SQL failed #2"); + + return $dbh->lastInsertId(); + } + + public function Submit() + { + global $dbh; + global $user_id; + + if(!isset($_POST["testid"]) || !isset($_POST["suiteid"]) || !isset($_POST["log"])) + return "Necessary sub-information not specified!"; + + // Make sure we may add information to the test with this Test ID + $stmt = $dbh->prepare("SELECT COUNT(*) FROM " . DB_TESTMAN . ".winetest_runs WHERE id = :testid AND finished = 0 AND user_id = :userid"); + $stmt->bindParam(":testid", $_POST["testid"]); + $stmt->bindParam(":userid", $user_id); + $stmt->execute() or die("Submit(): SQL failed #1"); + + if(!$stmt->fetchColumn()) + return "No such test or no permissions!"; + + // Validate and parse the log + $line = strrchr($_POST["log"], ":"); + + if(sscanf($line, ": %u tests executed (%u marked as todo, %u failures), %u skipped.", $count, $todo, $failures, $skipped) != 4) + return "Log is invalid!"; + + // Add the information into the DB + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, log, count, todo, failures, skipped) VALUES (:testid, :suiteid, :log, :count, :todo, :failures, :skipped)"); + $stmt->bindValue(":testid", (int)$_POST["testid"]); + $stmt->bindValue(":suiteid", (int)$_POST["suiteid"]); + $stmt->bindParam(":log", $_POST["log"]); + $stmt->bindParam(":count", $count); + $stmt->bindParam(":todo", $todo); + $stmt->bindParam(":failures", $failures); + $stmt->bindParam(":skipped", $skipped); + $stmt->execute() or die("Submit(): SQL failed #2"); + + return "OK"; + } + + public function Finish() + { + global $dbh; + global $user_id; + + if(!isset($_POST["testid"])) + return "Necessary sub-information not specified!"; + + // Mark this test as finished, so no more results can be submitted for it + $stmt = $dbh->prepare("UPDATE " . DB_TESTMAN . ".winetest_runs SET finished = 1 WHERE id = :testid AND user_id = :userid"); + $stmt->bindParam(":userid", $user_id); + $stmt->bindParam(":testid", $_POST["testid"]); + $stmt->execute() or die("Finish(): SQL failed #1"); + + if(!$stmt->rowCount()) + return "Did not update anything!"; + + return "OK"; + } + } +?> Propchange: trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/web/reactos.org/resources/testman/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 5 06:35:05 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/web/reactos.org/resources/testman/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/web/reactos.org/resources/testman/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/web/reactos.org/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/resources/testman/… ============================================================================== --- trunk/web/reactos.org/resources/testman/testman.sql (added) +++ trunk/web/reactos.org/resources/testman/testman.sql [iso-8859-1] Mon Jan 5 06:35:05 2009 @@ -1,0 +1,35 @@ +-- SQL Dump for the "testman" database + +CREATE TABLE `permitted_users` ( + `user_id` bigint(20) unsigned NOT NULL, + PRIMARY KEY (`user_id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; + +CREATE TABLE `winetest_results` ( + `id` int(10) unsigned NOT NULL auto_increment, + `test_id` int(10) unsigned NOT NULL, + `suite_id` int(10) unsigned NOT NULL, + `log` longtext collate latin1_general_ci NOT NULL, + `count` int(10) unsigned NOT NULL COMMENT 'Number of all executed tests', + `todo` int(10) unsigned NOT NULL COMMENT 'Tests marked as TODO', + `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', + `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; + +CREATE TABLE `winetest_runs` ( + `id` int(10) unsigned NOT NULL auto_increment, + `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, + `finished` tinyint(1) NOT NULL default '0', + `user_id` bigint(20) unsigned NOT NULL, + `revision` int(9) unsigned NOT NULL, + `platform` varchar(24) collate latin1_general_ci NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; + +CREATE TABLE `winetest_suites` ( + `id` int(10) unsigned NOT NULL auto_increment, + `module` varchar(50) collate latin1_general_ci NOT NULL, + `test` varchar(50) collate latin1_general_ci NOT NULL, + PRIMARY KEY (`id`) +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; Propchange: trunk/web/reactos.org/resources/testman/testman.sql ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 38578: - Move some more stuff into the Shared Web components - Finish the refactoring among getbuilds, peoplemap and the Shared components, simplify some stuff - Add an "svn.php" into the shared components for dealing with our SVN Server For now, it just contains a function for getting the latest revision. - Add a Polish getbuilds translation by Maciej Bialas and Olaf Siejka - Add a "basic.css" file containing just the very basic ReactOS Website styles. This can be used for creating Web
by cfinck＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: cfinck Date: Mon Jan 5 06:21:21 2009 New Revision: 38578 URL: http://svn.reactos.org/svn/reactos?rev=38578&view=rev Log: - Move some more stuff into the Shared Web components - Finish the refactoring among getbuilds, peoplemap and the Shared components, simplify some stuff - Add an "svn.php" into the shared components for dealing with our SVN Server For now, it just contains a function for getting the latest revision. - Add a Polish getbuilds translation by Maciej Bialas and Olaf Siejka - Add a "basic.css" file containing just the very basic ReactOS Website styles. This can be used for creating Website subsystems, which shall have the common ReactOS website style, but not the top and left menu. - Make the output of "subsys_layout.php" XHTML-compliant - Update copyrights :-) Added: trunk/web/reactos.org/htdocs/getbuilds/lang/pl.inc.php (with props) trunk/web/reactos.org/htdocs/shared/css/basic.css (with props) trunk/web/reactos.org/htdocs/shared/images/info.gif (props changed) - copied unchanged from r38296, trunk/web/reactos.org/htdocs/getbuilds/images/info.gif trunk/web/reactos.org/htdocs/shared/svn.php (with props) Removed: trunk/web/reactos.org/htdocs/getbuilds/images/info.gif Modified: trunk/web/reactos.org/htdocs/getbuilds/config.inc.php trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php trunk/web/reactos.org/htdocs/getbuilds/index.php trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php trunk/web/reactos.org/htdocs/peoplemap/index.php trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css trunk/web/reactos.org/htdocs/shared/css/menu.css trunk/web/reactos.org/htdocs/shared/css/reactos.css trunk/web/reactos.org/htdocs/shared/js/ajax.js trunk/web/reactos.org/htdocs/shared/lang/de.inc.php trunk/web/reactos.org/htdocs/shared/lang/en.inc.php trunk/web/reactos.org/htdocs/shared/lang/es.inc.php trunk/web/reactos.org/htdocs/shared/lang/fr.inc.php trunk/web/reactos.org/htdocs/shared/lang/it.inc.php trunk/web/reactos.org/htdocs/shared/lang/lt.inc.php trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php trunk/web/reactos.org/htdocs/shared/lang/ru.inc.php trunk/web/reactos.org/htdocs/shared/subsys_layout.php Modified: trunk/web/reactos.org/htdocs/getbuilds/config.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/c… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/config.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/config.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,12 +3,11 @@ PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> */ // Configuration - $AJAX_GETFILES_PROVIDER_URL = "http://iso.reactos.org/scripts/ajax-getfiles-provider.php"; + $AJAX_GETFILES_PROVIDER_URL = "http://localhost/getbuilds/ajax-getfiles-provider.php"; $ISO_DOWNLOAD_URL = "http://iso.reactos.org/"; $MAX_FILES_PER_PAGE = 100; // The same value has to be set in "ajax-getfiles-provider.php" - $SVN_ACTIVITY_URL = "http://svn.reactos.org/svnact/svn_activity.xml"; ?> Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.css [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,7 +3,7 @@ LICENSE: GPL v2 or any later version FILE: web/reactos.org/htdocs/getbuilds/getbuilds.css PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> */ a { @@ -12,10 +12,6 @@ a:hover { color: #000000; -} - -#content { - padding-right: 10px; } ul.web { @@ -46,10 +42,6 @@ vertical-align: middle; } -#controlbox { - margin-bottom: 2em; -} - #controlbox input { font-weight: bold; } @@ -59,13 +51,20 @@ margin-left: 20px; } -#infotable { +#infotable +{ + margin-top: 2em; width: 100%; } #pagesbox { font-weight: bold; text-align: right; +} + +.datatable { + cursor: pointer; + width: 100%; } .datatable tr.head th.fname { Modified: trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/g… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/getbuilds.js.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,7 +3,7 @@ PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> */ ?> @@ -31,7 +31,7 @@ AjaxGet("ajax-getfiles.php", "GetFilesCallback", data); } -function GetFilesCallback(HttpRequest, data) +function GetFilesCallback(HttpRequest) { // Check for an error if(HttpRequest.responseXML.getElementsByTagName("error").length > 0) @@ -69,13 +69,13 @@ if(CurrentPage == 1) { - html += '<strong>«<\/strong> '; - html += '<strong>&lsaquo; <?php echo addslashes($getbuilds_langres["prevpage"]); ?><\/strong> '; - } - else - { - html += '<a href="javascript:FirstPage()" title="<?php echo addslashes($getbuilds_langres["firstpage_title"]); ?>">«<\/a> '; - html += '<a href="javascript:PrevPage()" title="<?php echo addslashes($getbuilds_langres["prevpage_title"]); ?>">&lsaquo; <?php echo addslashes($getbuilds_langres["prevpage"]); ?><\/a> '; + html += '« '; + html += '&lsaquo; <?php echo addslashes($shared_langres["prevpage"]); ?> '; + } + else + { + html += '<a href="javascript:FirstPage()" title="<?php echo addslashes($shared_langres["firstpage_title"]); ?>">«<\/a> '; + html += '<a href="javascript:PrevPage()" title="<?php echo addslashes($shared_langres["prevpage_title"]); ?>">&lsaquo; <?php echo addslashes($shared_langres["prevpage"]); ?><\/a> '; } html += '<select id="pagesel" size="1" onchange="PageboxChange(this)">'; @@ -84,7 +84,7 @@ { PageCount = 1; - html += '<option selected="selected" value="' + CurrentPage + '-' + data["startrev"] + '"><?php echo addslashes($getbuilds_langres["page"]); ?> ' + CurrentPage; + html += '<option value="' + CurrentPage + '-' + data["startrev"] + '"><?php echo addslashes($shared_langres["page"]); ?> ' + CurrentPage; if(HttpRequest.responseXML.getElementsByTagName("filecount")[0].firstChild.data > 0) html += ' - ' + HttpRequest.responseXML.getElementsByTagName("firstrev")[0].firstChild.data + ' ... ' + HttpRequest.responseXML.getElementsByTagName("lastrev")[0].firstChild.data + '<\/option>'; @@ -98,19 +98,19 @@ if(HttpRequest.responseXML.getElementsByTagName("morefiles")[0].firstChild.data == 0) { - html += '<strong><?php echo addslashes($getbuilds_langres["nextpage"]); ?> &rsaquo;<\/strong> '; - html += '<strong>»<\/strong>'; - } - else - { - html += '<a href="javascript:NextPage()" title="<?php echo addslashes($getbuilds_langres["nextpage_title"]); ?>"><?php echo addslashes($getbuilds_langres["nextpage"]); ?> &rsaquo;<\/a> '; - html += '<a href="javascript:LastPage()" title="<?php echo addslashes($getbuilds_langres["lastpage_title"]); ?>">»<\/a>'; + html += '<?php echo addslashes($shared_langres["nextpage"]); ?> &rsaquo; '; + html += '»'; + } + else + { + html += '<a href="javascript:NextPage()" title="<?php echo addslashes($shared_langres["nextpage_title"]); ?>"><?php echo addslashes($shared_langres["nextpage"]); ?> &rsaquo;<\/a> '; + html += '<a href="javascript:LastPage()" title="<?php echo addslashes($shared_langres["lastpage_title"]); ?>">»<\/a>'; } html += '<\/td><\/tr><\/table>'; // File table - html += '<table class="datatable" cellspacing="0" cellpadding="1">'; + html += '<table class="datatable" cellspacing="0" cellpadding="0">'; html += '<thead><tr class="head"><th class="fname"><?php echo addslashes($getbuilds_langres["filename"]); ?><\/th><th class="fsize"><?php echo addslashes($getbuilds_langres["filesize"]); ?><\/th><th class="fdate"><?php echo addslashes($getbuilds_langres["filedate"]); ?><\/th><\/tr><\/thead>'; html += '<tbody>'; @@ -118,7 +118,7 @@ if(!files.length) { - html += '<tr class="odd"><td><?php printf(addslashes($getbuilds_langres["nofiles"]), "' + fullrange + '"); ?><\/td><td> <\/td><td> <\/td><\/tr>'; + html += '<tr class="even"><td><?php printf(addslashes($getbuilds_langres["nofiles"]), "' + FullRange + '"); ?><\/td><td> <\/td><td> <\/td><\/tr>'; } else { @@ -130,13 +130,14 @@ var fsize = files[i].getElementsByTagName("size")[0].firstChild.data; var fdate = files[i].getElementsByTagName("date")[0].firstChild.data; var flink = '<a href="<?php echo $ISO_DOWNLOAD_URL; ?>' + fname.substr(0, 6) + "/" + fname + '">'; - oddeven = !oddeven; html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="tr_mouseover(this);" onmouseout="tr_mouseout(this);">'; html += '<td>' + flink + '<img src="images/cd.gif" alt=""> ' + fname + '<\/a><\/td>'; html += '<td>' + flink + fsize + '<\/a><\/td>'; html += '<td>' + flink + fdate + '<\/a><\/td>'; html += '<\/tr>'; + + oddeven = !oddeven; } } @@ -147,15 +148,7 @@ if(data["requesttype"] == REQUESTTYPE_PAGESWITCH) { // Switch the selected page in the Page ComboBox - var options = document.getElementById("pagesel").getElementsByTagName("option"); - - for(var i = 0; i < options.length; i++) - { - if(options[i].value.substr(0, options[i].value.indexOf("-")) == CurrentPage) - options[i].selected = true; - else if(options[i].selected) - options[i].selected = false; - } + document.getElementById("pagesel").getElementsByTagName("option")[CurrentPage - 1].selected = true; } } else @@ -169,13 +162,13 @@ // As always, we have to work around an IE bug // If I use "innerHTML" here, the first <OPTION> start tag gets dropped in the IE... // Therefore I have to use the DOM functions in this case. - var option_elem = document.createElement("option"); - var option_text = document.createTextNode('<?php echo addslashes($getbuilds_langres["page"]); ?> ' + pagecount + ' - ' + HttpRequest.responseXML.getElementsByTagName("firstrev")[0].firstChild.data + ' ... ' + HttpRequest.responseXML.getElementsByTagName("lastrev")[0].firstChild.data); - - option_elem.value = pagecount + "-" + data["startrev"]; - option_elem.appendChild(option_text); - - document.getElementById("pagesel").appendChild(option_elem); + var OptionElem = document.createElement("option"); + var OptionText = document.createTextNode('<?php echo addslashes($shared_langres["page"]); ?> ' + PageCount + ' - ' + HttpRequest.responseXML.getElementsByTagName("firstrev")[0].firstChild.data + ' ... ' + HttpRequest.responseXML.getElementsByTagName("lastrev")[0].firstChild.data); + + OptionElem.value = PageCount + "-" + data["startrev"]; + OptionElem.appendChild(OptionText); + + document.getElementById("pagesel").appendChild(OptionElem); } if(HttpRequest.responseXML.getElementsByTagName("morefiles")[0].firstChild.data == 1 && (data["requesttype"] == REQUESTTYPE_FULLLOAD || data["requesttype"] == REQUESTTYPE_ADDPAGE)) @@ -272,7 +265,7 @@ return; CurrentPage = 1; - fullrange = document.getElementById("revnum").value; + FullRange = document.getElementById("revnum").value; data["bootcd-dbg"] = (document.getElementById("bootcd-dbg").checked ? 1 : 0); data["livecd-dbg"] = (document.getElementById("livecd-dbg").checked ? 1 : 0); @@ -311,7 +304,7 @@ // Show latest files CurrentPage = 1; - fullrange = <?php echo $rev; ?>; + FullRange = <?php echo $rev; ?>; data["filelist"] = 1; data["startrev"] = <?php echo $rev; ?>; Removed: trunk/web/reactos.org/htdocs/getbuilds/images/info.gif URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== Binary file - no diff available. Modified: trunk/web/reactos.org/htdocs/getbuilds/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/i… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/index.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,7 +3,7 @@ PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> */ define("ROOT_PATH", "../"); @@ -11,28 +11,13 @@ require_once("config.inc.php"); require_once("languages.inc.php"); require_once(ROOT_PATH . "shared/subsys_layout.php"); + require_once(ROOT_PATH . "shared/svn.php"); GetLanguage(); + require_once(ROOT_PATH . "shared/lang/$lang.inc.php"); require_once("lang/$lang.inc.php"); - // Get the latest SVN revision - $fp = fopen($SVN_ACTIVITY_URL, "r"); - - do - { - $line = fread($fp, 1024); - - $firstpos = strpos($line, "<id>"); - - if($firstpos > 0) - { - $lastpos = strpos($line, "</id>"); - $rev = substr($line, $firstpos + 4, ($lastpos - $firstpos - 4)); - break; - } - } while($line); - - fclose($fp); + $rev = GetLatestRevision(); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> @@ -118,7 +103,7 @@ <img src="images/rightarrow.gif" alt=">" title="<?php echo $getbuilds_langres["nextrev"]; ?>" onclick="NextRev();"><br> </span> - <img src="images/info.gif" alt="INFO:"> <?php printf($getbuilds_langres["rangeinfo"], $rev, ($rev - 50), $rev); ?> + <img src="../shared/images/info.gif" alt=""> <?php printf($shared_langres["rangeinfo"], $rev, ($rev - 50), $rev); ?> </td> </tr> <tr> @@ -141,22 +126,7 @@ </div> <div id="filetable"> - <table class="datatable" cellspacing="0" cellpadding="1"> - <thead> - <tr class="head"> - <th class="fname"><?php echo $getbuilds_langres["filename"]; ?></th> - <th class="fsize"><?php echo $getbuilds_langres["filesize"]; ?></th> - <th class="fdate"><?php echo $getbuilds_langres["filedate"]; ?></th> - </tr> - </thead> - <tbody> - <tr class="odd"> - <td><?php echo $getbuilds_langres["pleasewait"]; ?>...</td> - <td> </td> - <td> </td> - </tr> - </tbody> - </table> +  </div> </div> </div> Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/de.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Colin Finck <mail(a)colinfinck.de> - charset=utf-8 + charset=utf-8 without BOM */ $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Startseite</a> > ReactOS SVN Trunk-Builds'; @@ -28,23 +28,12 @@ $getbuilds_langres["nextrev"] = "NÃ¤chste Revision"; $getbuilds_langres["showrev"] = "Anzeigen"; $getbuilds_langres["gettinglist"] = "Dateiliste wird geladen"; - $getbuilds_langres["rangeinfo"] = "Sie kÃ¶nnen eine Revisionsnummer (z.B. %s) oder einen Revisionsbereich eingeben (z.B. %s-%s)"; $getbuilds_langres["isotype"] = "CD-Image-Typen anzeigen"; $getbuilds_langres["foundfiles"] = "%s Dateien gefunden!"; - - $getbuilds_langres["firstpage_title"] = "Gehe zur ersten Seite"; - $getbuilds_langres["prevpage_title"] = "Vorherige Seite"; - $getbuilds_langres["prevpage"] = "ZurÃ¼ck"; - $getbuilds_langres["page"] = "Seite"; - $getbuilds_langres["nextpage"] = "Vor"; - $getbuilds_langres["nextpage_title"] = "NÃ¤chste Seite"; - $getbuilds_langres["lastpage_title"] = "Gehe zur letzten Seite"; - $getbuilds_langres["filename"] = "Dateiname"; $getbuilds_langres["filesize"] = "GrÃ¶Ãe"; $getbuilds_langres["filedate"] = "Zuletzt geÃ¤ndert"; - $getbuilds_langres["pleasewait"] = "Bitte warten"; $getbuilds_langres["nofiles"] = "FÃ¼r Revision %s gibt es keine vorkompilierten Dateien!"; $getbuilds_langres["invalidrev"] = "UngÃ¼ltige Revisionsnummer!"; Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/en.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Colin Finck <mail(a)colinfinck.de> - charset=utf-8 + charset=utf-8 without BOM */ $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > ReactOS SVN Trunk Builds'; @@ -33,18 +33,9 @@ $getbuilds_langres["foundfiles"] = "Found %s files!"; - $getbuilds_langres["firstpage_title"] = "Go to the first page"; - $getbuilds_langres["prevpage_title"] = "Previous page"; - $getbuilds_langres["prevpage"] = "Previous"; - $getbuilds_langres["page"] = "Page"; - $getbuilds_langres["nextpage"] = "Next"; - $getbuilds_langres["nextpage_title"] = "Next page"; - $getbuilds_langres["lastpage_title"] = "Go to the last page"; - $getbuilds_langres["filename"] = "File name"; $getbuilds_langres["filesize"] = "Size"; $getbuilds_langres["filedate"] = "Last changed"; - $getbuilds_langres["pleasewait"] = "Please wait"; $getbuilds_langres["nofiles"] = "There are no prebuilt files for revision %s!"; $getbuilds_langres["invalidrev"] = "Invalid revision number!"; Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/es.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Gabriel Ilardi <gabrielilardi(a)hotmail.it> - charset=utf-8 + charset=utf-8 without BOM */ $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > Builds del Trunk de ReactOS SVN'; @@ -28,23 +28,13 @@ $getbuilds_langres["nextrev"] = "RevisiÃ³n siguiente"; $getbuilds_langres["showrev"] = "Mostrar"; $getbuilds_langres["gettinglist"] = "Obteniendo la lista de archivos"; - $getbuilds_langres["rangeinfo"] = "Puedes entrar un numero de revisiÃ³n (p.ej. %s) o un rango de revisiones (p.ej. %s-%s)"; $getbuilds_langres["isotype"] = "Mostrar tipos de imagen de CD"; $getbuilds_langres["foundfiles"] = "Encontrado(s) %s archivo(s)!"; - $getbuilds_langres["firstpage_title"] = "Ir a la primera pÃ¡gina"; - $getbuilds_langres["prevpage_title"] = "PÃ¡gina anterior"; - $getbuilds_langres["prevpage"] = "Anterior"; - $getbuilds_langres["page"] = "PÃ¡gina"; - $getbuilds_langres["nextpage"] = "Siguiente"; - $getbuilds_langres["nextpage_title"] = "PÃ¡gina siguiente"; - $getbuilds_langres["lastpage_title"] = "Ir a la Ãºltima pÃ¡gina"; - $getbuilds_langres["filename"] = "Nombre de archivo"; $getbuilds_langres["filesize"] = "TamaÃ±o"; $getbuilds_langres["filedate"] = "Modificado"; - $getbuilds_langres["pleasewait"] = "Espera por favor"; $getbuilds_langres["nofiles"] = "No hay archivos precompilados para la revisiÃ³n %s!"; $getbuilds_langres["invalidrev"] = "NÃºmero de revisiÃ³n invÃ¡lido!"; Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/fr.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,10 +3,10 @@ PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Pierre Schweitzer <heis_spiter(a)hotmail.com> - charset=utf-8 + charset=utf-8 without BOM */ $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Accueil</a> > Binaires du tronc de ReactOS'; @@ -28,23 +28,13 @@ $getbuilds_langres["nextrev"] = "RÃ©vision suivante"; $getbuilds_langres["showrev"] = "Montrer"; $getbuilds_langres["gettinglist"] = "RÃ©cupÃ©ration de la liste des fichiers"; - $getbuilds_langres["rangeinfo"] = "Vous pouvez entrer un numÃ©ro de rÃ©vision (p.e. %s) ou un intervalle de rÃ©visions (p.e. %s-%s)"; $getbuilds_langres["isotype"] = "Montrer les types d'images de CD "; $getbuilds_langres["foundfiles"] = "%s fichiers trouvÃ©s !"; - $getbuilds_langres["firstpage_title"] = "Aller Ã la premiÃ¨re page"; - $getbuilds_langres["prevpage_title"] = "Page prÃ©cÃ©dente"; - $getbuilds_langres["prevpage"] = "PrÃ©cÃ©dente"; - $getbuilds_langres["page"] = "Page"; - $getbuilds_langres["nextpage"] = "Suivante"; - $getbuilds_langres["nextpage_title"] = "Page suivante"; - $getbuilds_langres["lastpage_title"] = "Aller Ã la derniÃ¨re page"; - $getbuilds_langres["filename"] = "Nom du fichier"; $getbuilds_langres["filesize"] = "Taille"; $getbuilds_langres["filedate"] = "Derniers changements"; - $getbuilds_langres["pleasewait"] = "Veuillez patienter"; $getbuilds_langres["nofiles"] = "Il n'y a pas de fichiers disponibles pour la rÃ©vision %s !"; $getbuilds_langres["invalidrev"] = "NumÃ©ro de rÃ©vision invalide !"; Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/it.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Gabriel Ilardi <gabrielilardi(a)hotmail.it> - charset=utf-8 + charset=utf-8 without BOM */ $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > Builds del Trunk di ReactOS SVN'; @@ -28,23 +28,13 @@ $getbuilds_langres["nextrev"] = "Revisione successiva"; $getbuilds_langres["showrev"] = "Mostrare"; $getbuilds_langres["gettinglist"] = "Ottentendo l'elenco dei file"; - $getbuilds_langres["rangeinfo"] = "Puoi inserire un numero di revisione (ad es. %s) oppure un range di revisioni (ad es. %s-%s)"; $getbuilds_langres["isotype"] = "Mostrare imagini cd"; $getbuilds_langres["foundfiles"] = "Trovato(i) %s file(s)!"; - $getbuilds_langres["firstpage_title"] = "Andare alla prima pagina"; - $getbuilds_langres["prevpage_title"] = "Pagina precendente"; - $getbuilds_langres["prevpage"] = "Precedente"; - $getbuilds_langres["page"] = "Pagina"; - $getbuilds_langres["nextpage"] = "Successiva"; - $getbuilds_langres["nextpage_title"] = "Pagina successiva"; - $getbuilds_langres["lastpage_title"] = "Andare all'ultima pagina"; - $getbuilds_langres["filename"] = "Nome file"; $getbuilds_langres["filesize"] = "Dimensioni"; $getbuilds_langres["filedate"] = "Modificato"; - $getbuilds_langres["pleasewait"] = "Attendere prego"; $getbuilds_langres["nofiles"] = "Non ci sono files precompilati per la revisione %s!"; $getbuilds_langres["invalidrev"] = "Numero di revisione invalido!"; Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/lt.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Vytis Girdzijauskas <cman(a)cman.us> - charset=utf-8 + charset=utf-8 without BOM */ $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Pagrindinis</a> > ReactOS SVN laidos'; @@ -28,23 +28,13 @@ $getbuilds_langres["nextrev"] = "Sekanti laida"; $getbuilds_langres["showrev"] = "Rodyti"; $getbuilds_langres["gettinglist"] = "IeÅ¡koma bylÅ³"; - $getbuilds_langres["rangeinfo"] = "Galima Ä¯vesti laidos numerÄ¯ (pvz. %s) arba laidÅ³ ribas (pvz. %s-%s)"; $getbuilds_langres["isotype"] = "Rodyti CD atvaizdÅ³ tipus"; $getbuilds_langres["foundfiles"] = "Rasta %s bylÅ³!"; - $getbuilds_langres["firstpage_title"] = "Eiti Ä¯ pirmÄ puslapÄ¯"; - $getbuilds_langres["prevpage_title"] = "Ankstesnis puslapis"; - $getbuilds_langres["prevpage"] = "Ankstesnis"; - $getbuilds_langres["page"] = "Puslapis"; - $getbuilds_langres["nextpage"] = "Sekantis"; - $getbuilds_langres["nextpage_title"] = "Sekantis puslapis"; - $getbuilds_langres["lastpage_title"] = "Eiti Ä¯ paskutinÄ¯ puslapÄ¯"; - $getbuilds_langres["filename"] = "Bylos vardas"; $getbuilds_langres["filesize"] = "Dydis"; $getbuilds_langres["filedate"] = "Data"; - $getbuilds_langres["pleasewait"] = "PraÅ¡ome palaukti"; $getbuilds_langres["nofiles"] = "Laidai %s bylÅ³ nerasta!"; $getbuilds_langres["invalidrev"] = "Neteisingas laidos numeris!"; Added: trunk/web/reactos.org/htdocs/getbuilds/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/pl.inc.php (added) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/pl.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,0 +1,44 @@ +<?php +/* + PROJECT: ReactOS Website + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Easily download prebuilt ReactOS Revisions + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> + TRANSLATOR: Maciej Bialas + Olaf Siejka + + charset=utf-8 without BOM +*/ + + $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > Wersje rozwojowe ReactOS z SVN'; + $getbuilds_langres["title"] = "Pobierz skompilowane wersje rozwojowe ReactOS"; + $getbuilds_langres["intro"] = 'Tutaj moÅ¼esz pobraÄ najnowszÄ ale takÅ¼e starsze wersje rozwojowe Reactos, ktÃ³re zostaÅy stworzone przez naszego <a href="http://www.reactos.org/wiki/index.php/RosBuild">BuildBota</a>.'; + + $getbuilds_langres["overview"] = "Informacje ogÃ³lne"; + $getbuilds_langres["latestrev"] = "Ostatnia wersja ReactOS na serwerze SVN"; + $getbuilds_langres["browsesvn"] = "PrzeglÄdaj repozytorium SVN"; + $getbuilds_langres["cia"] = "Zobacz ostatnie zmiany na CIA.vc"; + $getbuilds_langres["buildbot_status"] = "Status BuildBota"; + $getbuilds_langres["buildbot_web"] = "Zobacz szczegÃ³Åy w Interfejsie Web BuildBota"; + $getbuilds_langres["browsebuilds"] = "PrzeglÄdaj wszystkie stworzone wersje"; + + $getbuilds_langres["downloadrev"] = "Pobierz skompilowanÄ wersjÄ ReactOS"; + $getbuilds_langres["js_disclaimer"] = 'Musisz wÅÄczyÄ JavaScript w Twojej przeglÄdarce, aby uÅ¼ywaÄ listy plikÃ³w.<br>MoÅ¼esz rÃ³wnieÅ¼ pobraÄ wszystkie skompilowane wersje <a href="%s">tutaj</a>.'; + $getbuilds_langres["showrevfiles"] = "PokaÅ¼ pliki wersji"; + $getbuilds_langres["prevrev"] = "Poprzednia wersja"; + $getbuilds_langres["nextrev"] = "NastÄpna wersja"; + $getbuilds_langres["showrev"] = "PokaÅ¼"; + $getbuilds_langres["gettinglist"] = "Pobieranie listy plikÃ³w"; + $getbuilds_langres["isotype"] = "PokaÅ¼ typy obrazÃ³w CD"; + + $getbuilds_langres["foundfiles"] = "Znaleziono %s plikÃ³w!"; + + $getbuilds_langres["filename"] = "Nazwa pliku"; + $getbuilds_langres["filesize"] = "Rozmiar"; + $getbuilds_langres["filedate"] = "Ostatnio modyfikowany"; + + $getbuilds_langres["nofiles"] = "Brak skompilowanych plikÃ³w dla wersji %s!"; + $getbuilds_langres["invalidrev"] = "BÅÄdny numer wersji!"; + + $getbuilds_langres["rangelimitexceeded"] = "PrzedziaÅ moÅ¼e zawieraÄ maksymalnie %s wersji!"; +?> Propchange: trunk/web/reactos.org/htdocs/getbuilds/lang/pl.inc.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/lang/ru.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,10 +3,10 @@ PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Shashkov Maxim <bz00mmer(a)mail.ru> - charset=utf-8 + charset=utf-8 without BOM */ $getbuilds_langres["header"] = '<a href="http://www.reactos.org/">ÐÐ»Ð°Ð²Ð½Ð°Ñ</a> > Ð¡Ð±Ð¾ÑÐºÐ¸ ÑÑÐ°Ð½ÐºÐ° SVN ReactOS'; @@ -28,23 +28,13 @@ $getbuilds_langres["nextrev"] = "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÐµÐ²Ð¸Ð·Ð¸Ñ"; $getbuilds_langres["showrev"] = "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ"; $getbuilds_langres["gettinglist"] = "ÐÐ¾Ð»ÑÑÐµÐ½Ð¸Ðµ ÑÐ¿Ð¸ÑÐºÐ° ÑÐ°Ð¹Ð»Ð¾Ð²"; - $getbuilds_langres["rangeinfo"] = "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²Ð²ÐµÑÑÐ¸ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸(Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, %s) Ð¸Ð»Ð¸ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ð½Ð¾Ð¼ÐµÑÐ¾Ð² ÑÐµÐ²Ð¸Ð·Ð¸Ð¹ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, %s-%s)"; $getbuilds_langres["isotype"] = "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ÑÐ¸Ð¿Ñ Ð¾Ð±ÑÐ°Ð·Ð¾Ð² CD-Ð´Ð¸ÑÐºÐ¾Ð²"; $getbuilds_langres["foundfiles"] = "ÐÐ°Ð¹Ð´ÐµÐ½Ð¾ ÑÐ°Ð¹Ð»Ð¾Ð² - %s!"; - $getbuilds_langres["firstpage_title"] = "ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿ÐµÑÐ²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ"; - $getbuilds_langres["prevpage_title"] = "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°"; - $getbuilds_langres["prevpage"] = "ÐÐ°Ð·Ð°Ð´"; - $getbuilds_langres["page"] = "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°"; - $getbuilds_langres["nextpage"] = "ÐÐ¿ÐµÑÑÐ´"; - $getbuilds_langres["nextpage_title"] = "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°"; - $getbuilds_langres["lastpage_title"] = "ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ"; - $getbuilds_langres["filename"] = "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°"; $getbuilds_langres["filesize"] = "Ð Ð°Ð·Ð¼ÐµÑ"; $getbuilds_langres["filedate"] = "ÐÐ¾ÑÐ»ÐµÐ´Ð½ÐµÐµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ"; - $getbuilds_langres["pleasewait"] = "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ"; $getbuilds_langres["nofiles"] = "Ð¡Ð¾Ð±ÑÐ°Ð½Ð½ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð² Ð´Ð»Ñ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸ %s Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ!"; $getbuilds_langres["invalidrev"] = "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸!"; Modified: trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/getbuilds/l… ============================================================================== --- trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/getbuilds/languages.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,7 +3,7 @@ PROJECT: ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Easily download prebuilt ReactOS Revisions - COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> charset=utf-8 without BOM */ @@ -15,6 +15,7 @@ "fr" => "FranÃ§ais (French)", "it" => "Italiano (Italian)", "lt" => "LietuviÅ³ (Lithuanian)", + "pl" => "Polski (Polish)", "ru" => "Ð ÑÑÑÐºÐ¸Ð¹ (Russian)", ); ?> Modified: trunk/web/reactos.org/htdocs/peoplemap/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/i… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/index.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,7 +3,7 @@ PROJECT: People Map of the ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Main web page - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> */ define("ROOT_PATH", "../"); @@ -13,6 +13,7 @@ require_once(ROOT_PATH . "shared/subsys_layout.php"); GetLanguage(); + require_once(ROOT_PATH . "shared/lang/$lang.inc.php"); require_once("lang/$lang.inc.php"); ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/de.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: People Map of the ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Colin Finck - charset=utf-8 + charset=utf-8 without BOM */ $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Startseite</a> > ReactOS Personen-Karte'; Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/en.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: People Map of the ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Colin Finck - charset=utf-8 + charset=utf-8 without BOM */ $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > ReactOS People Map'; Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/es.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,12 +1,12 @@ -ï»¿<?php +<?php /* PROJECT: People Map of the ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Javier Fernandez - charset=utf-8 + charset=utf-8 without BOM */ $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Home</a> > ReactOS People Map'; Modified: trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/l… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/lang/pl.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,10 +3,10 @@ PROJECT: People Map of the ReactOS Website LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> TRANSLATOR: Maciej Bialas - charset=utf-8 + charset=utf-8 without BOM */ $peoplemap_langres["header"] = '<a href="http://www.reactos.org/">Strona gÅÃ³wna</a> > Mapa OsÃ³b ReactOS'; Modified: trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/peoplemap/p… ============================================================================== --- trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/peoplemap/peoplemap.css [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,7 +3,7 @@ LICENSE: GPL v2 or any later version FILE: web/reactos.org/htdocs/peoplemap/peoplemap.css PURPOSE: Main stylesheet - COPYRIGHT: Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> + COPYRIGHT: Copyright 2007-2009 Colin Finck <mail(a)colinfinck.de> */ a { @@ -12,10 +12,6 @@ a:hover { color: #000000; -} - -#content { - padding-right: 10px; } #map_td, #toolbox_td { Added: trunk/web/reactos.org/htdocs/shared/css/basic.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/css/… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/css/basic.css (added) +++ trunk/web/reactos.org/htdocs/shared/css/basic.css [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,0 +1,30 @@ +/* + PROJECT: ReactOS Shared Website Components + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Style file for inclusion inside subsystems, provides the general look of ReactOS webpages + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; +} + +h1 { + font-size: 14px; + font-weight: bold; + color: white; + background-color: #5984C3; + padding: 0px 0px 1px 10px; + margin-top: 0; +} + +h1 a { + color: white; + text-decoration: none; +} + +h1 a:hover { + color: white; + text-decoration: underline; +} Propchange: trunk/web/reactos.org/htdocs/shared/css/basic.css ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/shared/css/menu.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/css/… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/css/menu.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/css/menu.css [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,28 +1,16 @@ +/* + PROJECT: ReactOS Shared Website Components + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Style file for inclusion inside subsystems, provides the general look of ReactOS webpages including the top and left menu + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + +@import url("basic.css"); + body { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10pt; margin: 0 0 1em 0; padding: 0; /* Only affects Opera */ background: #FFFFFF url('http://www.reactos.org/images/topbar.jpg') repeat-x scroll top left; -} - -h1 { - font-size: 14px; - font-weight: bold; - color: white; - background-color: #5984C3; - padding: 0px 0px 1px 10px; - margin-top: 0; -} - -h1 a { - color: white; - text-decoration: none; -} - -h1 a:hover { - color: white; - text-decoration: underline; } #top { Modified: trunk/web/reactos.org/htdocs/shared/css/reactos.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/css/… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/css/reactos.css [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/css/reactos.css [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,3 +1,14 @@ +/* + PROJECT: ReactOS Shared Website Components + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Style file for inclusion inside custom subsystems, provides the look and feel of ReactOS Website components + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + +#content { + padding-right: 10px; +} + /* Headings */ h2 { font-size: 22px; @@ -55,37 +66,24 @@ } /* Data Table */ -.datatable { - min-width: 350px; - width: 100%; - cursor: pointer; - empty-cells: show; +.datatable th, .datatable td { + padding: 1px 1px 1px 2px; } -.datatable tr.head th, -.datatable tr.head { - background-image: none; +.datatable tr.head th { background: #5984C3; color: white; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-style: normal; text-align: left; - cursor: default; } .datatable tr.odd td, .datatable tr.even td { - color: black; - font-family: Verdana, Arial, Helvetica, sans-serif; - border-bottom: 1px solid #bbb; - background-image: none; + border-bottom: 1px solid #BBBBBB; } -.datatable tr.odd td, -.datatable tr.odd { +.datatable tr.odd td { background-color: #DDDDDD; } -.datatable tr.even td, -.datatable tr.even { +.datatable tr.even td { background-color: #EEEEEE; } Propchange: trunk/web/reactos.org/htdocs/shared/images/info.gif ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/web/reactos.org/htdocs/shared/images/info.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/web/reactos.org/htdocs/shared/js/ajax.js URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/js/a… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/js/ajax.js [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/js/ajax.js [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -2,7 +2,7 @@ PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Some easy-to-use AJAX functions - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ /* This hint comes originally from: http://design-noir.de/webdev/JS/XMLHttpRequest-IE/ */ @@ -31,7 +31,6 @@ } var parameters = PrepareParameters(data); - //alert(parameters); HttpRequest.open("GET", url + "?" + parameters, true); HttpRequest.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); // Bypass the IE Cache Modified: trunk/web/reactos.org/htdocs/shared/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/de.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/de.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,25 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Colin Finck charset=utf-8 without BOM */ - $shared_langres["language"] = "Sprache"; + $shared_langres = array( + "language" => "Sprache", + + "rangeinfo" => "Sie kÃ¶nnen eine Revisionsnummer (z.B. %s) oder einen Revisionsbereich eingeben (z.B. %s-%s)", + + "firstpage_title" => "Gehe zur ersten Seite", + "prevpage_title" => "Vorherige Seite", + "prevpage" => "ZurÃ¼ck", + "page" => "Seite", + "nextpage" => "Vor", + "nextpage_title" => "NÃ¤chste Seite", + "lastpage_title" => "Gehe zur letzten Seite", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/en.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/en.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,25 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Colin Finck charset=utf-8 without BOM */ - $shared_langres["language"] = "Language"; + $shared_langres = array( + "language" => "Language", + + "rangeinfo" => "You can enter a revision number (e.g. %s) or a revision range (e.g. %s-%s)", + + "firstpage_title" => "Go to the first page", + "prevpage_title" => "Previous page", + "prevpage" => "Previous", + "page" => "Page", + "nextpage" => "Next", + "nextpage_title" => "Next page", + "lastpage_title" => "Go to the last page", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/lang/es.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/es.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/es.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,26 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Javier Fernandez + Gabriel Ilardi <gabrielilardi(a)hotmail.it> charset=utf-8 without BOM */ - $shared_langres["language"] = "Idioma"; + $shared_langres = array( + "language" => "Idioma", + + "rangeinfo" => "Puedes entrar un numero de revisiÃ³n (p.ej. %s) o un rango de revisiones (p.ej. %s-%s)", + + "firstpage_title" => "Ir a la primera pÃ¡gina", + "prevpage_title" => "PÃ¡gina anterior", + "prevpage" => "Anterior", + "page" => "PÃ¡gina", + "nextpage" => "Siguiente", + "nextpage_title" => "PÃ¡gina siguiente", + "lastpage_title" => "Ir a la Ãºltima pÃ¡gina", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/lang/fr.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/fr.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/fr.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,25 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Pierre Schweitzer <heis_spiter(a)hotmail.com> charset=utf-8 without BOM */ - $shared_langres["language"] = "Langue"; + $shared_langres = array( + "language" => "Langue", + + "rangeinfo" => "Vous pouvez entrer un numÃ©ro de rÃ©vision (p.e. %s) ou un intervalle de rÃ©visions (p.e. %s-%s)", + + "firstpage_title" => "Aller Ã la premiÃ¨re page", + "prevpage_title" => "Page prÃ©cÃ©dente", + "prevpage" => "PrÃ©cÃ©dente", + "page" => "Page", + "nextpage" => "Suivante", + "nextpage_title" => "Page suivante", + "lastpage_title" => "Aller Ã la derniÃ¨re page", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/lang/it.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/it.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/it.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,25 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Gabriel Ilardi <gabrielilardi(a)hotmail.it> charset=utf-8 without BOM */ - $shared_langres["language"] = "Lingua"; + $shared_langres = array( + "language" => "Lingua", + + "rangeinfo" => "Puoi inserire un numero di revisione (ad es. %s) oppure un range di revisioni (ad es. %s-%s)", + + "firstpage_title" => "Andare alla prima pagina", + "prevpage_title" => "Pagina precendente", + "prevpage" => "Precedente", + "page" => "Pagina", + "nextpage" => "Successiva", + "nextpage_title" => "Pagina successiva", + "lastpage_title" => "Andare all'ultima pagina", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/lang/lt.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/lt.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/lt.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,25 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Vytis Girdzijauskas <cman(a)cman.us> charset=utf-8 without BOM */ - $shared_langres["language"] = "Kalba"; + $shared_langres = array( + "language" => "Kalba", + + "rangeinfo" => "Galima Ä¯vesti laidos numerÄ¯ (pvz. %s) arba laidÅ³ ribas (pvz. %s-%s)", + + "firstpage_title" => "Eiti Ä¯ pirmÄ puslapÄ¯", + "prevpage_title" => "Ankstesnis puslapis", + "prevpage" => "Ankstesnis", + "page" => "Puslapis", + "nextpage" => "Sekantis", + "nextpage_title" => "Sekantis puslapis", + "lastpage_title" => "Eiti Ä¯ paskutinÄ¯ puslapÄ¯", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,26 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Maciej Bialas + Olaf Siejka charset=utf-8 without BOM */ - $shared_langres["language"] = "JÄzyk"; + $shared_langres = array( + "language" => "JÄzyk", + + "rangeinfo" => "MoÅ¼esz wprowadziÄ numer wersji (np. %s) lub przedziaÅ wersji (np. %s-%s)", + + "firstpage_title" => "PrzejdÅº do pierwszej strony", + "prevpage_title" => "Poprzednia strona", + "prevpage" => "Poprzednia", + "page" => "Strona", + "nextpage" => "NastÄpna", + "nextpage_title" => "NastÄpna strona", + "lastpage_title" => "PrzejdÅº do ostatniej strony", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/lang/ru.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/ru.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/ru.inc.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,13 +1,25 @@ -<?php +ï»¿<?php /* PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Translation - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Shashkov Maxim <bz00mmer(a)mail.ru> charset=utf-8 without BOM */ - $shared_langres["language"] = "Ð¯Ð·ÑÐº"; + $shared_langres = array( + "language" => "Ð¯Ð·ÑÐº", + + "rangeinfo" => "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²Ð²ÐµÑÑÐ¸ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ²Ð¸Ð·Ð¸Ð¸(Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, %s) Ð¸Ð»Ð¸ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ Ð½Ð¾Ð¼ÐµÑÐ¾Ð² ÑÐµÐ²Ð¸Ð·Ð¸Ð¹ (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, %s-%s)", + + "firstpage_title" => "ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿ÐµÑÐ²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ", + "prevpage_title" => "ÐÑÐµÐ´ÑÐ´ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°", + "prevpage" => "ÐÐ°Ð·Ð°Ð´", + "page" => "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°", + "nextpage" => "ÐÐ¿ÐµÑÑÐ´", + "nextpage_title" => "Ð¡Ð»ÐµÐ´ÑÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°", + "lastpage_title" => "ÐÐµÑÐµÐ¹ÑÐ¸ Ðº Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ", + ); ?> Modified: trunk/web/reactos.org/htdocs/shared/subsys_layout.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/subs… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/subsys_layout.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -3,7 +3,7 @@ PROJECT: ReactOS Shared Website Components LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation PURPOSE: Language handling for subsystems - COPYRIGHT: Copyright 2008 Colin Finck <colin(a)reactos.org> + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> */ require_once(ROOT_PATH . "roscms/inc/utils.php"); @@ -46,9 +46,8 @@ function LanguageBox($lang) { + global $shared_langres; global $supported_languages; - - require_once(ROOT_PATH . "shared/lang/$lang.inc.php"); printf('<div class="navTitle">%s</div>', $shared_langres["language"]); echo '<ol>'; @@ -56,7 +55,7 @@ printf('<select size="1" onchange="window.location.href = \'http://%s?lang=\' + this.options[this.selectedIndex].value;">', $_SERVER["SERVER_NAME"] . $_SERVER["PHP_SELF"]); foreach($supported_languages as $lang_key => $lang_name) - printf('<option value="%s"%s>%s</option>', $lang_key, ($lang_key == $lang ? ' selected' : ''), $lang_name); + printf('<option value="%s"%s>%s</option>', $lang_key, ($lang_key == $lang ? ' selected="selected"' : ''), $lang_name); echo '</select></li></ol>'; } Added: trunk/web/reactos.org/htdocs/shared/svn.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/svn.… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/svn.php (added) +++ trunk/web/reactos.org/htdocs/shared/svn.php [iso-8859-1] Mon Jan 5 06:21:21 2009 @@ -1,0 +1,28 @@ +<?php +/* + PROJECT: ReactOS Shared Website Components + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: SVN functions for subsystems + COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> +*/ + + function GetLatestRevision() + { + $fp = fopen("http://svn.reactos.org/svnact/svn_activity.xml", "r"); + + do + { + $line = fread($fp, 1024); + + $firstpos = strpos($line, "<id>"); + + if($firstpos > 0) + { + $lastpos = strpos($line, "</id>"); + return substr($line, $firstpos + 4, ($lastpos - $firstpos - 4)); + } + } while($line); + + fclose($fp); + } +?> Propchange: trunk/web/reactos.org/htdocs/shared/svn.php ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mjmartin] 38577: - Change and silence a debug message that made it look like npfsRead had a problem.
by mjmartin＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: mjmartin Date: Mon Jan 5 05:52:44 2009 New Revision: 38577 URL: http://svn.reactos.org/svn/reactos?rev=38577&view=rev Log: - Change and silence a debug message that made it look like npfsRead had a problem. Modified: trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Mon Jan 5 05:52:44 2009 @@ -326,7 +326,7 @@ { /* Its ok if the other side has been Disconnect, but if we have data still in the buffer , need to still be able to read it. Currently this is a HAXXXX */ - DPRINT1("Pipe is NO longer connected and no data exist in buffer!\n"); + DPRINT("Pipe no longer connected and no data exist in buffer. Ok to close pipe\n"); if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE)

1 0

[khornicek] 38576: [FORMATTING] tabs -> spaces. No code changes.
by khornicek＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: khornicek Date: Mon Jan 5 05:03:28 2009 New Revision: 38576 URL: http://svn.reactos.org/svn/reactos?rev=38576&view=rev Log: [FORMATTING] tabs -> spaces. No code changes. Modified: trunk/reactos/dll/win32/opengl32/gl.c trunk/reactos/dll/win32/opengl32/glfuncs.h trunk/reactos/dll/win32/opengl32/icdtable.h trunk/reactos/dll/win32/opengl32/opengl32.c trunk/reactos/dll/win32/opengl32/opengl32.h trunk/reactos/dll/win32/opengl32/wgl.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/opengl32/gl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/gl.c?re… Modified: trunk/reactos/dll/win32/opengl32/glfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/glfuncs… Modified: trunk/reactos/dll/win32/opengl32/icdtable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/icdtabl… Modified: trunk/reactos/dll/win32/opengl32/opengl32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… Modified: trunk/reactos/dll/win32/opengl32/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… Modified: trunk/reactos/dll/win32/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/wgl.c?r…

1 0

[cwittich] 38575: enable oleaut32_winetest
by cwittich＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: cwittich Date: Mon Jan 5 02:02:13 2009 New Revision: 38575 URL: http://svn.reactos.org/svn/reactos?rev=38575&view=rev Log: enable oleaut32_winetest Modified: trunk/rostests/winetests/directory.rbuild Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… ============================================================================== --- trunk/rostests/winetests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/directory.rbuild [iso-8859-1] Mon Jan 5 02:02:13 2009 @@ -88,9 +88,9 @@ <directory name="ole32"> <xi:include href="ole32/ole32.rbuild" /> </directory> -  + </directory> <directory name="psapi"> <xi:include href="psapi/psapi.rbuild" /> </directory>

1 0

[jimtabor] 38574: - Implement large ansi unicode string support for win32k. I guess some Rtl library developer should look into adding lib/rtlw32k for Win32k and User32. - Created DefSetText to processes strings prior to calling NtUserDefSetText. - Rewrite NtUserDefSetText to support large strings and process them with RtlLargeStringToUnicodeString. - On last thing to remove, is the Hook junk in NtUserDefSetText.
by jimtabor＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: jimtabor Date: Sun Jan 4 21:34:10 2009 New Revision: 38574 URL: http://svn.reactos.org/svn/reactos?rev=38574&view=rev Log: - Implement large ansi unicode string support for win32k. I guess some Rtl library developer should look into adding lib/rtlw32k for Win32k and User32. - Created DefSetText to processes strings prior to calling NtUserDefSetText. - Rewrite NtUserDefSetText to support large strings and process them with RtlLargeStringToUnicodeString. - On last thing to remove, is the Hook junk in NtUserDefSetText. Added: trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c (with props) Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/rtlstr.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/probe.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -119,3 +119,4 @@ PVOID FASTCALL ValidateHandleNoErr(HANDLE handle, UINT uType); PWINDOW FASTCALL ValidateHwndNoErr(HWND hwnd); VOID FASTCALL GetConnected(VOID); +BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); Modified: trunk/reactos/dll/win32/user32/misc/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/rtls… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/rtlstr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/rtlstr.c [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -63,3 +63,24 @@ DestinationString->Buffer = (PWSTR)SourceString; DestinationString->bAnsi = FALSE; } + +BOOL +NTAPI +RtlLargeStringToUnicodeString( PUNICODE_STRING DestinationString, + PLARGE_STRING SourceString) +{ + ANSI_STRING AnsiString; + + RtlInitUnicodeString(DestinationString, NULL); + if (DestinationString && SourceString && SourceString->bAnsi) + { + RtlInitAnsiString(&AnsiString, (LPSTR)SourceString->Buffer); + return NT_SUCCESS(RtlAnsiStringToUnicodeString(DestinationString, &AnsiString, TRUE)); + } + else if (DestinationString && SourceString) + { + return RtlCreateUnicodeString(DestinationString, SourceString->Buffer); + } + else + return FALSE; +} Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -111,6 +111,22 @@ CONST COLORREF *lpaRgbValues) { return NtUserSetSysColors(cElements, lpaElements, lpaRgbValues, 0); +} + +BOOL +FASTCALL +DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi) +{ + LARGE_STRING lsString; + + if ( String ) + { + if ( Ansi ) + RtlInitLargeAnsiString((PLARGE_ANSI_STRING)&lsString, (PCSZ)String, 0); + else + RtlInitLargeUnicodeString((PLARGE_UNICODE_STRING)&lsString, String, 0); + } + return NtUserDefSetText(hWnd, (String ? &lsString : NULL)); } void @@ -1853,21 +1869,11 @@ { case WM_NCCREATE: { - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) * may have child window IDs instead of window name */ - if(cs->lpszName) - { - RtlInitAnsiString(&AnsiString, (LPSTR)cs->lpszName); - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - NtUserDefSetText(hWnd, &UnicodeString); - RtlFreeUnicodeString(&UnicodeString); - } - else - NtUserDefSetText(hWnd, NULL); + DefSetText(hWnd, (PCWSTR)cs->lpszName, TRUE); Result = 1; break; @@ -1933,18 +1939,7 @@ case WM_SETTEXT: { - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; - - if(lParam) - { - RtlInitAnsiString(&AnsiString, (LPSTR)lParam); - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - NtUserDefSetText(hWnd, &UnicodeString); - RtlFreeUnicodeString(&UnicodeString); - } - else - NtUserDefSetText(hWnd, NULL); + DefSetText(hWnd, (PCWSTR)lParam, TRUE); if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { @@ -2023,15 +2018,11 @@ { case WM_NCCREATE: { - UNICODE_STRING UnicodeString; LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam; /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) * may have child window IDs instead of window name */ - if(cs->lpszName) - RtlInitUnicodeString(&UnicodeString, (LPWSTR)cs->lpszName); - - NtUserDefSetText(hWnd, (cs->lpszName ? &UnicodeString : NULL)); + DefSetText(hWnd, cs->lpszName, FALSE); Result = 1; break; } @@ -2090,12 +2081,7 @@ case WM_SETTEXT: { - UNICODE_STRING UnicodeString; - - if(lParam) - RtlInitUnicodeString(&UnicodeString, (LPWSTR)lParam); - - NtUserDefSetText(hWnd, (lParam ? &UnicodeString : NULL)); + DefSetText(hWnd, (PCWSTR)lParam, FALSE); if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -1657,18 +1657,8 @@ if(ProcessId != GetCurrentProcessId()) { /* do not send WM_GETTEXT messages to other processes */ - ANSI_STRING AnsiString; - UNICODE_STRING UnicodeString; - - if(lpString) - { - RtlInitAnsiString(&AnsiString, (LPSTR)lpString); - RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, TRUE); - NtUserDefSetText(hWnd, &UnicodeString); - RtlFreeUnicodeString(&UnicodeString); - } - else - NtUserDefSetText(hWnd, NULL); + + DefSetText(hWnd, (PCWSTR)lpString, TRUE); if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { @@ -1697,12 +1687,8 @@ if(ProcessId != GetCurrentProcessId()) { /* do not send WM_GETTEXT messages to other processes */ - UNICODE_STRING UnicodeString; - - if(lpString) - RtlInitUnicodeString(&UnicodeString, (LPWSTR)lpString); - - NtUserDefSetText(hWnd, (lpString ? &UnicodeString : NULL)); + + DefSetText(hWnd, lpString, FALSE); if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) == WS_CAPTION) { Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/probe.h [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -9,6 +9,10 @@ static const LARGE_INTEGER __emptyLargeInteger = {{0, 0}}; static const ULARGE_INTEGER __emptyULargeInteger = {{0, 0}}; static const IO_STATUS_BLOCK __emptyIoStatusBlock = {{0}, 0}; + +#if defined(_WIN32K_) +static const LARGE_STRING __emptyLargeString = {0, 0, 0, NULL}; +#endif #if defined(_WIN32K_) /* @@ -48,7 +52,9 @@ #define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&((PLARGE_INTEGER)Ptr)->QuadPart, LONGLONG) #define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&((PULARGE_INTEGER)Ptr)->QuadPart, ULONGLONG) #define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType((PUNICODE_STRING)Ptr, UNICODE_STRING) +#if defined(_WIN32K_) #define ProbeForWriteLargeString(Ptr) ProbeForWriteGenericType((PLARGE_STRING)Ptr, LARGE_STRING) +#endif #define ProbeForWriteIoStatusBlock(Ptr) ProbeForWriteGenericType((PIO_STATUS_BLOCK)Ptr, IO_STATUS_BLOCK) #define ProbeForReadGenericType(Ptr, Type, Default) \ @@ -75,7 +81,9 @@ #define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType((const LARGE_INTEGER *)(Ptr), LARGE_INTEGER, __emptyLargeInteger) #define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType((const ULARGE_INTEGER *)(Ptr), ULARGE_INTEGER, __emptyULargeInteger) #define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType((const UNICODE_STRING *)(Ptr), UNICODE_STRING, __emptyUnicodeString) +#if defined(_WIN32K_) #define ProbeForReadLargeString(Ptr) ProbeForReadGenericType((const LARGE_STRING *)(Ptr), LARGE_STRING, __emptyLargeString) +#endif #define ProbeForReadIoStatusBlock(Ptr) ProbeForReadGenericType((const IO_STATUS_BLOCK *)(Ptr), IO_STATUS_BLOCK, __emptyIoStatusBlock) #define ProbeAndZeroHandle(Ptr) \ Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -33,7 +33,7 @@ VOID NTAPI RtlInitLargeAnsiString(IN OUT PLARGE_ANSI_STRING,IN PCSZ,IN INT); VOID NTAPI RtlInitLargeUnicodeString(IN OUT PLARGE_UNICODE_STRING,IN PCWSTR,IN INT); - +BOOL NTAPI RtlLargeStringToUnicodeString( PUNICODE_STRING, PLARGE_STRING); /* FIXME: UserHMGetHandle needs to be updated once the new handle manager is implemented */ #define UserHMGetHandle(obj) ((obj)->hdr.Handle) @@ -1176,7 +1176,7 @@ int cy, UINT Flags); BOOL NTAPI -NtUserDefSetText(HWND WindowHandle, PUNICODE_STRING WindowText); +NtUserDefSetText(HWND WindowHandle, PLARGE_STRING WindowText); BOOLEAN NTAPI Added: trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c (added) +++ trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -1,0 +1,82 @@ +/* + * PROJECT: ReactOS win32k.sys + * FILE: subsystems/win32/win32k/misc/rtlstr.c + * PURPOSE: Large Strings + * PROGRAMMER: + * UPDATE HISTORY: + * + */ + +/* INCLUDES ******************************************************************/ + +#include <w32k.h> + +/* FUNCTIONS *****************************************************************/ +VOID +NTAPI +RtlInitLargeAnsiString(IN OUT PLARGE_ANSI_STRING DestinationString, + IN PCSZ SourceString, + IN INT Unknown) +{ + ULONG DestSize; + + if (SourceString) + { + DestSize = strlen(SourceString); + DestinationString->Length = DestSize; + DestinationString->MaximumLength = DestSize + sizeof(CHAR); + } + else + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + } + + DestinationString->Buffer = (PCHAR)SourceString; + DestinationString->bAnsi = TRUE; +} + +VOID +NTAPI +RtlInitLargeUnicodeString(IN OUT PLARGE_UNICODE_STRING DestinationString, + IN PCWSTR SourceString, + IN INT Unknown) +{ + ULONG DestSize; + + if (SourceString) + { + DestSize = wcslen(SourceString) * sizeof(WCHAR); + DestinationString->Length = DestSize; + DestinationString->MaximumLength = DestSize + sizeof(WCHAR); + } + else + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + } + + DestinationString->Buffer = (PWSTR)SourceString; + DestinationString->bAnsi = FALSE; +} + +BOOL +NTAPI +RtlLargeStringToUnicodeString( PUNICODE_STRING DestinationString, + PLARGE_STRING SourceString) +{ + ANSI_STRING AnsiString; + + RtlInitUnicodeString(DestinationString, NULL); + if (DestinationString && SourceString && SourceString->bAnsi) + { + RtlInitAnsiString(&AnsiString, (LPSTR)SourceString->Buffer); + return NT_SUCCESS(RtlAnsiStringToUnicodeString(DestinationString, &AnsiString, TRUE)); + } + else if (DestinationString && SourceString) + { + return RtlCreateUnicodeString(DestinationString, SourceString->Buffer); + } + else + return FALSE; +} Propchange: trunk/reactos/subsystems/win32/win32k/misc/rtlstr.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -4531,35 +4531,35 @@ * Status * @implemented */ - BOOL APIENTRY -NtUserDefSetText(HWND hWnd, PUNICODE_STRING WindowText) +NtUserDefSetText(HWND hWnd, PLARGE_STRING WindowText) { PWINDOW_OBJECT Window; PWINDOW Wnd; - UNICODE_STRING SafeText; + LARGE_STRING SafeText; + UNICODE_STRING UnicodeString; BOOL Ret = TRUE; DPRINT("Enter NtUserDefSetText\n"); - RtlInitUnicodeString(&SafeText, NULL); if (WindowText != NULL) { - _SEH2_TRY - { - SafeText = ProbeForReadUnicodeString(WindowText); - ProbeForRead(SafeText.Buffer, SafeText.Length, sizeof(WCHAR)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Ret = FALSE; - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; - - if (!Ret) - return FALSE; - } + _SEH2_TRY + { + SafeText = ProbeForReadLargeString(WindowText); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + SetLastNtError(_SEH2_GetExceptionCode()); + } + _SEH2_END; + + if (!Ret) + return FALSE; + } + else + return TRUE; UserEnterExclusive(); @@ -4570,27 +4570,41 @@ } Wnd = Window->Wnd; - if (SafeText.Length != 0) + // ReactOS uses Unicode and not mixed. Up/Down converting will take time. + // Brought to you by: The Wine Project! Dysfunctional Thought Processes! + // Now we know what the bAnsi is for. + RtlInitUnicodeString(&UnicodeString, NULL); + if (SafeText.Buffer) + { + _SEH2_TRY + { + if (SafeText.bAnsi) + ProbeForRead(SafeText.Buffer, SafeText.Length, sizeof(CHAR)); + else + ProbeForRead(SafeText.Buffer, SafeText.Length, sizeof(WCHAR)); + Ret = RtlLargeStringToUnicodeString(&UnicodeString, &SafeText); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + SetLastNtError(_SEH2_GetExceptionCode()); + } + _SEH2_END; + if (!Ret) goto Exit; + } + + if (UnicodeString.Length != 0) { if (Wnd->WindowName.MaximumLength > 0 && - SafeText.Length <= Wnd->WindowName.MaximumLength - sizeof(UNICODE_NULL)) + UnicodeString.Length <= Wnd->WindowName.MaximumLength - sizeof(UNICODE_NULL)) { ASSERT(Wnd->WindowName.Buffer != NULL); - _SEH2_TRY - { - Wnd->WindowName.Length = SafeText.Length; - Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; - RtlCopyMemory(Wnd->WindowName.Buffer, - SafeText.Buffer, - SafeText.Length); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Ret = FALSE; - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; + Wnd->WindowName.Length = UnicodeString.Length; + Wnd->WindowName.Buffer[UnicodeString.Length / sizeof(WCHAR)] = L'\0'; + RtlCopyMemory(Wnd->WindowName.Buffer, + UnicodeString.Buffer, + UnicodeString.Length); } else { @@ -4604,26 +4618,15 @@ } Wnd->WindowName.Buffer = DesktopHeapAlloc(Wnd->pdesktop, - SafeText.Length + sizeof(UNICODE_NULL)); + UnicodeString.Length + sizeof(UNICODE_NULL)); if (Wnd->WindowName.Buffer != NULL) { - _SEH2_TRY - { - Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; - RtlCopyMemory(Wnd->WindowName.Buffer, - SafeText.Buffer, - SafeText.Length); - Wnd->WindowName.MaximumLength = SafeText.Length + sizeof(UNICODE_NULL); - Wnd->WindowName.Length = SafeText.Length; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Wnd->WindowName.Buffer = NULL; - DesktopHeapFree(Wnd->pdesktop, Wnd->WindowName.Buffer); - Ret = FALSE; - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; + Wnd->WindowName.Buffer[UnicodeString.Length / sizeof(WCHAR)] = L'\0'; + RtlCopyMemory(Wnd->WindowName.Buffer, + UnicodeString.Buffer, + UnicodeString.Length); + Wnd->WindowName.MaximumLength = UnicodeString.Length + sizeof(UNICODE_NULL); + Wnd->WindowName.Length = UnicodeString.Length; } else { @@ -4649,7 +4652,8 @@ } Ret = TRUE; - +Exit: + if (UnicodeString.Buffer) RtlFreeUnicodeString(&UnicodeString); DPRINT("Leave NtUserDefSetText, ret=%i\n", Ret); UserLeave(); return Ret; Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Jan 4 21:34:10 2009 @@ -84,6 +84,7 @@ <file>driver.c</file> <file>err.c</file> <file>math.c</file> + <file>rtlstr.c</file> <file>copy.c</file> <file>usrheap.c</file> <if property="ARCH" value="i386">

1 0

[mjmartin] 38573: - Re-implement Message Type read/write mode as the previous implementation was incorrect. - Fixed bug in Byte Stream mode that caused threads to not wake from a wait. - Implemented NpfsPeekPipe.
by mjmartin＠svn.reactos.org 05 Jan '09

05 Jan '09

Author: mjmartin Date: Sun Jan 4 18:08:43 2009 New Revision: 38573 URL: http://svn.reactos.org/svn/reactos?rev=38573&view=rev Log: - Re-implement Message Type read/write mode as the previous implementation was incorrect. - Fixed bug in Byte Stream mode that caused threads to not wake from a wait. - Implemented NpfsPeekPipe. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sun Jan 4 18:08:43 2009 @@ -5,6 +5,7 @@ * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> * Eric Kohl +* Michael Martin */ /* INCLUDES ******************************************************************/ @@ -368,11 +369,15 @@ PNPFS_FCB Fcb; PNPFS_CCB Ccb; NTSTATUS Status; - - DPRINT1("NpfsPeekPipe\n"); + ULONG MessageCount = 0; + ULONG MessageLength; + ULONG ReadDataAvailable; + PVOID BufferPtr; + + DPRINT("NpfsPeekPipe\n"); OutputBufferLength = IoStack->Parameters.DeviceIoControl.OutputBufferLength; - DPRINT1("OutputBufferLength: %lu\n", OutputBufferLength); + DPRINT("OutputBufferLength: %lu\n", OutputBufferLength); /* Validate parameters */ if (OutputBufferLength < sizeof(FILE_PIPE_PEEK_BUFFER)) @@ -391,16 +396,61 @@ Reply->ReadDataAvailable = Ccb->ReadDataAvailable; DPRINT("ReadDataAvailable: %lu\n", Ccb->ReadDataAvailable); - Reply->NumberOfMessages = 0; /* FIXME */ - Reply->MessageLength = 0; /* FIXME */ - Reply->Data[0] = 0; /* FIXME */ - - // Irp->IoStatus.Information = sizeof(FILE_PIPE_PEEK_BUFFER); - - // Status = STATUS_SUCCESS; - Status = STATUS_NOT_IMPLEMENTED; - - DPRINT1("NpfsPeekPipe done\n"); + if (Ccb->Fcb->ReadMode == FILE_PIPE_BYTE_STREAM_MODE) + { + DPRINT("Byte Stream Mode\n"); + Reply->MessageLength = Ccb->ReadDataAvailable; + DPRINT("Reply->MessageLength %d\n",Reply->MessageLength ); + } + else + { + DPRINT("Message Mode\n"); + ReadDataAvailable=Ccb->ReadDataAvailable; + + if (ReadDataAvailable > 0) + { + memcpy(&Reply->MessageLength,Ccb->Data,sizeof(ULONG)); + BufferPtr = Ccb->Data; + /* NOTE: Modifying the structure in header file to keep track of NumberOfMessage would be better */ + while ((ReadDataAvailable > 0) && (BufferPtr < Ccb->WritePtr)) + { + memcpy(&MessageLength, BufferPtr, sizeof(MessageLength)); + + ASSERT(MessageLength > 0); + + DPRINT("MessageLength = %d\n",MessageLength); + MessageCount++; + ReadDataAvailable -= MessageLength; + + /* If its the first message, copy the Message if the size of buffer is large enough */ + if ((MessageCount==1) && (Reply->Data[0]) + && (OutputBufferLength >= (sizeof(FILE_PIPE_PEEK_BUFFER) + MessageLength))) + { + memcpy(&Reply->Data[0], (PVOID)((ULONG)BufferPtr + sizeof(MessageLength)), MessageLength); + } + BufferPtr =(PVOID)((ULONG)BufferPtr + MessageLength + sizeof(MessageLength)); + DPRINT("Message %d\n",MessageCount); + DPRINT("ReadDataAvailable: %lu\n", ReadDataAvailable); + } + + if (ReadDataAvailable != 0) + { + DPRINT1("This should never happen! Possible memory corruption.\n"); + return STATUS_UNSUCCESSFUL; + } + } + } + + Reply->NumberOfMessages = MessageCount; + if (MessageCount > 0) + Reply->Data[0] = 0; + + Irp->IoStatus.Information = OutputBufferLength; + Irp->IoStatus.Status = STATUS_SUCCESS; + + Status = STATUS_SUCCESS; + + DPRINT("NpfsPeekPipe done\n"); return Status; } Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Sun Jan 4 18:08:43 2009 @@ -4,6 +4,7 @@ * FILE: drivers/fs/np/rw.c * PURPOSE: Named pipe filesystem * PROGRAMMER: David Welch <welch(a)cwcom.net> +* Michael Martin */ /* INCLUDES ******************************************************************/ @@ -300,7 +301,7 @@ KEVENT Event; ULONG Length; ULONG Information = 0; - ULONG CopyLength; + ULONG CopyLength = 0; ULONG TempLength; BOOLEAN IsOriginalRequest = TRUE; PVOID Buffer; @@ -316,12 +317,16 @@ } FileObject = IoGetCurrentIrpStackLocation(Irp)->FileObject; + DPRINT("FileObject %p\n", FileObject); + DPRINT("Pipe name %wZ\n", &FileObject->FileName); Ccb = FileObject->FsContext2; Context = (PNPFS_CONTEXT)&Irp->Tail.Overlay.DriverContext; - if (Ccb->OtherSide == NULL) - { - DPRINT("Pipe is NOT connected!\n"); + if ((Ccb->OtherSide == NULL) && (Ccb->ReadDataAvailable == 0)) + { + /* Its ok if the other side has been Disconnect, but if we have data still in the buffer + , need to still be able to read it. Currently this is a HAXXXX */ + DPRINT1("Pipe is NO longer connected and no data exist in buffer!\n"); if (Ccb->PipeState == FILE_PIPE_LISTENING_STATE) Status = STATUS_PIPE_LISTENING; else if (Ccb->PipeState == FILE_PIPE_DISCONNECTED_STATE) @@ -420,7 +425,7 @@ { break; } - if (Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) + if ((Ccb->PipeState != FILE_PIPE_CONNECTED_STATE) && (Ccb->ReadDataAvailable == 0)) { DPRINT("PipeState: %x\n", Ccb->PipeState); Status = STATUS_PIPE_BROKEN; @@ -450,7 +455,7 @@ if (NT_SUCCESS(Status)) { Status = STATUS_PENDING; - goto done; + goto done; } ExAcquireFastMutex(&Ccb->DataListLock); break; @@ -489,7 +494,7 @@ Ccb->WriteQuotaAvailable += CopyLength; } - if (Length == 0) + if ((Length == 0) || (Ccb->ReadDataAvailable == 0)) { if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) { @@ -503,37 +508,82 @@ { DPRINT("Message mode\n"); - /* Message mode */ + /* For Message mode, the Message length will be stored in the buffer preceeding the Message. */ + if (Ccb->ReadDataAvailable) { - /* Truncate the message if the receive buffer is too small */ - CopyLength = min(Ccb->ReadDataAvailable, Length); - memcpy(Buffer, Ccb->Data, CopyLength); - + ULONG NextMessageLength=0; + //HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); + + /*First get the size of the message */ + memcpy(&NextMessageLength, Ccb->Data, sizeof(NextMessageLength)); + + if (NextMessageLength == 0) + { + DPRINT1("This should never happen! Possible memory corruption.\n"); #ifndef NDEBUG - DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); - HexDump((PUCHAR)Buffer, CopyLength); + HexDump(Ccb->Data, (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data); #endif - - Information = CopyLength; - - if (Ccb->ReadDataAvailable > Length) + break; + } + + /* Use the smaller value */ + CopyLength = min(NextMessageLength, Length); + /* retrieve the message from the buffer */ + memcpy(Buffer, (PVOID)((ULONG)Ccb->Data + sizeof(NextMessageLength)), CopyLength); + + + if (Ccb->ReadDataAvailable > CopyLength) { - memmove(Ccb->Data, (PVOID)((ULONG_PTR)Ccb->Data + Length), - Ccb->ReadDataAvailable - Length); - Ccb->ReadDataAvailable -= Length; - Status = STATUS_MORE_ENTRIES; + if (CopyLength < NextMessageLength) + { + /* Client only requested part of the message */ + + /* Calculate the remaining message new size */ + ULONG NewMessageSize = NextMessageLength-CopyLength; + /* Write a new Message size to buffer for the part of the message still there */ + memcpy(Ccb->Data, &NewMessageSize, sizeof(NewMessageSize)); + + /* Move the memory starting from end of partial Message just retrieved */ + memmove((PVOID)((ULONG_PTR)Ccb->Data + sizeof(NewMessageSize)), + (PVOID)((ULONG_PTR) Ccb->Data + CopyLength + sizeof(NewMessageSize)), + (ULONG)Ccb->WritePtr - ((ULONG)Ccb->Data + sizeof(NewMessageSize)) - CopyLength); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - CopyLength); + } + else + { + /* Client wanted the entire message */ + /* Move the memory starting from the next Message just retrieved */ + memmove(Ccb->Data, + (PVOID)((ULONG_PTR) Ccb->Data + NextMessageLength + sizeof(NextMessageLength)), + (ULONG)Ccb->WritePtr - (ULONG)Ccb->Data - NextMessageLength - sizeof(NextMessageLength)); + + /* Update the write pointer */ + Ccb->WritePtr = (PVOID)((ULONG)Ccb->WritePtr - NextMessageLength); + } } else { + /* This was the last Message, so just zero this messages for safety sake */ + memset(Ccb->Data,0,NextMessageLength + sizeof(NextMessageLength)); + /* reset the write pointer */ + Ccb->WritePtr = Ccb->Data; KeResetEvent(&Ccb->ReadEvent); if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) { KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } - Ccb->ReadDataAvailable = 0; - Ccb->WriteQuotaAvailable = Ccb->MaxDataLength; } +#ifndef NDEBUG + DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); + HexDump((PUCHAR)Buffer, CopyLength); +#endif + + Information += CopyLength; + Ccb->WriteQuotaAvailable +=CopyLength; + Ccb->ReadDataAvailable -= CopyLength; } if (Information > 0) @@ -708,9 +758,11 @@ if (Fcb->WriteMode == FILE_PIPE_BYTE_STREAM_MODE) { DPRINT("Byte stream mode\n"); + while (Length > 0 && ReaderCcb->WriteQuotaAvailable > 0) { CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable); + if ((ULONG_PTR)ReaderCcb->WritePtr + CopyLength <= (ULONG_PTR)ReaderCcb->Data + ReaderCcb->MaxDataLength) { memcpy(ReaderCcb->WritePtr, Buffer, CopyLength); @@ -745,15 +797,23 @@ } else { + /* For Message Type Pipe, the Pipes memory will be used to store the size of each message */ + /* FIXME: Check and verify ReadMode ByteStream */ DPRINT("Message mode\n"); if (Length > 0) { CopyLength = min(Length, ReaderCcb->WriteQuotaAvailable); - memcpy(ReaderCcb->Data, Buffer, CopyLength); - - Information = CopyLength; - ReaderCcb->ReadDataAvailable = CopyLength; - ReaderCcb->WriteQuotaAvailable = 0; + /* First Copy the Length of the message into the pipes buffer */ + memcpy(ReaderCcb->WritePtr, &CopyLength, sizeof(CopyLength)); + /* Now the user buffer itself */ + memcpy((PVOID)((ULONG)ReaderCcb->WritePtr+ sizeof(CopyLength)), Buffer, CopyLength); + /* Update the write pointer */ + ReaderCcb->WritePtr = (PVOID)((ULONG)ReaderCcb->WritePtr + sizeof(CopyLength) + CopyLength); + + Information += CopyLength; + + ReaderCcb->ReadDataAvailable += CopyLength; + ReaderCcb->WriteQuotaAvailable -= CopyLength; } if (Information > 0)

1 0

[weiden] 38572: Copying the string in NtUserDefSetText () must be protected with SEH, probing alone is not sufficient.
by weiden＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: weiden Date: Sun Jan 4 16:20:19 2009 New Revision: 38572 URL: http://svn.reactos.org/svn/reactos?rev=38572&view=rev Log: Copying the string in NtUserDefSetText () must be protected with SEH, probing alone is not sufficient. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Sun Jan 4 16:20:19 2009 @@ -4577,11 +4577,20 @@ { ASSERT(Wnd->WindowName.Buffer != NULL); - Wnd->WindowName.Length = SafeText.Length; - Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; - RtlCopyMemory(Wnd->WindowName.Buffer, - SafeText.Buffer, - SafeText.Length); + _SEH2_TRY + { + Wnd->WindowName.Length = SafeText.Length; + Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; + RtlCopyMemory(Wnd->WindowName.Buffer, + SafeText.Buffer, + SafeText.Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Ret = FALSE; + SetLastNtError(_SEH2_GetExceptionCode()); + } + _SEH2_END; } else { @@ -4598,12 +4607,23 @@ SafeText.Length + sizeof(UNICODE_NULL)); if (Wnd->WindowName.Buffer != NULL) { - Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; - RtlCopyMemory(Wnd->WindowName.Buffer, - SafeText.Buffer, - SafeText.Length); - Wnd->WindowName.MaximumLength = SafeText.Length + sizeof(UNICODE_NULL); - Wnd->WindowName.Length = SafeText.Length; + _SEH2_TRY + { + Wnd->WindowName.Buffer[SafeText.Length / sizeof(WCHAR)] = L'\0'; + RtlCopyMemory(Wnd->WindowName.Buffer, + SafeText.Buffer, + SafeText.Length); + Wnd->WindowName.MaximumLength = SafeText.Length + sizeof(UNICODE_NULL); + Wnd->WindowName.Length = SafeText.Length; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Wnd->WindowName.Buffer = NULL; + DesktopHeapFree(Wnd->pdesktop, Wnd->WindowName.Buffer); + Ret = FALSE; + SetLastNtError(_SEH2_GetExceptionCode()); + } + _SEH2_END; } else {

1 0

[tkreuzer] 38571: Add tests for CreateFontIndirect
by tkreuzer＠svn.reactos.org 04 Jan '09

04 Jan '09

Author: tkreuzer Date: Sun Jan 4 15:48:32 2009 New Revision: 38571 URL: http://svn.reactos.org/svn/reactos?rev=38571&view=rev Log: Add tests for CreateFontIndirect Added: trunk/rostests/apitests/gdi32api/tests/CreateFontIndirect.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Sun Jan 4 15:48:32 2009 @@ -9,6 +9,7 @@ #include "tests/BeginPath.c" #include "tests/CreateBitmapIndirect.c" #include "tests/CreateCompatibleDC.c" +#include "tests/CreateFontIndirect.c" #include "tests/CreateFont.c" #include "tests/CreatePen.c" #include "tests/CreateRectRgn.c" @@ -50,6 +51,7 @@ { L"BeginPath", Test_BeginPath }, { L"CreateBitmapIndirect", Test_CreateBitmapIndirect }, { L"CreateCompatibleDC", Test_CreateCompatibleDC }, + { L"CreateFontIndirect", Test_CreateFontIndirect }, { L"CreateFont", Test_CreateFont }, { L"CreatePen", Test_CreatePen }, { L"EngCreateSemaphore", Test_EngCreateSemaphore }, Added: trunk/rostests/apitests/gdi32api/tests/CreateFontIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreateFontIndirect.c (added) +++ trunk/rostests/apitests/gdi32api/tests/CreateFontIndirect.c [iso-8859-1] Sun Jan 4 15:48:32 2009 @@ -1,0 +1,180 @@ + +INT +Test_CreateFontIndirectA(PTESTINFO pti) +{ + LOGFONTA logfont; + HFONT hFont; + ULONG ret; + ENUMLOGFONTEXDVW elfedv2; + + logfont.lfHeight = 12; + logfont.lfWidth = 0; + logfont.lfEscapement = 0; + logfont.lfOrientation = 0; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 0; + logfont.lfUnderline = 0; + logfont.lfStrikeOut = 0; + logfont.lfCharSet = DEFAULT_CHARSET; + logfont.lfOutPrecision = OUT_DEFAULT_PRECIS; + logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logfont.lfQuality = PROOF_QUALITY; + logfont.lfPitchAndFamily = DEFAULT_PITCH; + memset(logfont.lfFaceName, 'A', LF_FACESIZE); + hFont = CreateFontIndirectA(&logfont); + TEST(hFont != 0); + + memset(&elfedv2, 0, sizeof(elfedv2)); + ret = GetObjectW(hFont, sizeof(elfedv2), &elfedv2); + TEST(ret == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD)); + TEST(elfedv2.elfEnumLogfontEx.elfLogFont.lfFaceName[LF_FACESIZE-1] == 0); + TEST(elfedv2.elfEnumLogfontEx.elfFullName[0] == 0); + + return APISTATUS_NORMAL; +} + +INT +Test_CreateFontIndirectW(PTESTINFO pti) +{ + LOGFONTW logfont; + HFONT hFont; + ULONG ret; + ENUMLOGFONTEXDVW elfedv2; + + logfont.lfHeight = 12; + logfont.lfWidth = 0; + logfont.lfEscapement = 0; + logfont.lfOrientation = 0; + logfont.lfWeight = FW_NORMAL; + logfont.lfItalic = 0; + logfont.lfUnderline = 0; + logfont.lfStrikeOut = 0; + logfont.lfCharSet = DEFAULT_CHARSET; + logfont.lfOutPrecision = OUT_DEFAULT_PRECIS; + logfont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logfont.lfQuality = PROOF_QUALITY; + logfont.lfPitchAndFamily = DEFAULT_PITCH; + memset(logfont.lfFaceName, 'A', LF_FACESIZE * 2); + hFont = CreateFontIndirectW(&logfont); + TEST(hFont != 0); + + memset(&elfedv2, 0, sizeof(elfedv2)); + ret = GetObjectW(hFont, sizeof(elfedv2), &elfedv2); + TEST(ret == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD)); + TEST(elfedv2.elfEnumLogfontEx.elfLogFont.lfFaceName[LF_FACESIZE-1] == ((WCHAR)'A' << 8) + 'A'); + TEST(elfedv2.elfEnumLogfontEx.elfFullName[0] == 0); + /* Theres a bunch of data in elfFullName ... */ + + return APISTATUS_NORMAL; +} + +INT +Test_CreateFontIndirectExA(PTESTINFO pti) +{ + ENUMLOGFONTEXDVA elfedva, elfedva2; + ENUMLOGFONTEXDVW elfedvw; + ENUMLOGFONTEXA *penumlfa; + LOGFONTA *plogfonta; + HFONT hFont; + ULONG ret; + + memset(&elfedva, 0, sizeof(elfedva)); + penumlfa = &elfedva.elfEnumLogfontEx; + plogfonta = &elfedva.elfEnumLogfontEx.elfLogFont; + + plogfonta->lfHeight = 12; + plogfonta->lfWidth = 0; + plogfonta->lfEscapement = 0; + plogfonta->lfOrientation = 0; + plogfonta->lfWeight = FW_NORMAL; + plogfonta->lfItalic = 0; + plogfonta->lfUnderline = 0; + plogfonta->lfStrikeOut = 0; + plogfonta->lfCharSet = DEFAULT_CHARSET; + plogfonta->lfOutPrecision = OUT_DEFAULT_PRECIS; + plogfonta->lfClipPrecision = CLIP_DEFAULT_PRECIS; + plogfonta->lfQuality = PROOF_QUALITY; + plogfonta->lfPitchAndFamily = DEFAULT_PITCH; + + memset(plogfonta->lfFaceName, 'A', LF_FACESIZE * sizeof(WCHAR)); + memset(penumlfa->elfFullName, 'B', LF_FULLFACESIZE * sizeof(WCHAR)); + + hFont = CreateFontIndirectExA(&elfedva); + TEST(hFont != 0); + + ret = GetObjectW(hFont, sizeof(elfedvw), &elfedvw); + TEST(ret == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD)); + TEST(elfedvw.elfEnumLogfontEx.elfLogFont.lfFaceName[LF_FACESIZE-1] == 0); + TEST(elfedvw.elfEnumLogfontEx.elfFullName[LF_FULLFACESIZE-1] == 0); + + memset(&elfedva2, 0, sizeof(elfedva2)); + ret = GetObjectA(hFont, sizeof(elfedva2), &elfedva2); + TEST(ret == sizeof(ENUMLOGFONTEXDVA)); + TEST(elfedva2.elfEnumLogfontEx.elfLogFont.lfFaceName[LF_FACESIZE-1] == 0); + TEST(elfedva2.elfEnumLogfontEx.elfFullName[LF_FULLFACESIZE-1] == 0); + + return APISTATUS_NORMAL; +} + +INT +Test_CreateFontIndirectExW(PTESTINFO pti) +{ + ENUMLOGFONTEXDVW elfedv, elfedv2; + ENUMLOGFONTEXDVA elfedva; + ENUMLOGFONTEXW *penumlfw; + LOGFONTW *plogfontw; + HFONT hFont; + ULONG ret; + + memset(&elfedv, 0, sizeof(elfedv)); + penumlfw = &elfedv.elfEnumLogfontEx; + plogfontw = &elfedv.elfEnumLogfontEx.elfLogFont; + + plogfontw->lfHeight = 12; + plogfontw->lfWidth = 0; + plogfontw->lfEscapement = 0; + plogfontw->lfOrientation = 0; + plogfontw->lfWeight = FW_NORMAL; + plogfontw->lfItalic = 0; + plogfontw->lfUnderline = 0; + plogfontw->lfStrikeOut = 0; + plogfontw->lfCharSet = DEFAULT_CHARSET; + plogfontw->lfOutPrecision = OUT_DEFAULT_PRECIS; + plogfontw->lfClipPrecision = CLIP_DEFAULT_PRECIS; + plogfontw->lfQuality = PROOF_QUALITY; + plogfontw->lfPitchAndFamily = DEFAULT_PITCH; + + memset(plogfontw->lfFaceName, 'A', LF_FACESIZE * sizeof(WCHAR)); + memset(penumlfw->elfFullName, 'B', LF_FULLFACESIZE * sizeof(WCHAR)); + + hFont = CreateFontIndirectExW(&elfedv); + TEST(hFont != 0); + + memset(&elfedv2, 0, sizeof(elfedv2)); + ret = GetObjectW(hFont, sizeof(elfedv2), &elfedv2); + TEST(ret == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD)); + TEST(elfedv2.elfEnumLogfontEx.elfLogFont.lfFaceName[LF_FACESIZE-1] == ((WCHAR)'A' << 8) + 'A'); + TEST(elfedv2.elfEnumLogfontEx.elfFullName[LF_FULLFACESIZE-1] == ((WCHAR)'B' << 8) + 'B'); + + memset(&elfedva, 0, sizeof(elfedva)); + ret = GetObjectA(hFont, sizeof(elfedva), &elfedva); + TEST(ret == sizeof(ENUMLOGFONTEXDVA)); + TEST(elfedva.elfEnumLogfontEx.elfLogFont.lfFaceName[LF_FACESIZE-1] == '?'); + TEST(elfedva.elfEnumLogfontEx.elfFullName[LF_FULLFACESIZE-1] == 0); + + return APISTATUS_NORMAL; +} + + +INT +Test_CreateFontIndirect(PTESTINFO pti) +{ + + Test_CreateFontIndirectA(pti); + Test_CreateFontIndirectW(pti); + Test_CreateFontIndirectExA(pti); + Test_CreateFontIndirectExW(pti); + + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/CreateFontIndirect.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009