Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[cwittich] 23769: fix indentation
by cwittich＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: cwittich Date: Tue Aug 29 17:01:47 2006 New Revision: 23769 URL: http://svn.reactos.org/svn/reactos?rev=23769&view=rev Log: fix indentation Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c trunk/reactos/base/applications/msconfig/generalpage.c trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c trunk/reactos/base/applications/msconfig/systempage.c trunk/reactos/base/applications/msconfig/toolspage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.c (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c Tue Aug 29 17:01:47 2006 @@ -21,9 +21,8 @@ switch (message) { case WM_INITDIALOG: hFreeLdrDialog = hDlg; - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - return TRUE; - } - - return 0; + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + return TRUE; + } + return 0; } Modified: trunk/reactos/base/applications/msconfig/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/generalpage.c (original) +++ trunk/reactos/base/applications/msconfig/generalpage.c Tue Aug 29 17:01:47 2006 @@ -21,9 +21,8 @@ switch (message) { case WM_INITDIALOG: hGeneralDialog = hDlg; - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - return TRUE; - } - - return 0; + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + return TRUE; + } + return 0; } Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Tue Aug 29 17:01:47 2006 @@ -17,10 +17,10 @@ BOOL OnCreate(HWND hWnd) { - TCHAR szTemp[256]; - TCITEM item; - - hTabWnd = GetDlgItem(hWnd, IDC_TAB); + TCHAR szTemp[256]; + TCITEM item; + + hTabWnd = GetDlgItem(hWnd, IDC_TAB); hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc); hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc); hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc); @@ -31,38 +31,38 @@ LoadString(hInst, IDS_MSCONFIG, szTemp, 256); SetWindowText(hWnd, szTemp); - // Insert Tab Pages - LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); + // Insert Tab Pages + LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; (void)TabCtrl_InsertItem(hTabWnd, 0, &item); - LoadString(hInst, IDS_TAB_SYSTEM, szTemp, 256); + LoadString(hInst, IDS_TAB_SYSTEM, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; (void)TabCtrl_InsertItem(hTabWnd, 1, &item); - LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); + LoadString(hInst, IDS_TAB_FREELDR, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; (void)TabCtrl_InsertItem(hTabWnd, 2, &item); - LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); + LoadString(hInst, IDS_TAB_SERVICES, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; (void)TabCtrl_InsertItem(hTabWnd, 3, &item); - LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); + LoadString(hInst, IDS_TAB_STARTUP, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; (void)TabCtrl_InsertItem(hTabWnd, 4, &item); - LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); + LoadString(hInst, IDS_TAB_TOOLS, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); item.mask = TCIF_TEXT; item.pszText = szTemp; @@ -70,7 +70,7 @@ MsConfig_OnTabWndSelChange(); - return TRUE; + return TRUE; } @@ -80,58 +80,58 @@ case 0: //General ShowWindow(hGeneralPage, SW_SHOW); ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_HIDE); BringWindowToTop(hGeneralPage); - break; + break; case 1: //SYSTEM.INI ShowWindow(hGeneralPage, SW_HIDE); ShowWindow(hSystemPage, SW_SHOW); ShowWindow(hToolsPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); BringWindowToTop(hSystemPage); break; case 2: //Freeldr ShowWindow(hGeneralPage, SW_HIDE); ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_SHOW); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_HIDE); BringWindowToTop(hFreeLdrPage); - break; + break; case 3: //Services ShowWindow(hGeneralPage, SW_HIDE); ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_SHOW); - ShowWindow(hStartupPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_SHOW); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_HIDE); BringWindowToTop(hServicesPage); - break; + break; case 4: //startup ShowWindow(hGeneralPage, SW_HIDE); ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_SHOW); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_SHOW); ShowWindow(hToolsPage, SW_HIDE); BringWindowToTop(hStartupPage); - break; - case 5: //Tools - ShowWindow(hGeneralPage, SW_HIDE); - ShowWindow(hSystemPage, SW_HIDE); - ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); + break; + case 5: //Tools + ShowWindow(hGeneralPage, SW_HIDE); + ShowWindow(hSystemPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_SHOW); BringWindowToTop(hToolsPage); - break; - } + break; + } } @@ -142,43 +142,44 @@ int idctrl; LPNMHDR pnmh; - switch (message) { - case WM_INITDIALOG: - hMainWnd = hDlg; - return OnCreate(hDlg); - - case WM_COMMAND: - - if (LOWORD(wParam) == IDOK) { - //MsConfig_OnSaveChanges(); - } - - if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { - EndDialog(hDlg, LOWORD(wParam)); - return TRUE; - } - break; - - case WM_NOTIFY: - idctrl = (int)wParam; - pnmh = (LPNMHDR)lParam; - if ((pnmh->hwndFrom == hTabWnd) && - (pnmh->idFrom == IDC_TAB) && - (pnmh->code == TCN_SELCHANGE)) - { - MsConfig_OnTabWndSelChange(); - } - break; - - case WM_DESTROY: - DestroyWindow(hToolsPage); - DestroyWindow(hGeneralPage); - DestroyWindow(hServicesPage); - DestroyWindow(hStartupPage); - DestroyWindow(hFreeLdrPage); - DestroyWindow(hSystemPage); - return DefWindowProc(hDlg, message, wParam, lParam); - + switch (message) + { + case WM_INITDIALOG: + hMainWnd = hDlg; + return OnCreate(hDlg); + + case WM_COMMAND: + + if (LOWORD(wParam) == IDOK) + { + //MsConfig_OnSaveChanges(); + } + + if (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL) { + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + break; + + case WM_NOTIFY: + idctrl = (int)wParam; + pnmh = (LPNMHDR)lParam; + if ((pnmh->hwndFrom == hTabWnd) && + (pnmh->idFrom == IDC_TAB) && + (pnmh->code == TCN_SELCHANGE)) + { + MsConfig_OnTabWndSelChange(); + } + break; + + case WM_DESTROY: + DestroyWindow(hToolsPage); + DestroyWindow(hGeneralPage); + DestroyWindow(hServicesPage); + DestroyWindow(hStartupPage); + DestroyWindow(hFreeLdrPage); + DestroyWindow(hSystemPage); + return DefWindowProc(hDlg, message, wParam, lParam); } return 0; Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c Tue Aug 29 17:01:47 2006 @@ -18,9 +18,9 @@ INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - LV_COLUMN column; - TCHAR szTemp[256]; - DWORD dwStyle; + LV_COLUMN column; + TCHAR szTemp[256]; + DWORD dwStyle; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); @@ -35,7 +35,7 @@ dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; SendMessage(hServicesListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); // Initialize the application page's controls column.mask = LVCF_TEXT | LVCF_WIDTH; @@ -64,10 +64,10 @@ (void)ListView_InsertColumn(hServicesListCtrl, 3, &column); GetServices(); - return TRUE; - } - - return 0; + return TRUE; + } + + return 0; } void @@ -106,7 +106,7 @@ /* reserve memory for service info array */ pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (!pServiceStatus) - return; + return; /* fill array with service info */ if (EnumServicesStatusEx(ScHandle, SC_ENUM_PROCESS_INFO, SERVICE_WIN32, SERVICE_STATE_ALL, (LPBYTE)pServiceStatus, BytesNeeded, &BytesNeeded, &NumServices, &ResumeHandle, 0) == 0) @@ -146,7 +146,7 @@ { pServiceFailureActions = (LPSERVICE_FAILURE_ACTIONS) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceFailureActions == NULL) - return; + return; if (!QueryServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, (LPBYTE)pServiceFailureActions, BytesNeeded, &BytesNeeded)) { @@ -170,11 +170,11 @@ } } - if (pServiceFailureActions != NULL) - { - HeapFree(GetProcessHeap(), 0, pServiceFailureActions); - pServiceFailureActions = NULL; - } + if (pServiceFailureActions != NULL) + { + HeapFree(GetProcessHeap(), 0, pServiceFailureActions); + pServiceFailureActions = NULL; + } /* get vendor of service binary */ BytesNeeded = 0; @@ -184,7 +184,7 @@ { pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(GetProcessHeap(), 0, BytesNeeded); if (pServiceConfig == NULL) - return; + return; if (!QueryServiceConfig(hService, pServiceConfig, BytesNeeded, &BytesNeeded)) { @@ -208,20 +208,21 @@ _tcscpy(FileName, pServiceConfig->lpBinaryPathName); } - HeapFree(GetProcessHeap(), 0, pServiceConfig); - pServiceConfig = NULL; - - dwLen = GetFileVersionInfoSize(FileName, &dwHandle); + HeapFree(GetProcessHeap(), 0, pServiceConfig); + pServiceConfig = NULL; + + dwLen = GetFileVersionInfoSize(FileName, &dwHandle); if (dwLen) { lpData = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, dwLen); if (lpData == NULL) - return; - - if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) { - HeapFree(GetProcessHeap(), 0, lpData); - return; - } + return; + + if (!GetFileVersionInfo (FileName, dwHandle, dwLen, lpData)) + { + HeapFree(GetProcessHeap(), 0, lpData); + return; + } if (VerQueryValue(lpData, _T("\\VarFileInfo\\Translation"), &pvData, (PUINT) &BufLen)) { @@ -230,12 +231,13 @@ wsprintf(szStrFileInfo, _T("StringFileInfo\\%04X%04X\\CompanyName"), wCodePage, wLangID); } - if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) { + if (VerQueryValue (lpData, szStrFileInfo, (LPVOID) &lpBuffer, (PUINT) &BufLen)) + { item.pszText = lpBuffer; item.iSubItem = 2; SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - HeapFree(GetProcessHeap(), 0, lpData); + HeapFree(GetProcessHeap(), 0, lpData); } else { @@ -259,5 +261,4 @@ CloseServiceHandle(ScHandle); } - } Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c Tue Aug 29 17:01:47 2006 @@ -60,8 +60,8 @@ GetAutostartEntriesFromRegistry(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); GetAutostartEntriesFromRegistry(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); - GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupreg")); - GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupfolder")); + GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupreg")); + GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupfolder")); //FIXME: What about HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Userinit //FIXME: Common Startup (startmenu) @@ -181,7 +181,7 @@ item.iItem = ListView_GetItemCount(hStartupListCtrl); item.lParam = 0; (void)ListView_InsertItem(hStartupListCtrl, &item); - ListView_SetCheckState(hStartupListCtrl, item.iItem, TRUE); + ListView_SetCheckState(hStartupListCtrl, item.iItem, TRUE); if (dwType == REG_SZ) { Modified: trunk/reactos/base/applications/msconfig/systempage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/systempage.c (original) +++ trunk/reactos/base/applications/msconfig/systempage.c Tue Aug 29 17:01:47 2006 @@ -17,11 +17,13 @@ UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); switch (message) { - case WM_INITDIALOG: - hSystemDialog = hDlg; - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - return TRUE; - } + case WM_INITDIALOG: + { + hSystemDialog = hDlg; + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + return TRUE; + } + } - return 0; + return 0; } Modified: trunk/reactos/base/applications/msconfig/toolspage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/toolspage.c (original) +++ trunk/reactos/base/applications/msconfig/toolspage.c Tue Aug 29 17:01:47 2006 @@ -20,11 +20,11 @@ DWORD ListItems_Params[20]; void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id ) { - TCHAR szTemp[256]; + TCHAR szTemp[256]; LV_ITEM item; - LoadString(hInst, name_id, szTemp, 256); - memset(&item, 0, sizeof(LV_ITEM)); + LoadString(hInst, name_id, szTemp, 256); + memset(&item, 0, sizeof(LV_ITEM)); item.mask = LVIF_TEXT; item.iImage = 0; item.pszText = szTemp; @@ -32,102 +32,114 @@ item.lParam = 0; (void)ListView_InsertItem(hToolsListCtrl, &item); - ListItems_Cmds[item.iItem] = cmd_id; - ListItems_Params[item.iItem] = param_id; + ListItems_Cmds[item.iItem] = cmd_id; + ListItems_Params[item.iItem] = param_id; - LoadString(hInst, descr_id, szTemp, 256); - item.pszText = szTemp; - item.iSubItem = 1; - SendMessage(hToolsListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + LoadString(hInst, descr_id, szTemp, 256); + item.pszText = szTemp; + item.iSubItem = 1; + SendMessage(hToolsListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } void FillListView ( void ) { - AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM); - AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM); - AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM); - AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM); + AddItem(IDS_TOOLS_CMD_NAME, IDS_TOOLS_CMD_DESCR, IDS_TOOLS_CMD_CMD, IDS_TOOLS_CMD_PARAM); + AddItem(IDS_TOOLS_REGEDIT_NAME, IDS_TOOLS_REGEDIT_DESCR, IDS_TOOLS_REGEDIT_CMD,IDS_TOOLS_REGEDIT_PARAM); + AddItem(IDS_TOOLS_SYSDM_NAME, IDS_TOOLS_SYSDM_DESCR, IDS_TOOLS_SYSDM_CMD, IDS_TOOLS_SYSDM_PARAM); + AddItem(IDS_TOOLS_INFO_NAME, IDS_TOOLS_INFO_DESCR, IDS_TOOLS_INFO_CMD, IDS_TOOLS_INFO_PARAM); } INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - LV_COLUMN column; - TCHAR szTemp[256]; - TCHAR szTemp2[256]; - LPNMITEMACTIVATE lpnmitem; - LPNMHDR nmh; - DWORD dwStyle; + LV_COLUMN column; + TCHAR szTemp[256]; + TCHAR szTemp2[256]; + LPNMITEMACTIVATE lpnmitem; + LPNMHDR nmh; + DWORD dwStyle; - switch (message) { - case WM_INITDIALOG: + switch (message) + { + case WM_INITDIALOG: + { + hToolsListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); + hToolsDialog = hDlg; - hToolsListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); - hToolsDialog = hDlg; + dwStyle = (DWORD) SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); + dwStyle = dwStyle | LVS_EX_FULLROWSELECT; + SendMessage(hToolsListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); - dwStyle = (DWORD) SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); - dwStyle = dwStyle | LVS_EX_FULLROWSELECT; - SendMessage(hToolsListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); - SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + // Initialize the application page's controls + column.mask = LVCF_TEXT | LVCF_WIDTH; - // Initialize the application page's controls - column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_TOOLS_COLUMN_NAME, szTemp, 256); + column.pszText = szTemp; + column.cx = 150; + (void)ListView_InsertColumn(hToolsListCtrl, 0, &column); - LoadString(hInst, IDS_TOOLS_COLUMN_NAME, szTemp, 256); - column.pszText = szTemp; - column.cx = 150; - (void)ListView_InsertColumn(hToolsListCtrl, 0, &column); + column.mask = LVCF_TEXT | LVCF_WIDTH; + LoadString(hInst, IDS_TOOLS_COLUMN_DESCR, szTemp, 256); + column.pszText = szTemp; + column.cx = 500; + (void)ListView_InsertColumn(hToolsListCtrl, 1, &column); - column.mask = LVCF_TEXT | LVCF_WIDTH; - LoadString(hInst, IDS_TOOLS_COLUMN_DESCR, szTemp, 256); - column.pszText = szTemp; - column.cx = 500; - (void)ListView_InsertColumn(hToolsListCtrl, 1, &column); - - FillListView(); - return TRUE; - + FillListView(); + return TRUE; + } case WM_COMMAND: - switch (LOWORD(wParam)) { - case IDC_BTN_RUN: - if (ListView_GetSelectionMark(hToolsListCtrl) != -1) { - LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], szTemp, 256); - LoadString(hInst, ListItems_Params[ListView_GetSelectionMark(hToolsListCtrl)], szTemp2, 256); - ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); - } - } - break; - - case WM_NOTIFY: - nmh = (LPNMHDR) lParam; - if (nmh->hwndFrom == hToolsListCtrl) - { - switch (nmh->code) - { - case NM_CLICK: - lpnmitem = (LPNMITEMACTIVATE) lParam; - if (lpnmitem->iItem > -1) { - LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); - LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); - _tcscat(szTemp, _T(" ")); - _tcscat(szTemp, szTemp2); - SendDlgItemMessage(hToolsDialog, IDC_TOOLS_CMDLINE, WM_SETTEXT, 0, (LPARAM) szTemp); - } - break; - case NM_DBLCLK: - lpnmitem = (LPNMITEMACTIVATE) lParam; - if (lpnmitem->iItem > -1) { - LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); - LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); - ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); - } - break; - } - } - break; - } - - return 0; + switch (LOWORD(wParam)) + { + case IDC_BTN_RUN: + { + if (ListView_GetSelectionMark(hToolsListCtrl) != -1) + { + LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], szTemp, 256); + LoadString(hInst, ListItems_Params[ListView_GetSelectionMark(hToolsListCtrl)], szTemp2, 256); + ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + } + } + } + break; + } + case WM_NOTIFY: + { + nmh = (LPNMHDR) lParam; + if (nmh->hwndFrom == hToolsListCtrl) + { + switch (nmh->code) + { + case NM_CLICK: + { + lpnmitem = (LPNMITEMACTIVATE) lParam; + if (lpnmitem->iItem > -1) + { + LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); + _tcscat(szTemp, _T(" ")); + _tcscat(szTemp, szTemp2); + SendDlgItemMessage(hToolsDialog, IDC_TOOLS_CMDLINE, WM_SETTEXT, 0, (LPARAM) szTemp); + } + break; + } + case NM_DBLCLK: + { + lpnmitem = (LPNMITEMACTIVATE) lParam; + if (lpnmitem->iItem > -1) + { + LoadString(hInst, ListItems_Cmds[lpnmitem->iItem], szTemp, 256); + LoadString(hInst, ListItems_Params[lpnmitem->iItem], szTemp2, 256); + ShellExecute(0, _T("open"), szTemp, szTemp2, _T(""), SW_NORMAL); + } + break; + } + } + } + } + break; + } + return 0; }

