Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50212: [STLPORT] - Fix compilation with 64 bit gcc
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 11:45:57 2010 New Revision: 50212 URL: http://svn.reactos.org/svn/reactos?rev=50212&view=rev Log: [STLPORT] - Fix compilation with 64 bit gcc Modified: branches/cmake-bringup/include/c++/stlport/stl/_num_put.c Modified: branches/cmake-bringup/include/c++/stlport/stl/_num_put.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/_num_put.c [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/_num_put.c [iso-8859-1] Wed Dec 29 11:45:57 2010 @@ -497,6 +497,9 @@ # pragma warning (disable : 4311) //pointer truncation from 'const void*' to 'unsigned long' #endif _OutputIter result = +#ifdef _WIN64 // ReactOS, compilation with 64 bit gcc +_STLP_PRIV __do_put_integer(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned _STLP_LONG_LONG,__val)); +#else #ifdef _STLP_LONG_LONG ( sizeof(void*) == sizeof(unsigned long) ) ? #endif @@ -506,6 +509,7 @@ _STLP_PRIV __do_put_integer(__s, __f, __c_type.widen('0'), __REINTERPRET_CAST(unsigned _STLP_LONG_LONG,__val)) #endif ; +#endif #if defined (_STLP_MSVC) # pragma warning (pop) #endif

1 0

[tkreuzer] 50211: [STLPORT] - Add some additional definitions for amd64 compilation with gcc
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 11:42:10 2010 New Revision: 50211 URL: http://svn.reactos.org/svn/reactos?rev=50211&view=rev Log: [STLPORT] - Add some additional definitions for amd64 compilation with gcc Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h Modified: branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/c%2B%2B/s… ============================================================================== --- branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/c++/stlport/stl/config/_reactos.h [iso-8859-1] Wed Dec 29 11:42:10 2010 @@ -305,4 +305,21 @@ // Include stlport windows specifics #include "_windows.h" -#endif +#ifdef _M_AMD64 +#ifdef __cplusplus +extern "C" { +#endif + _STLP_IMPORT_DECLSPEC void* InterlockedFlushSList(void*); + _STLP_IMPORT_DECLSPEC void* InterlockedPopEntrySList(void*); + _STLP_IMPORT_DECLSPEC void* InterlockedPushEntrySList(void*, void*); +#ifdef __cplusplus +} +#endif +#define InterlockedPopEntrySList(list) reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedPopEntrySList(list)) +#define InterlockedFlushSList(list) reinterpret_cast<_STLP_atomic_freelist::item*>(InterlockedFlushSList(list)) + +#undef __cdecl__ +#define __cdecl__ +#endif + +#endif

1 0

[fireball] 50210: [NTOS] - Greatly simplify and fix the incorrect and overcomplicated if condition in IoIsOperationSynchronous(), based on MSDN description. Bug spotted, fix tested by Pierre.
by fireball＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: fireball Date: Wed Dec 29 11:12:17 2010 New Revision: 50210 URL: http://svn.reactos.org/svn/reactos?rev=50210&view=rev Log: [NTOS] - Greatly simplify and fix the incorrect and overcomplicated if condition in IoIsOperationSynchronous(), based on MSDN description. Bug spotted, fix tested by Pierre. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Dec 29 11:12:17 2010 @@ -1704,12 +1704,21 @@ NTAPI IoIsOperationSynchronous(IN PIRP Irp) { + BOOLEAN SynchIO; + BOOLEAN ForceAsync; + + /* If the IRP requests synchronous paging I/O, if the file object was opened + for synchronous I/O, if the IRP_SYNCHRONOUS_API flag is set in the IRP + the operation is synchronous */ + SynchIO = (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & FO_SYNCHRONOUS_IO) || + (Irp->Flags & IRP_SYNCHRONOUS_API) || (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO); + + /* If the IRP requests asynchronous paging I/O, the operation is asynchronous, + even if one of the above conditions is true */ + ForceAsync = (Irp->Flags & IRP_PAGING_IO) && !(Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO); + /* Check the flags */ - if (!(Irp->Flags & (IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO)) && - ((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) || - (Irp->Flags & IRP_SYNCHRONOUS_API) || - (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & - FO_SYNCHRONOUS_IO))) + if (SynchIO && !ForceAsync) { /* Synch API or Paging I/O is OK, as is Sync File I/O */ return TRUE;

