Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[cgutman] 35404: - Add debug prints for failure statuses
by cgutman＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: cgutman Date: Sun Aug 17 03:17:03 2008 New Revision: 35404 URL: http://svn.reactos.org/svn/reactos?rev=35404&view=rev Log: - Add debug prints for failure statuses Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 17 03:17:03 2008 @@ -286,11 +286,11 @@ case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; break; case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; case STATUS_BUFFER_TOO_SMALL: /* Fall through to STATUS_BUFFER_OVERFLOW */ - case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; + case STATUS_BUFFER_OVERFLOW: DbgPrint("MSAFD: STATUS_BUFFER_TOO_SMALL/STATUS_BUFFER_OVERFLOW\n"); *Errno = WSAEMSGSIZE; break; case STATUS_NO_MEMORY: /* Fall through to STATUS_INSUFFICIENT_RESOURCES */ - case STATUS_INSUFFICIENT_RESOURCES: *Errno = WSA_NOT_ENOUGH_MEMORY; break; - case STATUS_INVALID_CONNECTION: *Errno = WSAEAFNOSUPPORT; break; - case STATUS_REMOTE_NOT_LISTENING: *Errno = WSAECONNRESET; break; + case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); *Errno = WSA_NOT_ENOUGH_MEMORY; break; + case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); *Errno = WSAEAFNOSUPPORT; break; + case STATUS_REMOTE_NOT_LISTENING: DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); *Errno = WSAECONNRESET; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; break;

1 0

[arty] 35403: Don't attempt to mount a partition that starts with a fat bootblock.
by arty＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: arty Date: Sun Aug 17 00:23:10 2008 New Revision: 35403 URL: http://svn.reactos.org/svn/reactos?rev=35403&view=rev Log: Don't attempt to mount a partition that starts with a fat bootblock. Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Sun Aug 17 00:23:10 2008 @@ -252,6 +252,14 @@ Ext2PerformVerifyDiskRead ( TargetDeviceObject, BootSector, StartingOffset, NumberOfBytesToRead ); + // Reject a volume that contains fat artifacts + + DebugTrace(DEBUG_TRACE_MOUNT, "OEM[%s]", BootSector->Oem); + if (BootSector->Oem[0]) + { + try_return (STATUS_WRONG_VOLUME); + } + // Allocating memory for reading in Super Block... SuperBlock = Ext2AllocatePool( PagedPool, NumberOfBytesToRead );

1 0

[ros-arm-bringup] 35402: Make RAM disk support work on x86 as well (it is now generic): 1) Don't assert if loaded from setup. On NT this means special things, but we don't care about that for now. 2) Add to txtsetup.sif along with the other core FS drivers. This will eventually allow installing from ramdisk as well (and later, over the network) 3) Add to hivesys_i386.inf so that the driver is initialized. RAM disk now works flawlessly on x86 -- just make sure to follow the previous instructions,
by ros-arm-bringup＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: ros-arm-bringup Date: Sat Aug 16 21:35:30 2008 New Revision: 35402 URL: http://svn.reactos.org/svn/reactos?rev=35402&view=rev Log: Make RAM disk support work on x86 as well (it is now generic): 1) Don't assert if loaded from setup. On NT this means special things, but we don't care about that for now. 2) Add to txtsetup.sif along with the other core FS drivers. This will eventually allow installing from ramdisk as well (and later, over the network) 3) Add to hivesys_i386.inf so that the driver is initialized. RAM disk now works flawlessly on x86 -- just make sure to follow the previous instructions, and add <size of your RAM disk> to your total memory available to ReactOS. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Aug 16 21:35:30 2008 @@ -24,6 +24,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"NetCfgx.dll,NetClassInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","NoDisplayClass",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1" + +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}",,0x00000000,"Ramdisk" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Class",0x00000000,"Ramdisk" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Icon",0x00000000,"-5" ; Default computer name settings HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName",,0x00000012 @@ -1025,6 +1029,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 +; RAM Disk class driver +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ImagePath",0x00020000,"system32\drivers\ramdisk.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Type",0x00010001,0x00000002 + ; EXT2 Filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Aug 16 21:35:30 2008 @@ -33,6 +33,7 @@ scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 +ramdisk.sys=,,,,,,x,,,,,,4 ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Aug 16 21:35:30 2008 @@ -2284,7 +2284,7 @@ // // Are we being booted from setup? Not yet supported // - ASSERT (!KeLoaderBlock->SetupLdrBlock); + //ASSERT(!KeLoaderBlock->SetupLdrBlock); } // @@ -2308,6 +2308,7 @@ PCHAR BootDeviceName, CommandLine; PDEVICE_OBJECT PhysicalDeviceObject = NULL; NTSTATUS Status; + DPRINT1("RAM Disk Driver Initialized\n"); // // Query ramdisk parameters @@ -2399,7 +2400,7 @@ // // Installing from Ramdisk isn't supported yet // - ASSERT(!KeLoaderBlock->SetupLdrBlock); + //ASSERT(!KeLoaderBlock->SetupLdrBlock); // // Are we reporting the device

