Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[janderwald] 23517: * make 2nd stage setup semi-unattendable (locale page is missing) * to enable add the boot\bootdata\unattend.inf 6 optional to boot\bootdata\packages\reactos.dff
by janderwald＠svn.reactos.org 07 Aug '06

07 Aug '06

Author: janderwald Date: Mon Aug 7 17:31:11 2006 New Revision: 23517 URL: http://svn.reactos.org/svn/reactos?rev=23517&view=rev Log: * make 2nd stage setup semi-unattendable (locale page is missing) * to enable add the boot\bootdata\unattend.inf 6 optional to boot\bootdata\packages\reactos.dff Modified: trunk/reactos/dll/win32/syssetup/globals.h trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/globals… ============================================================================== --- trunk/reactos/dll/win32/syssetup/globals.h (original) +++ trunk/reactos/dll/win32/syssetup/globals.h Mon Aug 7 17:31:11 2006 @@ -37,8 +37,6 @@ ULONG Index; } TIMEZONE_ENTRY, *PTIMEZONE_ENTRY; - - typedef struct _SETUPDATA { HFONT hTitleFont; @@ -47,10 +45,14 @@ TCHAR OwnerOrganization[51]; TCHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; /* max. 63 characters */ TCHAR AdminPassword[15]; /* max. 14 characters */ + BOOL UnattendSetup; SYSTEMTIME SystemTime; PTIMEZONE_ENTRY TimeZoneListHead; PTIMEZONE_ENTRY TimeZoneListTail; + DWORD TimeZoneIndex; + DWORD DisableAutoDaylightTimeSet; + LCID LocaleID; } SETUPDATA, *PSETUPDATA; Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Mon Aug 7 17:31:11 2006 @@ -268,6 +268,15 @@ case PSN_SETACTIVE: /* Enable the Next button */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + if (SetupData.UnattendSetup) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_ACKPAGE); + return TRUE; + } + break; + + case PSN_WIZBACK: + SetupData.UnattendSetup = FALSE; break; default: @@ -360,6 +369,15 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (SetupData.UnattendSetup) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_OWNERPAGE); + return TRUE; + } + break; + + case PSN_WIZBACK: + SetupData.UnattendSetup = FALSE; break; default: @@ -375,6 +393,50 @@ return FALSE; } +static +BOOL +WriteOwnerSettings(TCHAR * OwnerName, + TCHAR * OwnerOrganization) +{ + HKEY hKey; + LONG res; + + + + res = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("Software\\Microsoft\\Windows NT\\CurrentVersion"), + 0, + KEY_ALL_ACCESS, + &hKey); + + if (res != ERROR_SUCCESS) + { + return FALSE; + } + + res = RegSetValueEx(hKey, + _T("RegisteredOwner"), + 0, + REG_SZ, + (LPBYTE)OwnerName, + (_tcslen(OwnerName) + 1) * sizeof(TCHAR)); + + if (res != ERROR_SUCCESS) + { + RegCloseKey(hKey); + return FALSE; + } + + res = RegSetValueEx(hKey, + _T("RegisteredOrganization"), + 0, + REG_SZ, + (LPBYTE)OwnerOrganization, + (_tcslen(OwnerOrganization) + 1) * sizeof(TCHAR)); + + RegCloseKey(hKey); + return (res == ERROR_SUCCESS); +} static INT_PTR CALLBACK OwnerPageDlgProc(HWND hwndDlg, @@ -384,7 +446,6 @@ { TCHAR OwnerName[51]; TCHAR OwnerOrganization[51]; - HKEY hKey; LPNMHDR lpnm; switch (uMsg) @@ -409,6 +470,16 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (SetupData.UnattendSetup) + { + SendMessage(GetDlgItem(hwndDlg, IDC_OWNERNAME), WM_SETTEXT, 0, (LPARAM)SetupData.OwnerName); + SendMessage(GetDlgItem(hwndDlg, IDC_OWNERORGANIZATION), WM_SETTEXT, 0, (LPARAM)SetupData.OwnerOrganization); + if (WriteOwnerSettings(SetupData.OwnerName, SetupData.OwnerOrganization)) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_COMPUTERPAGE); + return TRUE; + } + } break; case PSN_WIZNEXT: @@ -429,30 +500,15 @@ OwnerOrganization[0] = 0; GetDlgItemTextW(hwndDlg, IDC_OWNERORGANIZATION, OwnerOrganization, 50); - RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("Software\\Microsoft\\Windows NT\\CurrentVersion"), - 0, - KEY_ALL_ACCESS, - &hKey); - /* FIXME: check error code */ - - RegSetValueEx(hKey, - _T("RegisteredOwner"), - 0, - REG_SZ, - (LPBYTE)OwnerName, - (_tcslen(OwnerName) + 1) * sizeof(TCHAR)); - /* FIXME: check error code */ - - RegSetValueEx(hKey, - _T("RegisteredOrganization"), - 0, - REG_SZ, - (LPBYTE)OwnerOrganization, - (_tcslen(OwnerOrganization) + 1) * sizeof(TCHAR)); - /* FIXME: check error code */ - - RegCloseKey(hKey); + if (!WriteOwnerSettings(OwnerName, OwnerOrganization)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_OWNERNAME)); + SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + return TRUE; + } + + case PSN_WIZBACK: + SetupData.UnattendSetup = FALSE; break; default: @@ -467,7 +523,25 @@ return FALSE; } - +static +BOOL +WriteComputerSettings(TCHAR * ComputerName, HWND hwndDlg) +{ + if (!SetComputerName(ComputerName)) + { + MessageBox(hwndDlg, + _T("Setup failed to set the computer name."), + _T("ReactOS Setup"), + MB_ICONERROR | MB_OK); + + return FALSE; + } + + /* Try to also set DNS hostname */ + SetComputerNameEx(ComputerNamePhysicalDnsHostname, ComputerName); + + return TRUE; +} static INT_PTR CALLBACK ComputerPageDlgProc(HWND hwndDlg, @@ -499,6 +573,13 @@ /* Set focus to computer name */ SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); + if (SetupData.UnattendSetup) + { + SendMessage(GetDlgItem(hwndDlg, IDC_COMPUTERNAME), WM_SETTEXT, 0, (LPARAM)SetupData.ComputerName); + SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD1), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); + SendMessage(GetDlgItem(hwndDlg, IDC_ADMINPASSWORD2), WM_SETTEXT, 0, (LPARAM)SetupData.AdminPassword); + } + } break; @@ -512,6 +593,11 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (SetupData.UnattendSetup && WriteComputerSettings(SetupData.ComputerName, hwndDlg)) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_LOCALEPAGE); + return TRUE; + } break; case PSN_WIZNEXT: @@ -528,18 +614,12 @@ /* FIXME: check computer name for invalid characters */ - if (!SetComputerName(ComputerName)) - { - MessageBox(hwndDlg, - _T("Setup failed to set the computer name."), - _T("ReactOS Setup"), - MB_ICONERROR | MB_OK); - SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); - return TRUE; - } - /* Try to also set DNS hostname */ - SetComputerNameEx(ComputerNamePhysicalDnsHostname, ComputerName); + if (!WriteComputerSettings(ComputerName, hwndDlg)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); + SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + return TRUE; + } /* Check admin passwords */ GetDlgItemText(hwndDlg, IDC_ADMINPASSWORD1, Password1, 15); @@ -560,6 +640,10 @@ /* FIXME: Set admin password */ break; + case PSN_WIZBACK: + SetupData.UnattendSetup = FALSE; + break; + default: break; } @@ -666,6 +750,14 @@ FreeLibrary(hDll); } +static BOOL +SetInputLocale() +{ + //TODO + //store the default locale + + return FALSE; +} static INT_PTR CALLBACK LocalePageDlgProc(HWND hwndDlg, @@ -722,9 +814,18 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (SetupData->UnattendSetup && SetInputLocale()) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); + return TRUE; + } break; case PSN_WIZNEXT: + break; + + case PSN_WIZBACK: + SetupData->UnattendSetup = FALSE; break; default: @@ -1044,17 +1145,15 @@ static VOID -ShowTimeZoneList(HWND hwnd, PSETUPDATA SetupData) +ShowTimeZoneList(HWND hwnd, PSETUPDATA SetupData, DWORD dwEntryIndex) { PTIMEZONE_ENTRY Entry; DWORD dwIndex = 0; - DWORD dwEntryIndex = 0; DWORD dwCount; #if 0 GetTimeZoneListIndex(&dwEntryIndex); #endif - dwEntryIndex = 85; /* GMT time zone */ Entry = SetupData->TimeZoneListHead; while (Entry != NULL) @@ -1235,6 +1334,25 @@ return Ret; } +static BOOL +WriteDateTimeSettings(HWND hwndDlg, PSETUPDATA SetupData) +{ + GetLocalSystemTime(hwndDlg, SetupData); + SetLocalTimeZone(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), + SetupData); + + SetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); + if(!SetSystemLocalTime(hwndDlg, SetupData)) + { + MessageBox(hwndDlg, + _T("Setup was unable to set the local time."), + _T("ReactOS Setup"), + MB_ICONWARNING | MB_OK); + return FALSE; + } + + return TRUE; +} static INT_PTR CALLBACK DateTimePageDlgProc(HWND hwndDlg, @@ -1256,11 +1374,25 @@ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); CreateTimeZoneList(SetupData); - - ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), - SetupData); - - SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + + if (SetupData->UnattendSetup) + { + ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), + SetupData, SetupData->TimeZoneIndex); + + if (!SetupData->DisableAutoDaylightTimeSet) + { + SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + } + } + else + { + ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), + SetupData, 85 /* GMT time zone */); + + SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + } + } break; @@ -1274,6 +1406,11 @@ case PSN_SETACTIVE: /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (SetupData->UnattendSetup && WriteDateTimeSettings(hwndDlg, SetupData)) + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_PROCESSPAGE); + return TRUE; + } break; case PSN_WIZNEXT: @@ -1290,6 +1427,10 @@ MB_ICONWARNING | MB_OK); } } + break; + + case PSN_WIZBACK: + SetupData->UnattendSetup = FALSE; break; default: @@ -1610,6 +1751,10 @@ case PSN_WIZNEXT: break; + case PSN_WIZBACK: + SetupData->UnattendSetup = FALSE; + break; + default: break; } @@ -1745,8 +1890,8 @@ KillTimer(hwndDlg, 1); /* Skip the progress page */ - PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_DATETIMEPAGE); - SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); + SetupData.UnattendSetup = FALSE; return TRUE; case PSN_WIZFINISH: @@ -1764,6 +1909,86 @@ } return FALSE; +} +BOOL +ProcessUnattendInf(HINF hUnattendedInf) +{ + INFCONTEXT InfContext; + TCHAR szName[256]; + TCHAR szValue[256]; + DWORD LineLength; + + if (!SetupFindFirstLine(hUnattendedInf, + _T("Unattend"), + NULL, + &InfContext)) + { + DPRINT1("Error: SetupFindFirstLine failed %d\n", GetLastError()); + return FALSE; + } + + do + { + if (!SetupGetStringField(&InfContext, + 0, + szName, + sizeof(szName) / sizeof(TCHAR), + &LineLength)) + { + DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); + return FALSE; + } + + if (!SetupGetStringField(&InfContext, + 1, + szValue, + sizeof(szValue) / sizeof(TCHAR), + &LineLength)) + { + DPRINT1("Error: SetupGetStringField failed with %d\n", GetLastError()); + return FALSE; + } + DPRINT1("Name %S Value %S\n",szName, szValue); + if (!_tcscmp(szName, _T("FullName"))) + { + if ((sizeof(SetupData.OwnerName) / sizeof(TCHAR)) > LineLength) + { + _tcscpy(SetupData.OwnerName, szValue); + } + } + else if (!_tcscmp(szName, _T("OrgName"))) + { + if ((sizeof(SetupData.OwnerOrganization) / sizeof(TCHAR)) > LineLength) + { + _tcscpy(SetupData.OwnerOrganization, szValue); + } + } + else if (!_tcscmp(szName, _T("ComputerName"))) + { + if ((sizeof(SetupData.ComputerName) / sizeof(TCHAR)) > LineLength) + { + _tcscpy(SetupData.ComputerName, szValue); + } + } + else if (!_tcscmp(szName, _T("AdminPassword"))) + { + if ((sizeof(SetupData.AdminPassword) / sizeof(TCHAR)) > LineLength) + { + _tcscpy(SetupData.AdminPassword, szValue); + } + } + else if (!_tcscmp(szName, _T("TimeZoneIndex"))) + { + SetupData.TimeZoneIndex = _ttoi(szValue); + } + else if (_tcscmp(szName, _T("DisableAutoDaylightTimeSet"))) + { + SetupData.DisableAutoDaylightTimeSet = _ttoi(szValue); + } + } + while (SetupFindNextLine(&InfContext, &InfContext)); + + return TRUE; } @@ -1774,9 +1999,21 @@ HPROPSHEETPAGE ahpsp[8]; PROPSHEETPAGE psp = {0}; UINT nPages = 0; + HINF hUnattendedInf; /* Clear setup data */ ZeroMemory(&SetupData, sizeof(SETUPDATA)); + + hUnattendedInf = SetupOpenInfFileW(L"unattend.inf", + NULL, + INF_STYLE_OLDNT, + NULL); + + if (hUnattendedInf != INVALID_HANDLE_VALUE) + { + SetupData.UnattendSetup = ProcessUnattendInf(hUnattendedInf); + SetupCloseInfFile(hUnattendedInf); + } /* Create the Welcome page */ psp.dwSize = sizeof(PROPSHEETPAGE);