1 0

[hpoussin] 23768: Add some missing SIDs. Fix bug 1772. See http://www.msfn.org/board/lofiversion/index.php/t43597.html for the list of authorities
by hpoussin＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: hpoussin Date: Tue Aug 29 15:27:50 2006 New Revision: 23768 URL: http://svn.reactos.org/svn/reactos?rev=23768&view=rev Log: Add some missing SIDs. Fix bug 1772. See http://www.msfn.org/board/lofiversion/index.php/t43597.html for the list of authorities Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Aug 29 15:27:50 2006 @@ -526,6 +526,18 @@ #define SECURITY_NETWORK_SERVICE_RID 0x00000014L #define SECURITY_NT_NON_UNIQUE 0x00000015L #define SECURITY_BUILTIN_DOMAIN_RID 0x00000020L + +/* S-1-6 */ +#define SECURITY_SITE_SERVER_AUTHORITY {0,0,0,0,0,6} + +/* S-1-7 */ +#define SECURITY_INTERNET_SITE_AUTHORITY {0,0,0,0,0,7} + +/* S-1-8 */ +#define SECURITY_EXCHANGE_AUTHORITY {0,0,0,0,0,8} + +/* S-1-9 */ +#define SECURITY_RESOURCE_MANAGER_AUTHORITY {0,0,0,0,0,9} #define SECURITY_LOGON_IDS_RID_COUNT 0x3 #define SID_REVISION 1 @@ -1028,7 +1040,7 @@ #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ -#define FIELD_OFFSET(t,f) ((LONG)&(((t*)0)->f)) +#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field))))

