Ros-diffs September 2006

ros-diffs@reactos.org

16 participants
146 discussions

[hpoussin] 24286: Support mount manager in disk.sys

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Sep 28 20:33:12 2006 New Revision: 24286 URL: http://svn.reactos.org/svn/reactos?rev=24286&view=rev Log: Support mount manager in disk.sys Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/disk/disk.… ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.c (original) +++ trunk/reactos/drivers/storage/disk/disk.c Thu Sep 28 20:33:12 2006 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/storage/disk/disk.c @@ -31,6 +30,8 @@ #include <ntdddisk.h> #include <scsi.h> #include <ntddscsi.h> +#include <mountdev.h> +#include <mountmgr.h> #include <include/class2.h> #include <stdio.h> @@ -849,6 +850,62 @@ DiskData->HiddenSectors = PartitionEntry->HiddenSectors; DiskData->BootIndicator = PartitionEntry->BootIndicator; DiskData->DriveNotReady = FALSE; + + /* Tell mount manager that we have a new partition for him. This should be replaced + * by the registration of MOUNTDEV_MOUNTED_DEVICE_GUID interface on partition PDO. + */ + { + UNICODE_STRING MountManagerU = RTL_CONSTANT_STRING(MOUNTMGR_DEVICE_NAME); + IO_STATUS_BLOCK IoStatusBlock; + ULONG Length = strlen(NameBuffer2) * sizeof(WCHAR); + PMOUNTMGR_TARGET_NAME TargetName; + HANDLE hMountManager; + InitializeObjectAttributes( + &ObjectAttributes, + &MountManagerU, + 0, + NULL, + NULL); + Status = NtOpenFile(&hMountManager, FILE_READ_ACCESS, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtOpenFile(%wZ) failed with status 0x%08lx\n", &MountManagerU, Status); + } + else + { + TargetName = ExAllocatePool(PagedPool, FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName) + Length + sizeof(UNICODE_NULL)); + if (!TargetName) + { + DPRINT("ExAllocatePool() failed\n"); + } + else + { + TargetName->DeviceNameLength = Length; + swprintf( + TargetName->DeviceName, + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskNumber, + PartitionNumber + 1); + Status = NtDeviceIoControlFile( + hMountManager, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION, + TargetName, FIELD_OFFSET(MOUNTMGR_TARGET_NAME, DeviceName) + Length, + NULL, 0); + if (NT_SUCCESS(Status)) + Status = NtWaitForSingleObject(hMountManager, FALSE, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtDeviceIoControlFile() failed with status 0x%08lx\n", Status); + } + ExFreePool(TargetName); + } + NtClose(hMountManager); + } + } } else { @@ -1589,6 +1646,76 @@ break; } + case IOCTL_MOUNTDEV_QUERY_DEVICE_NAME: + { + WCHAR NameBuffer[80]; + PMOUNTDEV_NAME pMountDevName; + ULONG NameLength; + DPRINT("IOCTL_MOUNTDEV_QUERY_DEVICE_NAME\n"); + if (IrpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUNTDEV_NAME)) + { + Status = STATUS_BUFFER_TOO_SMALL; + Information = 0; + } + else + { + pMountDevName = (PMOUNTDEV_NAME)Irp->AssociatedIrp.SystemBuffer; + swprintf(NameBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + DeviceExtension->DeviceNumber, + ((PDISK_DATA)(DeviceExtension + 1))->PartitionNumber); + NameLength = wcslen(NameBuffer) * sizeof(WCHAR); + pMountDevName->NameLength = NameLength; + if (IrpStack->Parameters.DeviceIoControl.OutputBufferLength < FIELD_OFFSET(MOUNTDEV_NAME, Name) + NameLength) + { + Information = sizeof(MOUNTDEV_NAME); + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + RtlCopyMemory(pMountDevName->Name, NameBuffer, NameLength); + Information = FIELD_OFFSET(MOUNTDEV_NAME, Name) + NameLength; + Status = STATUS_SUCCESS; + } + } + break; + } + + case IOCTL_MOUNTDEV_QUERY_UNIQUE_ID: + { + WCHAR NameBuffer[80]; + PMOUNTDEV_UNIQUE_ID pMountDevUniqueId; + ULONG UniqueIdLength; + DPRINT("IOCTL_MOUNTDEV_QUERY_UNIQUE_ID\n"); + if (IrpStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(MOUNTDEV_NAME)) + { + Status = STATUS_BUFFER_TOO_SMALL; + Information = 0; + } + else + { + pMountDevUniqueId = (PMOUNTDEV_UNIQUE_ID)Irp->AssociatedIrp.SystemBuffer; + swprintf(NameBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + DeviceExtension->DeviceNumber, + ((PDISK_DATA)(DeviceExtension + 1))->PartitionNumber); + UniqueIdLength = wcslen(NameBuffer) * sizeof(WCHAR); + pMountDevUniqueId->UniqueIdLength = UniqueIdLength; + if (IrpStack->Parameters.DeviceIoControl.OutputBufferLength < FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + UniqueIdLength) + { + Information = sizeof(MOUNTDEV_UNIQUE_ID); + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + RtlCopyMemory(pMountDevUniqueId->UniqueId, NameBuffer, UniqueIdLength); + Information = FIELD_OFFSET(MOUNTDEV_UNIQUE_ID, UniqueId) + UniqueIdLength; + Status = STATUS_SUCCESS; + } + } + break; + } + default: /* Call the common device control function */ return(ScsiClassDeviceControl(DeviceObject, Irp));