1 0

[hpoussin] 23516: Add missing svn:eol-style property
by hpoussin＠svn.reactos.org 07 Aug '06

07 Aug '06

Author: hpoussin Date: Mon Aug 7 15:11:15 2006 New Revision: 23516 URL: http://svn.reactos.org/svn/reactos?rev=23516&view=rev Log: Add missing svn:eol-style property Modified: trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/widl.man.in (props changed) trunk/reactos/tools/widl/widltypes.h Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=23… ============================================================================== --- trunk/reactos/tools/widl/parser.l (original) +++ trunk/reactos/tools/widl/parser.l Mon Aug 7 15:11:15 2006 @@ -289,7 +289,7 @@ {"small", tSMALL}, /* ... */ {"source", tSOURCE}, -/* ... */ +/* ... */ {"string", tSTRING}, {"struct", tSTRUCT}, {"switch", tSWITCH}, Propchange: trunk/reactos/tools/widl/widl.man.in ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… ============================================================================== --- trunk/reactos/tools/widl/widltypes.h (original) +++ trunk/reactos/tools/widl/widltypes.h Mon Aug 7 15:11:15 2006 @@ -171,7 +171,7 @@ TKIND_UNION, TKIND_MAX }; - + struct _attr_t { enum attr_type type; union {

1 0