1 0

[hpoussin] 23767: Fix bug 1770. Patch by Grzegorz Jaskiewicz
by hpoussin＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: hpoussin Date: Tue Aug 29 15:02:08 2006 New Revision: 23767 URL: http://svn.reactos.org/svn/reactos?rev=23767&view=rev Log: Fix bug 1770. Patch by Grzegorz Jaskiewicz Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf (original) +++ trunk/reactos/boot/bootdata/hivesft.inf Tue Aug 29 15:02:08 2006 @@ -374,7 +374,7 @@ 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\ 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Display",0x00000000,"(GMT+01:00) Sarajevo, Skopje, Sofija, Warschau, Zagreb" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Display",0x00000000,"(GMT+01:00) Sarajevo, Skopje, Sofija, Warsaw, Zagreb" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Dlt",0x00000000,"Central European Daylight Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Std",0x00000000,"Central European Standard Time" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Index",0x00010001,100

1 0

[greatlrd] 23766: put in if define i386 for asm version of cos, sin, atan2, floor, ceil we do not have a C version of those commands in rbuild file
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 12:28:50 2006 New Revision: 23766 URL: http://svn.reactos.org/svn/reactos?rev=23766&view=rev Log: put in if define i386 for asm version of cos, sin, atan2, floor, ceil we do not have a C version of those commands in rbuild file Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Tue Aug 29 12:28:50 2006 @@ -85,13 +85,15 @@ <file>copy.c</file> <file>usrheap.c</file> </compilationunit> - <directory name="i386"> - <file>cos_asm.s</file> - <file>sin_asm.s</file> - <file>atan2_asm.s</file> - <file>floor_asm.s</file> - <file>ceil_asm.s</file> - </directory> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>cos_asm.s</file> + <file>sin_asm.s</file> + <file>atan2_asm.s</file> + <file>floor_asm.s</file> + <file>ceil_asm.s</file> + </directory> + </if> </directory> <directory name="ntddraw"> <compilationunit name="ntddraw.c">

