Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28009: Show the building startup time in Title now.
by dreimer＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: dreimer Date: Sun Jul 29 19:33:09 2007 New Revision: 28009 URL: http://svn.reactos.org/svn/reactos?rev=28009&view=rev Log: Show the building startup time in Title now. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Sun Jul 29 19:33:09 2007 @@ -77,17 +77,21 @@ :: if %ROSBE_SHOWTIME% == 1 ( if %ROSBE_WRITELOG% == 1 ( + title Started: %TIMERAW%, Building... call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) if %ROSBE_WRITELOG% == 0 ( + title Started: %TIMERAW%, Building... call buildtime "%MAKE_COMMAND%" 2>&1 ) ) if %ROSBE_SHOWTIME% == 0 ( if %ROSBE_WRITELOG% == 1 ( + title Started: %TIMERAW%, Building... call "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) if %ROSBE_WRITELOG% == 0 ( + title Started: %TIMERAW%, Building... call "%MAKE_COMMAND%" 2>&1 ) )

1 0

[dreimer] 28008: Finally fix the two "\" Problem.
by dreimer＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: dreimer Date: Sun Jul 29 19:21:33 2007 New Revision: 28008 URL: http://svn.reactos.org/svn/reactos?rev=28008&view=rev Log: Finally fix the two "\" Problem. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Jul 29 19:21:33 2007 @@ -16,6 +16,9 @@ color 0A set _VER=0.3.8 set ROSBEBASEDIR=%~dp0 +echo %ROSBEBASEDIR%|%ROSBEBASEDIR%Tools\sed "s/.$//g" > "C:\aaa.tmp" +set /P ROSBEBASEDIR=< "C:\aaa.tmp" +del "C:\aaa.tmp" set ROSBE_SHOWTIME=1 set ROSBE_WRITELOG=1 set _LOGDIR=%CD%\RosBE-Logs

1 0