[hpoussin] 23515: Skip first call to AddDevice
by hpoussin＠svn.reactos.org 07 Aug '06

07 Aug '06

Author: hpoussin Date: Mon Aug 7 15:03:35 2006 New Revision: 23515 URL: http://svn.reactos.org/svn/reactos?rev=23515&view=rev Log: Skip first call to AddDevice Modified: trunk/reactos/drivers/input/sermouse/fdo.c Modified: trunk/reactos/drivers/input/sermouse/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo… ============================================================================== --- trunk/reactos/drivers/input/sermouse/fdo.c (original) +++ trunk/reactos/drivers/input/sermouse/fdo.c Mon Aug 7 15:03:35 2006 @@ -22,6 +22,9 @@ NTSTATUS Status; DPRINT("SermouseAddDevice called. Pdo = 0x%p\n", Pdo); + + if (Pdo == NULL) + return STATUS_SUCCESS; /* Create new device object */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject);

1 0

[hpoussin] 23514: Remove extra call to SETUP_CreateDevicesList
by hpoussin＠svn.reactos.org 07 Aug '06

07 Aug '06

Author: hpoussin Date: Mon Aug 7 15:02:14 2006 New Revision: 23514 URL: http://svn.reactos.org/svn/reactos?rev=23514&view=rev Log: Remove extra call to SETUP_CreateDevicesList Modified: trunk/reactos/dll/win32/setupapi/devclass.c Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Mon Aug 7 15:02:14 2006 @@ -1201,8 +1201,6 @@ SetLastError(ERROR_INVALID_PARAMETER); goto cleanup; } - - rc = SETUP_CreateDevicesList(list, MachineName, ClassGuid, Enumerator); if (rc != ERROR_SUCCESS) { SetLastError(rc);