1 0

[arty] 23765: Menu displays. Need stdin/hid objects.
by arty＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: arty Date: Tue Aug 29 11:16:16 2006 New Revision: 23765 URL: http://svn.reactos.org/svn/reactos?rev=23765&view=rev Log: Menu displays. Need stdin/hid objects. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Tue Aug 29 11:16:16 2006 @@ -30,6 +30,7 @@ BOOLEAN AcpiPresent = FALSE; char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 }; jmp_buf jmp; +char *video_mem = 0; void le_swap( void *start_addr_v, void *end_addr_v, @@ -107,26 +108,29 @@ ofw_print_string("ClearScreen\n"); } -VIDEODISPLAYMODE PpcVideoSetDisplayMode( char *DisplayMode, BOOLEAN Init ) { - printf( "DisplayMode: %s %s\n", DisplayMode, Init ? "true" : "false" ); - return VideoGraphicsMode; -} - -/* FIXME: Query */ VOID PpcVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) { - ofw_print_string("GetDisplaySize\n"); - *Width = 640; - *Height = 480; - *Depth = 8; + //ofw_print_string("GetDisplaySize\n"); + *Width = 80; + *Height = 25; + *Depth = 16; + //printf("GetDisplaySize(%d,%d,%d)\n", *Width, *Height, *Depth); } ULONG PpcVideoGetBufferSize() { ULONG Width, Height, Depth; - ofw_print_string("PpcVideoGetBufferSize\n"); + //ofw_print_string("PpcVideoGetBufferSize\n"); PpcVideoGetDisplaySize( &Width, &Height, &Depth ); return Width * Height * Depth / 8; } +VIDEODISPLAYMODE PpcVideoSetDisplayMode( char *DisplayMode, BOOLEAN Init ) { + //printf( "DisplayMode: %s %s\n", DisplayMode, Init ? "true" : "false" ); + if( Init && !video_mem ) { + video_mem = MmAllocateMemory( PpcVideoGetBufferSize() ); + } + return VideoTextMode; +} + VOID PpcVideoSetTextCursorPosition( ULONG X, ULONG Y ) { printf("SetTextCursorPosition(%d,%d)\n", X,Y); } @@ -140,7 +144,22 @@ } VOID PpcVideoCopyOffScreenBufferToVRAM( PVOID Buffer ) { - printf( "CopyOffScreenBufferToVRAM(%x)\n", Buffer ); + int i,j; + ULONG w,h,d; + PCHAR ChBuf = Buffer; + int offset = 0; + + PpcVideoGetDisplaySize( &w, &h, &d ); + + for( i = 0; i < h; i++ ) { + for( j = 0; j < w; j++ ) { + offset = (j * 2) + (i * w * 2); + if( ChBuf[offset] != video_mem[offset] ) { + video_mem[offset] = ChBuf[offset]; + PpcVideoPutChar(ChBuf[offset],0,j+1,i+1); + } + } + } } BOOLEAN PpcVideoIsPaletteFixed() { @@ -294,7 +313,7 @@ VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second ) { - printf("RTCGeturrentDateTime\n"); + //printf("RTCGeturrentDateTime\n"); } VOID PpcHwDetect() {