1 0

[ros-arm-bringup] 35401: FreeLDR-side of RAM Disk support for x86 based on actual NT implementation (instead of ARM-only hacks): 1) First, remove the hack in bootmgr.c that looked for a reactos.img. 2) Instead, read the command line to the kernel, and check for /RDIMAGEPATH. If found, load the ramdisk in the loader. 3) This uses the same routine as the previous hack, but enhances it with actual status and progress printouts. 4) Finally, update usetup to generate a ReactOS (RAM Disk) entry on DBG
by ros-arm-bringup＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: ros-arm-bringup Date: Sat Aug 16 21:01:30 2008 New Revision: 35401 URL: http://svn.reactos.org/svn/reactos?rev=35401&view=rev Log: FreeLDR-side of RAM Disk support for x86 based on actual NT implementation (instead of ARM-only hacks): 1) First, remove the hack in bootmgr.c that looked for a reactos.img. 2) Instead, read the command line to the kernel, and check for /RDIMAGEPATH. If found, load the ramdisk in the loader. 3) This uses the same routine as the previous hack, but enhances it with actual status and progress printouts. 4) Finally, update usetup to generate a ReactOS (RAM Disk) entry on DBG builds, under the WinLDR one. Also fixed a bug where, on MiniTUI, the text sent to UiDrawProgressBarCenter would be ignored. This patch does not result in working RAM disk support yet. To test the FreeLDR side of things, you need to create a ramdisk file: this is easy. Preferred way right now is to use qemu-img to create a standard QEMU image. Then install ReactOS on it and configure it. This is now your ramdisk. Make your image about 100MB; this is how much ReactOS requires to install right now. Now on your "official" QEMU image, you can delete everything except freeldr.sys and freeldr.ini. Or don't, if it's large enough. Now add the reactos.img to your official image. You should have at least 100MB free space. Now when you boot the ReactOS (RAM disk) entry, it should boot up until the kernel, which will panic since there's no ramdisk support yet. Note that you can't just create a QEMU image and drop files in it -- it must be properly formatted and have the ReactOS boot sector: The RAM disk isn't just a collection of files, it's an entire virtual drive, so that's why you must first officially install ReactOS on it. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/ui/minitui.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -387,6 +387,13 @@ INSERT_LAST, L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\""); + + /* ReactOS_Ram="ReactOS (RAM Disk)" */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"ReactOS_Ram", + L"\"ReactOS (RAM Disk)\""); #endif /* Create "ReactOS" section */ @@ -444,7 +451,7 @@ IniSection = IniCacheAppendSection(IniCache, L"ReactOS_WinLdr"); - /* BootType=ReactOS */ + /* BootType=Windows2003 */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, @@ -464,6 +471,31 @@ INSERT_LAST, L"Options", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); + + /* Create "ReactOS_WinLdr" section */ + IniSection = IniCacheAppendSection(IniCache, + L"ReactOS_Ram"); + + /* BootType=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootType", + L"ReactOS"); + + /* SystemPath=ramdisk(0)\\ReactOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"SystemPath", + L"ramdisk(0)\\ReactOS"); + + /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256*/ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"Options", + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); #endif /* Save the ini file */ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -37,14 +37,6 @@ return; } - // - // Check if we have a virtual RAM disk - // This is for x86 emulation -- on real hardware, the RAM disk will be - // located in one of the hardware memory descriptors as well as on the - // freeldr command-line - // - RamDiskCheckForVirtualFile(); - if (!IniFileInitialize()) { UiMessageBoxCritical("Error initializing .ini file"); Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -27,7 +27,7 @@ // // Return data from our RAM Disk // - assert(((ULONG_PTR)gRamDiskBase + (ULONG_PTR)Offset) < + ASSERT(((ULONG_PTR)gRamDiskBase + (ULONG_PTR)Offset) < ((ULONG_PTR)gRamDiskBase + (ULONG_PTR)gRamDiskSize)); return (PVOID)((ULONG_PTR)gRamDiskBase + (ULONG_PTR)(Offset)); } @@ -83,35 +83,41 @@ VOID NTAPI -RamDiskCheckForVirtualFile(VOID) +RamDiskLoadVirtualFile(IN PCHAR FileName) { PFILE RamFile; ULONG TotalRead, ChunkSize; - + PCHAR MsgBuffer = "Loading ramdisk..."; + ULONG PercentPerChunk, Percent; + + // + // Display progress + // + UiDrawProgressBarCenter(1, 100, MsgBuffer); + // // Try opening the ramdisk file (this assumes the boot volume was opened) - // - RamFile = FsOpenFile("reactos.img"); + // + RamFile = FsOpenFile(FileName); if (RamFile) { // // Get the file size // gRamDiskSize = FsGetFileSize(RamFile); - TuiPrintf("Found virtual ramdisk (%dKB)\n", gRamDiskSize / 1024); if (!gRamDiskSize) return; // // Allocate memory for it // ChunkSize = 8 * 1024 * 1024; + Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); gRamDiskBase = MmAllocateMemory(gRamDiskSize); if (!gRamDiskBase) return; - + // // Read it in chunks // - TuiPrintf("Loading ramdisk @ 0x%x...", gRamDiskBase); for (TotalRead = 0; TotalRead < gRamDiskSize; TotalRead += ChunkSize) { // @@ -124,11 +130,17 @@ // ChunkSize = gRamDiskSize - TotalRead; } - + + // + // Draw progress + // + UiDrawProgressBarCenter(Percent, 100, MsgBuffer); + Percent += PercentPerChunk; + // // Copy the contents // - TuiPrintf("."); + if (!FsReadFile(RamFile, ChunkSize, NULL, @@ -137,10 +149,9 @@ // // Fail // - TuiPrintf("Failed to read ramdisk\n"); + UiMessageBox("Failed to read ramdisk\n"); } } - TuiPrintf("\n"); } } Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -20,8 +20,8 @@ VOID NTAPI -RamDiskCheckForVirtualFile( - VOID +RamDiskLoadVirtualFile( + IN PCHAR FileName ); extern PVOID gRamDiskBase; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -40,7 +40,7 @@ CHAR szHalName[255]; CHAR szBootPath[255]; CHAR SystemRoot[255]; -static CHAR szLoadingMsg[] = "Loading ReactOS..."; +static CHAR szLoadingMsg[] = "ReactOS is loading files..."; BOOLEAN FrLdrBootType; ULONG_PTR KernelBase; ROS_KERNEL_ENTRY_POINT KernelEntryPoint; @@ -576,6 +576,11 @@ PVOID LoadBase; ULONG_PTR Base; ULONG Size; + + // + // Backdrop + // + UiDrawBackdrop(); // // Open the operating system section @@ -588,13 +593,40 @@ return; } - UiDrawBackdrop(); + // + // Read the command line + // + if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) + { + // + // Check if a ramdisk file was given + // + PCHAR File; + File = strstr(value, "/RDIMAGEPATH="); + if (File) + { + // + // Copy the file name and everything else after it + // + strcpy(szFileName, File + 13); + + // + // Null-terminate + // + *strstr(szFileName, " ") = ANSI_NULL; + + // + // Load the ramdisk + // + RamDiskLoadVirtualFile(szFileName); + } + } + + /* + * Setup multiboot information structure + */ + UiDrawProgressBarCenter(1, 100, szLoadingMsg); UiDrawStatusText("Detecting Hardware..."); - UiDrawProgressBarCenter(1, 100, szLoadingMsg); - - /* - * Setup multiboot information structure - */ LoaderBlock.CommandLine = reactos_kernel_cmdline; LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/mi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -65,7 +65,7 @@ // // Draw the "Loading..." text // - TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, "ReactOS is loading files...", ATTR(7, 0)); + TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(7, 0)); // Draw the percent complete for (i=0; i<(Position*ProgressBarWidth)/Range; i++)