1 0

[hpoussin] 23513: Return code is really a NTSTATUS, not an unsigned int
by hpoussin＠svn.reactos.org 07 Aug '06

07 Aug '06

Author: hpoussin Date: Mon Aug 7 13:56:33 2006 New Revision: 23513 URL: http://svn.reactos.org/svn/reactos?rev=23513&view=rev Log: Return code is really a NTSTATUS, not an unsigned int Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c Mon Aug 7 13:56:33 2006 @@ -122,7 +122,7 @@ } /* Function 0 */ -unsigned int +NTSTATUS LsarClose(IN handle_t BindingHandle, IN unsigned long ObjectHandle) { @@ -145,7 +145,7 @@ } /* Function 1 */ -unsigned int +NTSTATUS LsarDelete(IN handle_t BindingHandle, IN unsigned long ObjectHandle) {

1 0

[hpoussin] 23512: Move some more standard types in a common header Thanks to Elrond from Samba-TNG for help
by hpoussin＠svn.reactos.org 07 Aug '06

07 Aug '06

Author: hpoussin Date: Mon Aug 7 13:48:54 2006 New Revision: 23512 URL: http://svn.reactos.org/svn/reactos?rev=23512&view=rev Log: Move some more standard types in a common header Thanks to Elrond from Samba-TNG for help Modified: trunk/reactos/include/reactos/idl/lsa.idl trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/idl/wtypes.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl (original) +++ trunk/reactos/include/reactos/idl/lsa.idl Mon Aug 7 13:48:54 2006 @@ -5,7 +5,6 @@ #include "include/reactos/idl/wtypes.idl" #define LSA_HANDLE unsigned long -#define NTSTATUS unsigned int [ uuid(12345778-1234-abcd-ef00-0123456789ab), Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl (original) +++ trunk/reactos/include/reactos/idl/pnp.idl Mon Aug 7 13:48:54 2006 @@ -2,12 +2,9 @@ * Plug and Play Manager RPC interface definition */ -#define WORD unsigned short -#define DWORD unsigned long -#define ULONG unsigned long +#include "include/reactos/idl/wtypes.idl" + #define CONFIGRET unsigned long -#define BOOL unsigned long -#define PBOOL unsigned long * [ uuid (809F4e40-A03D-11CE-8F69-08003E30051B), Modified: trunk/reactos/include/reactos/idl/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes… ============================================================================== --- trunk/reactos/include/reactos/idl/wtypes.idl (original) +++ trunk/reactos/include/reactos/idl/wtypes.idl Mon Aug 7 13:48:54 2006 @@ -1,5 +1,7 @@ #define BYTE unsigned char +#define WORD unsigned short #define DWORD unsigned long +#define ULONG unsigned long #define BOOL unsigned long #define LPSTR char* #define LPCSTR char* @@ -7,3 +9,6 @@ #define LPCWSTR wchar_t* #define LPBYTE unsigned char* #define LPDWORD unsigned long* +#define PBOOL unsigned long* + +#define NTSTATUS long