[cfinck] 28007: Merge down r27781:r27789
by cfinck＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: cfinck Date: Sun Jul 29 19:05:09 2007 New Revision: 28007 URL: http://svn.reactos.org/svn/reactos?rev=28007&view=rev Log: Merge down r27781:r27789 Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/advanced.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/environment.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/general.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardprof.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardware.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/licence.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/resources/gpl.txt branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/sysdm.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/userprofile.c branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/virtmem.c Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/advanced.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/advanced.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/advanced.c Sun Jul 29 19:05:09 2007 @@ -24,7 +24,7 @@ switch (uMsg) { case WM_INITDIALOG: - break; + break; case WM_COMMAND: { @@ -76,11 +76,10 @@ SW_SHOWNORMAL); } break; - } } - break; + break; } return FALSE; } Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/environment.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/environment.c Sun Jul 29 19:05:09 2007 @@ -12,11 +12,10 @@ typedef struct _VARIABLE_DATA { - LPTSTR lpName; - LPTSTR lpRawValue; - LPTSTR lpCookedValue; + LPTSTR lpName; + LPTSTR lpRawValue; + LPTSTR lpCookedValue; } VARIABLE_DATA, *PVARIABLE_DATA; - INT_PTR CALLBACK @@ -25,573 +24,574 @@ WPARAM wParam, LPARAM lParam) { - PVARIABLE_DATA VarData; - DWORD dwNameLength; - DWORD dwValueLength; - - VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); - - switch (uMsg) - { - case WM_INITDIALOG: - SetWindowLongPtr(hwndDlg, GWL_USERDATA, (LONG_PTR)lParam); - VarData = (PVARIABLE_DATA)lParam; - - if (VarData->lpName != NULL) - { - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_SETTEXT, 0, (LPARAM)VarData->lpName); - } - - if (VarData->lpRawValue != NULL) - { - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_SETTEXT, 0, (LPARAM)VarData->lpRawValue); - } - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); - dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); - if (dwNameLength != 0 && dwValueLength != 0) - { - if (VarData->lpName == NULL) - { - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - } - else if (_tcslen(VarData->lpName) < dwNameLength) - { - GlobalFree(VarData->lpName); - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - } - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXT, dwNameLength + 1, (LPARAM)VarData->lpName); - - if (VarData->lpRawValue == NULL) - { - VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); - } - else if (_tcslen(VarData->lpRawValue) < dwValueLength) - { - GlobalFree(VarData->lpRawValue); - VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); - } - SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); - - if (_tcschr(VarData->lpRawValue, _T('%'))) - { - if (VarData->lpCookedValue == NULL) - { - VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); - } - - ExpandEnvironmentStrings(VarData->lpRawValue, - VarData->lpCookedValue, - 2 * MAX_PATH); - } - else if (VarData->lpCookedValue) - { - GlobalFree(VarData->lpCookedValue); - } - } - EndDialog(hwndDlg, 1); - return TRUE; - - case IDCANCEL: - EndDialog(hwndDlg, 0); - return TRUE; - } - break; - } - - return FALSE; + PVARIABLE_DATA VarData; + DWORD dwNameLength; + DWORD dwValueLength; + + VarData = (PVARIABLE_DATA)GetWindowLongPtr(hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (LONG_PTR)lParam); + VarData = (PVARIABLE_DATA)lParam; + + if (VarData->lpName != NULL) + { + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_SETTEXT, 0, (LPARAM)VarData->lpName); + } + + if (VarData->lpRawValue != NULL) + { + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_SETTEXT, 0, (LPARAM)VarData->lpRawValue); + } + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + dwNameLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXTLENGTH, 0, 0); + dwValueLength = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXTLENGTH, 0, 0); + if (dwNameLength != 0 && dwValueLength != 0) + { + if (VarData->lpName == NULL) + { + VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + } + else if (_tcslen(VarData->lpName) < dwNameLength) + { + GlobalFree(VarData->lpName); + VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + } + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_NAME, WM_GETTEXT, dwNameLength + 1, (LPARAM)VarData->lpName); + + if (VarData->lpRawValue == NULL) + { + VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + } + else if (_tcslen(VarData->lpRawValue) < dwValueLength) + { + GlobalFree(VarData->lpRawValue); + VarData->lpRawValue = GlobalAlloc(GPTR, (dwValueLength + 1) * sizeof(TCHAR)); + } + SendDlgItemMessage(hwndDlg, IDC_VARIABLE_VALUE, WM_GETTEXT, dwValueLength + 1, (LPARAM)VarData->lpRawValue); + + if (_tcschr(VarData->lpRawValue, _T('%'))) + { + if (VarData->lpCookedValue == NULL) + { + VarData->lpCookedValue = GlobalAlloc(GPTR, 2 * MAX_PATH * sizeof(TCHAR)); + } + + ExpandEnvironmentStrings(VarData->lpRawValue, + VarData->lpCookedValue, + 2 * MAX_PATH); + } + else if (VarData->lpCookedValue) + { + GlobalFree(VarData->lpCookedValue); + } + } + EndDialog(hwndDlg, 1); + return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + } + + return FALSE; } static VOID SetEnvironmentVariables(HWND hwndListView, - HKEY hRootKey, - LPTSTR lpSubKeyName) -{ - HKEY hKey; - DWORD dwValues; - DWORD dwMaxValueNameLength; - DWORD dwMaxValueDataLength; - DWORD i; - LPTSTR lpName; - LPTSTR lpData; - LPTSTR lpExpandData = NULL; - DWORD dwNameLength; - DWORD dwDataLength; - DWORD dwType; - PVARIABLE_DATA VarData; - - LV_ITEM lvi; - int iItem; - - if (RegOpenKeyEx(hRootKey, - lpSubKeyName, - 0, - KEY_READ, - &hKey)) - return; - - if (RegQueryInfoKey(hKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueDataLength, - NULL, - NULL)) - { - RegCloseKey(hKey); - return; - } - - lpName = GlobalAlloc(GPTR, (dwMaxValueNameLength + 1) * sizeof(TCHAR)); - if (lpName == NULL) - { - RegCloseKey(hKey); - return; - } - - lpData = GlobalAlloc(GPTR, (dwMaxValueDataLength + 1) * sizeof(TCHAR)); - if (lpData == NULL) - { - GlobalFree(lpData); - RegCloseKey(hKey); - return; - } - - for (i = 0; i < dwValues; i++) - { - dwNameLength = dwMaxValueNameLength + 1; - dwDataLength = dwMaxValueDataLength + 1; - if (RegEnumValue(hKey, - i, - lpName, - &dwNameLength, - NULL, - &dwType, - (LPBYTE)lpData, - &dwDataLength)) - { - GlobalFree(lpName); - GlobalFree(lpData); - RegCloseKey(hKey); - return; - } - - VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); - - VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpName, lpName); - - VarData->lpRawValue = GlobalAlloc(GPTR, (dwDataLength + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpRawValue, lpData); - - if (dwType == REG_EXPAND_SZ) - { - lpExpandData = GlobalAlloc(GPTR, MAX_PATH * 2* sizeof(TCHAR)); - if (lpExpandData == NULL) - { - GlobalFree(lpName); + HKEY hRootKey, + LPTSTR lpSubKeyName) +{ + HKEY hKey; + DWORD dwValues; + DWORD dwMaxValueNameLength; + DWORD dwMaxValueDataLength; + DWORD i; + LPTSTR lpName; + LPTSTR lpData; + LPTSTR lpExpandData = NULL; + DWORD dwNameLength; + DWORD dwDataLength; + DWORD dwType; + PVARIABLE_DATA VarData; + + LV_ITEM lvi; + int iItem; + + if (RegOpenKeyEx(hRootKey, + lpSubKeyName, + 0, + KEY_READ, + &hKey)) + return; + + if (RegQueryInfoKey(hKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueDataLength, + NULL, + NULL)) + { + RegCloseKey(hKey); + return; + } + + lpName = GlobalAlloc(GPTR, (dwMaxValueNameLength + 1) * sizeof(TCHAR)); + if (lpName == NULL) + { + RegCloseKey(hKey); + return; + } + + lpData = GlobalAlloc(GPTR, (dwMaxValueDataLength + 1) * sizeof(TCHAR)); + if (lpData == NULL) + { GlobalFree(lpData); RegCloseKey(hKey); return; - } - - ExpandEnvironmentStrings(lpData, - lpExpandData, - 2 * MAX_PATH); - - VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); - _tcscpy(VarData->lpCookedValue, lpExpandData); - GlobalFree(lpExpandData); + } + + for (i = 0; i < dwValues; i++) + { + dwNameLength = dwMaxValueNameLength + 1; + dwDataLength = dwMaxValueDataLength + 1; + + if (RegEnumValue(hKey, + i, + lpName, + &dwNameLength, + NULL, + &dwType, + (LPBYTE)lpData, + &dwDataLength)) + { + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); + return; + } + + VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + + VarData->lpName = GlobalAlloc(GPTR, (dwNameLength + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpName, lpName); + + VarData->lpRawValue = GlobalAlloc(GPTR, (dwDataLength + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpRawValue, lpData); + + if (dwType == REG_EXPAND_SZ) + { + lpExpandData = GlobalAlloc(GPTR, MAX_PATH * 2* sizeof(TCHAR)); + if (lpExpandData == NULL) + { + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); + return; + } + + ExpandEnvironmentStrings(lpData, + lpExpandData, + 2 * MAX_PATH); + + VarData->lpCookedValue = GlobalAlloc(GPTR, (_tcslen(lpExpandData) + 1) * sizeof(TCHAR)); + _tcscpy(VarData->lpCookedValue, lpExpandData); + GlobalFree(lpExpandData); + } + + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; + lvi.lParam = (LPARAM)VarData; + lvi.pszText = VarData->lpName; + lvi.state = (i == 0) ? LVIS_SELECTED : 0; + iItem = ListView_InsertItem(hwndListView, &lvi); + + ListView_SetItemText(hwndListView, iItem, 1, + (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + } + + GlobalFree(lpName); + GlobalFree(lpData); + RegCloseKey(hKey); +} + + +static VOID +SetListViewColumns(HWND hwndListView) +{ + RECT rect; + LV_COLUMN column; + TCHAR szStr[32]; + + GetClientRect(hwndListView, &rect); + + memset(&column, 0x00, sizeof(column)); + column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; + column.fmt=LVCFMT_LEFT; + column.cx = (INT)((rect.right - rect.left) * 0.32); + column.iSubItem = 0; + LoadString(hApplet, IDS_VARIABLE, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 0, &column); + + column.cx = (INT)((rect.right - rect.left) * 0.63); + column.iSubItem = 1; + LoadString(hApplet, IDS_VALUE, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; + (void)ListView_InsertColumn(hwndListView, 1, &column); +} + + +static VOID +OnInitDialog(HWND hwndDlg) +{ + HWND hwndListView; + + /* Set user environment variables */ + hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); + + SetListViewColumns(hwndListView); + + SetEnvironmentVariables(hwndListView, + HKEY_CURRENT_USER, + _T("Environment")); + + (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + (void)ListView_Update(hwndListView,0); + + + /* Set system environment variables */ + hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + + SetListViewColumns(hwndListView); + + SetEnvironmentVariables(hwndListView, + HKEY_LOCAL_MACHINE, + _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); + + (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); + (void)ListView_Update(hwndListView,0); +} + + +VOID +OnNewVariable(HWND hwndDlg, + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + int iItem; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); + + if (!DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_EDIT_VARIABLE), + hwndDlg, + (DLGPROC) EditVariableDlgProc, + (LPARAM)VarData) > 0) + { + if (VarData->lpName != NULL) + GlobalFree(VarData->lpName); + + if (VarData->lpRawValue != NULL) + GlobalFree(VarData->lpRawValue); + + if (VarData->lpCookedValue != NULL) + GlobalFree(VarData->lpCookedValue); + + GlobalFree(VarData); } memset(&lvi, 0x00, sizeof(lvi)); lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; lvi.lParam = (LPARAM)VarData; lvi.pszText = VarData->lpName; - lvi.state = (i == 0) ? LVIS_SELECTED : 0; + lvi.state = 0; iItem = ListView_InsertItem(hwndListView, &lvi); ListView_SetItemText(hwndListView, iItem, 1, (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); - } - - GlobalFree(lpName); - GlobalFree(lpData); - RegCloseKey(hKey); -} - - -static VOID -SetListViewColumns(HWND hwndListView) -{ - RECT rect; - LV_COLUMN column; - TCHAR szStr[32]; - - GetClientRect(hwndListView, &rect); - - memset(&column, 0x00, sizeof(column)); - column.mask=LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT; - column.fmt=LVCFMT_LEFT; - column.cx = (INT)((rect.right - rect.left) * 0.32); - column.iSubItem = 0; - LoadString(hApplet, IDS_VARIABLE, szStr, sizeof(szStr) / sizeof(szStr[0])); - column.pszText = szStr; - (void)ListView_InsertColumn(hwndListView, 0, &column); - - column.cx = (INT)((rect.right - rect.left) * 0.63); - column.iSubItem = 1; - LoadString(hApplet, IDS_VALUE, szStr, sizeof(szStr) / sizeof(szStr[0])); - column.pszText = szStr; - (void)ListView_InsertColumn(hwndListView, 1, &column); -} - - -static VOID -OnInitDialog(HWND hwndDlg) -{ - HWND hwndListView; - - /* Set user environment variables */ - hwndListView = GetDlgItem(hwndDlg, IDC_USER_VARIABLE_LIST); - - SetListViewColumns(hwndListView); - - SetEnvironmentVariables(hwndListView, - HKEY_CURRENT_USER, - _T("Environment")); - - (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - (void)ListView_Update(hwndListView,0); - - - /* Set system environment variables */ - hwndListView = GetDlgItem(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - - SetListViewColumns(hwndListView); - - SetEnvironmentVariables(hwndListView, - HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment")); - - (void)ListView_SetColumnWidth(hwndListView,2,LVSCW_AUTOSIZE_USEHEADER); - (void)ListView_Update(hwndListView,0); -} - - -VOID -OnNewVariable(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - int iItem; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA)); - - if (!DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_EDIT_VARIABLE), - hwndDlg, - (DLGPROC) EditVariableDlgProc, - (LPARAM)VarData) > 0) - { - if (VarData->lpName != NULL) - GlobalFree(VarData->lpName); - - if (VarData->lpRawValue != NULL) - GlobalFree(VarData->lpRawValue); - - if (VarData->lpCookedValue != NULL) - GlobalFree(VarData->lpCookedValue); - - GlobalFree(VarData); - } - - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_TEXT | LVIF_STATE | LVIF_PARAM; - lvi.lParam = (LPARAM)VarData; - lvi.pszText = VarData->lpName; - lvi.state = 0; - iItem = ListView_InsertItem(hwndListView, &lvi); - - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); } VOID OnEditVariable(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - int iItem; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - iItem = ListView_GetSelectionMark(hwndListView); - if (iItem != -1) - { - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_PARAM; - lvi.iItem = iItem; - - if (ListView_GetItem(hwndListView, &lvi)) - { - VarData = (PVARIABLE_DATA)lvi.lParam; - - if (DialogBoxParam(hApplet, - MAKEINTRESOURCE(IDD_EDIT_VARIABLE), - hwndDlg, - (DLGPROC) EditVariableDlgProc, - (LPARAM)VarData) > 0) - { - ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); - ListView_SetItemText(hwndListView, iItem, 1, - (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); - } - } - } + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + int iItem; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + iItem = ListView_GetSelectionMark(hwndListView); + if (iItem != -1) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + if (ListView_GetItem(hwndListView, &lvi)) + { + VarData = (PVARIABLE_DATA)lvi.lParam; + + if (DialogBoxParam(hApplet, + MAKEINTRESOURCE(IDD_EDIT_VARIABLE), + hwndDlg, + (DLGPROC) EditVariableDlgProc, + (LPARAM)VarData) > 0) + { + ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); + ListView_SetItemText(hwndListView, iItem, 1, + (VarData->lpCookedValue) ? VarData->lpCookedValue : VarData->lpRawValue); + } + } + } } VOID OnDeleteVariable(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - int iItem; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - iItem = ListView_GetSelectionMark(hwndListView); - if (iItem != -1) - { - memset(&lvi, 0x00, sizeof(lvi)); - lvi.mask = LVIF_PARAM; - lvi.iItem = iItem; - - if (ListView_GetItem(hwndListView, &lvi)) - { - VarData = (PVARIABLE_DATA)lvi.lParam; - if (VarData != NULL) - { - if (VarData->lpName != NULL) - GlobalFree(VarData->lpName); - - if (VarData->lpRawValue != NULL) - GlobalFree(VarData->lpRawValue); - - if (VarData->lpCookedValue != NULL) - GlobalFree(VarData->lpCookedValue); - - GlobalFree(VarData); - lvi.lParam = 0; - } - } - - (void)ListView_DeleteItem(hwndListView, iItem); - } + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + int iItem; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + iItem = ListView_GetSelectionMark(hwndListView); + if (iItem != -1) + { + memset(&lvi, 0x00, sizeof(lvi)); + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + if (ListView_GetItem(hwndListView, &lvi)) + { + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + if (VarData->lpName != NULL) + GlobalFree(VarData->lpName); + + if (VarData->lpRawValue != NULL) + GlobalFree(VarData->lpRawValue); + + if (VarData->lpCookedValue != NULL) + GlobalFree(VarData->lpCookedValue); + + GlobalFree(VarData); + lvi.lParam = 0; + } + } + + (void)ListView_DeleteItem(hwndListView, iItem); + } } VOID ReleaseListViewItems(HWND hwndDlg, - int iDlgItem) -{ - HWND hwndListView; - PVARIABLE_DATA VarData; - int nItemCount; - LV_ITEM lvi; - int i; - - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - - memset(&lvi, 0x00, sizeof(lvi)); - - nItemCount = ListView_GetItemCount(hwndListView); - for (i = 0; i < nItemCount; i++) - { - lvi.mask = LVIF_PARAM; - lvi.iItem = i; - - if (ListView_GetItem(hwndListView, &lvi)) - { - VarData = (PVARIABLE_DATA)lvi.lParam; - if (VarData != NULL) - { - if (VarData->lpName != NULL) - GlobalFree(VarData->lpName); - - if (VarData->lpRawValue != NULL) - GlobalFree(VarData->lpRawValue); - - if (VarData->lpCookedValue != NULL) - GlobalFree(VarData->lpCookedValue); - - GlobalFree(VarData); - lvi.lParam = 0; - } - } - } + int iDlgItem) +{ + HWND hwndListView; + PVARIABLE_DATA VarData; + int nItemCount; + LV_ITEM lvi; + int i; + + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + + memset(&lvi, 0x00, sizeof(lvi)); + + nItemCount = ListView_GetItemCount(hwndListView); + for (i = 0; i < nItemCount; i++) + { + lvi.mask = LVIF_PARAM; + lvi.iItem = i; + + if (ListView_GetItem(hwndListView, &lvi)) + { + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + if (VarData->lpName != NULL) + GlobalFree(VarData->lpName); + + if (VarData->lpRawValue != NULL) + GlobalFree(VarData->lpRawValue); + + if (VarData->lpCookedValue != NULL) + GlobalFree(VarData->lpCookedValue); + + GlobalFree(VarData); + lvi.lParam = 0; + } + } + } } VOID SetAllVars(HWND hwndDlg, INT iDlgItem) { - HWND hwndListView; - PVARIABLE_DATA VarData; - LV_ITEM lvi; - INT iItem; - HKEY hk; - DWORD Type = 0; - - memset(&lvi, 0x00, sizeof(lvi)); - - /* Get the handle to the list box with all system vars in it */ - hwndListView = GetDlgItem(hwndDlg, iDlgItem); - /* first item is 0 */ - iItem = 0; - /* set up struct to retreive item */ - lvi.mask = LVIF_PARAM; - lvi.iItem = iItem; - - /* Open or create the key */ - if (RegCreateKeyEx((iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER), - (iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment") : _T("Environment")), - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE | KEY_READ, - NULL, - &hk, - NULL)) - { - return; - } - - /* loop through all system variables */ - while(ListView_GetItem(hwndListView, &lvi)) - { - /* Get the data in each item */ - VarData = (PVARIABLE_DATA)lvi.lParam; - if (VarData != NULL) - { - /* Get the type */ - RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); - - /* Set the new value */ - if (RegSetValueEx(hk, - VarData->lpName, - 0, - Type, - (LPBYTE) VarData->lpRawValue, - (DWORD) (_tcslen(VarData->lpRawValue)* sizeof(TCHAR))+1)) // was _tcsclen. lstrlen? - { - RegCloseKey(hk); - return; - } - } - /* Fill struct for next item */ - lvi.mask = LVIF_PARAM; - lvi.iItem = ++iItem; - } - - RegCloseKey(hk); + HWND hwndListView; + PVARIABLE_DATA VarData; + LV_ITEM lvi; + INT iItem; + HKEY hk; + DWORD Type = 0; + + memset(&lvi, 0x00, sizeof(lvi)); + + /* Get the handle to the list box with all system vars in it */ + hwndListView = GetDlgItem(hwndDlg, iDlgItem); + /* first item is 0 */ + iItem = 0; + /* set up struct to retreive item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = iItem; + + /* Open or create the key */ + if (RegCreateKeyEx((iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER), + (iDlgItem == IDC_SYSTEM_VARIABLE_LIST ? _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment") : _T("Environment")), + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE | KEY_READ, + NULL, + &hk, + NULL)) + { + return; + } + + /* loop through all system variables */ + while(ListView_GetItem(hwndListView, &lvi)) + { + /* Get the data in each item */ + VarData = (PVARIABLE_DATA)lvi.lParam; + if (VarData != NULL) + { + /* Get the type */ + RegQueryValueEx(hk,VarData->lpName,NULL,&Type,NULL,NULL); + + /* Set the new value */ + if (RegSetValueEx(hk, + VarData->lpName, + 0, + Type, + (LPBYTE) VarData->lpRawValue, + (DWORD) (_tcslen(VarData->lpRawValue)* sizeof(TCHAR))+1)) // was _tcsclen. lstrlen? + { + RegCloseKey(hk); + return; + } + } + /* Fill struct for next item */ + lvi.mask = LVIF_PARAM; + lvi.iItem = ++iItem; + } + + RegCloseKey(hk); } /* Environment dialog procedure */ INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch (uMsg) - { - case WM_INITDIALOG: - OnInitDialog(hwndDlg); - break; - - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_USER_VARIABLE_NEW: - OnNewVariable(hwndDlg, IDC_USER_VARIABLE_LIST); - return TRUE; - - case IDC_USER_VARIABLE_EDIT: - OnEditVariable(hwndDlg, IDC_USER_VARIABLE_LIST); - return TRUE; - - case IDC_USER_VARIABLE_DELETE: - OnDeleteVariable(hwndDlg, IDC_USER_VARIABLE_LIST); - return TRUE; - - case IDC_SYSTEM_VARIABLE_NEW: - OnNewVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - return TRUE; - - case IDC_SYSTEM_VARIABLE_EDIT: - OnEditVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - return TRUE; - - case IDC_SYSTEM_VARIABLE_DELETE: - OnDeleteVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - return TRUE; - - case IDOK: - SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); - SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - - case IDCANCEL: - ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); - ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); - EndDialog(hwndDlg, 0); - return TRUE; - } - break; - - case WM_NOTIFY: - { - NMHDR *phdr; - - phdr = (NMHDR*)lParam; - switch(phdr->code) - { - case NM_DBLCLK: - { - if (phdr->idFrom == IDC_USER_VARIABLE_LIST || - phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + OnInitDialog(hwndDlg); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_USER_VARIABLE_NEW: + OnNewVariable(hwndDlg, IDC_USER_VARIABLE_LIST); + return TRUE; + + case IDC_USER_VARIABLE_EDIT: + OnEditVariable(hwndDlg, IDC_USER_VARIABLE_LIST); + return TRUE; + + case IDC_USER_VARIABLE_DELETE: + OnDeleteVariable(hwndDlg, IDC_USER_VARIABLE_LIST); + return TRUE; + + case IDC_SYSTEM_VARIABLE_NEW: + OnNewVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + return TRUE; + + case IDC_SYSTEM_VARIABLE_EDIT: + OnEditVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + return TRUE; + + case IDC_SYSTEM_VARIABLE_DELETE: + OnDeleteVariable(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + return TRUE; + + case IDOK: + SetAllVars(hwndDlg, IDC_USER_VARIABLE_LIST); + SetAllVars(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + + case IDCANCEL: + ReleaseListViewItems(hwndDlg, IDC_USER_VARIABLE_LIST); + ReleaseListViewItems(hwndDlg, IDC_SYSTEM_VARIABLE_LIST); + EndDialog(hwndDlg, 0); + return TRUE; + } + break; + + case WM_NOTIFY: + { + NMHDR *phdr; + + phdr = (NMHDR*)lParam; + switch(phdr->code) + { + case NM_DBLCLK: { - OnEditVariable(hwndDlg, (INT)phdr->idFrom); - return TRUE; + if (phdr->idFrom == IDC_USER_VARIABLE_LIST || + phdr->idFrom == IDC_SYSTEM_VARIABLE_LIST) + { + OnEditVariable(hwndDlg, (INT)phdr->idFrom); + return TRUE; + } } - } - } - } - break; - } - - return FALSE; + } + } + break; + } + + return FALSE; } /* EOF */ Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/general.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/general.c Sun Jul 29 19:05:09 2007 @@ -5,7 +5,7 @@ * PURPOSE: General System Information * COPYRIGHT: Copyright Thomas Weidenmueller <w3seek(a)reactos.org> * Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> - * Copyright 2006 Colin Finck <mail(a)colinfinck.de> + * Copyright 2006-2007 Colin Finck <mail(a)colinfinck.de> * */ @@ -23,27 +23,27 @@ void ShowLastWin32Error(HWND hWndOwner) { - LPTSTR lpMsg; - DWORD LastError; - - LastError = GetLastError(); - - if((LastError == 0) || - !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + LPTSTR lpMsg; + DWORD LastError; + + LastError = GetLastError(); + + if((LastError == 0) || + !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - LastError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsg, - 0, - NULL)) - { - return; - } - - MessageBox(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); - - LocalFree((LPVOID)lpMsg); + NULL, + LastError, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsg, + 0, + NULL)) + { + return; + } + + MessageBox(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); + + LocalFree((LPVOID)lpMsg); } @@ -145,56 +145,57 @@ (PBYTE)lpBuf, &BufSize) == ERROR_SUCCESS) { - if(BufSize > ((30 + 1) * sizeof(TCHAR))) - { - /* Wrap the Processor Name String like XP does: * - * - Take the first 30 characters and look for the last space. * - * Then wrap the string after this space. * - * - If no space is found, wrap the string after character 30. * - * * - * For example the Processor Name String of a Pentium 4 is right-aligned. * - * With this wrapping the first line looks centered. */ - - _tcsncpy(szBuf, lpBuf, 30); - szLastSpace = _tcsrchr(szBuf, ' '); - - if(szLastSpace == 0) - LastSpace = 30; - else - LastSpace = (szLastSpace - szBuf); - - _tcsncpy(szBuf, lpBuf, LastSpace); - szBuf[LastSpace] = 0; - - SetDlgItemText(hwnd, - uID1, - szBuf); - - SetDlgItemText(hwnd, - uID2, - lpBuf+LastSpace+1); - - /* Return the number of used lines */ - Ret = 2; + if(BufSize > ((30 + 1) * sizeof(TCHAR))) + { + /* Wrap the Processor Name String like XP does: * + * - Take the first 30 characters and look for the last space. * + * Then wrap the string after this space. * + * - If no space is found, wrap the string after character 30. * + * * + * For example the Processor Name String of a Pentium 4 is right-aligned. * + * With this wrapping the first line looks centered. */ + + _tcsncpy(szBuf, lpBuf, 30); + szBuf[30] = 0; + szLastSpace = _tcsrchr(szBuf, ' '); + + if(szLastSpace == 0) + LastSpace = 30; + else + { + LastSpace = (szLastSpace - szBuf); + szBuf[LastSpace] = 0; + } + + _tcsncpy(szBuf, lpBuf, LastSpace); + + SetDlgItemText(hwnd, + uID1, + szBuf); + + SetDlgItemText(hwnd, + uID2, + lpBuf+LastSpace+1); + + /* Return the number of used lines */ + Ret = 2; } else { - SetDlgItemText(hwnd, + SetDlgItemText(hwnd, uID1, lpBuf); - - Ret = 1; + + Ret = 1; } } HeapFree(GetProcessHeap(), 0, lpBuf); - - return Ret; - } - - return 0; + } + + return Ret; } static VOID @@ -218,12 +219,12 @@ (PVOID)&ppi, sizeof(ppi)) == STATUS_SUCCESS && ppi.CurrentMhz != 0) || - RegQueryValueEx(hKey, - Value, - NULL, - &Type, - (PBYTE)&ppi.CurrentMhz, - &BufSize) == ERROR_SUCCESS) + RegQueryValueEx(hKey, + Value, + NULL, + &Type, + (PBYTE)&ppi.CurrentMhz, + &BufSize) == ERROR_SUCCESS) { if (ppi.CurrentMhz < 1000) { @@ -248,7 +249,6 @@ TCHAR ProcKey[] = _T("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); MEMORYSTATUSEX MemStat; TCHAR Buf[32]; - INT Ret = 0; INT CurMachineLine = IDC_MACHINELINE1; @@ -263,22 +263,21 @@ KEY_READ, &hKey) == ERROR_SUCCESS) { - SetRegTextData(hwnd, - hKey, - _T("VendorIdentifier"), + SetRegTextData(hwnd, + hKey, + _T("VendorIdentifier"), CurMachineLine); CurMachineLine++; - Ret = SetProcNameString(hwnd, - hKey, - _T("ProcessorNameString"), - CurMachineLine, - CurMachineLine+1); - CurMachineLine += Ret; + CurMachineLine += SetProcNameString(hwnd, + hKey, + _T("ProcessorNameString"), + CurMachineLine, + CurMachineLine + 1); - SetProcSpeed(hwnd, - hKey, - _T("~MHz"), + SetProcSpeed(hwnd, + hKey, + _T("~MHz"), CurMachineLine); CurMachineLine++; } @@ -313,7 +312,6 @@ if (MemStat.ullTotalPhys > 1024 * 1024) { /* We're dealing with PBs or more */ - MemStat.ullTotalPhys /= 1024; i++; @@ -333,15 +331,13 @@ if (LoadString(hApplet, uStrId[i], szStr, sizeof(szStr) / sizeof(szStr[0]))) { - Ret = _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr); - } - } - - if (Ret) - { - SetDlgItemText(hwnd, - CurMachineLine, - Buf); + if( _stprintf(Buf, _T("%.2f %s"), dTotalPhys, szStr) ) + { + SetDlgItemText(hwnd, + CurMachineLine, + Buf); + } + } } } @@ -434,8 +430,3 @@ return FALSE; } - - - - - Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardprof.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardprof.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardprof.c Sun Jul 29 19:05:09 2007 @@ -37,8 +37,8 @@ } } break; - } - return FALSE; + } + return FALSE; } @@ -80,9 +80,8 @@ return TRUE; } } - } break; - } - return FALSE; + } + return FALSE; } Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardware.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/hardware.c Sun Jul 29 19:05:09 2007 @@ -84,4 +84,3 @@ return FALSE; } - Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/licence.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/licence.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/licence.c Sun Jul 29 19:05:09 2007 @@ -55,11 +55,10 @@ IDC_LICENCEEDIT, LicenseText); - SendDlgItemMessage(hDlg, - IDC_LICENCEEDIT, - EM_SETSEL, - -1, - 0); + PostMessage(GetDlgItem(hDlg, IDC_LICENCEEDIT), + EM_SETSEL, + -1, + 0); return TRUE; } Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/resources/gpl.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/startrec.c Sun Jul 29 19:05:09 2007 @@ -15,15 +15,15 @@ void SetTimeout(HWND hwndDlg, int Timeout) { - if (Timeout == 0) - { - EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), FALSE); - } - else - { - EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), TRUE); - } - SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); + if (Timeout == 0) + { + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), FALSE); + } + else + { + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECLISTUPDWN), TRUE); + } + SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_SETPOS, (WPARAM) 0, (LPARAM) MAKELONG((short) Timeout, 0)); } /* Property page dialog callback */ @@ -33,116 +33,116 @@ WPARAM wParam, LPARAM lParam) { - TCHAR *szSystemDrive; - TCHAR szDefaultOS[MAX_PATH]; - TCHAR szDefaultOSName[MAX_PATH]; - TCHAR szTimeout[10]; - int iTimeout; + TCHAR *szSystemDrive; + TCHAR szDefaultOS[MAX_PATH]; + TCHAR szDefaultOSName[MAX_PATH]; + TCHAR szTimeout[10]; + int iTimeout; - UNREFERENCED_PARAMETER(lParam); - - switch(uMsg) - { - case WM_INITDIALOG: - { - DWORD dwBufSize; + UNREFERENCED_PARAMETER(lParam); - /* get Path to freeldr.ini or boot.ini */ - szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); - if (szSystemDrive != NULL) - { - dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, MAX_PATH); - if (dwBufSize > MAX_PATH) - { - TCHAR *szTmp; - DWORD dwBufSize2; + switch(uMsg) + { + case WM_INITDIALOG: + { + DWORD dwBufSize; - szTmp = HeapReAlloc(GetProcessHeap(), 0, szSystemDrive, dwBufSize * sizeof(TCHAR)); - if (szTmp == NULL) - goto FailGetSysDrive; + /* get Path to freeldr.ini or boot.ini */ + szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(TCHAR)); + if (szSystemDrive != NULL) + { + dwBufSize = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, MAX_PATH); + if (dwBufSize > MAX_PATH) + { + TCHAR *szTmp; + DWORD dwBufSize2; - szSystemDrive = szTmp; + szTmp = HeapReAlloc(GetProcessHeap(), 0, szSystemDrive, dwBufSize * sizeof(TCHAR)); + if (szTmp == NULL) + goto FailGetSysDrive; - dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, dwBufSize); - if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) - goto FailGetSysDrive; - } - else if (dwBufSize == 0) - { + szSystemDrive = szTmp; + + dwBufSize2 = GetEnvironmentVariable(_T("SystemDrive"), szSystemDrive, dwBufSize); + if (dwBufSize2 > dwBufSize || dwBufSize2 == 0) + goto FailGetSysDrive; + } + else if (dwBufSize == 0) + { FailGetSysDrive: - HeapFree(GetProcessHeap(), 0, szSystemDrive); - szSystemDrive = NULL; - } + HeapFree(GetProcessHeap(), 0, szSystemDrive); + szSystemDrive = NULL; + } - if (szSystemDrive != NULL) - { - if (m_szFreeldrIni != NULL) - { - _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); - if (!PathFileExists(m_szFreeldrIni)) - { - _tcscpy(m_szFreeldrIni, szSystemDrive); - _tcscat(m_szFreeldrIni, _T("\\boot.ini")); - } - } - HeapFree(GetProcessHeap(), 0, szSystemDrive); - } - } - - SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); + if (szSystemDrive != NULL) + { + if (m_szFreeldrIni != NULL) + { + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\freeldr.ini")); + if (!PathFileExists(m_szFreeldrIni)) + { + _tcscpy(m_szFreeldrIni, szSystemDrive); + _tcscat(m_szFreeldrIni, _T("\\boot.ini")); + } + } + HeapFree(GetProcessHeap(), 0, szSystemDrive); + } + } - /* load settings from freeldr.ini */ - GetPrivateProfileString(_T("boot loader"), _T("default"), NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); - GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni); - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName); - SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); + SetDlgItemText(hwndDlg, IDC_STRRECDUMPFILE, _T("%SystemRoot%\\MiniDump")); - /* timeout */ - iTimeout = GetPrivateProfileInt(_T("boot loader"), _T("timeout"), 0, m_szFreeldrIni); - SetTimeout(hwndDlg, iTimeout); - if (iTimeout != 0) - SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + /* load settings from freeldr.ini */ + GetPrivateProfileString(_T("boot loader"), _T("default"), NULL, szDefaultOS, MAX_PATH, m_szFreeldrIni); + GetPrivateProfileString(_T("operating systems"), szDefaultOS, NULL, szDefaultOSName, MAX_PATH, m_szFreeldrIni); + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM)szDefaultOSName); + SendDlgItemMessage(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)0, (LPARAM)0); - } - break; + /* timeout */ + iTimeout = GetPrivateProfileInt(_T("boot loader"), _T("timeout"), 0, m_szFreeldrIni); + SetTimeout(hwndDlg, iTimeout); + if (iTimeout != 0) + SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case IDC_STRRECEDIT: - { - ShellExecute(0, _T("open"), _T("notepad"), m_szFreeldrIni, NULL, SW_SHOWNORMAL); - break; - } - case IDOK: - { - /* save timeout */ - if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) - iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0); - else - iTimeout = 0; - _stprintf(szTimeout, _T("%i"), iTimeout); - WritePrivateProfileString(_T("boot loader"), _T("timeout"), szTimeout, m_szFreeldrIni); - } - case IDCANCEL: - { - EndDialog(hwndDlg, - LOWORD(wParam)); - return TRUE; - break; - } - case IDC_STRECLIST: - { - if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) - SetTimeout(hwndDlg, 30); - else - SetTimeout(hwndDlg, 0); - } - } - } - break; - } - return FALSE; + } + break; + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_STRRECEDIT: + { + ShellExecute(0, _T("open"), _T("notepad"), m_szFreeldrIni, NULL, SW_SHOWNORMAL); + break; + } + case IDOK: + { + /* save timeout */ + if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) + iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0); + else + iTimeout = 0; + _stprintf(szTimeout, _T("%i"), iTimeout); + WritePrivateProfileString(_T("boot loader"), _T("timeout"), szTimeout, m_szFreeldrIni); + } + case IDCANCEL: + { + EndDialog(hwndDlg, + LOWORD(wParam)); + return TRUE; + break; + } + case IDC_STRECLIST: + { + if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) + SetTimeout(hwndDlg, 30); + else + SetTimeout(hwndDlg, 0); + } + } + } + break; + } + return FALSE; } Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/sysdm.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/sysdm.c Sun Jul 29 19:05:09 2007 @@ -15,7 +15,7 @@ /* Applets */ APPLET Applets[NUM_APPLETS] = { - {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} + {IDI_CPLSYSTEM, IDS_CPLSYSTEMNAME, IDS_CPLSYSTEMDESCRIPTION, SystemApplet} }; #define MAX_SYSTEM_PAGES 32 @@ -99,107 +99,106 @@ LONG CALLBACK SystemApplet(VOID) { - HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; - PROPSHEETHEADER psh; - HMODULE hNetIdDll; - HPSXA hpsxa = NULL; - LONG Ret; - static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; - - if (!InitCommonControlsEx(&icc)) - return 0; - - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); - psh.dwFlags = PSH_PROPTITLE; - psh.hwndParent = NULL; - psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); - psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME); - psh.nPages = 0; - psh.nStartPage = 0; - psh.phpage = hpsp; - psh.pfnCallback = NULL; - - InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); - hNetIdDll = AddNetIdPage(&psh); - InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); - - /* Load additional pages provided by shell extensions */ - hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages); - if (hpsxa != NULL) - { - SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); - } - - Ret = (LONG)(PropertySheet(&psh) != -1); - - if (hpsxa != NULL) - { - SHDestroyPropSheetExtArray(hpsxa); - } - - if (hNetIdDll != NULL) - FreeLibrary(hNetIdDll); - - return Ret; + HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; + PROPSHEETHEADER psh; + HMODULE hNetIdDll; + HPSXA hpsxa = NULL; + LONG Ret; + static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; + + if (!InitCommonControlsEx(&icc)) + return 0; + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPTITLE; + psh.hwndParent = NULL; + psh.hInstance = hApplet; + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + psh.pszCaption = MAKEINTRESOURCE(IDS_CPLSYSTEMNAME); + psh.nPages = 0; + psh.nStartPage = 0; + psh.phpage = hpsp; + psh.pfnCallback = NULL; + + InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); + hNetIdDll = AddNetIdPage(&psh); + InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); + + /* Load additional pages provided by shell extensions */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages); + if (hpsxa != NULL) + { + SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + } + + Ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxa != NULL) + { + SHDestroyPropSheetExtArray(hpsxa); + } + + if (hNetIdDll != NULL) + FreeLibrary(hNetIdDll); + + return Ret; } /* Control Panel Callback */ LONG CALLBACK CPlApplet( - HWND hwndCPl, - UINT uMsg, - LPARAM lParam1, - LPARAM lParam2) -{ - int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl); - - switch(uMsg) - { - case CPL_INIT: - { - return TRUE; - } - case CPL_GETCOUNT: - { - return NUM_APPLETS; - } - case CPL_INQUIRE: - { - CPLINFO *CPlInfo = (CPLINFO*)lParam2; - CPlInfo->lData = 0; - CPlInfo->idIcon = Applets[i].idIcon; - CPlInfo->idName = Applets[i].idName; - CPlInfo->idInfo = Applets[i].idDescription; - break; - } - case CPL_DBLCLK: - { - Applets[i].AppletProc(); - break; - } - } - return FALSE; + HWND hwndCPl, + UINT uMsg, + LPARAM lParam1, + LPARAM lParam2) +{ + int i = (int)lParam1; + UNREFERENCED_PARAMETER(hwndCPl); + + switch(uMsg) + { + case CPL_INIT: + { + return TRUE; + } + case CPL_GETCOUNT: + { + return NUM_APPLETS; + } + case CPL_INQUIRE: + { + CPLINFO *CPlInfo = (CPLINFO*)lParam2; + CPlInfo->lData = 0; + CPlInfo->idIcon = Applets[i].idIcon; + CPlInfo->idName = Applets[i].idName; + CPlInfo->idInfo = Applets[i].idDescription; + break; + } + case CPL_DBLCLK: + { + Applets[i].AppletProc(); + break; + } + } + return FALSE; } BOOL STDCALL DllMain( - HINSTANCE hinstDLL, - DWORD dwReason, - LPVOID lpvReserved) -{ - UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - case DLL_THREAD_ATTACH: - hApplet = hinstDLL; - break; - } - return TRUE; -} - + HINSTANCE hinstDLL, + DWORD dwReason, + LPVOID lpvReserved) +{ + UNREFERENCED_PARAMETER(lpvReserved); + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + case DLL_THREAD_ATTACH: + hApplet = hinstDLL; + break; + } + return TRUE; +} Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/userprofile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/userprofile.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/userprofile.c Sun Jul 29 19:05:09 2007 @@ -55,6 +55,6 @@ } break; } - } - return FALSE; + } + return FALSE; } Modified: branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/virtmem.c (original) +++ branches/ros-branch-0_3_3/reactos/dll/cpl/sysdm/virtmem.c Sun Jul 29 19:05:09 2007 @@ -53,7 +53,6 @@ bRet = TRUE; } } - } } @@ -559,7 +558,6 @@ LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; OnSelChange(pVirtMem, pnmv); - } } }