18 years, 2 months

[gedmurphy] 24285: update a few cpl icons

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Sep 28 02:40:18 2006 New Revision: 24285 URL: http://svn.reactos.org/svn/reactos?rev=24285&view=rev Log: update a few cpl icons Modified: trunk/reactos/dll/cpl/hdwwiz/resources/applet.ico trunk/reactos/dll/cpl/intl/resources/applet.ico trunk/reactos/dll/cpl/intl_new/resources/applet.ico trunk/reactos/dll/cpl/sysdm/resources/applet.ico Modified: trunk/reactos/dll/cpl/hdwwiz/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/resources/a… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/intl/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/intl_new/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/sysdm/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resources/ap… ============================================================================== Binary files - no diff available.

18 years, 2 months

[greatlrd] 24284: hpoussin forget change this regkey to SOFTWARE\\Microsoft\\WindowsNT\\CurrentVersion\\Winlogon"

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Sep 27 21:30:08 2006 New Revision: 24284 URL: http://svn.reactos.org/svn/reactos?rev=24284&view=rev Log: hpoussin forget change this regkey to SOFTWARE\\Microsoft\\WindowsNT\\CurrentVersion\\Winlogon" Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Wed Sep 27 21:30:08 2006 @@ -408,7 +408,7 @@ /* Load the default shell */ rc = RegOpenKeyEx( HKEY_LOCAL_MACHINE, - TEXT("SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\Winlogon"), /* FIXME: should be REGSTR_PATH_WINLOGON */ + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), /* FIXME: should be REGSTR_PATH_WINLOGON */ 0, KEY_QUERY_VALUE, &hKey);

18 years, 2 months

[weiden] 24283: Don't use BOOL for 1 bit flags because it's signed.

by weiden＠svn.reactos.org

Author: weiden Date: Wed Sep 27 16:43:50 2006 New Revision: 24283 URL: http://svn.reactos.org/svn/reactos?rev=24283&view=rev Log: Don't use BOOL for 1 bit flags because it's signed. Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c Wed Sep 27 16:43:50 2006 @@ -57,18 +57,25 @@ DWORD nDevPropSheets; HPROPSHEETPAGE *DevPropSheets; - BOOL FreeDevPropSheets : 1; - BOOL CanDisable : 1; - BOOL DeviceStarted : 1; - BOOL DeviceUsageChanged : 1; - BOOL CloseDevInst : 1; - BOOL IsAdmin : 1; - BOOL DoDefaultDevAction : 1; - BOOL PageInitialized : 1; - BOOL ShowRemotePages : 1; - BOOL HasDriverPage : 1; - BOOL HasResourcePage : 1; - BOOL HasPowerPage : 1; + union + { + UINT Flags; + struct + { + UINT FreeDevPropSheets : 1; + UINT CanDisable : 1; + UINT DeviceStarted : 1; + UINT DeviceUsageChanged : 1; + UINT CloseDevInst : 1; + UINT IsAdmin : 1; + UINT DoDefaultDevAction : 1; + UINT PageInitialized : 1; + UINT ShowRemotePages : 1; + UINT HasDriverPage : 1; + UINT HasResourcePage : 1; + UINT HasPowerPage : 1; + }; + }; WCHAR szDevName[255]; WCHAR szTemp[255];

18 years, 2 months

[weiden] 24282: Move the memory in RtlpDeleteData instead of copying it because the source and destination may be overlapping.

by weiden＠svn.reactos.org

Author: weiden Date: Wed Sep 27 16:28:25 2006 New Revision: 24282 URL: http://svn.reactos.org/svn/reactos?rev=24282&view=rev Log: Move the memory in RtlpDeleteData instead of copying it because the source and destination may be overlapping. Modified: trunk/reactos/lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=24282&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c (original) +++ trunk/reactos/lib/rtl/acl.c Wed Sep 27 16:28:25 2006 @@ -612,7 +612,7 @@ { if (AceSize < Offset) { - RtlCopyMemory(Ace, + RtlMoveMemory(Ace, (PVOID)((ULONG_PTR)Ace + AceSize), Offset - AceSize); }

18 years, 2 months