1 0

[jimtabor] 35400: - Add timer handle type.
by jimtabor＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: jimtabor Date: Sat Aug 16 19:46:51 2008 New Revision: 35400 URL: http://svn.reactos.org/svn/reactos?rev=35400&view=rev Log: - Add timer handle type. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/subsystems/win32/win32k/include/object.h Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sat Aug 16 19:46:51 2008 @@ -187,6 +187,7 @@ #define VALIDATE_TYPE_ACCEL 8 #define VALIDATE_TYPE_MONITOR 12 #define VALIDATE_TYPE_EVENT 15 +#define VALIDATE_TYPE_TIMER 16 #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Sat Aug 16 19:46:51 2008 @@ -51,7 +51,8 @@ otCallProc = 7, otAccel, otMonitor = 12, - otEvent = 15 + otEvent = 15, + otTimer } USER_OBJECT_TYPE;

1 0

[arty] 35399: Merge aicom-network-fixes up to 35398
by arty＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: arty Date: Sat Aug 16 17:39:01 2008 New Revision: 35399 URL: http://svn.reactos.org/svn/reactos?rev=35399&view=rev Log: Merge aicom-network-fixes up to 35398 Modified: trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/tcpip/tcpip/irp.c Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -39,27 +39,30 @@ NTSTATUS STDCALL AfdSetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - NTSTATUS Status = STATUS_NO_MEMORY; + NTSTATUS Status = STATUS_BUFFER_TOO_SMALL; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + if( FCB->Context ) { + ExFreePool( FCB->Context ); + FCB->Context = NULL; + } + if( FCB->ContextSize < IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { - if( FCB->Context ) - ExFreePool( FCB->Context ); FCB->Context = ExAllocatePool ( PagedPool, IrpSp->Parameters.DeviceIoControl.InputBufferLength ); - } - if( FCB->Context ) { - Status = STATUS_SUCCESS; + if( !FCB->Context ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + RtlCopyMemory( FCB->Context, IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, IrpSp->Parameters.DeviceIoControl.InputBufferLength ); + Status = STATUS_SUCCESS; } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -24,12 +24,9 @@ AFD_DbgPrint(MID_TRACE,("Called %x %x\n", InfoReq, InfoReq ? InfoReq->InformationClass : 0)); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + _SEH_TRY { - if( !SocketAcquireStateLock( FCB ) ) { - Status = LostSocket( Irp ); - _SEH_YIELD(return Status); - } - switch( InfoReq->InformationClass ) { case AFD_INFO_RECEIVE_WINDOW_SIZE: InfoReq->Information.Ulong = FCB->Recv.Size; @@ -113,7 +110,7 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } else { - if( !NT_SUCCESS + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo, FCB->LocalAddress->Address[0].AddressType ) ) ) { @@ -148,11 +145,11 @@ if( ConnInfo ) ExFreePool( ConnInfo ); if( SysMdl ) IoFreeMdl( SysMdl ); + if( TransAddr ) MmUnmapLockedPages( TransAddr, Mdl ); } + /* MmUnlockPages( Mdl ); */ } - - /* MmUnlockPages( Mdl ); */ - /* IoFreeMdl( Mdl ); */ + /* IoFreeMdl( Mdl ); */ } else { Status = STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -188,14 +188,17 @@ if( !NT_SUCCESS(Status) ) return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); - FCB->State = SOCKET_STATE_LISTENING; - TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionCallInfo, FCB->LocalAddress->Address[0].AddressType ); TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + + if( !FCB->ListenIrp.ConnectionReturnInfo || !FCB->ListenIrp.ConnectionCallInfo ) + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + + FCB->State = SOCKET_STATE_LISTENING; Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, @@ -272,6 +275,8 @@ ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + if( !FCB->ListenIrp.ConnectionReturnInfo ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, @@ -306,6 +311,8 @@ (PVOID *)&NewFileObject, NULL ); + if( !NT_SUCCESS(Status) ) UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + ASSERT(NewFileObject != FileObject); ASSERT(NewFileObject->FsContext != FCB); Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -167,7 +167,7 @@ NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); AFD_DbgPrint(MAX_TRACE,("Called on %x, attempting to lock\n", FCB)); @@ -218,7 +218,7 @@ PVOID CurrentThread = KeGetCurrentThread(); #endif ASSERT(FCB->LockCount > 0); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); ExAcquireFastMutex( &FCB->Mutex ); FCB->LockCount--; Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -210,8 +210,12 @@ ExFreePool( FCB->LocalAddress ); if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - - ExFreePool(FCB->TdiDeviceName.Buffer); + if( FCB->ListenIrp.ConnectionReturnInfo ) + ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); + if( FCB->ListenIrp.ConnectionCallInfo ) + ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); + if( FCB->TdiDeviceName.Buffer ) + ExFreePool(FCB->TdiDeviceName.Buffer); ExFreePool(FCB); AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -27,14 +27,14 @@ UntrackFL( __FILE__, __LINE__, Irp ); #endif - (void)IoSetCancelRoutine( Irp, NULL ); + Irp->IoStatus.Status = Status; if( Status == STATUS_PENDING ) IoMarkIrpPending( Irp ); else { - Irp->IoStatus.Status = Status; Irql = KeGetCurrentIrql(); + (void)IoSetCancelRoutine( Irp, NULL ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); if (KeGetCurrentIrql() != Irql) { DbgPrint("WARNING: IO COMPLETION RETURNED AT WRONG IRQL:\n");

