Ros-diffs October 2011

ros-diffs@reactos.org

18 participants
369 discussions

[jgardou] 54270: [NTOSKRNL] - add missing lock/unlock of kernel address space
by jgardou＠svn.reactos.org 29 Oct '11

29 Oct '11

Author: jgardou Date: Sat Oct 29 16:25:11 2011 New Revision: 54270 URL: http://svn.reactos.org/svn/reactos?rev=54270&view=rev Log: [NTOSKRNL] - add missing lock/unlock of kernel address space Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Oct 29 16:25:11 2011 @@ -4911,8 +4911,12 @@ DPRINT("MmUnmapViewInSystemSpace() called\n"); AddressSpace = MmGetKernelAddressSpace(); + + MmLockAddressSpace(AddressSpace); Status = MmUnmapViewOfSegment(AddressSpace, MappedBase); + + MmUnlockAddressSpace(AddressSpace); return Status; }

1 0

[cgutman] 54269: [USETUP] - Use a separate function, InstallFat12BootCodeToFloppy(), to install the floppy boot code - Format the floppy to FAT12 before writing to it - Booting FreeLoader from flop...
by cgutman＠svn.reactos.org 29 Oct '11

29 Oct '11

Author: cgutman Date: Sat Oct 29 15:10:11 2011 New Revision: 54269 URL: http://svn.reactos.org/svn/reactos?rev=54269&view=rev Log: [USETUP] - Use a separate function, InstallFat12BootCodeToFloppy(), to install the floppy boot code - Format the floppy to FAT12 before writing to it - Booting FreeLoader from floppy works again (bug #6495) Modified: trunk/reactos/base/setup/usetup/bootsup.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 Oct 29 15:10:11 2011 @@ -1259,6 +1259,161 @@ return Status; } +NTSTATUS +InstallFat12BootCodeToFloppy(PWSTR SrcPath, + PWSTR RootPath) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + HANDLE FileHandle; + NTSTATUS Status; + PFAT_BOOTSECTOR OrigBootSector; + PFAT_BOOTSECTOR NewBootSector; + + /* Allocate buffer for original bootsector */ + OrigBootSector = RtlAllocateHeap(ProcessHeap, 0, SECTORSIZE); + if (OrigBootSector == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Read current boot sector into buffer */ + RtlInitUnicodeString(&Name, RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return Status; + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + OrigBootSector, + SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return Status; + } + + + /* Allocate buffer for new bootsector */ + NewBootSector = RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); + if (NewBootSector == NULL) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Read new bootsector from SrcPath */ + RtlInitUnicodeString(&Name, SrcPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + + Status = NtReadFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + + /* Adjust bootsector (copy a part of the FAT16 BPB) */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT_BOOTSECTOR, OemName)); + + /* Free the original boot sector */ + RtlFreeHeap(ProcessHeap, 0, OrigBootSector); + + /* Write new bootsector to RootPath */ + RtlInitUnicodeString(&Name, RootPath); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_WRITE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_SEQUENTIAL_ONLY); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtOpenFile() failed (Status %lx)\n", Status); + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + return Status; + } + +#if 0 + FilePosition.QuadPart = 0; +#endif + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatusBlock, + NewBootSector, + SECTORSIZE, + NULL, + NULL); + NtClose(FileHandle); + + /* Free the new boot sector */ + RtlFreeHeap(ProcessHeap, 0, NewBootSector); + + return Status; +} + NTSTATUS InstallFat16BootCodeToDisk( @@ -2198,9 +2353,23 @@ PUNICODE_STRING DestinationArcPath) { #ifdef __REACTOS__ + UNICODE_STRING FloppyDevice = RTL_CONSTANT_STRING(L"\\Device\\Floppy0"); WCHAR SrcPath[MAX_PATH]; WCHAR DstPath[MAX_PATH]; NTSTATUS Status; + + /* Format the floppy first */ + Status = VfatFormat(&FloppyDevice, + FMIFS_FLOPPY, + NULL, + TRUE, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("VfatFormat() failed (Status %lx)\n", Status); + return Status; + } /* Copy FreeLoader to the boot partition */ wcscpy(SrcPath, SourceRootPath->Buffer); @@ -2234,7 +2403,7 @@ wcscpy(DstPath, L"\\Device\\Floppy0"); DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, DstPath); - Status = InstallFat16BootCodeToDisk(SrcPath, DstPath); + Status = InstallFat12BootCodeToFloppy(SrcPath, DstPath); if (!NT_SUCCESS(Status)) { DPRINT1("InstallFat16BootCodeToDisk() failed (Status %lx)\n", Status);