[hpoussin] 24281: Patch by Matthias Kupfer Fix tiny typo in all rc-files "%" -> "%s" See issue #1828 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Sep 27 01:08:11 2006 New Revision: 24281 URL: http://svn.reactos.org/svn/reactos?rev=24281&view=rev Log: Patch by Matthias Kupfer Fix tiny typo in all rc-files "%" -> "%s" See issue #1828 for more details. Modified: trunk/reactos/dll/cpl/timedate/Cz.rc trunk/reactos/dll/cpl/timedate/De.rc trunk/reactos/dll/cpl/timedate/Dk.rc trunk/reactos/dll/cpl/timedate/En.rc trunk/reactos/dll/cpl/timedate/Fr.rc trunk/reactos/dll/cpl/timedate/Gr.rc trunk/reactos/dll/cpl/timedate/Hu.rc trunk/reactos/dll/cpl/timedate/It.rc trunk/reactos/dll/cpl/timedate/Ja.rc trunk/reactos/dll/cpl/timedate/Nl.rc trunk/reactos/dll/cpl/timedate/Pl.rc trunk/reactos/dll/cpl/timedate/Ru.rc trunk/reactos/dll/cpl/timedate/Sv.rc trunk/reactos/dll/cpl/timedate/Uk.rc Modified: trunk/reactos/dll/cpl/timedate/Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Cz.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Cz.rc (original) +++ trunk/reactos/dll/cpl/timedate/Cz.rc Wed Sep 27 01:08:11 2006 @@ -60,6 +60,6 @@ IDS_TIMEZONETEXT "Aktuální èasové pásmo: %s" IDS_TIMEZONEINVALID "Neplatné" IDS_TIMEZONEUNKNOWN "Neznámé" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/De.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/De.rc (original) +++ trunk/reactos/dll/cpl/timedate/De.rc Wed Sep 27 01:08:11 2006 @@ -61,7 +61,7 @@ IDS_TIMEZONETEXT "Aktuelle Zeitzone: %s" IDS_TIMEZONEINVALID "Ungültig" IDS_TIMEZONEUNKNOWN "Unbekannt" - IDS_INETTIMESUCSYNC "Die Zeit wurde erfolgreich mit %s am % um %s synchronisiert" + IDS_INETTIMESUCSYNC "Die Zeit wurde erfolgreich mit %s am %s um %s synchronisiert" IDS_INETTIMENEXTSYNC "Nächste Synchronisierung am %s um %s" END Modified: trunk/reactos/dll/cpl/timedate/Dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Dk.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Dk.rc (original) +++ trunk/reactos/dll/cpl/timedate/Dk.rc Wed Sep 27 01:08:11 2006 @@ -61,6 +61,6 @@ IDS_TIMEZONETEXT "Nuværende tidszone: %s" IDS_TIMEZONEINVALID "Ugyldig" IDS_TIMEZONEUNKNOWN "Ukendt" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/En.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/En.rc (original) +++ trunk/reactos/dll/cpl/timedate/En.rc Wed Sep 27 01:08:11 2006 @@ -61,7 +61,7 @@ IDS_TIMEZONETEXT "Current time zone: %s" IDS_TIMEZONEINVALID "Invalid" IDS_TIMEZONEUNKNOWN "Unknown" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" IDS_INETTIMESYNCING "Please wait while ReactOS synchronizes the time with %s" IDS_INETTIMEERROR "An error occured while ReactOS was synchronizing with %s" Modified: trunk/reactos/dll/cpl/timedate/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Fr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Fr.rc Wed Sep 27 01:08:11 2006 @@ -60,6 +60,6 @@ IDS_TIMEZONETEXT "Fuseau horaire actuel: %s" IDS_TIMEZONEINVALID "Invalide" IDS_TIMEZONEUNKNOWN "Inconnu" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/Gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Gr.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Gr.rc (original) +++ trunk/reactos/dll/cpl/timedate/Gr.rc Wed Sep 27 01:08:11 2006 @@ -61,6 +61,6 @@ IDS_TIMEZONETEXT "ÔùñéíÞ ÷ñïíéêÞ æþíç: %s" IDS_TIMEZONEINVALID "Ìç Ýããõñï" IDS_TIMEZONEUNKNOWN "¢ãíùóôï" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Hu.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Hu.rc (original) +++ trunk/reactos/dll/cpl/timedate/Hu.rc Wed Sep 27 01:08:11 2006 @@ -60,6 +60,6 @@ IDS_TIMEZONETEXT "Használt idõzóna: %s" IDS_TIMEZONEINVALID "Érvénytelen" IDS_TIMEZONEUNKNOWN "Ismeretlen" - IDS_INETTIMESUCSYNC "A számítógép órája sikeresen szinkronizálva lett: %s (% %s-kor)" + IDS_INETTIMESUCSYNC "A számítógép órája sikeresen szinkronizálva lett: %s (%s %s-kor)" IDS_INETTIMENEXTSYNC "A következõ szinkronizálás: %s %s-kor" END Modified: trunk/reactos/dll/cpl/timedate/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/It.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/It.rc (original) +++ trunk/reactos/dll/cpl/timedate/It.rc Wed Sep 27 01:08:11 2006 @@ -61,7 +61,7 @@ IDS_TIMEZONETEXT "Fuso orario corrente: %s" IDS_TIMEZONEINVALID "Non valido" IDS_TIMEZONEUNKNOWN "Sconosciuto" - IDS_INETTIMESUCSYNC "L'ora è stata sincronizzata correttamente con %s % alle %s" + IDS_INETTIMESUCSYNC "L'ora è stata sincronizzata correttamente con %s %s alle %s" IDS_INETTIMENEXTSYNC "Prossima sincronizzazione: %s alle %s" IDS_INETTIMESYNCING "Sincronizzazione ora con %s" IDS_INETTIMEERROR "E' stato rilevato un errore mentre ReactOS si stava sincronizzando con %s" Modified: trunk/reactos/dll/cpl/timedate/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Ja.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ja.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ja.rc Wed Sep 27 01:08:11 2006 @@ -61,6 +61,6 @@ IDS_TIMEZONETEXT "»ÝÌ^C ][: %s" IDS_TIMEZONEINVALID "s³Èl" IDS_TIMEZONEUNKNOWN "s¾" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Nl.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Nl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Nl.rc Wed Sep 27 01:08:11 2006 @@ -60,6 +60,6 @@ IDS_TIMEZONETEXT "Huidige tijdzone: %s" IDS_TIMEZONEINVALID "Ongelding" IDS_TIMEZONEUNKNOWN "Niet gekend" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Pl.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Pl.rc (original) +++ trunk/reactos/dll/cpl/timedate/Pl.rc Wed Sep 27 01:08:11 2006 @@ -62,6 +62,6 @@ IDS_TIMEZONETEXT "Aktualna strefa czasowa: %s" IDS_TIMEZONEINVALID "Nieprawid³owa" IDS_TIMEZONEUNKNOWN "Nieznana" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Ru.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Ru.rc (original) +++ trunk/reactos/dll/cpl/timedate/Ru.rc Wed Sep 27 01:08:11 2006 @@ -60,6 +60,6 @@ IDS_TIMEZONETEXT "Òåêóùèé ÷àñîâîé ïîÿñ: %s" IDS_TIMEZONEINVALID "Íåäåéñòâèòåëüíàÿ" IDS_TIMEZONEUNKNOWN "Íåèçâåñòíàÿ" - IDS_INETTIMESUCSYNC "Âðåìÿ áûëî óñïåøíî ñèíõðîíèçèðîâàíî ñ %s íà % â %s" + IDS_INETTIMESUCSYNC "Âðåìÿ áûëî óñïåøíî ñèíõðîíèçèðîâàíî ñ %s íà %s â %s" IDS_INETTIMENEXTSYNC "Ñëåäóþùàÿ ñèíõðîíèçàöèÿ ÷åðåç: %s â %s" END Modified: trunk/reactos/dll/cpl/timedate/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Sv.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Sv.rc (original) +++ trunk/reactos/dll/cpl/timedate/Sv.rc Wed Sep 27 01:08:11 2006 @@ -65,6 +65,6 @@ IDS_TIMEZONETEXT "Aktuell tidszon: %s" IDS_TIMEZONEINVALID "Felaktig" IDS_TIMEZONEUNKNOWN "Okänd" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on %s at %s" IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END Modified: trunk/reactos/dll/cpl/timedate/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/Uk.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/timedate/Uk.rc (original) +++ trunk/reactos/dll/cpl/timedate/Uk.rc Wed Sep 27 01:08:11 2006 @@ -69,7 +69,7 @@ IDS_TIMEZONETEXT "Ïîòî÷íèé ÷àñîâèé ïîÿñ: %s" IDS_TIMEZONEINVALID "Íåä³éñíèé" IDS_TIMEZONEUNKNOWN "Íåâ³äîìèé" - IDS_INETTIMESUCSYNC "×àñ áóëî óñï³øíî ñèíõðîí³çîâàíî ç %s íà % â %s" + IDS_INETTIMESUCSYNC "×àñ áóëî óñï³øíî ñèíõðîí³çîâàíî ç %s íà %s â %s" IDS_INETTIMENEXTSYNC "Íàñòóïíà ñèíõðîí³çàö³ÿ: %s â %s" IDS_INETTIMESYNCING "Áóäü ëàñêà çà÷åêàéòå, ïîêè ReactOS ñèíõðîí³çóº ÷àñ ç %s" IDS_INETTIMEERROR "Ïîìèëêà ï³ä ÷àñ ñèíõðîí³çàö³¿ ç %s"