1 0

[tkreuzer] 50209: [NTOSKRNL] - Add MiPdeToAddress and MI_IS_PAGE_LARGE for amd64 - Fix a pragma message - Add some missing globals for amd64
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 10:20:39 2010 New Revision: 50209 URL: http://svn.reactos.org/svn/reactos?rev=50209&view=rev Log: [NTOSKRNL] - Add MiPdeToAddress and MI_IS_PAGE_LARGE for amd64 - Fix a pragma message - Add some missing globals for amd64 Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c branches/cmake-bringup/ntoskrnl/mm/amd64/init.c Modified: branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Wed Dec 29 10:20:39 2010 @@ -131,6 +131,7 @@ Temp >>= 16; return (PVOID)Temp; } +#define MiPdeToAddress MiPteToAddress BOOLEAN FORCEINLINE @@ -199,6 +200,7 @@ #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) +#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.LargePage == 1) #if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #else Modified: branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/io/iomgr… ============================================================================== --- branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Dec 29 10:20:39 2010 @@ -549,7 +549,7 @@ if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; /* FIXME: Implement Lookaside Floats */ - + /* Figure out which Lookaside List to use */ if ((StackSize <= 8) && (ChargeQuota == FALSE)) { @@ -1823,7 +1823,7 @@ IoIs32bitProcess( IN PIRP Irp OPTIONAL) { -#pragma message IoIs32bitProcess is hardcoded to FALSE +#pragma message "IoIs32bitProcess is hardcoded to FALSE" return FALSE; } #endif Modified: branches/cmake-bringup/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/amd64… ============================================================================== --- branches/cmake-bringup/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Dec 29 10:20:39 2010 @@ -27,10 +27,16 @@ /* GLOBALS *****************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | 0xFFFFF000}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; + +/* Template PDE for a demand-zero page */ +MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; + +/* Template PTE for prototype page */ +MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; /* Sizes */ ///SIZE_T MmSessionSize = MI_SESSION_SIZE; @@ -413,7 +419,7 @@ TmplPte.u.Flush.Write = 1; HyperTemplatePte = TmplPte; - /* Create PDPTs (72 KB) for shared system address space, + /* Create PDPTs (72 KB) for shared system address space, * skip page tables and hyperspace */ /* Loop the PXEs */ @@ -492,7 +498,7 @@ /* Page-align the nonpaged pool size */ MmSizeOfNonPagedPoolInBytes &= ~(PAGE_SIZE - 1); - + /* Now, check if there was a registry size for the maximum size */ if (!MmMaximumNonPagedPoolInBytes) { @@ -501,7 +507,7 @@ MmMaximumNonPagedPoolInBytes += (MmNumberOfPhysicalPages - 1024) / 256 * MmMaxAdditionNonPagedPoolPerMb; } - + /* Don't let the maximum go too high */ if (MmMaximumNonPagedPoolInBytes > MI_MAX_NONPAGED_POOL_SIZE) { @@ -517,7 +523,7 @@ { /* Put non paged pool after the PFN database */ MmNonPagedPoolStart = (PCHAR)MmPfnDatabase + MxPfnSizeInBytes; - MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - + MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - (ULONG64)MmNonPagedPoolStart; } @@ -688,7 +694,7 @@ PMMPTE Pte; MMPTE TmplPte; ULONG Size, BitMapSize; - + /* Default size for paged pool is 4 times non paged pool */ MmSizeOfPagedPoolInBytes = 4 * MmMaximumNonPagedPoolInBytes; @@ -767,7 +773,7 @@ // Allocate the allocation bitmap, which tells us which regions have not yet // been mapped into memory - MmPagedPoolInfo.PagedPoolAllocationMap = + MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); @@ -783,7 +789,7 @@ // Given the allocation bitmap and a base address, we can therefore figure // out which page is the last page of that allocation, and thus how big the // entire allocation is. - MmPagedPoolInfo.EndOfPagedPoolBitmap = + MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); @@ -859,7 +865,7 @@ //MmPagedPoolSize = MM_PAGED_POOL_SIZE; //ASSERT((PCHAR)MmPagedPoolBase + MmPagedPoolSize < (PCHAR)MmNonPagedSystemStart); - + HalInitializeBios(0, LoaderBlock); } @@ -871,7 +877,7 @@ MiSyncARM3WithROS(IN PVOID AddressStart, IN PVOID AddressEnd) { - + } NTSTATUS