1 0

[cgutman] 35398: - Make sure we successfully allocated ConnectionReturnInfo and ConnectionCallInfo - Make sure ObReferenceObjectByHandle was successful
by cgutman＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: cgutman Date: Sat Aug 16 16:16:41 2008 New Revision: 35398 URL: http://svn.reactos.org/svn/reactos?rev=35398&view=rev Log: - Make sure we successfully allocated ConnectionReturnInfo and ConnectionCallInfo - Make sure ObReferenceObjectByHandle was successful Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 16 16:16:41 2008 @@ -188,14 +188,17 @@ if( !NT_SUCCESS(Status) ) return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); - FCB->State = SOCKET_STATE_LISTENING; - TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionCallInfo, FCB->LocalAddress->Address[0].AddressType ); TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + + if( !FCB->ListenIrp.ConnectionReturnInfo || !FCB->ListenIrp.ConnectionCallInfo ) + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + + FCB->State = SOCKET_STATE_LISTENING; Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, @@ -271,6 +274,8 @@ ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + if( !FCB->ListenIrp.ConnectionReturnInfo ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, @@ -305,6 +310,8 @@ (PVOID *)&NewFileObject, NULL ); + if( !NT_SUCCESS(Status) ) UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + ASSERT(NewFileObject != FileObject); ASSERT(NewFileObject->FsContext != FCB);