18 years, 2 months

[hpoussin] 24280: Fix format build. Why dependency tracking didn't detect this problem? Another mystery...

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 26 23:52:55 2006 New Revision: 24280 URL: http://svn.reactos.org/svn/reactos?rev=24280&view=rev Log: Fix format build. Why dependency tracking didn't detect this problem? Another mystery... Modified: trunk/reactos/base/system/format/format.c Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c (original) +++ trunk/reactos/base/system/format/format.c Tue Sep 26 23:52:55 2006 @@ -195,13 +195,14 @@ case UNKNOWN4: case UNKNOWN5: case INSUFFICIENTRIGHTS: - case UNKNOWN7: - case UNKNOWN8: + case FSNOTSUPPORTED: + case VOLUMEINUSE: case UNKNOWN9: case UNKNOWNA: case UNKNOWNC: case UNKNOWND: case STRUCTUREPROGRESS: + case CLUSTERSIZETOOSMALL: LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); _tprintf(szMsg); return FALSE;

18 years, 2 months

[hpoussin] 24279: Merge from Wine: Frank Richter <frank.richter@gmail.com> setupapi: Duplicate behaviour of native SetupGetInfInformation with NULL ReturnBuffer and certain ReturnBufferSizes.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 26 23:44:17 2006 New Revision: 24279 URL: http://svn.reactos.org/svn/reactos?rev=24279&view=rev Log: Merge from Wine: Frank Richter <frank.richter(a)gmail.com> setupapi: Duplicate behaviour of native SetupGetInfInformation with NULL ReturnBuffer and certain ReturnBufferSizes. Modified: trunk/reactos/dll/win32/setupapi/query.c Modified: trunk/reactos/dll/win32/setupapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/query.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/query.c (original) +++ trunk/reactos/dll/win32/setupapi/query.c Tue Sep 26 23:44:17 2006 @@ -119,6 +119,7 @@ { HINF inf; BOOL ret; + DWORD infSize; TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer, ReturnBufferSize, RequiredSize); @@ -130,12 +131,6 @@ else SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (!ReturnBuffer && ReturnBufferSize) - { - SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -170,7 +165,13 @@ return FALSE; } - ret = fill_inf_info(inf, ReturnBuffer, ReturnBufferSize, RequiredSize); + ret = fill_inf_info(inf, ReturnBuffer, ReturnBufferSize, &infSize); + if (!ReturnBuffer && (ReturnBufferSize >= infSize)) + { + SetLastError(ERROR_INVALID_PARAMETER); + ret = FALSE; + } + if (RequiredSize) *RequiredSize = infSize; if (SearchControl >= INFINFO_INF_NAME_IS_ABSOLUTE) SetupCloseInfFile(inf);