1 0

[winesync] 23511: [FORMATTING] Fix file headers to match coding style, and include reference to all programmers. No code change.
by winesync＠svn.reactos.org 07 Aug '06

07 Aug '06

Author: winesync Date: Mon Aug 7 11:54:08 2006 New Revision: 23511 URL: http://svn.reactos.org/svn/reactos?rev=23511&view=rev Log: [FORMATTING] Fix file headers to match coding style, and include reference to all programmers. No code change. Modified: trunk/reactos/ntoskrnl/cm/import.c trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/import.c (original) +++ trunk/reactos/ntoskrnl/cm/import.c Mon Aug 7 11:54:08 2006 @@ -1,7 +1,7 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * COPYRIGHT: GPL - See COPYING in the top level directory * FILE: ntoskrnl/cm/import.c * PURPOSE: Registry-Hive import functions * Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Mon Aug 7 11:54:08 2006 @@ -1,11 +1,17 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * COPYRIGHT: GPL - See COPYING in the top level directory * FILE: ntoskrnl/cm/ntfunc.c * PURPOSE: Ntxxx function for registry access * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Hartmut Birr + * Casper Hornstrup + * Alex Ionescu + * Rex Jolliff + * Eric Kohl + * Filip Navara + * Thomas Weidenmueller */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Mon Aug 7 11:54:08 2006 @@ -1,11 +1,13 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * COPYRIGHT: GPL - See COPYING in the top level directory * FILE: ntoskrnl/cm/regfile.c * PURPOSE: Registry file manipulation routines * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Casper Hornstrup + * Eric Kohl + * Filip Navara */ #include <ntoskrnl.h> Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Mon Aug 7 11:54:08 2006 @@ -1,13 +1,17 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * COPYRIGHT: GPL - See COPYING in the top level directory * FILE: ntoskrnl/cm/registry.c * PURPOSE: Registry functions * - * PROGRAMMERS: Rex Jolliff + * PROGRAMMERS: Hartmut Birr + * Alex Ionescu + * Rex Jolliff + * Eric Kohl * Matt Pyne * Jean Michault + * Art Yerkes */ #include <ntoskrnl.h> Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Mon Aug 7 11:54:08 2006 @@ -1,11 +1,15 @@ /* $Id$ * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * COPYRIGHT: GPL - See COPYING in the top level directory * FILE: ntoskrnl/cm/regobj.c * PURPOSE: Registry object manipulation routines. * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Hartmut Birr + * Alex Ionescu + * Rex Jolliff + * Eric Kohl + * Casper Hornstrup */ #include <ntoskrnl.h>