1 0

[sginsberg] 35397: - Remove deprecated ExfpInterlockedExchange64
by sginsberg＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: sginsberg Date: Sat Aug 16 13:06:12 2008 New Revision: 35397 URL: http://svn.reactos.org/svn/reactos?rev=35397&view=rev Log: - Remove deprecated ExfpInterlockedExchange64 Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Sat Aug 16 13:06:12 2008 @@ -556,24 +556,5 @@ /* Return */ ret 8 - -/* Ugly hack: Use InterlockedExchange64 */ -.att_syntax -.global @ExfpInterlockedExchange64@8 -@ExfpInterlockedExchange64@8: - pushl %ebx - pushl %esi - movl %ecx,%esi - movl (%edx),%ebx - movl 4(%edx),%ecx -1: - movl (%esi),%eax - movl 4(%esi),%edx - LOCK - cmpxchg8b (%esi) - jnz 1b - popl %esi - popl %ebx - ret /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sat Aug 16 13:06:12 2008 @@ -1007,13 +1007,6 @@ IN PERESOURCE Resource ); -LONGLONG -FASTCALL -ExfpInterlockedExchange64( - LONGLONG volatile * Destination, - PLONGLONG Exchange -); - NTSTATUS ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation); @@ -1068,7 +1061,4 @@ #define ExfInterlockedCompareExchange64UL(Destination, Exchange, Comperand) \ (ULONGLONG)ExfInterlockedCompareExchange64((PLONGLONG)(Destination), (PLONGLONG)(Exchange), (PLONGLONG)(Comperand)) -#define ExfpInterlockedExchange64UL(Target, Value) \ - (ULONGLONG)ExfpInterlockedExchange64((PLONGLONG)(Target), (PLONGLONG)(Value)) - #endif /* __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H */

1 0

