Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 23775: Copied remotely
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 19:04:58 2006 New Revision: 23775 URL: http://svn.reactos.org/svn/reactos?rev=23775&view=rev Log: Copied remotely Added: trunk/reactos/lib/crt/math/i386/floor_asm.s - copied unchanged from r23774, trunk/reactos/lib/rtl/i386/floor_asm.s

1 0

[greatlrd] 23774: Copied remotely
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 19:03:41 2006 New Revision: 23774 URL: http://svn.reactos.org/svn/reactos?rev=23774&view=rev Log: Copied remotely Added: trunk/reactos/lib/crt/math/i386/cos_asm.s - copied unchanged from r23773, trunk/reactos/lib/rtl/i386/cos_asm.s

1 0

[greatlrd] 23773: Copied remotely ceil from rtl to crt/math/i386
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 19:02:41 2006 New Revision: 23773 URL: http://svn.reactos.org/svn/reactos?rev=23773&view=rev Log: Copied remotely ceil from rtl to crt/math/i386 Added: trunk/reactos/lib/crt/math/i386/ceil_asm.s - copied unchanged from r23772, trunk/reactos/lib/rtl/i386/ceil_asm.s

1 0

[greatlrd] 23772: Created folder remotely here we prepare copy asm version of math api from rtl asm version
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 19:01:19 2006 New Revision: 23772 URL: http://svn.reactos.org/svn/reactos?rev=23772&view=rev Log: Created folder remotely here we prepare copy asm version of math api from rtl asm version Added: trunk/reactos/lib/crt/math/i386/

1 0

[greatlrd] 23771: add back change long to long_ptr change did not think about it was correct thx hpussin
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 18:25:55 2006 New Revision: 23771 URL: http://svn.reactos.org/svn/reactos?rev=23771&view=rev Log: add back change long to long_ptr change did not think about it was correct thx hpussin 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 18:25:55 2006 @@ -1028,7 +1028,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

[greatlrd] 23770: revert 23768 for this member does not exists in psdk or ddk in windows. and that reason is it wrong. I told the author of the patch on the irc this changes was wrong.
by greatlrd＠svn.reactos.org 29 Aug '06

29 Aug '06

Author: greatlrd Date: Tue Aug 29 18:13:42 2006 New Revision: 23770 URL: http://svn.reactos.org/svn/reactos?rev=23770&view=rev Log: revert 23768 for this member does not exists in psdk or ddk in windows. and that reason is it wrong. I told the author of the patch on the irc this changes was wrong. 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 18:13:42 2006 @@ -526,18 +526,6 @@ #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 @@ -1040,7 +1028,7 @@ #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ -#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#define FIELD_OFFSET(t,f) ((LONG)&(((t*)0)->f)) #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field))))

1 0

[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

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