1 0

[greatlrd] 28006: NtGdiGetCurrentObject activate palette, so it sending back a palette objects NtGdiCreateHalftonePalette fix support for halftone palette for other color deep that is higher 8bits This letting us passing some more winetest
by greatlrd＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: greatlrd Date: Sun Jul 29 18:24:10 2007 New Revision: 28006 URL: http://svn.reactos.org/svn/reactos?rev=28006&view=rev Log: NtGdiGetCurrentObject activate palette, so it sending back a palette objects NtGdiCreateHalftonePalette fix support for halftone palette for other color deep that is higher 8bits This letting us passing some more winetest Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Sun Jul 29 18:24:10 2007 @@ -129,61 +129,134 @@ HPALETTE STDCALL NtGdiCreateHalftonePalette(HDC hDC) { - int i, r, g, b; - struct { - WORD Version; - WORD NumberOfEntries; - PALETTEENTRY aEntries[256]; - } Palette; - - Palette.Version = 0x300; - Palette.NumberOfEntries = 256; - if (NtGdiGetSystemPaletteEntries(hDC, 0, 256, Palette.aEntries) == 0) - { - return 0; - } - - for (r = 0; r < 6; r++) - for (g = 0; g < 6; g++) - for (b = 0; b < 6; b++) - { - i = r + g*6 + b*36 + 10; - Palette.aEntries[i].peRed = r * 51; - Palette.aEntries[i].peGreen = g * 51; - Palette.aEntries[i].peBlue = b * 51; - } - - for (i = 216; i < 246; i++) - { - int v = (i - 216) << 3; - Palette.aEntries[i].peRed = v; - Palette.aEntries[i].peGreen = v; - Palette.aEntries[i].peBlue = v; - } + int i, r, g, b; + struct { + WORD Version; + WORD NumberOfEntries; + PALETTEENTRY aEntries[256]; + } Palette; + + Palette.Version = 0x300; + Palette.NumberOfEntries = 256; + if (NtGdiGetSystemPaletteEntries(hDC, 0, 256, Palette.aEntries) == 0) + { + /* from wine, more that 256 color math */ + Palette.NumberOfEntries = 20; + for (i = 0; i < Palette.NumberOfEntries; i++) + { + Palette.aEntries[i].peRed=0xff; + Palette.aEntries[i].peGreen=0xff; + Palette.aEntries[i].peBlue=0xff; + Palette.aEntries[i].peFlags=0x00; + } + + Palette.aEntries[0].peRed=0x00; + Palette.aEntries[0].peBlue=0x00; + Palette.aEntries[0].peGreen=0x00; + + /* the first 6 */ + for (i=1; i <= 6; i++) + { + Palette.aEntries[i].peRed=(i%2)?0x80:0; + Palette.aEntries[i].peGreen=(i==2)?0x80:(i==3)?0x80:(i==6)?0x80:0; + Palette.aEntries[i].peBlue=(i>3)?0x80:0; + } + + for (i=7; i <= 12; i++) + { + switch(i) + { + case 7: + Palette.aEntries[i].peRed=0xc0; + Palette.aEntries[i].peBlue=0xc0; + Palette.aEntries[i].peGreen=0xc0; + break; + case 8: + Palette.aEntries[i].peRed=0xc0; + Palette.aEntries[i].peGreen=0xdc; + Palette.aEntries[i].peBlue=0xc0; + break; + case 9: + Palette.aEntries[i].peRed=0xa6; + Palette.aEntries[i].peGreen=0xca; + Palette.aEntries[i].peBlue=0xf0; + break; + case 10: + Palette.aEntries[i].peRed=0xff; + Palette.aEntries[i].peGreen=0xfb; + Palette.aEntries[i].peBlue=0xf0; + break; + case 11: + Palette.aEntries[i].peRed=0xa0; + Palette.aEntries[i].peGreen=0xa0; + Palette.aEntries[i].peBlue=0xa4; + break; + case 12: + Palette.aEntries[i].peRed=0x80; + Palette.aEntries[i].peGreen=0x80; + Palette.aEntries[i].peBlue=0x80; + } + } + + for (i=13; i <= 18; i++) + { + Palette.aEntries[i].peRed=(i%2)?0xff:0; + Palette.aEntries[i].peGreen=(i==14)?0xff:(i==15)?0xff:(i==18)?0xff:0; + Palette.aEntries[i].peBlue=(i>15)?0xff:0x00; + } + } + else + { + /* 256 color table */ + for (r = 0; r < 6; r++) + for (g = 0; g < 6; g++) + for (b = 0; b < 6; b++) + { + i = r + g*6 + b*36 + 10; + Palette.aEntries[i].peRed = r * 51; + Palette.aEntries[i].peGreen = g * 51; + Palette.aEntries[i].peBlue = b * 51; + } + + for (i = 216; i < 246; i++) + { + int v = (i - 216) << 3; + Palette.aEntries[i].peRed = v; + Palette.aEntries[i].peGreen = v; + Palette.aEntries[i].peBlue = v; + } + } return NtGdiCreatePalette((LOGPALETTE *)&Palette); } HPALETTE STDCALL NtGdiCreatePalette(CONST PLOGPALETTE palette) { - PPALGDI PalGDI; - - HPALETTE NewPalette = PALETTE_AllocPalette( - PAL_INDEXED, - palette->palNumEntries, - (PULONG)palette->palPalEntry, - 0, 0, 0); - - if (NewPalette == NULL) - return NULL; - - PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette); - /* FIXME - Handle PalGDI == NULL!!!! */ - - PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); - PalGDI->logicalToSystem = NULL; - - PALETTE_UnlockPalette(PalGDI); + PPALGDI PalGDI; + + HPALETTE NewPalette = PALETTE_AllocPalette( + PAL_INDEXED, + palette->palNumEntries, + (PULONG)palette->palPalEntry, + 0, 0, 0); + + if (NewPalette == NULL) + { + return NULL; + } + + PalGDI = (PPALGDI) PALETTE_LockPalette(NewPalette); + if (PalGDI != NULL) + { + PALETTE_ValidateFlags(PalGDI->IndexedColors, PalGDI->NumColors); + PalGDI->logicalToSystem = NULL; + PALETTE_UnlockPalette(PalGDI); + } + else + { + /* FIXME - Handle PalGDI == NULL!!!! */ + DPRINT1("waring PalGDI is NULL \n"); + } return NewPalette; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sun Jul 29 18:24:10 2007 @@ -1127,8 +1127,7 @@ SelObject = dc->w.hBrush; break; case OBJ_PAL: - DPRINT1("FIXME: NtGdiGetCurrentObject() ObjectType OBJ_PAL not supported yet!\n"); - SelObject = NULL; + SelObject = dc->w.hPalette; break; case OBJ_FONT: SelObject = dc->w.hFont;