18 years, 2 months

[hpoussin] 24278: Fix some warnings in winlogon code Change winlogon registry key to "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" for compatibility reasons, as some programs read it directly

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 26 23:18:02 2006 New Revision: 24278 URL: http://svn.reactos.org/svn/reactos?rev=24278&view=rev Log: Fix some warnings in winlogon code Change winlogon registry key to "SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" for compatibility reasons, as some programs read it directly Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/base/system/winlogon/setup.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c (original) +++ trunk/reactos/base/system/userinit/userinit.c Tue Sep 26 23:18:02 2006 @@ -118,7 +118,7 @@ BOOL ConsoleShell = IsConsoleShell(); if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\Winlogon", + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { Size = MAX_PATH * sizeof(WCHAR); Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Tue Sep 26 23:18:02 2006 @@ -37,7 +37,7 @@ BOOL SetDefaultLanguage( - IN BOOL UserProfile) + IN BOOLEAN UserProfile) { HKEY BaseKey; LPCWSTR SubKey; @@ -114,7 +114,7 @@ } /* Convert Value to a Lcid */ - ValueString.Length = ValueString.MaximumLength = dwSize; + ValueString.Length = ValueString.MaximumLength = (USHORT)dwSize; ValueString.Buffer = Value; Status = RtlUnicodeStringToInteger(&ValueString, 16, &Lcid); if (!NT_SUCCESS(Status)) @@ -146,7 +146,7 @@ HandleLogon( IN OUT PWLSESSION Session) { - PROFILEINFOW ProfileInfo; + PROFILEINFOW ProfileInfo = { 0 }; LPVOID lpEnvironment = NULL; BOOLEAN Old; @@ -177,7 +177,8 @@ TRUE)) { ERR("WL: CreateEnvironmentBlock() failed\n"); - UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); + if (!(Session->Options & WLX_LOGON_OPT_NO_PROFILE)) + UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile); CloseHandle(Session->UserToken); return FALSE; } @@ -317,13 +318,15 @@ return STATUS_SUCCESS; } -static INT_PTR CALLBACK +static BOOL CALLBACK ShutdownComputerWindowProc( IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + switch (uMsg) { case WM_COMMAND: @@ -689,7 +692,7 @@ Session = (PWLSESSION)((LPCREATESTRUCT)lParam)->lpCreateParams; /* Save the Session pointer */ - SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)Session); + SetWindowLongPtrW(hwndDlg, GWLP_USERDATA, (LONG_PTR)Session); return RegisterHotKeys(Session, hwndDlg); } Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c (original) +++ trunk/reactos/base/system/winlogon/screensaver.c Tue Sep 26 23:18:02 2006 @@ -202,29 +202,31 @@ } #endif - if (!(Session->hScreenSaverParametersChanged = CreateEventW(NULL, FALSE, FALSE, NULL))) + Session->hScreenSaverParametersChanged = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!Session->hScreenSaverParametersChanged) { WARN("WL: Unable to create screen saver event (error %lu)\n", GetLastError()); - } - else if (!(Session->hEndOfScreenSaverThread = CreateEventW(NULL, FALSE, FALSE, NULL))) + return TRUE; + } + Session->hEndOfScreenSaverThread = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!Session->hEndOfScreenSaverThread) { WARN("WL: Unable to create screen saver event (error %lu)\n", GetLastError()); CloseHandle(Session->hScreenSaverParametersChanged); - } + return TRUE; + } + + ScreenSaverThread = CreateThread( + NULL, + 0, + ScreenSaverThreadMain, + Session, + 0, + NULL); + if (ScreenSaverThread) + CloseHandle(ScreenSaverThread); else - { - ScreenSaverThread = CreateThread( - NULL, - 0, - ScreenSaverThreadMain, - Session, - 0, - NULL); - if (ScreenSaverThread) - CloseHandle(ScreenSaverThread); - else - WARN("WL: Unable to start screen saver thread\n"); - } + WARN("WL: Unable to start screen saver thread\n"); return TRUE; } Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c (original) +++ trunk/reactos/base/system/winlogon/setup.c Tue Sep 26 23:18:02 2006 @@ -109,7 +109,7 @@ STARTUPINFOW StartupInfo; WCHAR Shell[MAX_PATH]; WCHAR CommandLine[MAX_PATH]; - BOOLEAN Result; + BOOL Result; DWORD dwError; HKEY hKey; DWORD dwType; Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c (original) +++ trunk/reactos/base/system/winlogon/winlogon.c Tue Sep 26 23:18:02 2006 @@ -24,7 +24,7 @@ static BOOL StartServicesManager(VOID) { - HANDLE ServicesInitEvent; + HANDLE ServicesInitEvent = NULL; STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInformation; DWORD Count; @@ -154,7 +154,7 @@ OUT HKEY *WinLogonKey) { return ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\WinLogon", + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", 0, KEY_QUERY_VALUE, WinLogonKey); @@ -302,7 +302,7 @@ return Session->Gina.Functions.WlxRemoveStatusMessage(Session->Gina.Context); } -static INT_PTR CALLBACK +static BOOL CALLBACK GinaLoadFailedWindowProc( IN HWND hwndDlg, IN UINT uMsg, @@ -362,6 +362,10 @@ #endif MSG Msg; + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + UNREFERENCED_PARAMETER(nShowCmd); + hAppInstance = hInstance; if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) @@ -370,7 +374,6 @@ HandleShutdown(NULL, WLX_SAS_ACTION_SHUTDOWN_POWER_OFF); NtShutdownSystem(ShutdownNoReboot); ExitProcess(0); - return 0; } WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION)); @@ -380,7 +383,6 @@ ERR("WL: Could not allocate memory for winlogon instance\n"); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); - return 1; } WLSession->DialogTimeout = 120; /* 2 minutes */ @@ -389,7 +391,6 @@ ERR("WL: Could not create window station and desktops\n"); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); - return 1; } LockWorkstation(WLSession); @@ -398,7 +399,6 @@ ERR("WL: Could not start services.exe\n"); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); - return 1; } /* Check for pending setup */ @@ -415,7 +415,6 @@ HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); ExitProcess(0); - return 0; } if (!StartLsass()) @@ -423,7 +422,6 @@ DPRINT1("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, 0, 0); ExitProcess(1); - return 1; } /* Load and initialize gina */ @@ -433,7 +431,6 @@ DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), 0, GinaLoadFailedWindowProc, (LPARAM)L""); HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); ExitProcess(1); - return 1; } DisplayStatusMessage(WLSession, WLSession->WinlogonDesktop, IDS_REACTOSISSTARTINGUP); @@ -475,7 +472,6 @@ { ERR("WL: Failed to initialize SAS\n"); ExitProcess(2); - return 2; } //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_PREPARENETWORKCONNECTIONS); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h (original) +++ trunk/reactos/base/system/winlogon/winlogon.h Tue Sep 26 23:18:02 2006 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * COPYRIGHT: See COPYING in the top level directory +/* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS winlogon * FILE: subsys/system/winlogon/winlogon.h * PURPOSE: Winlogon @@ -180,7 +179,7 @@ /* sas.c */ BOOL SetDefaultLanguage( - IN BOOL UserProfile); + IN BOOLEAN UserProfile); BOOL InitializeSAS( Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c (original) +++ trunk/reactos/base/system/winlogon/wlx.c Tue Sep 26 23:18:02 2006 @@ -18,7 +18,7 @@ static DLGPROC PreviousWindowProc; static UINT_PTR IdTimer; -static INT_PTR CALLBACK +static BOOL CALLBACK DefaultWlxWindowProc( IN HWND hwndDlg, IN UINT uMsg, @@ -120,6 +120,11 @@ HANDLE hProcess, HANDLE hThread) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(hToken); + UNREFERENCED_PARAMETER(hProcess); + UNREFERENCED_PARAMETER(hThread); + UNIMPLEMENTED; return 0; } @@ -135,6 +140,8 @@ LPWSTR lpszTitle, UINT fuStyle) { + UNREFERENCED_PARAMETER(hWlx); + TRACE("WlxMessageBox()\n"); /* FIXME: Provide a custom window proc to be able to handle timeout */ return MessageBoxW(hwndOwner, lpszText, lpszTitle, fuStyle); @@ -151,6 +158,8 @@ HWND hwndOwner, DLGPROC dlgprc) { + UNREFERENCED_PARAMETER(hWlx); + TRACE("WlxDialogBox()\n"); if (PreviousWindowProc != NULL) @@ -171,6 +180,8 @@ DLGPROC dlgprc, LPARAM dwInitParam) { + UNREFERENCED_PARAMETER(hWlx); + TRACE("WlxDialogBoxParam()\n"); if (PreviousWindowProc != NULL) @@ -190,6 +201,8 @@ HWND hwndOwner, DLGPROC dlgprc) { + UNREFERENCED_PARAMETER(hWlx); + TRACE("WlxDialogBoxIndirect()\n"); if (PreviousWindowProc != NULL) @@ -210,6 +223,8 @@ DLGPROC dlgprc, LPARAM dwInitParam) { + UNREFERENCED_PARAMETER(hWlx); + TRACE("WlxDialogBoxIndirectParam()\n"); if (PreviousWindowProc != NULL) @@ -255,6 +270,10 @@ PWLX_MPR_NOTIFY_INFO pMprInfo, DWORD dwChangeInfo) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(pMprInfo); + UNREFERENCED_PARAMETER(dwChangeInfo); + UNIMPLEMENTED; return 0; } @@ -267,6 +286,9 @@ HANDLE hWlx, PWLX_DESKTOP* ppDesktop) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(ppDesktop); + UNIMPLEMENTED; return FALSE; } @@ -279,6 +301,9 @@ HANDLE hWlx, PWLX_DESKTOP pDesktop) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(pDesktop); + UNIMPLEMENTED; return FALSE; } @@ -294,6 +319,12 @@ PWSTR pszDesktopName, PWLX_DESKTOP* ppDesktop) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(hToken); + UNREFERENCED_PARAMETER(Flags); + UNREFERENCED_PARAMETER(pszDesktopName); + UNREFERENCED_PARAMETER(ppDesktop); + UNIMPLEMENTED; return FALSE; } @@ -309,6 +340,12 @@ PWSTR ProviderName, PVOID Reserved) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(pMprInfo); + UNREFERENCED_PARAMETER(dwChangeInfo); + UNREFERENCED_PARAMETER(ProviderName); + UNREFERENCED_PARAMETER(Reserved); + UNIMPLEMENTED; return 0; } @@ -322,6 +359,10 @@ PWLX_DESKTOP pDesktop, HANDLE hToken) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(pDesktop); + UNREFERENCED_PARAMETER(hToken); + UNIMPLEMENTED; return FALSE; } @@ -422,6 +463,8 @@ WlxWin31Migrate( HANDLE hWlx) { + UNREFERENCED_PARAMETER(hWlx); + UNIMPLEMENTED; } @@ -432,6 +475,8 @@ WlxQueryClientCredentials( PWLX_CLIENT_CREDENTIALS_INFO_V1_0 pCred) { + UNREFERENCED_PARAMETER(pCred); + UNIMPLEMENTED; return FALSE; } @@ -443,6 +488,8 @@ WlxQueryInetConnectorCredentials( PWLX_CLIENT_CREDENTIALS_INFO_V1_0 pCred) { + UNREFERENCED_PARAMETER(pCred); + UNIMPLEMENTED; return FALSE; } @@ -467,6 +514,11 @@ WCHAR* UserName, WCHAR* Domain) { + UNREFERENCED_PARAMETER(hWlx); + UNREFERENCED_PARAMETER(pTSData); + UNREFERENCED_PARAMETER(UserName); + UNREFERENCED_PARAMETER(Domain); + UNIMPLEMENTED; return 0; } @@ -478,6 +530,8 @@ WlxQueryConsoleSwitchCredentials( PWLX_CONSOLESWITCH_CREDENTIALS_INFO_V1_0 pCred) { + UNREFERENCED_PARAMETER(pCred); + UNIMPLEMENTED; return 0; } @@ -489,6 +543,8 @@ WlxQueryTsLogonCredentials( PWLX_CLIENT_CREDENTIALS_INFO_V2_0 pCred) { + UNREFERENCED_PARAMETER(pCred); + UNIMPLEMENTED; return FALSE; } @@ -588,7 +644,8 @@ /* Terminate string */ GinaDll[MAX_PATH] = '\0'; - if (!(hGina = LoadLibraryW(GinaDll))) + hGina = LoadLibraryW(GinaDll); + if (!hGina) goto cleanup; Functions->WlxNegotiate = (PFWLXNEGOTIATE)GetProcAddress(hGina, "WlxNegotiate"); 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 Sep 26 23:18:02 2006 @@ -738,14 +738,14 @@ HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FAT",0x00000000,"ufat.dll" HKLM,"SOFTWARE\ReactOS\ReactOS\CurrentVersion\IFS","FAT32",0x00000000,"ufat.dll" -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator" -HKLM,"SOFTWARE\ReactOS\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","ConsoleShell",0x00020000,"%SystemRoot%\system32\cmd.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Shell",0x00020000,"%SystemRoot%\explorer.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartServices",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","StartLsass",0x00010001,0x00000001 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","Userinit",0x00020000,"%SystemRoot%\system32\userinit.exe" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","AutoAdminLogon",0x00000000,"1" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0x00000000,"Administrator" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"Secret" ;Time Zone Servers HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","1",0x00000000,"pool.ntp.org" Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c (original) +++ trunk/reactos/dll/win32/msgina/msgina.c Tue Sep 26 23:18:02 2006 @@ -239,7 +239,7 @@ TRACE("WlxActivateUserShell()\n"); /* get the path of userinit */ if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\Winlogon", + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) {ERR("GINA: Failed: 1\n"); VirtualFree(pEnvironment, 0, MEM_RELEASE); @@ -419,7 +419,7 @@ rc = RegOpenKeyExW( HKEY_LOCAL_MACHINE, - L"SOFTWARE\\ReactOS\\Windows NT\\CurrentVersion\\WinLogon", + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", 0, KEY_QUERY_VALUE, &WinLogonKey);