1 0

[cgutman] 54268: [FSLIB] - Don't call the callback if the caller didn't give one
by cgutman＠svn.reactos.org 29 Oct '11

29 Oct '11

Author: cgutman Date: Sat Oct 29 15:03:01 2011 New Revision: 54268 URL: http://svn.reactos.org/svn/reactos?rev=54268&view=rev Log: [FSLIB] - Don't call the callback if the caller didn't give one Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c trunk/reactos/lib/fslib/vfatlib/vfatlib.c trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c Modified: trunk/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ext2lib/Mke2fs.c… ============================================================================== --- trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Sat Oct 29 15:03:01 2011 @@ -820,7 +820,10 @@ ULONG ret_blk; - Callback(PROGRESS, 0, (PVOID)&Percent); + if (Callback != NULL) + { + Callback(PROGRESS, 0, (PVOID)&Percent); + } RtlZeroMemory(&Ext2Sb, sizeof(EXT2_SUPER_BLOCK)); @@ -997,7 +1000,10 @@ Ext2CloseDevice(&FileSys); - Callback(DONE, 0, (PVOID)&bRet); + if (Callback != NULL) + { + Callback(DONE, 0, (PVOID)&bRet); + } return Status; } Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Sat Oct 29 15:03:01 2011 @@ -294,7 +294,10 @@ if (NewPercent > Context->Percent) { Context->Percent = NewPercent; - Context->Callback (PROGRESS, 0, &Context->Percent); + if (Context->Callback != NULL) + { + Context->Callback (PROGRESS, 0, &Context->Percent); + } } } Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/vfatxli… ============================================================================== --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c [iso-8859-1] Sat Oct 29 15:03:01 2011 @@ -169,7 +169,10 @@ if (NewPercent > Context->Percent) { Context->Percent = NewPercent; - Context->Callback(PROGRESS, 0, &Context->Percent); + if (Context->Callback != NULL) + { + Context->Callback(PROGRESS, 0, &Context->Percent); + } } }

1 0

[cgutman] 54267: [FLOPPY] - Prevent a deadlock on very old controllers by sending the configure and version commands before resetting the controller
by cgutman＠svn.reactos.org 29 Oct '11

29 Oct '11

Author: cgutman Date: Sat Oct 29 14:19:30 2011 New Revision: 54267 URL: http://svn.reactos.org/svn/reactos?rev=54267&view=rev Log: [FLOPPY] - Prevent a deadlock on very old controllers by sending the configure and version commands before resetting the controller Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sat Oct 29 14:19:30 2011 @@ -666,15 +666,22 @@ UCHAR HeadLoadTime; UCHAR HeadUnloadTime; UCHAR StepRateTime; + UCHAR ControllerVersion; PAGED_CODE(); ASSERT(ControllerInfo); TRACE_(FLOPPY, "InitController called with Controller 0x%p\n", ControllerInfo); + /* Get controller in a known state */ + HwConfigure(ControllerInfo, FALSE, TRUE, TRUE, 0, 0); + + /* Get the controller version */ + ControllerVersion = HwGetVersion(ControllerInfo); + KeClearEvent(&ControllerInfo->SynchEvent); - /* Reset the controller to avoid interrupt garbage on certain controllers */ + /* Reset the controller */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { WARN_(FLOPPY, "InitController: unable to reset controller\n"); @@ -701,10 +708,10 @@ INFO_(FLOPPY, "InitController: done sensing interrupts\n"); /* Next, see if we have the right version to do implied seek */ - if(HwGetVersion(ControllerInfo) == VERSION_ENHANCED) + if(ControllerVersion == VERSION_ENHANCED) { /* If so, set that up -- all defaults below except first TRUE for EIS */ - if(HwConfigure(ControllerInfo, TRUE, TRUE, FALSE, 0, 0) != STATUS_SUCCESS) + if(HwConfigure(ControllerInfo, TRUE, TRUE, TRUE, 0, 0) != STATUS_SUCCESS) { WARN_(FLOPPY, "InitController: unable to set up implied seek\n"); ControllerInfo->ImpliedSeeks = FALSE;