[sginsberg] 35396: - Spelling fixes - Remove deprecated comment from resource.c - Fix obsdcach.c comment header
by sginsberg＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: sginsberg Date: Sat Aug 16 12:53:28 2008 New Revision: 35396 URL: http://svn.reactos.org/svn/reactos?rev=35396&view=rev Log: - Spelling fixes - Remove deprecated comment from resource.c - Fix obsdcach.c comment header Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/io/iomgr/iowork.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/obsdcach.c Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -226,7 +226,7 @@ cmp eax, ecx je 2f - /* Get the next entry and do the deletion*/ + /* Get the next entry and do the deletion */ #ifdef CONFIG_SMP push ebx mov ebx, [eax] @@ -569,7 +569,7 @@ push ebx push ebp - /* Get desination pointer, exchange value and comperand value/address */ + /* Get destination pointer, exchange value and comperand value/address */ mov ebp, ecx mov ebx, [edx] mov ecx, [edx+4] @@ -601,7 +601,7 @@ push ebp push ebp - /* Get desination pointer, exchange value and comperand value/address */ + /* Get destination pointer, exchange value and comperand value/address */ mov ebp, ecx mov ebx, [edx] mov ecx, [edx+4] @@ -730,7 +730,7 @@ push ebp push ebp - /* Get desination pointer, exchange value and comperand value/address */ + /* Get destination pointer, exchange value and comperand value/address */ mov ebp, ecx mov ebx, [edx] mov ecx, [edx+4] Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -239,7 +239,7 @@ /* Restore flags */ popfd - /* check if the list was empty and return NULL */ + /* Check if the list was empty and return NULL */ xor eax, edx jz 2f Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=353… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -986,7 +986,7 @@ /* Setup bugcheck messages */ KiInitializeBugCheck(); - /* Setup initial system settings (FIXME: Needs Cm Rewrite) */ + /* Setup initial system settings */ CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); /* Load static defaults for Service Pack 1 and add our SVN revision */ Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -4,14 +4,6 @@ * FILE: ntoskrnl/ex/resource.c * PURPOSE: Executive Resource Implementation * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* - * WARNING: - * This implementation is the Windows NT 5.x one. - * Vista has optimized the OwnerThread entry array and the internals of - * ExpFindEntryForThread and ExpFindFreeEntry probably need to be modified - * accordingly in order to support the WDK. */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iowork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iowork.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -26,7 +26,7 @@ /* Call the work routine */ IoWorkItem->WorkerRoutine(DeviceObject, IoWorkItem->Context); - /* Dereferenece the device object */ + /* Dereference the device object */ ObDereferenceObject(DeviceObject); } Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/dirobj.c + * FILE: ntoskrnl/ob/obdir.c * PURPOSE: Manages the Object Manager's Directory Implementation, * such as functions for addition, deletion and lookup into * the Object Manager's namespace. These routines are separate Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/init.c + * FILE: ntoskrnl/ob/obinit.c * PURPOSE: Handles Object Manager Initialization and Shutdown * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/create.c + * FILE: ntoskrnl/ob/oblife.c * PURPOSE: Manages the lifetime of an Object, including its creation, * and deletion, as well as setting or querying any of its * information while it is active. Since Object Types are also Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/ob/symlink.c +* FILE: ntoskrnl/ob/oblink.c * PURPOSE: Implements symbolic links * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/namespce.c + * FILE: ntoskrnl/ob/obname.c * PURPOSE: Manages all functions related to the Object Manager name- * space, such as finding objects or querying their names. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/refderef.c + * FILE: ntoskrnl/ob/obref.c * PURPOSE: Manages the referencing and de-referencing of all Objects, * as well as the Object Fast Reference implementation. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/sdcache.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ob/obsdcach.c + * PURPOSE: Security Descriptor Caching + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES *******************************************************************/

1 0

[jimtabor] 35395: Wine update to dialog.c, see bug 3644.
by jimtabor＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: jimtabor Date: Sat Aug 16 11:01:03 2008 New Revision: 35395 URL: http://svn.reactos.org/svn/reactos?rev=35395&view=rev Log: Wine update to dialog.c, see bug 3644. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Aug 16 11:01:03 2008 @@ -755,13 +755,12 @@ { rect.left += MulDiv(template.x, xBaseUnit, 4); rect.top += MulDiv(template.y, yBaseUnit, 8); + if( !(template.style & (WS_CHILD|DS_ABSALIGN)) ) + ClientToScreen( owner, (POINT *)&rect ); } if ( !(template.style & WS_CHILD) ) { INT dX, dY; - - if( !(template.style & DS_ABSALIGN) ) - ClientToScreen( owner, (POINT *)&rect ); /* try to fit it into the desktop */

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
86
Older →

Jump to page:

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 2008