1 0

[cfinck] 28005: These ones were missing in r27997, sorry...
by cfinck＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: cfinck Date: Sun Jul 29 18:02:15 2007 New Revision: 28005 URL: http://svn.reactos.org/svn/reactos?rev=28005&view=rev Log: These ones were missing in r27997, sorry... Added: trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/dll/win32/newdev/lang/bg-BG.rc trunk/reactos/subsystems/ntvdm/lang/bg-BG.rc Added: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc (added) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc Sun Jul 29 18:02:15 2007 @@ -1,0 +1,12 @@ +/* $Id: bg-US.rc 26288 28.VI.2007 $ */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CAPTION "Ñëàãàíå íà ÐåàêòÎÑ" + IDS_TEXT "Íå ìîæåòå íàïðàâî äà ñëîæèòå ÐåàêòÎÑ îò òîçè êîìïàêòåí äèñê!\n\nÏðåçàïóñíåòå êîìïþòúðà ñè ñ òîçè ÊÄ, çà äà ñëîæèòå ÐåàêòÎÑ." +END + +/* EOF */ Added: trunk/reactos/dll/win32/newdev/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/bg-BG.rc (added) +++ trunk/reactos/dll/win32/newdev/lang/bg-BG.rc Sun Jul 29 18:02:15 2007 @@ -1,0 +1,109 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Çäðàâåéòå",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "Âúëøåáíèêúò ùå ñëîæè âîäà÷ çà íîâî óñòðîéñòâî:", + IDC_STATIC,120,21,195,16 + LTEXT "Íàòèñíåòå 'Íàïðåä' çà ïðîäúëæåíèå.",IDC_STATIC,120,169,195,17 + LTEXT "ÍÅÈÇÂÅÑÒÍÎ ÓÑÒÐÎÉÑÒÂÎ",IDC_DEVICE,134,36,164,11 + LTEXT "WARNING! INSTALLING A CUSTOM DEVICE MAY FREEZE YOUR COMPUTER OR RENDER IT UNBOOTABLE!",IDC_STATIC,120,59,195,16 + CONTROL "Ñàì ñëîæè âîäà÷à",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "Ñëàãàíå íà âîäà÷à îò îïðåäåëåíî ìÿñòî",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñëàãàíåòî íåóñïåøíî",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Óñòðîéñòâîòî íå ìîæà äà áúäå ïîäêàðàíî, çàùîòî íå áå íàìåðåí âîäà÷.", + IDC_STATIC,120,40,195,19 + LTEXT "íàòèñíåòå 'Íàçàä', àêî èìàòå äèñê ñ âîäà÷ èëè çíàåòå ïúòÿ êúì íåãî.", + IDC_STATIC,120,98,181,24 + CONTROL "Òîçè ïðîçîðåö äà íå ñå ïîêàçâà ïîâå÷å",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñëàãàíåòî íåóñïåøíî",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Óñòðîéñòâîòî íå ìîæà äà áúäå ïîäêàðàíî, ïîðàäè íåî÷àâàíà ãðåøêà.", + IDC_STATIC,120,40,195,19 + LTEXT "ÍÅÈÇÂÅÑÒÍÎ ÓÑÒÐÎÉÑÒÂÎ",IDC_DEVICE,134,55,164,11 +END + +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Òúðñåíå íà òåçè ìåñòà",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "Ðú÷íî èçáèðàíå íà âîäà÷à",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "Òúðñåíå â èçâàæäàåìè íîñèòåëè",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "Òúðñåíå è â",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "Îáçîð",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÍÅÈÇÂÅÑÒÍÎ ÓÑÒÐÎÉÑÒÂÎ",IDC_DEVICE,51,20,169,16 +END + +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "ÍÅÈÇÂÅÑÒÍÎ ÓÑÒÐÎÉÑÒÂÎ",IDC_DEVICE,51,20,169,16 +END + +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñëàãàíåòî ïðèêëþ÷è",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Òðÿáâà äà ïðåçàïóñíåòå êîìïþòúðà, çà äà çàâúðøè ñëàãàíåòî íà:", + IDC_STATIC,120,32,195,19 + LTEXT "íàòèñíåòå 'Êðàé', çà äà çàòâîðèòå âúëøåáíèêà.",IDC_STATIC,120,174, + 179,11 + LTEXT "ÍÅÈÇÂÅÑÒÍÎ ÓÑÒÐÎÉÑÒÂÎ",IDC_DEVICE,148,53,147,12 +END + +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ñëàãàíå íà óñòðîéñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ñëàãàíåòî çàâúðøè",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Âúëøåáíèêúò çàâúðøè ñëàãàíåòî íà âîäà÷ çà:", + IDC_STATIC,120,32,195,19 + LTEXT "Íàòèñíåòå 'Êðàé' çà çàòâàðÿíå íà âúëøåáíèêà.",IDC_STATIC,120,174, + 179,11 + LTEXT "ÍÅÈÇÂÅÑÒÍÎ ÓÑÒÐÎÉÑÒÂÎ",IDC_DEVICE,148,53,147,12 +END + Added: trunk/reactos/subsystems/ntvdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/bg-B… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/bg-BG.rc (added) +++ trunk/reactos/subsystems/ntvdm/lang/bg-BG.rc Sun Jul 29 18:02:15 2007 @@ -1,0 +1,13 @@ +#include "resource.h" +/* + * Moved all hardcoded strings to En.rc. + * By Magnus Olsen 2005 + */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + +STRING_WelcomeMsg, "Ïîääðúæêà íà ÐåàêòÎÑ çà ïðèâèäíà ÄÎÑ ìàøèíà.\n" +STRING_PromptMsg, "Íàïèøåòå r<cr> çà ïóñêàíå, s<cr> çà ñïèðàíå èëè q<cr> çà èçõîä." +}