1 0

[cgutman] 54266: [FLOPPY] - Improve the floppy controller initialization code to fix several cases where the controller could deadlock or otherwise malfunction on us
by cgutman＠svn.reactos.org 29 Oct '11

29 Oct '11

Author: cgutman Date: Sat Oct 29 13:22:18 2011 New Revision: 54266 URL: http://svn.reactos.org/svn/reactos?rev=54266&view=rev Log: [FLOPPY] - Improve the floppy controller initialization code to fix several cases where the controller could deadlock or otherwise malfunction on us Modified: trunk/reactos/drivers/storage/floppy/floppy.c Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Sat Oct 29 13:22:18 2011 @@ -674,38 +674,10 @@ KeClearEvent(&ControllerInfo->SynchEvent); - INFO_(FLOPPY, "InitController: resetting the controller\n"); - - /* Reset the controller */ - if(HwReset(ControllerInfo) != STATUS_SUCCESS) - { - WARN_(FLOPPY, "InitController: unable to reset controller\n"); - return STATUS_IO_DEVICE_ERROR; - } - - /* All controllers should support this so - * if we get something strange back then we - * know that this isn't a floppy controller - */ - if (HwGetVersion(ControllerInfo) <= 0) - { - WARN_(FLOPPY, "InitController: unable to contact controller\n"); - return STATUS_NO_SUCH_DEVICE; - } - /* Reset the controller to avoid interrupt garbage on certain controllers */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { - WARN_(FLOPPY, "InitController: unable to reset controller #2\n"); - return STATUS_IO_DEVICE_ERROR; - } - - INFO_(FLOPPY, "InitController: setting data rate\n"); - - /* Set data rate */ - if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) - { - WARN_(FLOPPY, "InitController: unable to set data rate\n"); + WARN_(FLOPPY, "InitController: unable to reset controller\n"); return STATUS_IO_DEVICE_ERROR; } @@ -776,6 +748,15 @@ HeadLoadTime = SPECIFY_HLT_500K; HeadUnloadTime = SPECIFY_HUT_500K; StepRateTime = SPECIFY_SRT_500K; + + INFO_(FLOPPY, "InitController: setting data rate\n"); + + /* Set data rate */ + if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) + { + WARN_(FLOPPY, "InitController: unable to set data rate\n"); + return STATUS_IO_DEVICE_ERROR; + } INFO_(FLOPPY, "InitController: issuing specify command to controller\n"); @@ -850,7 +831,7 @@ } /* Now that we have a controller, set it up with the system */ - for(i = 0; i < gNumberOfControllers; i++) + for(i = 0; i < gNumberOfControllers && gControllerInfo[i].NumberOfDrives > 0; i++) { /* 0: Report resource usage to the kernel, to make sure they aren't assigned to anyone else */ /* FIXME: Implement me. */ @@ -994,7 +975,7 @@ INFO_(FLOPPY, "AddControllers: --------------------------------------------> finished adding controllers\n"); - return TRUE; + return (IoGetConfigurationInformation()->FloppyCount != 0); }

1 0

[cgutman] 54265: [NTOSKRNL] - Fix handling of HAL returning a different address space than we thought
by cgutman＠svn.reactos.org 29 Oct '11

29 Oct '11