1 0

[jimtabor] 50208: [User32] - Fix most of the user32 wine win test_mdi tests. Leaving 30 failures dealing with rect size, Class and Title names.
by jimtabor＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: jimtabor Date: Wed Dec 29 08:17:54 2010 New Revision: 50208 URL: http://svn.reactos.org/svn/reactos?rev=50208&view=rev Log: [User32] - Fix most of the user32 wine win test_mdi tests. Leaving 30 failures dealing with rect size, Class and Title names. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Dec 29 08:17:54 2010 @@ -342,6 +342,20 @@ POINT mPos[2]; UINT id = 0; HWND top_child; + PWND pWndParent; + PCLS pCls; + + pWndParent = ValidateHwnd(hWndParent); + + if (!pWndParent) return NULL; + + pCls = DesktopPtrToUser(pWndParent->pcls); + + if (pCls->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT + { + WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); + return NULL; + } /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -358,7 +372,7 @@ lpParam = (LPVOID)&mdi; - if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + if (pWndParent->style & MDIS_ALLCHILDSTYLES) { if (dwStyle & WS_POPUP) { @@ -454,7 +468,21 @@ POINT mPos[2]; UINT id = 0; HWND top_child; - + PWND pWndParent; + PCLS pCls; + + pWndParent = ValidateHwnd(hWndParent); + + if (!pWndParent) return NULL; + + pCls = DesktopPtrToUser(pWndParent->pcls); + + if (pCls->fnid != FNID_MDICLIENT) + { + WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); + return NULL; + } + /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. */ @@ -470,7 +498,7 @@ lpParam = (LPVOID)&mdi; - if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + if (pWndParent->style & MDIS_ALLCHILDSTYLES) { if (dwStyle & WS_POPUP) {

1 0

[tkreuzer] 50207: [CMAKE] - fix decorations on non-x86 builds - improve batt and aclui - remove set_export_spec macro
by tkreuzer＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: tkreuzer Date: Wed Dec 29 08:08:18 2010 New Revision: 50207 URL: http://svn.reactos.org/svn/reactos?rev=50207&view=rev Log: [CMAKE] - fix decorations on non-x86 builds - improve batt and aclui - remove set_export_spec macro Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Wed Dec 29 08:08:18 2010 @@ -1,3 +1,5 @@ + +spec2def(aclui.dll aclui.spec) set_unicode() @@ -18,9 +20,7 @@ set_module_type(aclui win32dll) -set_export_spec(aclui aclui.spec aclui.dll) - -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def) +add_importlib_target(aclui.spec) add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Wed Dec 29 08:08:18 2010 @@ -1,3 +1,5 @@ + +spec2def(batt.dll batt.spec) set_unicode() @@ -8,9 +10,7 @@ set_module_type(batt win32dll) -set_export_spec(batt batt.spec) - -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def) +add_importlib_target(batt.spec) add_importlibs(batt msvcrt kernel32) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=502… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Dec 29 08:08:18 2010 @@ -224,6 +224,10 @@ endforeach() endmacro() +if(NOT ARCH MATCHES i386) + set(DECO_OPTION "-@") +endif() + macro(add_importlib_target _exports_file) get_filename_component(_name ${_exports_file} NAME_WE) @@ -234,10 +238,6 @@ set(DLLNAME_OPTION "-n=${ARGV1}") else() set(DLLNAME_OPTION "") - endif() - - if(NOT ARCH MATCHES i386) - set(DECO_OPTION "-@") endif() add_custom_command( @@ -273,17 +273,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) endmacro() -# Optional 3rd parameter: dllname -macro(set_export_spec _module _spec_file) - get_filename_component(_file ${_spec_file} NAME_WE) - if (${ARGC} GREATER 2) - set(_dllname ${ARGV2}) - else() - set(_dllname ${_file}.dll) - endif() - spec2def(${_dllname} ${_spec_file}) -endmacro() - #pseh lib, needed with mingw set(PSEH_LIB "pseh")