1 0

[arty] 23764: Fixed support for disk and filesystem. We're reading files normally. Now working on display modes and character input.
by arty＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: arty Date: Tue Aug 29 10:28:13 2006 New Revision: 23764 URL: http://svn.reactos.org/svn/reactos?rev=23764&view=rev Log: Fixed support for disk and filesystem. We're reading files normally. Now working on display modes and character input. Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/fs/fs.c branches/powerpc/reactos/boot/freeldr/freeldr/include/arch.h branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h branches/powerpc/reactos/tools/ofw_interface/calls.ofw Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofw_util.s Tue Aug 29 10:28:13 2006 @@ -50,7 +50,8 @@ mr %r5,%r6 mr %r6,%r7 mr %r7,%r8 - + mr %r8,%r9 + /* Goto the swapped function */ bctrl Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Tue Aug 29 10:28:13 2006 @@ -169,11 +169,16 @@ */ ULONG PpcGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { - int i, memhandle, returned, total = 0, num_mem = 0; + int i, memhandle, mmuhandle, returned, total = 0, num_mem = 0; int memdata[256]; + + printf("PpcGetMemoryMap(%d)\n", MaxMemoryMapSize); ofw_getprop(chosen_package, "memory", (char *)&memhandle, sizeof(memhandle)); + ofw_getprop(chosen_package, "mmu", + (char *)&mmuhandle, sizeof(mmuhandle)); + returned = ofw_getprop(memhandle, "available", (char *)memdata, sizeof(memdata)); @@ -188,6 +193,10 @@ BiosMemoryMap[num_mem].Length = TOTAL_HEAP_NEEDED; ofw_claim(BiosMemoryMap[num_mem].BaseAddress, BiosMemoryMap[num_mem].Length, 0x1000); /* claim it */ + printf("virt2phys(%x)->%x\n", + BiosMemoryMap[num_mem].BaseAddress, + ofw_virt2phys + (mmuhandle, BiosMemoryMap[num_mem].BaseAddress)); total += BiosMemoryMap[0].Length; num_mem++; } @@ -237,7 +246,7 @@ } BOOLEAN PpcDiskReadLogicalSectors( ULONG DriveNumber, ULONGLONG SectorNumber, - ULONG SectorCount, PVOID Buffer ) { + ULONG SectorCount, PVOID Buffer ) { int rlen = 0; if( part_handle == -1 ) { @@ -254,11 +263,13 @@ return FALSE; } - if( ofw_seek( part_handle, SectorNumber * 512 ) ) { - printf("Seek to %x failed\n", SectorNumber * 512); + if( ofw_seek( part_handle, + (ULONG)(SectorNumber >> 25), + (ULONG)((SectorNumber * 512) & 0xffffffff) ) ) { + printf("Seek to %x failed\n", (ULONG)(SectorNumber * 512)); return FALSE; } - rlen = ofw_read( part_handle, Buffer, SectorCount * 512 ); + rlen = ofw_read( part_handle, Buffer, (ULONG)(SectorCount * 512) ); return rlen > 0; } @@ -293,15 +304,25 @@ typedef unsigned int uint32_t; void PpcInit( of_proxy the_ofproxy ) { - int len; + int len, stdin_handle_chosen; ofproxy = the_ofproxy; - ofw_print_string("Made it into freeldr LE code ... bootstrap complete\n"); + ofw_print_string("Freeldr PowerPC Init\n"); chosen_package = ofw_finddevice( "/chosen" ); + ofw_print_string("Freeldr: chosen_package is "); + ofw_print_number(chosen_package); + ofw_print_string("\n"); + ofw_getprop( chosen_package, "stdin", - (char *)&stdin_handle, sizeof(stdin_handle) ); + (char *)&stdin_handle_chosen, sizeof(stdin_handle_chosen) ); + + ofw_print_string("Freeldr: stdin_handle is "); + ofw_print_number(stdin_handle_chosen); + ofw_print_string("\n"); + + stdin_handle = stdin_handle_chosen; /* stdin_handle = REV(stdin_handle); */ Modified: branches/powerpc/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/fs/fs.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/fs/fs.c Tue Aug 29 10:28:13 2006 @@ -27,6 +27,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////// ULONG FsType = 0; // Type of filesystem on boot device, set by FsOpenVolume() +PVOID FsStaticBufferDisk = 0, FsStaticBufferData = 0; ///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS @@ -51,8 +52,20 @@ { CHAR ErrorText[80]; + printf("FsOpenVolume: (disk=%d,start=%d,count=%d,type=%d)\n", + DriveNumber, StartSector, SectorCount, Type); + FsType = Type; + if( !FsStaticBufferDisk ) + FsStaticBufferDisk = MmAllocateMemory( 0x20000 ); + if( !FsStaticBufferDisk ) + { + FileSystemError("could not allocate filesystem static buffer"); + return FALSE; + } + FsStaticBufferData = ((PCHAR)FsStaticBufferDisk) + 0x10000; + switch (FsType) { case FS_FAT: Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/arch.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/arch.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/arch.h Tue Aug 29 10:28:13 2006 @@ -34,11 +34,17 @@ #define STACK16ADDR 0x7000 /* The 16-bit stack top will be at 0000:7000 */ #define STACK32ADDR 0x78000 /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ +#ifdef _M_IX86 #define BIOSCALLBUFFER 0x78000 /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFSEGMENT 0x7800 /* Buffer to store temporary data for any Int386() call */ #define BIOSCALLBUFOFFSET 0x0000 /* Buffer to store temporary data for any Int386() call */ #define FILESYSBUFFER 0x80000 /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER 0x90000 /* Buffer to store data read in from the disk via the BIOS */ +#elif defined(_M_PPC) +extern PVOID FsStaticBufferDisk, FsStaticBufferData; +#define DISKREADBUFFER FsStaticBufferDisk +#define FILESYSBUFFER FsStaticBufferData +#endif /* Makes "x" a global variable or label */ #define EXTERN(x) .global x; x: Modified: branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/include/of.h Tue Aug 29 10:28:13 2006 @@ -10,7 +10,7 @@ #include <string.h> typedef int (*of_proxy) - ( int table_off, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5 ); + ( int table_off, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 ); typedef long jmp_buf[100]; extern of_proxy ofproxy; extern void le_swap( void *begin, void *end, void *dest ); Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Tue Aug 29 10:28:13 2006 @@ -8,7 +8,7 @@ exit 0 0 child 1 1 int int peer 1 1 int int -seek 2 1 int int int +seek 3 1 int int int int # MMU methods # claim (virt size align -- base) claim 3 1 int int int int