Author: cgutman Date: Sat Oct 29 12:18:25 2011 New Revision: 54265 URL: http://svn.reactos.org/svn/reactos?rev=54265&view=rev Log: [NTOSKRNL] - Fix handling of HAL returning a different address space than we thought Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sat Oct 29 12:18:25 2011 @@ -783,9 +783,12 @@ if (AddressSpace == 0) { - /* This is actually a memory resource */ - DescriptorRaw->Type = CmResourceTypeMemory; - DescriptorTranslated->Type = CmResourceTypeMemory; + DPRINT1("Guessed incorrect address space: 1 -> 0\n"); + + /* FIXME: I think all other CM_RESOURCE_PORT_XXX flags are + * invalid for this state but I'm not 100% sure */ + DescriptorRaw->Flags = + DescriptorTranslated->Flags = CM_RESOURCE_PORT_MEMORY; } break; } @@ -825,9 +828,10 @@ if (AddressSpace != 0) { - /* This is actually an I/O port resource */ - DescriptorRaw->Type = CmResourceTypePort; - DescriptorTranslated->Type = CmResourceTypePort; + DPRINT1("Guessed incorrect address space: 0 -> 1\n"); + + /* This should never happen for memory space */ + ASSERT(FALSE); } }

1 0

[tfaber] 54264: [USER32] - Fix MSVC build
by tfaber＠svn.reactos.org 28 Oct '11

28 Oct '11

Author: tfaber Date: Fri Oct 28 22:15:53 2011 New Revision: 54264 URL: http://svn.reactos.org/svn/reactos?rev=54264&view=rev Log: [USER32] - Fix MSVC build 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] Fri Oct 28 22:15:53 2011 @@ -2605,8 +2605,9 @@ WPARAM wParam, LPARAM lParam) { - if ( hDlg == HWND_TOPMOST || hDlg == HWND_BROADCAST ) return 0; // ReactOS - HWND hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); + HWND hwndCtrl; + if ( hDlg == HWND_TOPMOST || hDlg == HWND_BROADCAST ) return 0; // ReactOS + hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); if (hwndCtrl) return SendMessageA( hwndCtrl, Msg, wParam, lParam ); else return 0; } @@ -2624,8 +2625,9 @@ WPARAM wParam, LPARAM lParam) { - if ( hDlg == HWND_TOPMOST || hDlg == HWND_BROADCAST ) return 0; // ReactOS - HWND hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); + HWND hwndCtrl; + if ( hDlg == HWND_TOPMOST || hDlg == HWND_BROADCAST ) return 0; // ReactOS + hwndCtrl = GetDlgItem( hDlg, nIDDlgItem ); if (hwndCtrl) return SendMessageW( hwndCtrl, Msg, wParam, lParam ); else return 0; }

1 0

[cgutman] 54263: [WININET] - Disable connection keep-alive to avoid calling into msafd to close the connection later during DLL_PROCESS_DETACH
by cgutman＠svn.reactos.org 28 Oct '11

28 Oct '11

Author: cgutman Date: Fri Oct 28 18:58:43 2011 New Revision: 54263 URL: http://svn.reactos.org/svn/reactos?rev=54263&view=rev Log: [WININET] - Disable connection keep-alive to avoid calling into msafd to close the connection later during DLL_PROCESS_DETACH Modified: trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/wininet_ros.diff Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Fri Oct 28 18:58:43 2011 @@ -245,8 +245,17 @@ if(InterlockedDecrement(&server->ref)) return; +#ifndef __REACTOS__ if(!server->ref) server->keep_until = (DWORD64)GetTickCount() + COLLECT_TIME; +#else + EnterCriticalSection(&connection_pool_cs); + list_remove(&server->entry); + LeaveCriticalSection(&connection_pool_cs); + + heap_free(server->name); + heap_free(server); +#endif } static server_t *get_server(const WCHAR *name, INTERNET_PORT port) @@ -1861,6 +1870,7 @@ if(!req->netconn) return; +#ifndef __REACTOS__ if(reuse && req->netconn->keep_alive) { BOOL run_collector; @@ -1893,6 +1903,7 @@ } return; } +#endif INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, INTERNET_STATUS_CLOSING_CONNECTION, 0, 0); Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Fri Oct 28 18:58:43 2011 @@ -92,3 +92,41 @@ for (i = 0; i < sizeof(DefaultContainerData) / sizeof(DefaultContainerData[0]); i++) { WCHAR wszCachePath[MAX_PATH]; +Index: dll/win32/wininet/http.c +=================================================================== +--- dll/win32/wininet/http.c (revision 54234) ++++ dll/win32/wininet/http.c (working copy) +@@ -245,8 +245,17 @@ + if(InterlockedDecrement(&server->ref)) + return; + ++#ifndef __REACTOS__ + if(!server->ref) + server->keep_until = (DWORD64)GetTickCount() + COLLECT_TIME; ++#else ++ EnterCriticalSection(&connection_pool_cs); ++ list_remove(&server->entry); ++ LeaveCriticalSection(&connection_pool_cs); ++ ++ heap_free(server->name); ++ heap_free(server); ++#endif + } + + static server_t *get_server(const WCHAR *name, INTERNET_PORT port) +@@ -1861,6 +1870,7 @@ + if(!req->netconn) + return; + ++#ifndef __REACTOS__ + if(reuse && req->netconn->keep_alive) { + BOOL run_collector; + +@@ -1893,6 +1903,7 @@ + } + return; + } ++#endif + + INTERNET_SendCallback(&req->hdr, req->hdr.dwContext, + INTERNET_STATUS_CLOSING_CONNECTION, 0, 0);