1 0

[jimtabor] 50206: - Update note after 50205.
by jimtabor＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: jimtabor Date: Wed Dec 29 04:52:06 2010 New Revision: 50206 URL: http://svn.reactos.org/svn/reactos?rev=50206&view=rev Log: - Update note after 50205. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Dec 29 04:52:06 2010 @@ -668,7 +668,8 @@ /* FIXME I'm only getting NULLs from Thread Enumeration, and it's * probably because I'm not doing it right in NtUserBuildHwndList. * Once that's fixed, we shouldn't have to check for a NULL HWND - * here + * here + * This is now fixed in revision 50205. (jt) */ if (!pHwnd[i]) /* don't enumerate a NULL HWND */ continue;

1 0

[jimtabor] 50205: [Win32k] - Fix all the user32 wine win test_enum_thread_windows tests.
by jimtabor＠svn.reactos.org 29 Dec '10

29 Dec '10

Author: jimtabor Date: Wed Dec 29 04:43:51 2010 New Revision: 50205 URL: http://svn.reactos.org/svn/reactos?rev=50205&view=rev Log: [Win32k] - Fix all the user32 wine win test_enum_thread_windows tests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Dec 29 04:43:51 2010 @@ -1423,7 +1423,7 @@ ObDereferenceObject(Desktop); } } - else + else // Build EnumThreadWindows list! { PETHREAD Thread; PTHREADINFO W32Thread; @@ -1431,37 +1431,46 @@ PWND Window; Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); - if(!NT_SUCCESS(Status)) - { + if (!NT_SUCCESS(Status)) + { + DPRINT1("Thread Id is not valid!\n"); return ERROR_INVALID_PARAMETER; } - if(!(W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread)) + if (!(W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread)) { ObDereferenceObject(Thread); - DPRINT("Thread is not a GUI Thread!\n"); + DPRINT1("Thread is not initialized!\n"); return ERROR_INVALID_PARAMETER; } Current = W32Thread->WindowListHead.Flink; - while(Current != &(W32Thread->WindowListHead)) + while (Current != &(W32Thread->WindowListHead)) { Window = CONTAINING_RECORD(Current, WND, ThreadListEntry); ASSERT(Window); - if(bChildren || Window->spwndOwner != NULL) + if (dwCount < *pBufSize && pWnd) { - if(dwCount < *pBufSize && pWnd) - { - Status = MmCopyToCaller(pWnd++, &Window->head.h, sizeof(HWND)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - break; - } - } - dwCount++; + _SEH2_TRY + { + ProbeForWrite(pWnd, sizeof(HWND), 1); + *pWnd = Window->head.h; + pWnd++; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to build window list!\n"); + SetLastNtError(Status); + break; + } } - Current = Current->Flink; + dwCount++; + Current = Window->ThreadListEntry.Flink; } ObDereferenceObject(Thread);

1 0

[pschweitzer] 50204: [NTOSKRNL] Fix typo ~
by pschweitzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: pschweitzer Date: Tue Dec 28 21:40:23 2010 New Revision: 50204 URL: http://svn.reactos.org/svn/reactos?rev=50204&view=rev Log: [NTOSKRNL] Fix typo ~ Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 21:40:23 2010 @@ -203,7 +203,7 @@ Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { - return STATUS_INSUFFICIANT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; } MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; @@ -265,7 +265,7 @@ Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { - return STATUS_INSUFFICIANT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; } MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ;