18 years, 2 months

[hpoussin] 24277: Two more constants found in FMIFS...

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Sep 26 23:12:39 2006 New Revision: 24277 URL: http://svn.reactos.org/svn/reactos?rev=24277&view=rev Log: Two more constants found in FMIFS... Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/include/reactos/libs/fmifs/fmifs.h Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c (original) +++ trunk/reactos/base/system/autochk/autochk.c Tue Sep 26 23:12:39 2006 @@ -176,14 +176,6 @@ DPRINT("UNKNOWN5\r"); break; - case UNKNOWN7: - DPRINT("UNKNOWN7\r"); - break; - - case UNKNOWN8: - DPRINT("UNKNOWN8\r"); - break; - case UNKNOWN9: DPRINT("UNKNOWN9\r"); break; @@ -204,12 +196,24 @@ DPRINT("INSUFFICIENTRIGHTS\r"); break; + case FSNOTSUPPORTED: + DPRINT("FSNOTSUPPORTED\r"); + break; + + case VOLUMEINUSE: + DPRINT("VOLUMEINUSE\r"); + break; + case STRUCTUREPROGRESS: DPRINT("STRUCTUREPROGRESS\r"); break; case DONEWITHSTRUCTURE: DPRINT("DONEWITHSTRUCTURE\r"); + break; + + case CLUSTERSIZETOOSMALL: + DPRINT("CLUSTERSIZETOOSMALL\r"); break; case PROGRESS: Modified: trunk/reactos/include/reactos/libs/fmifs/fmifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fmifs… ============================================================================== --- trunk/reactos/include/reactos/libs/fmifs/fmifs.h (original) +++ trunk/reactos/include/reactos/libs/fmifs/fmifs.h Tue Sep 26 23:12:39 2006 @@ -68,15 +68,16 @@ UNKNOWN4, UNKNOWN5, INSUFFICIENTRIGHTS, - UNKNOWN7, - UNKNOWN8, + FSNOTSUPPORTED, + VOLUMEINUSE, UNKNOWN9, UNKNOWNA, DONE, UNKNOWNC, UNKNOWND, OUTPUT, - STRUCTUREPROGRESS + STRUCTUREPROGRESS, + CLUSTERSIZETOOSMALL, } CALLBACKCOMMAND; /* FMIFS callback definition */

18 years, 2 months

← Newer
1
2
3
4
5
6
7
8
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2006