1 0

[jgardou] 54262: [NTOSKRNL] - remove unused variables/arguments - Add small check in MmNotPresentFaultSectionView
by jgardou＠svn.reactos.org 28 Oct '11

28 Oct '11

Author: jgardou Date: Fri Oct 28 16:34:48 2011 New Revision: 54262 URL: http://svn.reactos.org/svn/reactos?rev=54262&view=rev Log: [NTOSKRNL] - remove unused variables/arguments - Add small check in MmNotPresentFaultSectionView Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Oct 28 16:34:48 2011 @@ -935,8 +935,7 @@ MmNotPresentFaultVirtualMemory( PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked + PVOID Address ); NTSTATUS @@ -1656,8 +1655,7 @@ MmNotPresentFaultSectionView( PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked + PVOID Address ); NTSTATUS @@ -1678,8 +1676,7 @@ MmAccessFaultSectionView( PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked + PVOID Address ); VOID Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Fri Oct 28 16:34:48 2011 @@ -161,8 +161,7 @@ NTAPI MmNotPresentFaultVirtualMemory(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked) + PVOID Address) /* * FUNCTION: Move data into memory to satisfy a page not present fault * ARGUMENTS: Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Fri Oct 28 16:34:48 2011 @@ -29,8 +29,7 @@ PMMSUPPORT AddressSpace; MEMORY_AREA* MemoryArea; NTSTATUS Status; - BOOLEAN Locked = FromMdl; - + DPRINT("MmAccessFault(Mode %d, Address %x)\n", Mode, Address); if (KeGetCurrentIrql() >= DISPATCH_LEVEL) @@ -80,8 +79,7 @@ case MEMORY_AREA_SECTION_VIEW: Status = MmAccessFaultSectionView(AddressSpace, MemoryArea, - (PVOID)Address, - Locked); + (PVOID)Address); break; case MEMORY_AREA_VIRTUAL_MEMORY: @@ -124,7 +122,6 @@ PMMSUPPORT AddressSpace; MEMORY_AREA* MemoryArea; NTSTATUS Status; - BOOLEAN Locked = FromMdl; DPRINT("MmNotPresentFault(Mode %d, Address %x)\n", Mode, Address); @@ -179,15 +176,13 @@ case MEMORY_AREA_SECTION_VIEW: Status = MmNotPresentFaultSectionView(AddressSpace, MemoryArea, - (PVOID)Address, - Locked); + (PVOID)Address); break; case MEMORY_AREA_VIRTUAL_MEMORY: Status = MmNotPresentFaultVirtualMemory(AddressSpace, MemoryArea, - (PVOID)Address, - Locked); + (PVOID)Address); break; #ifdef NEWCC Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Oct 28 16:34:48 2011 @@ -1309,8 +1309,7 @@ NTAPI MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked) + PVOID Address) { ULONG Offset; PFN_NUMBER Page; @@ -1334,6 +1333,14 @@ if (MmIsPagePresent(Process, Address)) { return(STATUS_SUCCESS); + } + + /* + * Check for the virtual memory area being deleted. + */ + if (MemoryArea->DeleteInProgress) + { + return(STATUS_UNSUCCESSFUL); } PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); @@ -1805,8 +1812,7 @@ NTAPI MmAccessFaultSectionView(PMMSUPPORT AddressSpace, MEMORY_AREA* MemoryArea, - PVOID Address, - BOOLEAN Locked) + PVOID Address) { PMM_SECTION_SEGMENT Segment; PROS_SECTION_OBJECT Section; @@ -1820,7 +1826,7 @@ ULONG Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address, Locked); + DPRINT("MmAccessFaultSectionView(%x, %x, %x, %x)\n", AddressSpace, MemoryArea, Address); /* * Check if the page has been paged out or has already been set readwrite