1 0

[ion] 23763: - Complete and utter reimplementation of V86 Mode for Ke386CallBios. Details below. Tested on QEMU/VMWARE. May give you a breakpoint/crash on real hardware - please let me know the V86 opcode displayed on the debug log/screen if this is the case *if you see such a message*. - Got rid of all the previous related assembly code and implemented Ki386SetupAndExitToV86Mode and Ki386BiosCallREturnAddress. - Implemented GPF (Trap 13) code for V86 faults (which will happen in V86 mode). Impl
by ion＠svn.reactos.org 28 Aug '06

28 Aug '06

Author: ion Date: Tue Aug 29 03:56:35 2006 New Revision: 23763 URL: http://svn.reactos.org/svn/reactos?rev=23763&view=rev Log: - Complete and utter reimplementation of V86 Mode for Ke386CallBios. Details below. Tested on QEMU/VMWARE. May give you a breakpoint/crash on real hardware - please let me know the V86 opcode displayed on the debug log/screen if this is the case *if you see such a message*. - Got rid of all the previous related assembly code and implemented Ki386SetupAndExitToV86Mode and Ki386BiosCallREturnAddress. - Implemented GPF (Trap 13) code for V86 faults (which will happen in V86 mode). Implement a generic Ki386HandleOpcodeV86 handler that increments counts and calls the right opcode handler. - Implemented an Opcode Table Entry Index and Opcode Table array for mapping opcodes that caused a GPF to their V86 handlers/emulators. - Implemented handlers for PUSHF, POPF, CLI, STI, IRETD and INTnn, which is what QEMU/VMWare and *most* VIDEO ROM BIOS code should use. - Created a /vdm tree and moved all NTVDM/VDM specific code there. - Halfplemented VdmStart/EndExecution APIs which the BIOS ROM V86 implementation is built upon. Currently don't handle VDM at all, only this V86 mode. - Also added code for NtVdmControl and fixed up CSRSS and ACPI's calls to this API. - Added detection and FIXMEs for support of VMEs in VMWare, Bochs and real hardware (VME is not yet supported). - Move exp.c fixmes to krnlfun and remove kernel fun entries that this patch fixes. Added: trunk/reactos/ntoskrnl/include/internal/vdm.h trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/vdm/ trunk/reactos/ntoskrnl/vdm/vdmexec.c trunk/reactos/ntoskrnl/vdm/vdmmain.c Removed: trunk/reactos/ntoskrnl/ke/i386/v86m.c trunk/reactos/ntoskrnl/ke/i386/vdm.c trunk/reactos/ntoskrnl/mkconfig.c trunk/reactos/ntoskrnl/ntoskrnl.txt Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/drivers/bus/acpi/ospm/osl.c trunk/reactos/drivers/video/videoprt/int10.c trunk/reactos/include/ndk/asm.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S trunk/reactos/ntoskrnl/ke/main.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/subsystems/win32/csrss/video.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/osl.… Modified: trunk/reactos/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2376… Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=237… Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=237… Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Added: trunk/reactos/ntoskrnl/include/internal/vdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… Removed: trunk/reactos/ntoskrnl/ke/i386/v86m.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m.c?re… Modified: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m_sup.… Added: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… Removed: trunk/reactos/ntoskrnl/ke/i386/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/vdm.c?rev… Modified: trunk/reactos/ntoskrnl/ke/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/main.c?rev=237… Removed: trunk/reactos/ntoskrnl/mkconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mkconfig.c?rev=23… Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=23763… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… Removed: trunk/reactos/ntoskrnl/ntoskrnl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.txt?rev=… Added: trunk/reactos/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev… Added: trunk/reactos/ntoskrnl/vdm/vdmmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmmain.c?rev… Modified: trunk/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/vid…