1 0

[hpoussin] 23510: Put standard types in a common header Thanks to Elrond from Samba-TNG for help
by hpoussin＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: hpoussin Date: Mon Aug 7 02:45:51 2006 New Revision: 23510 URL: http://svn.reactos.org/svn/reactos?rev=23510&view=rev Log: Put standard types in a common header Thanks to Elrond from Samba-TNG for help Added: trunk/reactos/include/reactos/idl/wtypes.idl (with props) Modified: trunk/reactos/include/reactos/idl/lsa.idl trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.id… ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl (original) +++ trunk/reactos/include/reactos/idl/lsa.idl Mon Aug 7 02:45:51 2006 @@ -2,11 +2,8 @@ * Local Security Authority interface definition */ -#define BYTE unsigned char -#define DWORD unsigned int -#define BOOL unsigned long -#define LPBYTE unsigned char* -#define LPDWORD unsigned long* +#include "include/reactos/idl/wtypes.idl" + #define LSA_HANDLE unsigned long #define NTSTATUS unsigned int Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl Mon Aug 7 02:45:51 2006 @@ -4,21 +4,13 @@ //#include <windef.h> //#include <winsvc.h> - -#define BYTE unsigned char -#define DWORD unsigned long -#define BOOL unsigned long +#include "include/reactos/idl/wtypes.idl" + #define SC_HANDLE unsigned int #define SC_LOCK unsigned int #define SERVICE_STATUS_HANDLE unsigned long #define SC_STATUS_TYPE unsigned long #define SC_ENUM_TYPE unsigned long -#define LPSTR char* -#define LPCSTR char* -#define LPWSTR wchar_t* -#define LPCWSTR wchar_t* -#define LPBYTE unsigned char* -#define LPDWORD unsigned long* [ uuid(367abb81-9844-35f1-ad32-98f038001003), Added: trunk/reactos/include/reactos/idl/wtypes.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes… ============================================================================== --- trunk/reactos/include/reactos/idl/wtypes.idl (added) +++ trunk/reactos/include/reactos/idl/wtypes.idl Mon Aug 7 02:45:51 2006 @@ -1,0 +1,9 @@ +#define BYTE unsigned char +#define DWORD unsigned long +#define BOOL unsigned long +#define LPSTR char* +#define LPCSTR char* +#define LPWSTR wchar_t* +#define LPCWSTR wchar_t* +#define LPBYTE unsigned char* +#define LPDWORD unsigned long* Propchange: trunk/reactos/include/reactos/idl/wtypes.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 23509: Relax restriction on the segment in NtSetLdtEntries(). Look into diff for details. Thanks to Myria for providing information. There were no reasons found which can proof that this change could lead to security issues.
by fireball＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: fireball Date: Mon Aug 7 02:02:02 2006 New Revision: 23509 URL: http://svn.reactos.org/svn/reactos?rev=23509&view=rev Log: Relax restriction on the segment in NtSetLdtEntries(). Look into diff for details. Thanks to Myria for providing information. There were no reasons found which can proof that this change could lead to security issues. Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c Mon Aug 7 02:02:02 2006 @@ -58,8 +58,20 @@ SegLimit=(SegLimit << 12) | 0xfff; } - return ((Base + SegLimit > (ULONG) MmHighestUserAddress) || - (Base > Base+SegLimit) ? FALSE : TRUE); + if ((Base + SegLimit > (ULONG_PTR) MmHighestUserAddress) || + (Base > Base+SegLimit)) + { + DPRINT1("WARNING: Windows would mark this descriptor invalid!"); + } + + /* + Certain "DOS32" programs expect to be able to create DPMI selectors + that wrap the address space. Windows NT does not allow user-created + selectors to reach into kernel memory. However, there is no security + risk in allowing it; the page table will prevent access anyway. + */ + return (/*(Base + SegLimit > (ULONG_PTR) MmHighestUserAddress) || + (Base > Base+SegLimit) ? FALSE : TRUE*/ TRUE); } NTSTATUS STDCALL