1 0

[pschweitzer] 50203: [NTOSKRNL] Hoovering part 2...
by pschweitzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: pschweitzer Date: Tue Dec 28 21:34:54 2010 New Revision: 50203 URL: http://svn.reactos.org/svn/reactos?rev=50203&view=rev Log: [NTOSKRNL] Hoovering part 2... Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 21:34:54 2010 @@ -186,62 +186,69 @@ NTAPI ReadCacheSegment(PCACHE_SEGMENT CacheSeg) { - ULONG Size; - PMDL Mdl; - NTSTATUS Status; - LARGE_INTEGER SegOffset; - IO_STATUS_BLOCK IoStatus; - KEVENT Event; - - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; - } - Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, & Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - IoFreeMdl(Mdl); - - if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) - { - DPRINT1("IoPageRead failed, Status %x\n", Status); - return Status; - } - if (CacheSeg->Bcb->CacheSegmentSize > Size) - { - memset ((char*)CacheSeg->BaseAddress + Size, 0, + ULONG Size; + PMDL Mdl; + NTSTATUS Status; + LARGE_INTEGER SegOffset; + IO_STATUS_BLOCK IoStatus; + KEVENT Event; + + SegOffset.QuadPart = CacheSeg->FileOffset; + Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); + if (Size > CacheSeg->Bcb->CacheSegmentSize) + { + Size = CacheSeg->Bcb->CacheSegmentSize; + } + + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); + if (!Mdl) + { + return STATUS_INSUFFICIANT_RESOURCES; + } + MmBuildMdlForNonPagedPool(Mdl); + Mdl->MdlFlags |= MDL_IO_PAGE_READ; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + IoFreeMdl(Mdl); + + if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) + { + DPRINT1("IoPageRead failed, Status %x\n", Status); + return Status; + } + + if (CacheSeg->Bcb->CacheSegmentSize > Size) + { + RtlZeroMemory((char*)CacheSeg->BaseAddress + Size, CacheSeg->Bcb->CacheSegmentSize - Size); } - return STATUS_SUCCESS; + + return STATUS_SUCCESS; } NTSTATUS NTAPI WriteCacheSegment(PCACHE_SEGMENT CacheSeg) { - ULONG Size; - PMDL Mdl; - NTSTATUS Status; - IO_STATUS_BLOCK IoStatus; - LARGE_INTEGER SegOffset; - KEVENT Event; - - CacheSeg->Dirty = FALSE; - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; + ULONG Size; + PMDL Mdl; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + LARGE_INTEGER SegOffset; + KEVENT Event; + + CacheSeg->Dirty = FALSE; + SegOffset.QuadPart = CacheSeg->FileOffset; + Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); + if (Size > CacheSeg->Bcb->CacheSegmentSize) + { + Size = CacheSeg->Bcb->CacheSegmentSize; } // // Nonpaged pool PDEs in ReactOS must actually be synchronized between the @@ -254,24 +261,30 @@ MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); } while (++i < (Size >> PAGE_SHIFT)); } - Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - IoFreeMdl(Mdl); - if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) - { - DPRINT1("IoPageWrite failed, Status %x\n", Status); - CacheSeg->Dirty = TRUE; - return(Status); - } - return(STATUS_SUCCESS); + + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); + if (!Mdl) + { + return STATUS_INSUFFICIANT_RESOURCES; + } + MmBuildMdlForNonPagedPool(Mdl); + Mdl->MdlFlags |= MDL_IO_PAGE_READ; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoSynchronousPageWrite(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + IoFreeMdl(Mdl); + if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) + { + DPRINT1("IoPageWrite failed, Status %x\n", Status); + CacheSeg->Dirty = TRUE; + return Status; + } + + return STATUS_SUCCESS; }

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