1 0

[cwittich] 28004: GetTimeFormat should use LocalTime instead of SystemTime See issue #1601 for more details.
by cwittich＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: cwittich Date: Sun Jul 29 17:51:54 2007 New Revision: 28004 URL: http://svn.reactos.org/svn/reactos?rev=28004&view=rev Log: GetTimeFormat should use LocalTime instead of SystemTime See issue #1601 for more details. Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lcformat.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lcformat.c Sun Jul 29 17:51:54 2007 @@ -410,7 +410,7 @@ if (!lpTime) { - GetSystemTime(&st); /* Default to current time */ + GetLocalTime(&st); /* Default to current time */ lpTime = &st; } else

1 0

[cfinck] 28003: Update Bugzilla's "fields.html" page (information was taken from our current Bugzilla on the web server)
by cfinck＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: cfinck Date: Sun Jul 29 17:45:17 2007 New Revision: 28003 URL: http://svn.reactos.org/svn/reactos?rev=28003&view=rev Log: Update Bugzilla's "fields.html" page (information was taken from our current Bugzilla on the web server) Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/fields.html… Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/fields.html… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/fields.html… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/pages/fields.html… Sun Jul 29 17:45:17 2007 @@ -211,39 +211,43 @@ <tr> <th>Blocker</th> - <td>Blocks development and/or testing work</td> + <td>Only allowed for releases or mega regressions. Do not set a bug to blocker unless you are the Testing Coordinator.</td> </tr> <tr> <th>Critical</th> - <td>crashes, loss of data, severe memory leak</td> + <td>Equivalent of <i>blocker</i> when a release isn't being done. High visibility regressions only.</td> </tr> <tr> <th>Major</th> - <td>major loss of function</td> - </tr> - + <td>Normal level for any regressions or bugs which cause a kernel mode crash (BSOD). Also, patches receive "major" for developer visibility.</td> + </tr> + + <tr> + <th>Normal</th> + + <td>This is the bugzilla default</td> + </tr> + <tr> <th>Minor</th> - <td>minor loss of function, or other problem where easy - workaround is present</td> + <td>Bugs which cause a major loss in functionality or cause a user mode (application) crash.</td> </tr> <tr> <th>Trivial</th> - <td>cosmetic problem like misspelled words or misaligned - text</td> + <td>Minor graphic bugs or missing funcionality that isn't usually commonly used in the program.</td> </tr> <tr> <th>Enhancement</th> - <td>Request for enhancement</td> + <td>Missing APIs or any other features.</td> </table> <h2><a name="priority">Priority</a></h2> @@ -260,10 +264,10 @@ <ul> <li>All (happens on all platforms; cross-platform [% terms.bug %])</li> - - <li>Macintosh</li> - - <li>PC</li> + <li>x86</li> + <li>QEmu</li> + <li>VMware</li> + <li>Virtual PC</li> </ul> <b>Note:</b> When searching, selecting the option "All" does not select [% terms.bugs %] @@ -277,12 +281,9 @@ <ul> <li>All (happens on all operating systems; cross-platform [% terms.bug %])</li> - - <li>Windows</li> - - <li>Mac OS</li> - - <li>Linux</li> + <li>ReactOS</li> + <li>Windows NT 4.0, 2000, XP, 2003, Vista</li> + <li>Windows 95, 98, ME</li> </ul> Sometimes the operating system implies the platform, but not always. For example, Linux can run on PC and Macintosh and