1 0

[fireball] 23508: Goodbye REGISTRY_ERROR bsod! - Change UserMode -> KernelMode in ObReferenceObject*() calls, because that calls failed - Remove Cm-specific hack from Ob "advapi32_winetest.exe registry" shows 0 failures on the first run and 2 failures on further runs. I suppose there might be a leakage in the CM. To be investigated further (or wait till complete Cm rewrite in October).
by fireball＠svn.reactos.org 06 Aug '06

06 Aug '06

Author: fireball Date: Mon Aug 7 01:15:55 2006 New Revision: 23508 URL: http://svn.reactos.org/svn/reactos?rev=23508&view=rev Log: Goodbye REGISTRY_ERROR bsod! - Change UserMode -> KernelMode in ObReferenceObject*() calls, because that calls failed - Remove Cm-specific hack from Ob "advapi32_winetest.exe registry" shows 0 failures on the first run and 2 failures on further runs. I suppose there might be a leakage in the CM. To be investigated further (or wait till complete Cm rewrite in October). Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Mon Aug 7 01:15:55 2006 @@ -148,7 +148,7 @@ ObReferenceObjectByPointer(FoundObject, STANDARD_RIGHTS_REQUIRED, CmiKeyType, - UserMode); + KernelMode); if (End != NULL) { *End = L'\\'; @@ -790,7 +790,7 @@ ObReferenceObjectByPointer(ParentKey, STANDARD_RIGHTS_REQUIRED, CmiKeyType, - UserMode); + KernelMode); NewKey->ParentKey = ParentKey; } Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Mon Aug 7 01:15:55 2006 @@ -239,17 +239,8 @@ /* Dereference the object as well */ ASSERT(ObjectHeader->Type); ASSERT(ObjectHeader->PointerCount != 0xCCCCCCCC); - if (!wcscmp(ObjectHeader->Type->Name.Buffer, L"Key")) - { - // - // WE DONT CLOSE REGISTRY HANDLES BECAUSE CM IS BRAINDEAD - // - DPRINT("NOT CLOSING THE KEY\n"); - } - else - { - ObDereferenceObject(Body); - } + + ObDereferenceObject(Body); /* Return to caller */ OBTRACE(OB_HANDLE_DEBUG,

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
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