1 0

[jimtabor] 54261: [User32] - Icon title, menu and scroll bar do not set the death bit. Menu and scroll bar set the id only on specific window messages.
by jimtabor＠svn.reactos.org 28 Oct '11

28 Oct '11

Author: jimtabor Date: Fri Oct 28 12:00:07 2011 New Revision: 54261 URL: http://svn.reactos.org/svn/reactos?rev=54261&view=rev Log: [User32] - Icon title, menu and scroll bar do not set the death bit. Menu and scroll bar set the id only on specific window messages. Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Fri Oct 28 12:00:07 2011 @@ -189,27 +189,6 @@ { HWND owner = GetWindow( hWnd, GW_OWNER ); -#ifdef __REACTOS__ // Do this now, remove after Server side is fixed. - PWND pWnd; - - pWnd = ValidateHwnd(hWnd); - if (pWnd) - { - if (!pWnd->fnid) - { - NtUserSetWindowFNID(hWnd, FNID_ICONTITLE); - } - else - { - if (pWnd->fnid != FNID_ICONTITLE) - { - ERR("Wrong window class for IconTitle!\n"); - return 0; - } - } - } -#endif - if (!IsWindow(hWnd)) return 0; switch( msg ) @@ -223,12 +202,6 @@ hIconTitleFont = CreateFontIndirectA( &logFont ); } return (hIconTitleFont ? 0 : -1); -#ifdef __REACTOS__ - case WM_NCDESTROY: - NtUserSetWindowFNID(hWnd, FNID_DESTROY); - case WM_DESTROY: - break; -#endif case WM_NCHITTEST: return HTCAPTION; case WM_NCMOUSEMOVE: Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Fri Oct 28 12:00:07 2011 @@ -110,7 +110,7 @@ */ if (nBar == SB_CTL) { - hBrush = (HBRUSH)SendMessageW(GetParent(hWnd), WM_CTLCOLORSCROLLBAR, (WPARAM)hDC, (LPARAM)hWnd); + hBrush = GetControlBrush( hWnd, hDC, WM_CTLCOLORSCROLLBAR); if (!hBrush) hBrush = GetSysColorBrush(COLOR_SCROLLBAR); } @@ -1251,6 +1251,10 @@ { if (!pWnd->fnid) { + if (Msg != WM_CREATE) + { + return DefWindowProc(Wnd, Msg, wParam, lParam); + } NtUserSetWindowFNID(Wnd, FNID_SCROLLBAR); } else @@ -1274,15 +1278,6 @@ case WM_CREATE: IntScrollCreateScrollBar(Wnd, (LPCREATESTRUCTW) lParam); break; - -#ifdef __REACTOS__ - case WM_DESTROY: - return DefWindowProc(Wnd, Msg, wParam, lParam ); - - case WM_NCDESTROY: - NtUserSetWindowFNID(Wnd, FNID_DESTROY); - break; -#endif //#if 0 /* FIXME */ case WM_ENABLE: Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Fri Oct 28 12:00:07 2011 @@ -1899,6 +1899,10 @@ { if (!pWnd->fnid) { + if (Message != WM_NCCREATE) + { + return DefWindowProcW(Wnd, Message, wParam, lParam); + } NtUserSetWindowFNID(Wnd, FNID_MENU); } else @@ -1953,12 +1957,6 @@ top_popup_hmenu = NULL; } break; - -#ifdef __REACTOS__ - case WM_NCDESTROY: - NtUserSetWindowFNID(Wnd, FNID_DESTROY); - break; -#endif case WM_SHOWWINDOW: if (0 != wParam)

1 0

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 October 2011