1 0

[cfinck] 28002: This part can be left out as requires_persistence is already enabled by default and I wouldn't make an extra Persistence module if we wouldn't need one
by cfinck＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: cfinck Date: Sun Jul 29 17:32:37 2007 New Revision: 28002 URL: http://svn.reactos.org/svn/reactos?rev=28002&view=rev Log: This part can be left out as requires_persistence is already enabled by default and I wouldn't make an extra Persistence module if we wouldn't need one Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm Sun Jul 29 17:32:37 2007 @@ -127,9 +127,4 @@ exit; } -sub requires_persistence { - # Persistence is handled by RosCMS - return 1; -} - 1;

1 0

[greatlrd] 28001: partly implement NtGdiGetRandomRgn, we do not support metadc, so we will fail on thuse wine test for this api. The implemetions are base partly on wine and msdn
by greatlrd＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: greatlrd Date: Sun Jul 29 17:12:20 2007 New Revision: 28001 URL: http://svn.reactos.org/svn/reactos?rev=28001&view=rev Log: partly implement NtGdiGetRandomRgn, we do not support metadc, so we will fail on thuse wine test for this api. The implemetions are base partly on wine and msdn Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/include/psdk/ntgdi.h trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sun Jul 29 17:12:20 2007 @@ -423,7 +423,7 @@ GetPixelFormat@4 GetPolyFillMode@4=NtGdiGetPolyFillMode@4 GetROP2@4=NtGdiGetROP2@4 -GetRandomRgn@12 +GetRandomRgn@12=NtGdiGetRandomRgn@12 GetRasterizerCaps@8 GetRegionData@12=NtGdiGetRegionData@12 GetRelAbs@8 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sun Jul 29 17:12:20 2007 @@ -1295,21 +1295,6 @@ } -/* - * @unimplemented - */ -INT -STDCALL -GetRandomRgn( - HDC a0, - HRGN a1, - INT a2 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Sun Jul 29 17:12:20 2007 @@ -2633,6 +2633,15 @@ W32KAPI INT APIENTRY +NtGdiGetRandomRgn( + IN HDC hDC, + OUT HRGN hDest, + IN INT iCode +); + +W32KAPI +INT +APIENTRY NtGdiGetRgnBox( IN HRGN hrgn, OUT LPRECT prcOut Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Sun Jul 29 17:12:20 2007 @@ -2344,6 +2344,67 @@ } +/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw */ +INT STDCALL +NtGdiGetRandomRgn(HDC hDC, HRGN hDest, INT iCode) +{ + PDC pDC; + HRGN hSrc = NULL; + POINT org; + + if ((hDC == NULL) || (hDest == NULL)) + { + return -1; + } + if ((iCode<1 ) || (iCode>4 )) + { + return -1; + } + + pDC = DC_LockDc(hDC); + if (pDC == NULL) + { + return -1; + } + + switch (iCode) + { + case 1: + hSrc = pDC->w.hClipRgn; + break; + case 2: + //hSrc = dc->hMetaRgn; + DPRINT1("hMetaRgn not implement\n"); + DC_UnlockDc(pDC); + return -1; + break; + case 3: + DPRINT1("waring : hMetaRgn not implement\n"); + //hSrc = dc->hMetaClipRgn; + if(!hSrc) + { + hSrc = pDC->w.hClipRgn; + } + //if(!hSrc) rgn = dc->hMetaRgn; + break; + case 4: + hSrc = pDC->w.hVisRgn; + } + if (hSrc) + { + NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY); + } + if (iCode == SYSRGN) + { + IntGdiGetDCOrgEx(pDC, &org); + NtGdiOffsetRgn(hDest, org.x, org.y ); + } + + DC_UnlockDc(pDC); + + return (hSrc != 0); +} + INT STDCALL NtGdiGetRgnBox(HRGN hRgn, LPRECT pRect) @@ -2428,13 +2489,13 @@ DPRINT("NtGdiOffsetRgn: hRgn %d Xoffs %d Yoffs %d rgn %x\n", hRgn, XOffset, YOffset, rgn ); if( !rgn ){ - DPRINT("NtGdiOffsetRgn: hRgn error\n"); - return ERROR; + DPRINT("NtGdiOffsetRgn: hRgn error\n"); + return ERROR; } if(XOffset || YOffset) { int nbox = rgn->rdh.nCount; - PRECT pbox = (PRECT)rgn->Buffer; + PRECT pbox = (PRECT)rgn->Buffer; if(nbox && pbox) { while(nbox--) { @@ -2475,7 +2536,7 @@ BITMAPOBJ *BitmapObj; if( !dc ) - return FALSE; + return FALSE; if(!(tmpVisRgn = NtGdiCreateRectRgn(0, 0, 0, 0))) { Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Sun Jul 29 17:12:20 2007 @@ -615,3 +615,4 @@ NtGdiDdUnlockD3D 2 NtGdiDdUpdateOverlay 3 NtGdiDdWaitForVerticalBlank 2 +NtGdiGetRandomRgn 3

1 0

[cfinck] 28000: My modifications for Bugzilla 3.0 These should work with both our Login system and Deskzilla This is still not final as some things still need to be done, which depend on the server configuration
by cfinck＠svn.reactos.org 29 Jul '07

29 Jul '07