1 0

[ion] 23762: [AUDIT] - Our CSRSS implementation is too different and incompatible for NT to have possibly been done through non-clean methods. Clean methods were probably not even used, except for reading documentation, since most of the code seems to be based on guesses and original implementations. (As a simple example, NT's CSRSS is 4kb, with all actions done by a server DLL. ROS has none of this).
by ion＠svn.reactos.org 28 Aug '06

28 Aug '06

Author: ion Date: Tue Aug 29 03:55:50 2006 New Revision: 23762 URL: http://svn.reactos.org/svn/reactos?rev=23762&view=rev Log: [AUDIT] - Our CSRSS implementation is too different and incompatible for NT to have possibly been done through non-clean methods. Clean methods were probably not even used, except for reading documentation, since most of the code seems to be based on guesses and original implementations. (As a simple example, NT's CSRSS is 4kb, with all actions done by a server DLL. ROS has none of this). Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c (props changed) trunk/reactos/subsystems/win32/csrss/api/process.c (props changed) trunk/reactos/subsystems/win32/csrss/api/wapi.c (props changed) trunk/reactos/subsystems/win32/csrss/csrss.c (props changed) trunk/reactos/subsystems/win32/csrss/init.c (props changed) trunk/reactos/subsystems/win32/csrss/print.c (props changed) trunk/reactos/subsystems/win32/csrss/video.c (props changed) Propchange: trunk/reactos/subsystems/win32/csrss/api/handle.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/api/process.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/api/wapi.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/csrss.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/init.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/print.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/subsystems/win32/csrss/video.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[weiden] 23761: Move the __ALIGNED attribute to the correct position in the definition of EX_PUSH_LOCK_WAIT_BLOCK
by weiden＠svn.reactos.org 28 Aug '06

28 Aug '06

Author: weiden Date: Tue Aug 29 00:20:03 2006 New Revision: 23761 URL: http://svn.reactos.org/svn/reactos?rev=23761&view=rev Log: Move the __ALIGNED attribute to the correct position in the definition of EX_PUSH_LOCK_WAIT_BLOCK Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h (original) +++ trunk/reactos/include/ndk/extypes.h Tue Aug 29 00:20:03 2006 @@ -422,8 +422,7 @@ // // Executive Pushlock Wait Block // -__ALIGNED(16) -typedef struct _EX_PUSH_LOCK_WAIT_BLOCK +typedef __ALIGNED(16) struct _EX_PUSH_LOCK_WAIT_BLOCK { union {

1 0

[gedmurphy] 23760: couple of minor fixes.
by gedmurphy＠svn.reactos.org 28 Aug '06

28 Aug '06

Author: gedmurphy Date: Mon Aug 28 23:33:28 2006 New Revision: 23760 URL: http://svn.reactos.org/svn/reactos?rev=23760&view=rev Log: couple of minor fixes. Modified: trunk/reactos/base/applications/network/ipconfig/En.rc trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Modified: trunk/reactos/base/applications/network/ipconfig/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/En.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/En.rc Mon Aug 28 23:33:28 2006 @@ -1,3 +1,4 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c Mon Aug 28 23:33:28 2006 @@ -443,7 +443,7 @@ if (bAll) { - _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), GetConnectionDescription(pAdapter->AdapterName)); /// here !! + _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), GetConnectionDescription(pAdapter->AdapterName)); _tprintf(_T("\tPhysical Address. . . . . . . . . : %s\n"), PrintMacAddr(pAdapter->Address)); if (pAdapter->DhcpEnabled) _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); @@ -497,6 +497,7 @@ VOID Release(LPTSTR Index) { IP_ADAPTER_INDEX_MAP AdapterInfo; + DWORD ret; /* if interface is not given, query GetInterfaceInfo */ if (Index == NULL) @@ -541,10 +542,10 @@ /* Call IpReleaseAddress to release the IP address on the specified adapter. */ - if (IpReleaseAddress(&AdapterInfo) != NO_ERROR) + if (ret = IpReleaseAddress(&AdapterInfo) != NO_ERROR) { _tprintf(_T("\nAn error occured while releasing interface %S : \n"), AdapterInfo.Name); - DoFormatMessage(0); + DoFormatMessage(ret); } } Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Mon Aug 28 23:33:28 2006 @@ -5,9 +5,7 @@ #define REACTOS_STR_FILE_DESCRIPTION "IP Configuration utility\0" #define REACTOS_STR_INTERNAL_NAME "ipconfig\0" #define REACTOS_STR_ORIGINAL_FILENAME "ipconfig.exe\0" -#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy <gedmurphy(a)gmail.com\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy <gedmurphy(a)gmail.com>\0" #include <reactos/version.rc> -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - #include "En.rc"

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
45
Older →

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 August 2006