Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 25129: ChangeDisplaySettingsEx() can be called with NULL DeviceName. In this case, we should look it up, instead of BSODing. Right now, this case is fixed by substituting the value to a hardcoded one "\\.\DISPLAY1" in case of NULL and call is made to store the values in registry.
by fireball＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: fireball Date: Tue Dec 12 15:18:17 2006 New Revision: 25129 URL: http://svn.reactos.org/svn/reactos?rev=25129&view=rev Log: ChangeDisplaySettingsEx() can be called with NULL DeviceName. In this case, we should look it up, instead of BSODing. Right now, this case is fixed by substituting the value to a hardcoded one "\\.\DISPLAY1" in case of NULL and call is made to store the values in registry. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Dec 12 15:18:17 2006 @@ -2914,6 +2914,7 @@ UNICODE_STRING DeviceName; UNICODE_STRING RegistryKey; + UNICODE_STRING InDeviceName; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE DevInstRegKey; ULONG NewValue; @@ -2921,6 +2922,14 @@ DPRINT1("set CDS_UPDATEREGISTRY \n"); dwflags &= ~CDS_UPDATEREGISTRY; + + /* Check if pDeviceName is NULL, we need to retrieve it */ + if (pDeviceName == NULL) + { + /* FIXME: It is a hack, but there is no proper way right now */ + RtlInitUnicodeString(&InDeviceName, L"\\\\.\\DISPLAY1"); + pDeviceName = &InDeviceName; + } Status = GetVideoDeviceName(&DeviceName, pDeviceName); if (!NT_SUCCESS(Status))

1 0

[janderwald] 25128: set svn:eolstyle native
by janderwald＠svn.reactos.org 12 Dec '06

12 Dec '06

Author: janderwald Date: Tue Dec 12 10:59:45 2006 New Revision: 25128 URL: http://svn.reactos.org/svn/reactos?rev=25128&view=rev Log: set svn:eolstyle native Modified: trunk/reactos/base/applications/network/ipconfig/fr-FR.rc (props changed) Propchange: trunk/reactos/base/applications/network/ipconfig/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 25127: add french translation to ipconfig
by spetreolle＠svn.reactos.org 11 Dec '06

11 Dec '06

Author: spetreolle Date: Tue Dec 12 01:41:37 2006 New Revision: 25127 URL: http://svn.reactos.org/svn/reactos?rev=25127&view=rev Log: add french translation to ipconfig Added: trunk/reactos/base/applications/network/ipconfig/fr-FR.rc Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Added: trunk/reactos/base/applications/network/ipconfig/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/fr-FR.rc (added) +++ trunk/reactos/base/applications/network/ipconfig/fr-FR.rc Tue Dec 12 01:41:37 2006 @@ -1,0 +1,65 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BCAST "Broadcast" + IDS_P2P "Peer To Peer" + IDS_MIXED "Mixte" + IDS_HYBRID "Hybride" + IDS_UNKNOWN "inconnu" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_OTHER "Autre Type d'Adapteur" + IDS_ETH "Adapteur Ethernet" + IDS_TOKEN "Adapteur Token Ring" + IDS_FDDI "Adapteur FDDI" + IDS_PPP "Adapteur PPP" + IDS_LOOP "Adapteur Loopback" + IDS_SLIP "Adapteur SLIP" +END + +STRINGTABLE DISCARDABLE +BEGIN +/* Please keep the spacing/formatting as per En.rc when translating */ + IDS_USAGE + "\nUSAGE:\n \ + ipconfig [/? | /all | /renew [adapteur] | /release [adapteur] |\n \ + /flushdns | /displaydns | /registerdns |\n \ + /showclassid adapteur |\n \ + /setclassid adapteur [classid] ]\n \ + \n \ + où\n \ + adapteur Nom de Connection\n \ + (jokers * et ? autorisés, voir les exemples)\n \ + \n \ + Options:\n \ + /? Affiche ce message d'aide\n \ + /all Affiche toutes les information de configuration.\n \ + /release Libère l'addresse IP pour l'adapteur spécifié.\n \ + /renew Renouvelle l'addresse IP pour l'adapteur spécifié.\n \ + /flushdns Purge le cache de résolution DNS.\n \ + /registerdns Renouvelle tous les baux DHCP et réenregistre les noms DNS.\n \ + /displaydns Affiche le contentu du cache de résolution DNS.\n \ + /showclassid Affiche tous les class IDs dhcp alloués pour l'adapteur.\n \ + /setclassid Modifie le class id dhcp.\n \ + \n \ + L'action par défaut est d'afficher seulement l'addresse IP, le masque de\n \ + sous réseau et la passerelle par défaut de chaque adapteur lié à TCP/IP.\n \ + \n \ + Pour Release et Renew, si aucun nom d'adapteur n'est spécifié, les baux d'addresse IP\n \ + pour tous les adapteurs liés à TCP/IP seront libérés ou renouvelés.\n \ + \n \ + Pour Setclassid, si aucun ClassId n'est spécifié, le ClassId existant est enlevé.\n \ + \n \ + Exemples:\n \ + > ipconfig ... Affiche les informations.\n \ + > ipconfig /all ... Affiche les informations detaillées\n \ + > ipconfig /renew ... Renouvelle tous les adapteurs\n \ + > ipconfig /renew EL* ... Renouvelle toute connection dont le nom\n \ + commence par EL\n \ + > ipconfig /release *Con* ... Libère toutes les connections concernées,\n \ + ex. ""Connection au réseau local 1"" ou\n \ + ""Connection au réseau local 2""\n" +END Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.rc (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.rc Tue Dec 12 01:41:37 2006 @@ -9,3 +9,4 @@ #include <reactos/version.rc> #include "en-US.rc" +#include "fr-FR.rc"

1 0

[spetreolle] 25126: unicode build fixes
by spetreolle＠svn.reactos.org 11 Dec '06

11 Dec '06

Author: spetreolle Date: Mon Dec 11 21:04:02 2006 New Revision: 25126 URL: http://svn.reactos.org/svn/reactos?rev=25126&view=rev Log: unicode build fixes Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Mon Dec 11 21:04:02 2006 @@ -238,7 +238,7 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; - PCHAR pBuf; + PTCHAR pBuf; CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; @@ -284,12 +284,7 @@ } len = _vstprintf (szOut, szFormat, arg_ptr); -#ifdef _UNICODE - pBuf = malloc(len + 1); - len = WideCharToMultiByte( OutputCodePage, 0, szOut, len + 1, pBuf, len + 1, NULL, NULL) - 1; -#else pBuf = szOut; -#endif for(i = 0; i < len; i++) { Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c (original) +++ trunk/reactos/base/shell/cmd/start.c Mon Dec 11 21:04:02 2006 @@ -50,27 +50,27 @@ ConOutResPaging(TRUE,STRING_START_HELP1); return 0; } - else if(!_tcsicmp(arg[i], "/LOW")) + else if(!_tcsicmp(arg[i], _T("/LOW"))) { Priority = IDLE_PRIORITY_CLASS; } - else if(!_tcsicmp(arg[i], "/NORMAL")) + else if(!_tcsicmp(arg[i], _T("/NORMAL"))) { Priority = NORMAL_PRIORITY_CLASS; } - else if(!_tcsicmp(arg[i], "/HIGH")) + else if(!_tcsicmp(arg[i], _T("/HIGH"))) { Priority = HIGH_PRIORITY_CLASS; } - else if(!_tcsicmp(arg[i], "/REALTIME")) + else if(!_tcsicmp(arg[i], _T("/REALTIME"))) { Priority = REALTIME_PRIORITY_CLASS; } - else if(!_tcsicmp(arg[i], "/ABOVENORMAL")) + else if(!_tcsicmp(arg[i], _T("/ABOVENORMAL"))) { Priority = ABOVE_NORMAL_PRIORITY_CLASS; } - else if(!_tcsicmp(arg[i], "/BELOWNORMAL")) + else if(!_tcsicmp(arg[i], _T("/BELOWNORMAL"))) { Priority = BELOW_NORMAL_PRIORITY_CLASS; }

1 0

[fireball] 25125: - Assign a proper InterfaceType to the resource descriptor. Fixes assert when using VMWare video driver. Approved by hpoussin.
by fireball＠svn.reactos.org 11 Dec '06

11 Dec '06

Author: fireball Date: Mon Dec 11 20:31:04 2006 New Revision: 25125 URL: http://svn.reactos.org/svn/reactos?rev=25125&view=rev Log: - Assign a proper InterfaceType to the resource descriptor. Fixes assert when using VMWare video driver. Approved by hpoussin. Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c (original) +++ trunk/reactos/drivers/bus/pci/pdo.c Mon Dec 11 20:31:04 2006 @@ -705,7 +705,7 @@ RtlZeroMemory(ResourceList, ListSize); ResourceList->Count = 1; - ResourceList->List[0].InterfaceType = PCIConfiguration; + ResourceList->List[0].InterfaceType = PCIBus; ResourceList->List[0].BusNumber = DeviceExtension->PciDevice->BusNumber; PartialList = &ResourceList->List[0].PartialResourceList;

1 0

[peterw] 25124: - Fix typo ;).
by peterw＠svn.reactos.org 11 Dec '06

11 Dec '06

Author: peterw Date: Mon Dec 11 06:17:35 2006 New Revision: 25124 URL: http://svn.reactos.org/svn/reactos?rev=25124&view=rev Log: - Fix typo ;). Modified: trunk/tools/mingw-make/makex.cmd Modified: trunk/tools/mingw-make/makex.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/mingw-make/makex.cmd?rev=251… ============================================================================== --- trunk/tools/mingw-make/makex.cmd (original) +++ trunk/tools/mingw-make/makex.cmd Mon Dec 11 06:17:35 2006 @@ -1,5 +1,5 @@ @echo off for /f "usebackq" %%i in (`cpucount -x1`) do set CPUCOUNT=%%i -echo %CPUCOUNT% Processors detected (Automatically doubled). +echo %CPUCOUNT% Processors detected (1 added automatically). mingw32-make -j %CPUCOUNT% %*

1 0

[peterw] 25123: - Oops forgot to remove the 'rem's, and changed makex.cmd to use -x1 instead.
by peterw＠svn.reactos.org 11 Dec '06

11 Dec '06

Author: peterw Date: Mon Dec 11 06:02:38 2006 New Revision: 25123 URL: http://svn.reactos.org/svn/reactos?rev=25123&view=rev Log: - Oops forgot to remove the 'rem's, and changed makex.cmd to use -x1 instead. Modified: trunk/tools/mingw-make/make.cmd trunk/tools/mingw-make/makex.cmd Modified: trunk/tools/mingw-make/make.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/mingw-make/make.cmd?rev=2512… ============================================================================== --- trunk/tools/mingw-make/make.cmd (original) +++ trunk/tools/mingw-make/make.cmd Mon Dec 11 06:02:38 2006 @@ -2,4 +2,4 @@ for /f "usebackq" %%i in (`cpucount`) do set CPUCOUNT=%%i echo %CPUCOUNT% Processors detected. -rem mingw32-make -j %CPUCOUNT% %* +mingw32-make -j %CPUCOUNT% %* Modified: trunk/tools/mingw-make/makex.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/mingw-make/makex.cmd?rev=251… ============================================================================== --- trunk/tools/mingw-make/makex.cmd (original) +++ trunk/tools/mingw-make/makex.cmd Mon Dec 11 06:02:38 2006 @@ -1,5 +1,5 @@ @echo off -for /f "usebackq" %%i in (`cpucount -x2`) do set CPUCOUNT=%%i +for /f "usebackq" %%i in (`cpucount -x1`) do set CPUCOUNT=%%i echo %CPUCOUNT% Processors detected (Automatically doubled). -rem mingw32-make -j %CPUCOUNT% %* +mingw32-make -j %CPUCOUNT% %*

1 0

[peterw] 25122: - Fix GCC 4.1.2 build. Patch by Usurp.
by peterw＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: peterw Date: Mon Dec 11 01:39:21 2006 New Revision: 25122 URL: http://svn.reactos.org/svn/reactos?rev=25122&view=rev Log: - Fix GCC 4.1.2 build. Patch by Usurp. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Mon Dec 11 01:39:21 2006 @@ -1000,7 +1000,7 @@ if ((Vpb) && !(FileObject->Flags & FO_DIRECT_DEVICE_OPEN)) { /* Dereference the VPB before the close */ - InterlockedDecrement(&Vpb->ReferenceCount); + InterlockedDecrement((PLONG)&Vpb->ReferenceCount); } /* Check if the FS will never disappear by itself */ @@ -1956,7 +1956,7 @@ if (DeviceObject->Vpb) { /* Reference it */ - InterlockedIncrement(&DeviceObject->Vpb->ReferenceCount); + InterlockedIncrement((PLONG)&DeviceObject->Vpb->ReferenceCount); } /* Check if the caller wants the handle */ @@ -2049,7 +2049,7 @@ if (DeviceObject->Vpb) { /* Reference it */ - InterlockedIncrement(&DeviceObject->Vpb->ReferenceCount); + InterlockedIncrement((PLONG)&DeviceObject->Vpb->ReferenceCount); } /* Return the file object */

1 0

[peterw] 25121: Fix compilation \ -> /.
by peterw＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: peterw Date: Mon Dec 11 01:26:01 2006 New Revision: 25121 URL: http://svn.reactos.org/svn/reactos?rev=25121&view=rev Log: Fix compilation \ -> /. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Mon Dec 11 01:26:01 2006 @@ -13,7 +13,7 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> -#include "internal\io_i.h" +#include "internal/io_i.h" /* PRIVATE FUNCTIONS *********************************************************/

1 0

[fireball] 25120: - Make NTFS functions debug prints more verbose
by fireball＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: fireball Date: Mon Dec 11 01:07:05 2006 New Revision: 25120 URL: http://svn.reactos.org/svn/reactos?rev=25120&view=rev Log: - Make NTFS functions debug prints more verbose Modified: branches/winldr/fs/ntfs.c Modified: branches/winldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/fs/ntfs.c?rev=25120&r1=2… ============================================================================== --- branches/winldr/fs/ntfs.c (original) +++ branches/winldr/fs/ntfs.c Mon Dec 11 01:07:05 2006 @@ -52,6 +52,8 @@ UCHAR DataRunLengthSize; CHAR i; + DbgPrint((DPRINT_FILESYSTEM, "NtfsDecodeRun() - DataRun = %d\n", DataRun)); + DataRunOffsetSize = (*DataRun >> 4) & 0xF; DataRunLengthSize = *DataRun & 0xF; *DataRunOffset = 0; @@ -91,6 +93,8 @@ { PNTFS_ATTR_CONTEXT Context; + DbgPrint((DPRINT_FILESYSTEM, "NtfsPrepareAttributeContext() - AttrRecord = %p\n", AttrRecord)); + Context = MmAllocateMemory(FIELD_OFFSET(NTFS_ATTR_CONTEXT, Record) + AttrRecord->Length); RtlCopyMemory(&Context->Record, AttrRecord, AttrRecord->Length); if (AttrRecord->IsNonResident) @@ -117,11 +121,15 @@ Context->CacheRunCurrentOffset = 0; } + DbgPrint((DPRINT_FILESYSTEM, "NtfsPrepareAttributeContext() prepared Context = %p\n", Context)); + return Context; } static VOID NtfsReleaseAttributeContext(PNTFS_ATTR_CONTEXT Context) { + DbgPrint((DPRINT_FILESYSTEM, "NtfsReleaseAttributeContext() - Context = %p\n", Context)); + MmFreeMemory(Context); } @@ -130,7 +138,7 @@ { USHORT ReadLength; - DbgPrint((DPRINT_FILESYSTEM, "NtfsDiskRead - Offset: %I64d Length: %I64d\n", Offset, Length)); + DbgPrint((DPRINT_FILESYSTEM, "NtfsDiskRead() - Offset: %I64d Length: %I64d\n", Offset, Length)); RtlZeroMemory((PCHAR)DISKREADBUFFER, 0x1000); /* I. Read partial first sector if needed */ @@ -179,6 +187,9 @@ ULONGLONG ReadLength; ULONGLONG AlreadyRead; + DbgPrint((DPRINT_FILESYSTEM, "NtfsReadAttribute() - Context: %p Offset: %I64d Length %I64d\n", + Context, Offset, Length)); + if (!Context->Record.IsNonResident) { if (Offset > Context->Record.Resident.ValueLength) @@ -371,6 +382,8 @@ USHORT USACount; USHORT *Block; + DbgPrint((DPRINT_FILESYSTEM, "NtfsFixupRecord() - Record: %p\n", Record)); + USA = (USHORT*)((PCHAR)Record + Record->USAOffset); USANumber = *(USA++); USACount = Record->USACount - 1; /* Exclude the USA Number. */ @@ -391,6 +404,8 @@ static BOOLEAN NtfsReadMftRecord(ULONG MFTIndex, PNTFS_MFT_RECORD Buffer) { ULONGLONG BytesRead; + + DbgPrint((DPRINT_FILESYSTEM, "NtfsReadMftRecord() - MFTIndex: %x Buffer: %p\n", MFTIndex, Buffer)); BytesRead = NtfsReadAttribute(NtfsMFTContext, MFTIndex * NtfsMftRecordSize, (PCHAR)Buffer, NtfsMftRecordSize); if (BytesRead != NtfsMftRecordSize) @@ -467,6 +482,9 @@ PNTFS_INDEX_ENTRY IndexEntry, IndexEntryEnd; ULONG RecordOffset; ULONG IndexBlockSize; + + DbgPrint((DPRINT_FILESYSTEM, "NtfsFindMftRecord() - MFTIndex: %x Filename: %s\n", + MFTIndex, FileName)); MftRecord = MmAllocateMemory(NtfsMftRecordSize); if (MftRecord == NULL) @@ -621,7 +639,7 @@ ULONG CurrentMFTIndex; UCHAR i; - DbgPrint((DPRINT_FILESYSTEM, "NtfsLookupFile() FileName = %s\n", FileName)); + DbgPrint((DPRINT_FILESYSTEM, "NtfsLookupFile() - FileName = %s\n", FileName)); CurrentMFTIndex = NTFS_FILE_ROOT; NumberOfPathParts = FsGetNumPathParts(FileName); @@ -662,7 +680,7 @@ { NtfsBootSector = (PNTFS_BOOTSECTOR)DISKREADBUFFER; - DbgPrint((DPRINT_FILESYSTEM, "NtfsOpenVolume() DriveNumber = 0x%x VolumeStartSector = 0x%x\n", DriveNumber, VolumeStartSector)); + DbgPrint((DPRINT_FILESYSTEM, "NtfsOpenVolume() - DriveNumber = 0x%x VolumeStartSector = 0x%x\n", DriveNumber, VolumeStartSector)); if (!MachDiskReadLogicalSectors(DriveNumber, VolumeStartSector, 1, (PCHAR)DISKREADBUFFER)) {

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