Author: cfinck Date: Sun Jul 29 17:08:23 2007 New Revision: 28000 URL: http://svn.reactos.org/svn/reactos?rev=28000&view=rev Log: My modifications for Bugzilla 3.0 These should work with both our Login system and Deskzilla This is still not final as some things still need to be done, which depend on the server configuration Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth.pm Sun Jul 29 17:08:23 2007 @@ -34,7 +34,7 @@ use Bugzilla::Error; use Bugzilla::Auth::Login::Stack; use Bugzilla::Auth::Verify::Stack; -use Bugzilla::Auth::Persist::Cookie; +use Bugzilla::Auth::Persist::ROSCMS; sub new { my ($class, $params) = @_; @@ -48,7 +48,7 @@ $self->{_verifier} = new Bugzilla::Auth::Verify::Stack($params->{Verify}); # If we ever have any other login persistence methods besides cookies, # this could become more configurable. - $self->{_persister} = new Bugzilla::Auth::Persist::Cookie(); + $self->{_persister} = new Bugzilla::Auth::Persist::ROSCMS(); return $self; } Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm (added) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Login/ROSCMS.pm Sun Jul 29 17:08:23 2007 @@ -1,0 +1,135 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> +# Erik Stambaugh <erik(a)dasbistro.com> +# Max Kanat-Alexander <mkanat(a)bugzilla.org> + +# Auth::Login class for RosCMS +# based on the former class for Bugzilla 2.x by Gé van Geldorp and Michael Wirth and the Auth::Login::CGI class +# improved and made compatible with Bugzilla 3.x and Deskzilla by Colin Finck (2007-07-29) + +package Bugzilla::Auth::Login::ROSCMS; +use strict; +use base qw(Bugzilla::Auth::Login); +use constant can_logout => 0; # The Bugzilla Logout feature has to be disabled, so the user can only log out with the RosCMS Logout feature + +use URI; +use URI::Escape; + +use Bugzilla::Constants; +use Bugzilla::WebService::Constants; +use Bugzilla::User; +use Bugzilla::Util; +use Bugzilla::Error; + +my $session_cookie_name = "roscmsusrkey"; +my $roscms_db_name = "roscms"; +my $roscms_login_page = "/roscms/?page=login&target="; + +sub get_login_info { + my ($self) = @_; + my $cgi = Bugzilla->cgi; + + # Check if we have username and password given (usual CGI method for apps like Deskzilla) + my $username = trim($cgi->param("Bugzilla_login")); + my $password = $cgi->param("Bugzilla_password"); + $cgi->delete('Bugzilla_login', 'Bugzilla_password'); + + if(defined $username && defined $password) { + return { username => $username, password => $password }; + } + + # No, then check for the RosCMS Login cookie + my $dbh = Bugzilla->dbh; + my $user_id; + my $session_id = $cgi->cookie($session_cookie_name); + if ( defined $session_id ) { + my $session_id_clean = $session_id; + trick_taint($session_id_clean); + my $remote_addr_clean; + if ($ENV{'REMOTE_ADDR'} =~ m/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { + $remote_addr_clean = $1; + } else { + $remote_addr_clean = 'invalid'; + } + my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; + trick_taint($browser_agent_clean); + my $query = "SELECT m.map_subsys_userid " . + " FROM $roscms_db_name.user_sessions s, " . + " $roscms_db_name.users u, " . + " $roscms_db_name.subsys_mappings m " . + " WHERE s.usersession_id = ? " . + " AND (s.usersession_expires IS NULL OR " . + " NOW() <= s.usersession_expires) " . + " AND u.user_id = s.usersession_user_id " . + " AND (u.user_setting_ipaddress = 'false' OR " . + " s.usersession_ipaddress = ?) " . + " AND (u.user_setting_browseragent = 'false' OR " . + " s.usersession_browseragent = ?) " . + " AND m.map_roscms_userid = s.usersession_user_id " . + " AND m.map_subsys_name = 'bugzilla'"; + my @params = ($session_id_clean, $remote_addr_clean, $browser_agent_clean); + ($user_id) = $dbh->selectrow_array($query, undef, @params); + if ($user_id) { + # Update time of last session use + $query = "UPDATE $roscms_db_name.user_sessions " . + " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . + " WHERE usersession_id = ? " . + " AND usersession_expires IS NOT NULL"; + @params = ($session_id_clean); + $dbh->do($query, undef, @params); + + # Get the user name and the crypted password from the database + my $username = user_id_to_login($user_id); + my $crypted_password = $dbh->selectrow_array("SELECT cryptpassword FROM profiles WHERE userid = ?", undef, $user_id); + + # We need to set a parameter for the Auth::Persist::ROSCMS module + $cgi->param('ROSCMS_login', 1); + + return { username => $username, crypted_password => $crypted_password }; + } + } + + return { failure => AUTH_NODATA }; +} + +sub fail_nodata { + my ($self) = @_; + my $cgi = Bugzilla->cgi; + + # Throw up the login page + my $this_uri = uri_escape($cgi->url(-absolute=>1, -path_info=>1, -query=>1)); + print $cgi->redirect($roscms_login_page . $this_uri); + exit; +} + +sub requires_persistence { + # Persistence is handled by RosCMS + return 1; +} + +1; Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm (added) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Persist/ROSCMS.pm Sun Jul 29 17:08:23 2007 @@ -1,0 +1,159 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> +# Erik Stambaugh <erik(a)dasbistro.com> +# Max Kanat-Alexander <mkanat(a)bugzilla.org> + +# Auth::Persist class for RosCMS +# developed by Colin Finck based on the Auth::Persist::Cookie class (2007-07-29) + +package Bugzilla::Auth::Persist::ROSCMS; +use strict; +use fields qw(); + +use Bugzilla::Constants; +use Bugzilla::Util; +use Bugzilla::Token; + +use List::Util qw(first); + +sub new { + my ($class) = @_; + my $self = fields::new($class); + return $self; +} + +sub persist_login { + my ($self, $user) = @_; + my $dbh = Bugzilla->dbh; + my $cgi = Bugzilla->cgi; + + # When we log in using RosCMS, it handles the persistence itself + if( defined $cgi->param('ROSCMS_login') ) { + return; + } + + my $ip_addr = $cgi->remote_addr; + unless ($cgi->param('Bugzilla_restrictlogin') || + Bugzilla->params->{'loginnetmask'} == 32) + { + $ip_addr = get_netaddr($ip_addr); + } + + # The IP address is valid, at least for comparing with itself in a + # subsequent login + trick_taint($ip_addr); + + my $login_cookie = + Bugzilla::Token::GenerateUniqueToken('logincookies', 'cookie'); + + $dbh->do("INSERT INTO logincookies (cookie, userid, ipaddr, lastused) + VALUES (?, ?, ?, NOW())", + undef, $login_cookie, $user->id, $ip_addr); + + # Remember cookie only if admin has told so + # or admin didn't forbid it and user told to remember. + if ( Bugzilla->params->{'rememberlogin'} eq 'on' || + (Bugzilla->params->{'rememberlogin'} ne 'off' && + $cgi->param('Bugzilla_remember') && + $cgi->param('Bugzilla_remember') eq 'on') ) + { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $user->id, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $login_cookie, + -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'); + + } + else { + $cgi->send_cookie(-name => 'Bugzilla_login', + -value => $user->id); + $cgi->send_cookie(-name => 'Bugzilla_logincookie', + -value => $login_cookie); + } +} + +sub logout { + my ($self, $param) = @_; + + my $dbh = Bugzilla->dbh; + my $cgi = Bugzilla->cgi; + $param = {} unless $param; + my $user = $param->{user} || Bugzilla->user; + my $type = $param->{type} || LOGOUT_ALL; + + if ($type == LOGOUT_ALL) { + $dbh->do("DELETE FROM logincookies WHERE userid = ?", + undef, $user->id); + return; + } + + # The LOGOUT_*_CURRENT options require the current login cookie. + # If a new cookie has been issued during this run, that's the current one. + # If not, it's the one we've received. + my $cookie = first {$_->name eq 'Bugzilla_logincookie'} + @{$cgi->{'Bugzilla_cookie_list'}}; + my $login_cookie; + if ($cookie) { + $login_cookie = $cookie->value; + } + else { + $login_cookie = $cgi->cookie("Bugzilla_logincookie"); + } + trick_taint($login_cookie); + + # These queries use both the cookie ID and the user ID as keys. Even + # though we know the userid must match, we still check it in the SQL + # as a sanity check, since there is no locking here, and if the user + # logged out from two machines simultaneously, while someone else + # logged in and got the same cookie, we could be logging the other + # user out here. Yes, this is very very very unlikely, but why take + # chances? - bbaetz + if ($type == LOGOUT_KEEP_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie != ? AND userid = ?", + undef, $login_cookie, $user->id); + } elsif ($type == LOGOUT_CURRENT) { + $dbh->do("DELETE FROM logincookies WHERE cookie = ? AND userid = ?", + undef, $login_cookie, $user->id); + } else { + die("Invalid type $type supplied to logout()"); + } + + if ($type != LOGOUT_KEEP_CURRENT) { + clear_browser_cookies(); + } + +} + +sub clear_browser_cookies { + my $cgi = Bugzilla->cgi; + $cgi->remove_cookie('Bugzilla_login'); + $cgi->remove_cookie('Bugzilla_logincookie'); +} + +1; Added: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm (added) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Auth/Verify/ROSCMS.pm Sun Jul 29 17:08:23 2007 @@ -1,0 +1,75 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry(a)mozilla.org> +# Dan Mosedale <dmose(a)mozilla.org> +# Joe Robins <jmrobins(a)tgix.com> +# Dave Miller <justdave(a)syndicomm.com> +# Christopher Aillon <christopher(a)aillon.com> +# Gervase Markham <gerv(a)gerv.net> +# Christian Reis <kiko(a)async.com.br> +# Bradley Baetz <bbaetz(a)acm.org> +# Erik Stambaugh <erik(a)dasbistro.com> + +# Auth::Verify class for RosCMS +# developed by Colin Finck based on the Auth::Verify::DB class (2007-07-29) + +package Bugzilla::Auth::Verify::ROSCMS; +use strict; +use base qw(Bugzilla::Auth::Verify); +use constant can_change_password => 0; # Password has to be changed at myReactOS + +use Bugzilla::Constants; +use Bugzilla::Token; +use Bugzilla::Util; +use Bugzilla::User; + +sub check_credentials { + my ($self, $login_data) = @_; + my $dbh = Bugzilla->dbh; + + my $username = $login_data->{username}; + my $user_id = login_to_id($username); + + return { failure => AUTH_NO_SUCH_USER } unless $user_id; + + $login_data->{bz_username} = $username; + + my ($real_password_crypted) = $dbh->selectrow_array("SELECT cryptpassword FROM profiles WHERE userid = ?", undef, $user_id); + my $entered_password_crypted = $login_data->{crypted_password}; + + if( !defined $entered_password_crypted ) { + my $password = $login_data->{password}; + + # Using the internal crypted password as the salt, + # crypt the password the user entered. + $entered_password_crypted = crypt($password, $real_password_crypted); + } + + return { failure => AUTH_LOGINFAILED } + if $entered_password_crypted ne $real_password_crypted; + + # The user's credentials are okay, so delete any outstanding + # password tokens they may have generated. + Bugzilla::Token::DeletePasswordTokens($user_id, "user_logged_in"); + + return $login_data; +} + +1; Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Auth.pm Sun Jul 29 17:08:23 2007 @@ -1,4 +1,4 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +ï»¿# -*- Mode: perl; indent-tabs-mode: nil -*- # # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file @@ -69,7 +69,7 @@ { name => 'user_info_class', type => 's', - choices => [ 'CGI', 'Env', 'Env,CGI' ], + choices => [ 'CGI', 'Env', 'Env,CGI', 'ROSCMS' ], default => 'CGI', checker => \&check_multi }, @@ -77,7 +77,7 @@ { name => 'user_verify_class', type => 's', - choices => [ 'DB', 'LDAP', 'DB,LDAP', 'LDAP,DB' ], + choices => [ 'DB', 'LDAP', 'DB,LDAP', 'LDAP,DB', 'ROSCMS' ], default => 'DB', checker => \&check_user_verify_class }, Modified: trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/Bu… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm (original) +++ trunk/web/reactos.org/htdocs/bugzilla/Bugzilla/Config/Common.pm Sun Jul 29 17:08:23 2007 @@ -1,4 +1,4 @@ -# -*- Mode: perl; indent-tabs-mode: nil -*- +ï»¿# -*- Mode: perl; indent-tabs-mode: nil -*- # # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file @@ -268,6 +268,8 @@ return "Error requiring Net::LDAP: '$@'" if $@; return "LDAP servername is missing" unless Bugzilla->params->{"LDAPserver"}; return "LDAPBaseDN is empty" unless Bugzilla->params->{"LDAPBaseDN"}; + } elsif ($class eq 'ROSCMS') { + # No params } else { return "Unknown user_verify_class '$class' in check_user_verify_class"; } Modified: trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/sk… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css (original) +++ trunk/web/reactos.org/htdocs/bugzilla/skins/standard/global.css Sun Jul 29 17:08:23 2007 @@ -22,14 +22,6 @@ * Marc Schumann <wurblzap(a)gmail.com> */ -/* global (begin) */ - body { - font-family: sans-serif; - color: #000; - background: #fff url("global/body-back.gif") repeat-x; - } -/* global (end) */ - /* header (begin) */ #header { margin-bottom: 1em; @@ -37,17 +29,15 @@ } #header form { - font-size: 85%; display: inline; } #header .btn, #header .txt { - font-size: 80%; + font-size: 9pt; } #header .links { - font-size: 85%; border-left: 1px solid silver; border-right: 1px solid silver; border-bottom: 1px solid silver; @@ -128,7 +118,7 @@ #footer .btn, #footer .txt { - font-size: 80%; + font-size: 9pt; } #footer #useful-links { @@ -284,7 +274,7 @@ /* Style of the attachment table */ #attachment_table { border-collapse: collapse; - width: 40em; + width: 47em; border: 1px solid #333333; } Modified: trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/sk… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css (original) +++ trunk/web/reactos.org/htdocs/bugzilla/skins/standard/index.css Sun Jul 29 17:08:23 2007 @@ -48,8 +48,8 @@ width: 250px; height: 200px; - margin-top: 2.3em; - margin-right: 2.3em; + margin-top: -15px; + margin-right: 5px; float: right; background: transparent no-repeat url(index/front.png); } Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/acc… Sun Jul 29 17:08:23 2007 @@ -25,75 +25,5 @@ # new_login_name: string. The user's new Bugzilla login whilst not confirmed. (optional) #%] -<table> - <tr> - <td colspan="3"> - Please enter your existing password to confirm account changes. - </td> - </tr> - <tr> - <th align="right">Password:</th> - <td> - <input type="hidden" name="Bugzilla_login" - value="[% user.login FILTER html %]"> - <input type="password" name="Bugzilla_password"> - </td> - </tr> - <tr> - <td colspan="2"><hr></td> - </tr> - [% IF user.authorizer.can_change_password %] - <tr> - <th align="right">New password:</th> - <td> - <input type="password" name="new_password1"> - </td> - </tr> - - <tr> - <th align="right">Re-enter new password:</th> - <td> - <input type="password" name="new_password2"> - </td> - </tr> - [% END %] - - <tr> - <th align="right">Your real name (optional, but encouraged):</th> - <td> - <input size="35" name="realname" value="[% realname FILTER html %]"> - </td> - </tr> - - [% IF user.authorizer.can_change_email && Param('allowemailchange') %] - [% IF login_change_date %] - [% IF new_login_name %] - <tr> - <th align="right">Pending email address:</th> - <td>[% new_login_name FILTER html %]</td> - </tr> - <tr> - <th align="right">Change request expires:</th> - <td>[% login_change_date FILTER time %]</td> - </tr> - [% ELSE %] - <tr> - <th align="right">Confirmed email address:</th> - <td>[% user.login FILTER html %]</td> - </tr> - <tr> - <th align="right">Completion date:</th> - <td>[% login_change_date FILTER time %]</td> - </tr> - [% END %] - [% ELSE %] - <tr> - <th align="right">New email address:</th> - <td> - <input size="35" name="new_login_name"> - </td> - </tr> - [% END %] - [% END %] - -</table> +You can change your account settings (password, email address etc.) in +<a href="/roscms/?page=user">myReactOS</a><br><br> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/account/prefs/pre… Sun Jul 29 17:08:23 2007 @@ -1,4 +1,4 @@ -[%# 1.0(a)bugzilla.org %] +ï»¿[%# 1.0(a)bugzilla.org %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -50,7 +50,7 @@ { name => "saved-searches", label => "Saved Searches", link => "userprefs.cgi?tab=saved-searches", saveable => "1" }, { name => "account", label => "Name and Password", - link => "userprefs.cgi?tab=account", saveable => "1" }, + link => "userprefs.cgi?tab=account", saveable => "0" }, { name => "permissions", label => "Permissions", link => "userprefs.cgi?tab=permissions", saveable => "0" } ] %] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/footer.htm… Sun Jul 29 17:08:23 2007 @@ -45,6 +45,23 @@ <div class="outro"></div> </div> +</div> +</td> +</tr> +</table> + + +<hr size="1"> + +<address> + <p align="center"> + ReactOS is a trademark of ReactOS Foundation in the United States and other countries. + </p> +</address> + </body> </html> Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/global/header.htm… Sun Jul 29 17:08:23 2007 @@ -62,7 +62,7 @@ "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <title>[% title %]</title> + <title>ReactOS Homepage - [% title %]</title> [%# Migration note: contents of the old Param 'headerhtml' would go here %] @@ -84,6 +84,8 @@ [%+ INCLUDE "global/help-header.html.tmpl" %] + <link href="/style.css" type="text/css" rel="stylesheet"> + [%# Set up the skin CSS cascade: # 1. Standard Bugzilla stylesheet set (persistent) # 2. Standard Bugzilla stylesheet set (selectable) @@ -229,31 +231,93 @@ # 'bannerhtml' #%] +<div id="top"> + <div id="topMenu"> +  + <p align="center"> + <a href="/?page=index">Home</a> <font color="#ffffff">|</font> + <a href="/?page=about">Info</a> <font color="#ffffff">|</font> + <a href="/?page=community">Community</a> <font color="#ffffff">|</font> + <a href="/?page=dev">Development</a> <font color="#ffffff">|</font> + <a href="/roscms/?page=user">myReactOS</a> </p> + </div> + </div> + +<table style="border:0" width="100%" cellpadding="0" cellspacing="0"> + <tr valign="top"> + <td style="width:147px" id="leftNav"> + <div class="navTitle">Navigation</div> + <ol> + <li><a href="/?page=index">Home</a></li> + <li><a href="/?page=about">Info</a></li> + <li><a href="/?page=community">Community</a></li> + <li><a href="/?page=dev">Development</a></li> + <li><a href="/roscms/?page=user">myReactOS</a></li> + </ol> + <p></p> + +<div class="navTitle">Bugzilla</div> + <ol> + <li><a href="/bugzilla">Main Page</a></li> + <li><a href="/bugzilla/enter_bug.cgi">New</a></li> + <li><a href="/bugzilla/query.cgi">Search</a></li> + <li><a href="/bugzilla/report.cgi">Reports</a></li> + <li><a href="/bugzilla/request.cgi">Requests</a></li> + </ol> + <p></p> + +[%# TODO we don't support switching languages yet +<div class="navTitle">Language</div> + <ol> + <li> + <div align="center"> + <select id="select" size="1" name="select" class="selectbox" onchange="window.open(this.options[this.selectedIndex].value,'_main')"> + <optgroup label="current language"> + <option value="#" selected="selected">English</option> + </optgroup> + <optgroup label="most popular"> + <option value="http://www.reactos.org/./[#inc_path_lang]../en/developer.htm">English</option> + <option value="http://www.reactos.org/./[#inc_path_lang]../de/developer.htm">Deutsch</option> + <option value="http://www.reactos.org/./[#inc_path_lang]../fr/developer.htm">Français</option> + </optgroup> + <optgroup label="other languages"> + <option value="#"><placeholder></option> + </optgroup> + </select> + </div> + </li> + </ol> + <p></p> +%] + +<div class="navTitle">Account</div> + <ol> +[% IF user.id %] + <li><a href="/roscms/?page=logout">Logout [% user.name %]</a></li> +[% ELSE %] + <li><a href="/roscms/?page=login&target=%2Fbugzilla">Login</a></li> +[% END %] + <li><a href="/roscms/?page=register&target=%2Fbugzilla">Register</a></li> + </ol> + <p></p> +</div> +</td> + +<td id="bugzillaContent"> +<div class="contentSmall"> +[% INCLUDE global/banner.html.tmpl %] +<span class="contentSmallTitle">ReactOS bug tracking and reporting - [% title %]</span> + +[%# Migration note: the following file corresponds to the old Param + # 'bannerhtml' + #%] <div id="header"> [% INCLUDE global/banner.html.tmpl %] - -<table border="0" cellspacing="0" cellpadding="0" id="titles"> -<tr> - <td id="title"> - <p>[% terms.Bugzilla %] - [% " – $header" IF header %]</p> - </td> - - [% IF subheader %] - <td id="subtitle"> - <p class="subheader">[% subheader %]</p> - </td> - [% END %] - - [% IF header_addl_info %] - <td id="information"> - <p class="header_addl_info">[% header_addl_info %]</p> - </td> - [% END %] -</tr> -</table> [% PROCESS "global/common-links.html.tmpl" btn_id = "find_top" %] Modified: trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/te… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl (original) +++ trunk/web/reactos.org/htdocs/bugzilla/template/en/default/index.html.tmpl Sun Jul 29 17:08:23 2007 @@ -114,29 +114,15 @@ <li id="query"><a href="query.cgi">Search existing [% terms.bug %] reports</a></li> <li id="enter-bug"><a href="enter_bug.cgi">Enter a new [% terms.bug %] report</a></li> <li id="report"><a href="report.cgi">Summary reports and charts</a></li> -[% IF user.id %] - <li id="userprefs"><a href="userprefs.cgi">Change password or user preferences</a></li> - [% IF user.authorizer.can_logout %] - <li id="logout"><a href="relogin.cgi">Log out [% user.login FILTER html %]</a></li> - [% END %] -[% ELSIF user.authorizer.can_login %] - </ul> - [% PROCESS "account/auth/login-small.html.tmpl" %] - <ul> - [% IF Param('createemailregexp') && user.authorizer.user_can_create_account %] - <li id="account"><a href="createaccount.cgi">Open a new [% terms.Bugzilla %] account</a></li> - [% END %] +[% IF NOT user.id %] + <li id="login"><a href="/roscms/?page=login&target=%2Fbugzilla">Log in to an existing account</a></li> + <li id="register"><a href="/roscms/?page=register&target=%2Fbugzilla">Register a new account</a></li> [% END %] <li id="sidebar"><a href="javascript:addSidebar()">Add to Sidebar</a> (requires a Mozilla browser like Mozilla Firefox)</li> <li id="quick_search_plugin"> <a href="javascript:window.external.AddSearchProvider('[% Param('urlbase') %]search_plugin.cgi')">Install the Quick Search plugin</a> (requires Firefox 2 or Internet Explorer 7) </li> - - - [%# List items of links to more things users can do on this installation. %] - [% Hook.process("links") %] - </ul> <form id="f" name="f" action="buglist.cgi" method="get" Modified: trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/bugzilla/us… ============================================================================== --- trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi (original) +++ trunk/web/reactos.org/htdocs/bugzilla/userprefs.cgi Sun Jul 29 17:08:23 2007 @@ -70,81 +70,6 @@ } } -sub SaveAccount { - my $cgi = Bugzilla->cgi; - my $dbh = Bugzilla->dbh; - my $user = Bugzilla->user; - - my $pwd1 = $cgi->param('new_password1'); - my $pwd2 = $cgi->param('new_password2'); - - if ($cgi->param('Bugzilla_password') ne "" || - $pwd1 ne "" || $pwd2 ne "") - { - my ($oldcryptedpwd) = $dbh->selectrow_array( - q{SELECT cryptpassword FROM profiles WHERE userid = ?}, - undef, $user->id); - $oldcryptedpwd || ThrowCodeError("unable_to_retrieve_password"); - - if (crypt(scalar($cgi->param('Bugzilla_password')), $oldcryptedpwd) ne - $oldcryptedpwd) - { - ThrowUserError("old_password_incorrect"); - } - - if ($pwd1 ne "" || $pwd2 ne "") - { - $cgi->param('new_password1') - || ThrowUserError("new_password_missing"); - validate_password($pwd1, $pwd2); - - if ($cgi->param('Bugzilla_password') ne $pwd1) { - my $cryptedpassword = bz_crypt($pwd1); - $dbh->do(q{UPDATE profiles - SET cryptpassword = ? - WHERE userid = ?}, - undef, ($cryptedpassword, $user->id)); - - # Invalidate all logins except for the current one - Bugzilla->logout(LOGOUT_KEEP_CURRENT); - } - } - } - - if(Bugzilla->params->{"allowemailchange"} && $cgi->param('new_login_name')) { - my $old_login_name = $cgi->param('Bugzilla_login'); - my $new_login_name = trim($cgi->param('new_login_name')); - - if($old_login_name ne $new_login_name) { - $cgi->param('Bugzilla_password') - || ThrowUserError("old_password_required"); - - use Bugzilla::Token; - # Block multiple email changes for the same user. - if (Bugzilla::Token::HasEmailChangeToken($user->id)) { - ThrowUserError("email_change_in_progress"); - } - - # Before changing an email address, confirm one does not exist. - validate_email_syntax($new_login_name) - || ThrowUserError('illegal_email_address', {addr => $new_login_name}); - is_available_username($new_login_name) - || ThrowUserError("account_exists", {email => $new_login_name}); - - Bugzilla::Token::IssueEmailChangeToken($user->id, $old_login_name, - $new_login_name); - - $vars->{'email_changes_saved'} = 1; - } - } - - my $realname = trim($cgi->param('realname')); - trick_taint($realname); # Only used in a placeholder - $dbh->do("UPDATE profiles SET realname = ? WHERE userid = ?", - undef, ($realname, $user->id)); -} - - sub DoSettings { my $user = Bugzilla->user; @@ -516,7 +441,7 @@ # Do any saving, and then display the current tab. SWITCH: for ($current_tab_name) { /^account$/ && do { - SaveAccount() if $cgi->param('dosave'); + #SaveAccount() if $cgi->param('dosave'); DoAccount(); last SWITCH; };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs