ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
December 2008
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
31 participants
710 discussions
Start a n
N
ew thread
[fireball] 37934: - Implement KeQueryRuntimeProcess for querying total user/kernel times of a process. - Use it for obtaining idle process times, and per-process information in QuerySystemInformation routines. - Fix incorrect multiplier being applied to user/kernel times (should be KeMaximumIncrement instead of 100000). - Slightly rework SystemProcessorPerformanceInformation to provide valid data. - This fixed a bug existing since revision 24148, 2 years ago. See issue #2329 for more details.
by fireball@svn.reactos.org
Author: fireball Date: Mon Dec 8 06:57:53 2008 New Revision: 37934 URL:
http://svn.reactos.org/svn/reactos?rev=37934&view=rev
Log: - Implement KeQueryRuntimeProcess for querying total user/kernel times of a process. - Use it for obtaining idle process times, and per-process information in QuerySystemInformation routines. - Fix incorrect multiplier being applied to user/kernel times (should be KeMaximumIncrement instead of 100000). - Slightly rework SystemProcessorPerformanceInformation to provide valid data. - This fixed a bug existing since revision 24148, 2 years ago. See issue #2329 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/procobj.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=…
============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Dec 8 06:57:53 2008 @@ -538,6 +538,7 @@ /* Class 2 - Performance Information */ QSI_DEF(SystemPerformanceInformation) { + ULONG IdleUser, IdleKernel; PSYSTEM_PERFORMANCE_INFORMATION Spi = (PSYSTEM_PERFORMANCE_INFORMATION) Buffer; @@ -554,8 +555,8 @@ TheIdleProcess = PsIdleProcess; - Spi->IdleProcessTime.QuadPart = TheIdleProcess->Pcb.KernelTime * 100000LL; - + IdleKernel = KeQueryRuntimeProcess(&TheIdleProcess->Pcb, &IdleUser); + Spi->IdleProcessTime.QuadPart = UInt32x32To64(IdleKernel, KeMaximumIncrement); Spi->IoReadTransferCount = IoReadTransferCount; Spi->IoWriteTransferCount = IoWriteTransferCount; Spi->IoOtherTransferCount = IoOtherTransferCount; @@ -699,7 +700,8 @@ { ULONG ovlSize = 0, nThreads; PEPROCESS pr = NULL, syspr; - unsigned char *pCur; + PUCHAR pCur; + ULONG TotalUser, TotalKernel; NTSTATUS Status = STATUS_SUCCESS; _SEH2_TRY @@ -757,8 +759,6 @@ SpiCur->NextEntryOffset = curSize+inLen; // relative offset to the beginnnig of the next structure SpiCur->NumberOfThreads = nThreads; SpiCur->CreateTime = pr->CreateTime; - SpiCur->UserTime.QuadPart = pr->Pcb.UserTime * 100000LL; - SpiCur->KernelTime.QuadPart = pr->Pcb.KernelTime * 100000LL; SpiCur->ImageName.Length = strlen(pr->ImageFileName) * sizeof(WCHAR); SpiCur->ImageName.MaximumLength = (USHORT)inLen; SpiCur->ImageName.Buffer = (void*)(pCur+curSize); @@ -798,8 +798,8 @@ current = CONTAINING_RECORD(current_entry, ETHREAD, ThreadListEntry); - ThreadInfo->KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; - ThreadInfo->UserTime.QuadPart = current->Tcb.UserTime * 100000LL; + ThreadInfo->KernelTime.QuadPart = UInt32x32To64(current->Tcb.KernelTime, KeMaximumIncrement); + ThreadInfo->UserTime.QuadPart = UInt32x32To64(current->Tcb.UserTime, KeMaximumIncrement); ThreadInfo->CreateTime.QuadPart = current->CreateTime.QuadPart; ThreadInfo->WaitTime = current->Tcb.WaitTime; ThreadInfo->StartAddress = (PVOID) current->StartAddress; @@ -809,9 +809,15 @@ ThreadInfo->ContextSwitches = current->Tcb.ContextSwitches; ThreadInfo->ThreadState = current->Tcb.State; ThreadInfo->WaitReason = current->Tcb.WaitReason; + ThreadInfo++; current_entry = current_entry->Flink; } + + /* Query total user/kernel times of a process */ + TotalKernel = KeQueryRuntimeProcess(&pr->Pcb, &TotalUser); + SpiCur->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); + SpiCur->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); /* Handle idle process entry */ if (pr == PsIdleProcess) pr = NULL; @@ -882,37 +888,39 @@ /* Class 8 - Processor Performance Information */ QSI_DEF(SystemProcessorPerformanceInformation) { - PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION Spi - = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) Buffer; - - LONG i; - LARGE_INTEGER CurrentTime; - PKPRCB Prcb; - - *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); - /* - * Check user buffer's size - */ - if (Size < KeNumberProcessors * sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION)) - { - return (STATUS_INFO_LENGTH_MISMATCH); - } - - CurrentTime.QuadPart = KeQueryInterruptTime(); - Prcb = KeGetPcr()->Prcb; - for (i = 0; i < KeNumberProcessors; i++) - { - Spi->IdleTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; - Spi->KernelTime.QuadPart = Prcb->KernelTime * 100000LL; - Spi->UserTime.QuadPart = Prcb->UserTime * 100000LL; - Spi->DpcTime.QuadPart = Prcb->DpcTime * 100000LL; - Spi->InterruptTime.QuadPart = Prcb->InterruptTime * 100000LL; - Spi->InterruptCount = Prcb->InterruptCount; - Spi++; - Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE); - } - - return (STATUS_SUCCESS); + PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION Spi + = (PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) Buffer; + + LONG i; + ULONG TotalTime; + LARGE_INTEGER CurrentTime; + PKPRCB Prcb; + + *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION); + + /* Check user buffer's size */ + if (Size < *ReqSize) + { + return STATUS_INFO_LENGTH_MISMATCH; + } + + CurrentTime.QuadPart = KeQueryInterruptTime(); + Prcb = KeGetPcr()->Prcb; + for (i = 0; i < KeNumberProcessors; i++) + { + /* Calculate total user and kernel times */ + TotalTime = Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime; + Spi->IdleTime.QuadPart = UInt32x32To64(TotalTime, KeMaximumIncrement); + Spi->KernelTime.QuadPart = UInt32x32To64(Prcb->KernelTime, KeMaximumIncrement); + Spi->UserTime.QuadPart = UInt32x32To64(Prcb->UserTime, KeMaximumIncrement); + Spi->DpcTime.QuadPart = UInt32x32To64(Prcb->DpcTime, KeMaximumIncrement); + Spi->InterruptTime.QuadPart = UInt32x32To64(Prcb->InterruptTime, KeMaximumIncrement); + Spi->InterruptCount = Prcb->InterruptCount; + Spi++; + Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE); + } + + return STATUS_SUCCESS; } /* Class 9 - Flags Information */ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Mon Dec 8 06:57:53 2008 @@ -716,6 +716,16 @@ FASTCALL KiActivateWaiterQueue(IN PKQUEUE Queue); +ULONG +NTAPI +KeQueryRuntimeProcess(IN PKPROCESS Process, + OUT PULONG UserTime); + +ULONG +NTAPI +KeQueryRuntimeThread(IN PKTHREAD Thread, + OUT PULONG UserTime); + /* INITIALIZATION FUNCTIONS *************************************************/ BOOLEAN Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=…
============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Mon Dec 8 06:57:53 2008 @@ -722,6 +722,54 @@ /* * @implemented */ +ULONG +NTAPI +KeQueryRuntimeProcess(IN PKPROCESS Process, + OUT PULONG UserTime) +{ + ULONG TotalUser, TotalKernel; + KLOCK_QUEUE_HANDLE ProcessLock; + PLIST_ENTRY NextEntry, ListHead; + PKTHREAD Thread; + + ASSERT_PROCESS(Process); + + /* Initialize user and kernel times */ + TotalUser = Process->UserTime; + TotalKernel = Process->KernelTime; + + /* Lock the process */ + KiAcquireProcessLock(Process, &ProcessLock); + + /* Loop all child threads and sum up their times */ + ListHead = &Process->ThreadListHead; + NextEntry = ListHead->Flink; + while (ListHead != NextEntry) + { + /* Get the thread */ + Thread = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); + + /* Sum up times */ + TotalKernel += Thread->KernelTime; + TotalUser += Thread->UserTime; + + /* Go to the next one */ + NextEntry = NextEntry->Flink; + } + + /* Release lock */ + KiReleaseProcessLock(&ProcessLock); + + /* Return the user time */ + *UserTime = TotalUser; + + /* Return the kernel time */ + return TotalKernel; +} + +/* + * @implemented + */ BOOLEAN NTAPI KeAddSystemServiceTable(IN PULONG_PTR Base,
15 years, 9 months
1
0
0
0
[tkreuzer] 37933: Fix gdi32 spec file. Some functions have SIZEL as parameter, which is 2*32bit on x86 and 1*64 bit on x64. We don't support this atm.
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 06:37:15 2008 New Revision: 37933 URL:
http://svn.reactos.org/svn/reactos?rev=37933&view=rev
Log: Fix gdi32 spec file. Some functions have SIZEL as parameter, which is 2*32bit on x86 and 1*64 bit on x64. We don't support this atm. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Mon Dec 8 06:37:15 2008 @@ -4,32 +4,28 @@ @ stdcall AddFontResourceA(str) @ stdcall AddFontResourceExA(str long ptr) @ stdcall AddFontResourceExW(wstr long ptr) -@ stub AddFontResourceTracking +@ stdcall AddFontResourceTracking(str long) @ stdcall AddFontResourceW(wstr) @ stdcall AngleArc(long long long long long long) @ stdcall AnimatePalette(long long long ptr) @ stdcall AnyLinkedFonts() NtGdiAnyLinkedFonts @ stdcall Arc(long long long long long long long long long) @ stdcall ArcTo(long long long long long long long long long) -@ stdcall BeginPath(long) -@ stdcall bInitSystemAndFontsDirectoriesW(wstr wstr) -@ stdcall BitBlt(long long long long long long long long long) -@ stdcall bMakePathNameW(wstr wstr wstr long) @ stdcall BRUSHOBJ_hGetColorTransform(ptr) NtGdiBRUSHOBJ_hGetColorTransform @ stdcall BRUSHOBJ_pvAllocRbrush(ptr long) NtGdiBRUSHOBJ_pvAllocRbrush @ stdcall BRUSHOBJ_pvGetRbrush(ptr) NtGdiBRUSHOBJ_pvGetRbrush @ stdcall BRUSHOBJ_ulGetBrushColor(ptr) NtGdiBRUSHOBJ_ulGetBrushColor -@ stub ByeByeGDI +@ stdcall BeginPath(long) +@ stdcall BitBlt(long long long long long long long long long) +@ stdcall CLIPOBJ_bEnum(ptr long long) NtGdiCLIPOBJ_bEnum +@ stdcall CLIPOBJ_cEnumStart(ptr long long long long) NtGdiCLIPOBJ_cEnumStart +@ stdcall CLIPOBJ_ppoGetPath(ptr) NtGdiCLIPOBJ_ppoGetPath @ stdcall CancelDC(long) -@ stdcall cGetTTFFromFOT(long long long long long long long) @ stdcall CheckColorsInGamut(ptr ptr ptr long) @ stdcall ChoosePixelFormat(long ptr) @ stdcall Chord(long long long long long long long long long) @ stdcall ClearBitmapAttributes(ptr long) @ stdcall ClearBrushAttributes(ptr long) -@ stdcall CLIPOBJ_bEnum(ptr long long) NtGdiCLIPOBJ_bEnum -@ stdcall CLIPOBJ_cEnumStart(ptr long long long long) NtGdiCLIPOBJ_cEnumStart -@ stdcall CLIPOBJ_ppoGetPath(ptr) NtGdiCLIPOBJ_ppoGetPath @ stdcall CloseEnhMetaFile(long) @ stdcall CloseFigure(long) @ stdcall CloseMetaFile(long) @@ -50,10 +46,10 @@ @ stdcall CreateCompatibleDC(long) @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) -@ stdcall CreateDIBitmap(long ptr long ptr ptr long) @ stdcall CreateDIBPatternBrush(long long) @ stdcall CreateDIBPatternBrushPt(long long) @ stdcall CreateDIBSection(long ptr long ptr long long) +@ stdcall CreateDIBitmap(long ptr long ptr ptr long) @ stdcall CreateDiscardableBitmap(long long long) @ stdcall CreateEllipticRgn(long long long long) NtGdiCreateEllipticRgn @ stdcall CreateEllipticRgnIndirect(ptr) @@ -61,8 +57,8 @@ @ stdcall CreateEnhMetaFileW(long wstr ptr wstr) @ stdcall CreateFontA(long long long long long long long long long long long long long str) @ stdcall CreateFontIndirectA(ptr) -# @ stub CreateFontIndirectExA -# @ stub CreateFontIndirectExW +@ stdcall CreateFontIndirectExA(ptr) +@ stdcall CreateFontIndirectExW(ptr) @ stdcall CreateFontIndirectW(ptr) @ stdcall CreateFontW(long long long long long long long long long long long long long wstr) @ stdcall CreateHalftonePalette(long) NtGdiCreateHalftonePalette @@ -83,6 +79,7 @@ @ stdcall CreateScalableFontResourceA(long str str str) @ stdcall CreateScalableFontResourceW(long wstr wstr wstr) @ stdcall CreateSolidBrush(long) +@ stdcall DPtoLP(long ptr long) @ stdcall DdEntry0(ptr ptr ptr ptr ptr ptr) NtGdiDxgGenericThunk @ stdcall DdEntry10(ptr ptr) NtGdiDdBeginMoCompFrame @ stdcall DdEntry11(ptr ptr ptr) NtGdiDdBlt @@ -146,10 +143,8 @@ @ stdcall DeleteMetaFile(long) @ stdcall DeleteObject(long) @ stdcall DescribePixelFormat(long long long ptr) -@ stub DeviceCapabilitiesEx @ stdcall DeviceCapabilitiesExA(str str long str ptr) @ stdcall DeviceCapabilitiesExW(wstr wstr long wstr ptr) -@ stdcall DPtoLP(long ptr long) @ stdcall DrawEscape(long long long ptr) @ stdcall Ellipse(long long long long long) @ stdcall EnableEUDC(long) NtGdiEnableEudc @@ -164,10 +159,13 @@ @ stdcall EngCheckAbort(ptr) NtGdiEngCheckAbort @ stdcall EngComputeGlyphSet(ptr ptr ptr) @ stdcall EngCopyBits(ptr ptr ptr ptr ptr ptr) NtGdiEngCopyBits -@ stdcall EngCreateBitmap(ptr long long ptr ptr) NtGdiEngCreateBitmap +# @ stdcall EngCreateBitmap(longlong long long long ptr) NtGdiEngCreateBitmap +@ stdcall EngCreateBitmap(long long long long long ptr) NtGdiEngCreateBitmap @ stdcall EngCreateClip() NtGdiEngCreateClip -@ stdcall EngCreateDeviceBitmap(ptr ptr long) NtGdiEngCreateDeviceBitmap -@ stdcall EngCreateDeviceSurface(ptr ptr long) NtGdiEngCreateDeviceSurface +# @ stdcall EngCreateDeviceBitmap(ptr longlong long) NtGdiEngCreateDeviceBitmap +@ stdcall EngCreateDeviceBitmap(ptr long long long) NtGdiEngCreateDeviceBitmap +# @ stdcall EngCreateDeviceSurface(ptr longlong long) NtGdiEngCreateDeviceSurface +@ stdcall EngCreateDeviceSurface(ptr long long long) NtGdiEngCreateDeviceSurface @ stdcall EngCreatePalette(long long ptr long long long) NtGdiEngCreatePalette @ stdcall EngCreateSemaphore() @ stdcall EngDeleteClip(ptr) NtGdiEngDeleteClip @@ -226,33 +224,31 @@ @ stdcall ExtSelectClipRgn(long long long) @ stdcall ExtTextOutA(long long long long ptr str long ptr) @ stdcall ExtTextOutW(long long long long ptr wstr long ptr) +@ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) NtGdiFONTOBJ_cGetAllGlyphHandles +@ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr) NtGdiFONTOBJ_cGetGlyphs +@ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long) NtGdiFONTOBJ_pQueryGlyphAttrs +@ stdcall FONTOBJ_pfdg(ptr) NtGdiFONTOBJ_pfdg +@ stdcall FONTOBJ_pifi(ptr) NtGdiFONTOBJ_pifi +@ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr) NtGdiFONTOBJ_pvTrueTypeFontFile +@ stdcall FONTOBJ_pxoGetXform(ptr) NtGdiFONTOBJ_pxoGetXform +@ stdcall FONTOBJ_vGetInfo(ptr long ptr) NtGdiFONTOBJ_vGetInfo @ stdcall FillPath(long) @ stdcall FillRgn(long long long) @ stdcall FixBrushOrgEx(long long long ptr) @ stdcall FlattenPath(long) @ stdcall FloodFill(long long long long) @ stdcall FontIsLinked(long) NtGdiFontIsLinked -@ stdcall FONTOBJ_cGetAllGlyphHandles(ptr ptr) NtGdiFONTOBJ_cGetAllGlyphHandles -@ stdcall FONTOBJ_cGetGlyphs(ptr long long ptr ptr) NtGdiFONTOBJ_cGetGlyphs -@ stdcall FONTOBJ_pfdg(ptr) NtGdiFONTOBJ_pfdg -@ stdcall FONTOBJ_pifi(ptr) NtGdiFONTOBJ_pifi -@ stdcall FONTOBJ_pQueryGlyphAttrs(ptr long) NtGdiFONTOBJ_pQueryGlyphAttrs -@ stdcall FONTOBJ_pvTrueTypeFontFile(ptr ptr) NtGdiFONTOBJ_pvTrueTypeFontFile -@ stdcall FONTOBJ_pxoGetXform(ptr) NtGdiFONTOBJ_pxoGetXform -@ stdcall FONTOBJ_vGetInfo(ptr long ptr) NtGdiFONTOBJ_vGetInfo @ stdcall FrameRgn(long long long long long) -@ stub FreeImageColorMatcher @ stdcall GdiAddFontResourceW(ptr ptr ptr) @ stdcall GdiAddGlsBounds(ptr ptr) @ stdcall GdiAddGlsRecord(ptr long ptr ptr) @ stdcall GdiAlphaBlend(long long long long long long long long long long long) @ stdcall GdiArtificialDecrementDriver(wstr long) -@ stub GdiAssociateObject @ stdcall GdiCleanCacheDC(ptr) @ stdcall GdiComment(long long ptr) @ stdcall GdiConsoleTextOut(ptr ptr long ptr) NtGdiConsoleTextOut -@ stub GdiConvertAndCheckDC -@ stub GdiConvertBitmap +@ stdcall GdiConvertAndCheckDC(ptr) +@ stdcall GdiConvertBitmap(ptr) @ stdcall GdiConvertBitmapV5(ptr ptr long long) @ stdcall GdiConvertBrush(ptr) @ stdcall GdiConvertDC(ptr) @@ -262,40 +258,23 @@ @ stdcall GdiConvertPalette(ptr) @ stdcall GdiConvertRegion(ptr) @ stdcall GdiConvertToDevmodeW(ptr) -@ stub GdiCreateLocalBitmap -@ stub GdiCreateLocalBrush -@ stub GdiCreateLocalEnhMetaFile -@ stub GdiCreateLocalFont -@ stub GdiCreateLocalMetaFilePict -@ stub GdiCreateLocalPalette -@ stub GdiCreateLocalRegion -@ stub GdiDciBeginAccess -@ stub GdiDciCreateOffscreenSurface -@ stub GdiDciCreateOverlaySurface -@ stub GdiDciCreatePrimarySurface -@ stub GdiDciDestroySurface -@ stub GdiDciDrawSurface -@ stub GdiDciEndAccess -@ stub GdiDciEnumSurface -@ stub GdiDciInitialize -@ stub GdiDciSetClipList -@ stub GdiDciSetDestination -@ stub GdiDeleteLocalDC -@ stub GdiDeleteLocalObject +@ stdcall GdiCreateLocalEnhMetaFile(ptr) +@ stdcall GdiCreateLocalMetaFilePict(ptr) +@ stdcall GdiDeleteLocalDC(ptr) @ stdcall GdiDeleteSpoolFileHandle(ptr) @ stdcall GdiDescribePixelFormat(ptr long long ptr) NtGdiDescribePixelFormat @ stdcall GdiDllInitialize(ptr long ptr) @ stdcall GdiDrawStream(ptr long ptr) @ stdcall GdiEndDocEMF(ptr) @ stdcall GdiEndPageEMF(ptr long) -@ stdcall GdiEntry1(ptr ptr) gdi32.DdCreateDirectDrawObject @ stdcall GdiEntry10(ptr long) gdi32.DdReenableDirectDrawObject @ stdcall GdiEntry11(ptr ptr) gdi32.DdAttachSurface @ stdcall GdiEntry12(ptr ptr) gdi32.DdUnattachSurface @ stdcall GdiEntry13() gdi32.DdQueryDisplaySettingsUniqueness @ stdcall GdiEntry14(ptr ptr long) gdi32.DdGetDxHandle @ stdcall GdiEntry15(ptr ptr ptr) gdi32.DdSetGammaRamp -@ stub GdiEntry16 +@ stdcall GdiEntry16(ptr ptr ptr) gdi32.DdSwapTextureHandles +@ stdcall GdiEntry1(ptr ptr) gdi32.DdCreateDirectDrawObject @ stdcall GdiEntry2(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) gdi32.DdQueryDirectDrawObject @ stdcall GdiEntry3(ptr) gdi32.DdDeleteDirectDrawObject @ stdcall GdiEntry4(ptr long) gdi32.DdCreateSurfaceObject @@ -308,21 +287,21 @@ @ stdcall GdiFlush() @ stdcall GdiFullscreenControl(ptr ptr long ptr ptr) NtGdiFullscreenControl @ stdcall GdiGetBatchLimit() +@ stdcall GdiGetBitmapBitsSize(ptr) @ stdcall GdiGetCharDimensions(long ptr ptr) @ stdcall GdiGetCodePage(long) @ stdcall GdiGetDC(ptr) @ stdcall GdiGetDevmodeForPage(ptr long ptr ptr) -@ stub GdiGetLocalBitmap -@ stub GdiGetLocalBrush -@ stub GdiGetLocalDC -@ stub GdiGetLocalFont +@ stdcall GdiGetLocalBrush(ptr) +@ stdcall GdiGetLocalDC(ptr) +@ stdcall GdiGetLocalFont(ptr) @ stdcall GdiGetPageCount(ptr) @ stdcall GdiGetPageHandle(ptr long ptr) @ stdcall GdiGetSpoolFileHandle(wstr ptr wstr) @ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) +@ stdcall GdiInitSpool() NtGdiInitSpool @ stdcall GdiInitializeLanguagePack(long) -@ stdcall GdiInitSpool() NtGdiInitSpool @ stdcall GdiIsMetaFileDC(long) @ stdcall GdiIsMetaPrintDC(long) @ stdcall GdiIsPlayMetafileDC(long) @@ -332,7 +311,6 @@ @ stdcall GdiPlayPageEMF(ptr ptr ptr ptr ptr) @ stdcall GdiPlayPrivatePageEMF(ptr long ptr) @ stdcall GdiPlayScript(ptr ptr ptr ptr ptr ptr ptr) -@ stdcall GdiPlaySpoolStream(long long long long long long) @ stdcall GdiPrinterThunk(ptr ptr long) @ stdcall GdiProcessSetup() @ stdcall GdiQueryFonts(ptr long ptr) NtGdiQueryFonts @@ -348,13 +326,9 @@ @ stdcall GdiSetServerAttr(ptr long) @ stdcall GdiStartDocEMF(ptr ptr) @ stdcall GdiStartPageEMF(ptr) -@ stub GdiSwapBuffers +@ stdcall GdiSwapBuffers(ptr) NtGdiSwapBuffers @ stdcall GdiTransparentBlt(long long long long long long long long long long long) @ stdcall GdiValidateHandle(ptr) -@ stub GdiWinWatchClose -@ stub GdiWinWatchDidStatusChange -@ stub GdiWinWatchGetClipList -@ stub GdiWinWatchOpen @ stdcall GetArcDirection(long) @ stdcall GetAspectRatioFilterEx(long ptr) @ stdcall GetBitmapAttributes(ptr) @@ -370,8 +344,6 @@ @ stdcall GetCharABCWidthsFloatW(long long long ptr) @ stdcall GetCharABCWidthsI(long long long ptr ptr) @ stdcall GetCharABCWidthsW(long long long ptr) -@ stdcall GetCharacterPlacementA(long str long long ptr long) -@ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetCharWidth32A(long long long long) @ stdcall GetCharWidth32W(long long long long) @ stdcall GetCharWidthA(long long long long) GetCharWidth32A @@ -380,7 +352,8 @@ @ stdcall GetCharWidthI(ptr long long ptr ptr) @ stdcall GetCharWidthInfo(ptr ptr) NtGdiGetCharWidthInfo @ stdcall GetCharWidthW(long long long long) -@ stub GetCharWidthWOW +@ stdcall GetCharacterPlacementA(long str long long ptr long) +@ stdcall GetCharacterPlacementW(long wstr long long ptr long) @ stdcall GetClipBox(long ptr) @ stdcall GetClipRgn(long long) @ stdcall GetColorAdjustment(long ptr) NtGdiGetColorAdjustment @@ -390,10 +363,13 @@ @ stdcall GetDCBrushColor(long) @ stdcall GetDCOrgEx(long ptr) @ stdcall GetDCPenColor(long) +@ stdcall GetDIBColorTable(long long long ptr) +@ stdcall GetDIBits(long long long long ptr ptr long) @ stdcall GetDeviceCaps(long long) @ stdcall GetDeviceGammaRamp(long ptr) -@ stdcall GetDIBColorTable(long long long ptr) -@ stdcall GetDIBits(long long long long ptr ptr long) +@ stdcall GetETM(ptr ptr) +@ stdcall GetEUDCTimeStamp() +@ stdcall GetEUDCTimeStampExW(str) @ stdcall GetEnhMetaFileA(str) @ stdcall GetEnhMetaFileBits(long long ptr) @ stdcall GetEnhMetaFileDescriptionA(long long ptr) @@ -402,14 +378,10 @@ @ stdcall GetEnhMetaFilePaletteEntries (long long ptr) @ stdcall GetEnhMetaFilePixelFormat(ptr long ptr) @ stdcall GetEnhMetaFileW(wstr) -@ stub GetETM -# @ stub GetEUDCTimeStamp -# @ stub GetEUDCTimeStampExW -# @ stub GetFontAssocStatus +@ stdcall GetFontAssocStatus(ptr) @ stdcall GetFontData(long long long ptr long) @ stdcall GetFontLanguageInfo(long) -@ stub GetFontResourceInfo -@ stub GetFontResourceInfoW +@ stdcall GetFontResourceInfoW(str ptr ptr long) @ stdcall GetFontUnicodeRanges(ptr ptr) NtGdiGetFontUnicodeRanges @ stdcall GetGlyphIndicesA(long ptr long ptr long) @ stdcall GetGlyphIndicesW(long ptr long ptr long) NtGdiGetGlyphIndicesW @@ -445,12 +417,12 @@ @ stdcall GetPixel(long long long) @ stdcall GetPixelFormat(long) @ stdcall GetPolyFillMode(long) +@ stdcall GetROP2(long) @ stdcall GetRandomRgn(long long long) NtGdiGetRandomRgn @ stdcall GetRasterizerCaps(ptr long) NtGdiGetRasterizerCaps @ stdcall GetRegionData(long long ptr) @ stdcall GetRelAbs(long long) @ stdcall GetRgnBox(long ptr) -@ stdcall GetROP2(long) @ stdcall GetStockObject(long) @ stdcall GetStretchBltMode(long) @ stdcall GetStringBitmapA(ptr str long long ptr) @@ -479,9 +451,9 @@ @ stdcall GetTransform(long long ptr) NtGdiGetTransform @ stdcall GetViewportExtEx(long ptr) @ stdcall GetViewportOrgEx(long ptr) +@ stdcall GetWinMetaFileBits(long long ptr long long) @ stdcall GetWindowExtEx(long ptr) @ stdcall GetWindowOrgEx(long ptr) -@ stdcall GetWinMetaFileBits(long long ptr long long) @ stdcall GetWorldTransform(long ptr) @ stdcall HT_Get8BPPFormatPalette(ptr long long long) NtGdiHT_Get8BPPFormatPalette @ stdcall HT_Get8BPPMaskPalette(ptr long long long long long) NtGdiHT_Get8BPPMaskPalette @@ -489,11 +461,9 @@ @ stdcall InvertRgn(long long) @ stdcall IsValidEnhMetaRecord(long long) @ stdcall IsValidEnhMetaRecordOffExt(long long long long) +@ stdcall LPtoDP(long ptr long) @ stdcall LineDDA(long long long long ptr long) @ stdcall LineTo(long long long) -@ stdcall LPtoDP(long ptr long) -@ stub LoadImageColorMatcherA -@ stub LoadImageColorMatcherW @ stdcall MaskBlt(long long long long long long long long long long long long) @ stdcall MirrorRgn(ptr ptr) @ stdcall ModifyWorldTransform(long ptr long) @@ -503,13 +473,13 @@ @ stdcall OffsetRgn(long long long) @ stdcall OffsetViewportOrgEx(long long long ptr) @ stdcall OffsetWindowOrgEx(long long long ptr) -@ stdcall PaintRgn(long long) -@ stdcall PatBlt(long long long long long long) @ stdcall PATHOBJ_bEnum(ptr ptr) NtGdiPATHOBJ_bEnum @ stdcall PATHOBJ_bEnumClipLines(ptr long ptr) NtGdiPATHOBJ_bEnumClipLines @ stdcall PATHOBJ_vEnumStart(ptr) NtGdiPATHOBJ_vEnumStart @ stdcall PATHOBJ_vEnumStartClipLines(ptr ptr ptr ptr) NtGdiPATHOBJ_vEnumStartClipLines @ stdcall PATHOBJ_vGetBounds(ptr ptr) NtGdiPATHOBJ_vGetBounds +@ stdcall PaintRgn(long long) +@ stdcall PatBlt(long long long long long long) @ stdcall PathToRegion(long) @ stdcall Pie(long long long long long long long long long) @ stdcall PlayEnhMetaFile(long long ptr) @@ -520,21 +490,21 @@ @ stdcall PolyBezier(long ptr long) @ stdcall PolyBezierTo(long ptr long) @ stdcall PolyDraw(long ptr ptr long) -@ stdcall Polygon(long ptr long) -@ stdcall Polyline(long ptr long) -@ stdcall PolylineTo(long ptr long) @ stdcall PolyPatBlt(ptr long ptr long long) @ stdcall PolyPolygon(long ptr ptr long) @ stdcall PolyPolyline(long ptr ptr long) @ stdcall PolyTextOutA(long ptr long) @ stdcall PolyTextOutW(long ptr long) +@ stdcall Polygon(long ptr long) +@ stdcall Polyline(long ptr long) +@ stdcall PolylineTo(long ptr long) @ stdcall PtInRegion(long long long) @ stdcall PtVisible(long long long) NtGdiPtVisible @ stdcall QueryFontAssocStatus() @ stdcall RealizePalette(long) -@ stdcall Rectangle(long long long long long) @ stdcall RectInRegion(long ptr) @ stdcall RectVisible(long ptr) NtGdiRectVisible +@ stdcall Rectangle(long long long long long) @ stdcall RemoveFontMemResourceEx(ptr) @ stdcall RemoveFontResourceA(str) @ stdcall RemoveFontResourceExA(str long ptr) @@ -546,6 +516,11 @@ @ stdcall ResizePalette(long long) @ stdcall RestoreDC(long long) @ stdcall RoundRect(long long long long long long long) +@ stdcall STROBJ_bEnum(ptr ptr ptr) NtGdiSTROBJ_bEnum +@ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr) NtGdiSTROBJ_bEnumPositionsOnly +@ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr) NtGdiSTROBJ_bGetAdvanceWidths +@ stdcall STROBJ_dwGetCodePage(ptr) NtGdiSTROBJ_dwGetCodePage +@ stdcall STROBJ_vEnumStart(ptr) NtGdiSTROBJ_vEnumStart @ stdcall SaveDC(long) @ stdcall ScaleViewportExtEx(long long long long long ptr) @ stdcall ScaleWindowExtEx(long long long long long ptr) @@ -569,10 +544,10 @@ @ stdcall SetColorSpace(long long) @ stdcall SetDCBrushColor(long long) @ stdcall SetDCPenColor(long long) -@ stdcall SetDeviceGammaRamp(long ptr) @ stdcall SetDIBColorTable(long long long ptr) @ stdcall SetDIBits(long long long long ptr ptr long) @ stdcall SetDIBitsToDevice(long long long long long long long long long ptr ptr long) +@ stdcall SetDeviceGammaRamp(long ptr) @ stdcall SetEnhMetaFileBits(long ptr) @ stdcall SetFontEnumeration(ptr) NtGdiSetFontEnumeration @ stdcall SetGraphicsMode(long long) @@ -587,15 +562,14 @@ @ stdcall SetMetaFileBitsEx(long ptr) @ stdcall SetMetaRgn(long) @ stdcall SetMiterLimit(long long ptr) -#@ stdcall SetObjectOwner(long long) @ stdcall SetPaletteEntries(long long long ptr) @ stdcall SetPixel(long long long long) @ stdcall SetPixelFormat(long long ptr) @ stdcall SetPixelV(long long long long) @ stdcall SetPolyFillMode(long long) +@ stdcall SetROP2(long long) @ stdcall SetRectRgn(long long long long long) @ stdcall SetRelAbs(long long) -@ stdcall SetROP2(long long) @ stdcall SetStretchBltMode(long long) @ stdcall SetSystemPaletteUse(long long) NtGdiSetSystemPaletteUse @ stdcall SetTextAlign(long long) @@ -605,9 +579,9 @@ @ stdcall SetViewportExtEx(long long long ptr) @ stdcall SetViewportOrgEx(long long long ptr) @ stdcall SetVirtualResolution(long long long long long) NtGdiSetVirtualResolution +@ stdcall SetWinMetaFileBits(long ptr long ptr) @ stdcall SetWindowExtEx(long long long ptr) @ stdcall SetWindowOrgEx(long long long ptr) -@ stdcall SetWinMetaFileBits(long ptr long ptr) @ stdcall SetWorldTransform(long ptr) @ stdcall StartDocA(long ptr) @ stdcall StartDocW(long ptr) @@ -615,11 +589,6 @@ @ stdcall StartPage(long) @ stdcall StretchBlt(long long long long long long long long long long long) @ stdcall StretchDIBits(long long long long long long long long long ptr ptr long long) -@ stdcall STROBJ_bEnum(ptr ptr ptr) NtGdiSTROBJ_bEnum -@ stdcall STROBJ_bEnumPositionsOnly(ptr ptr ptr) NtGdiSTROBJ_bEnumPositionsOnly -@ stdcall STROBJ_bGetAdvanceWidths(ptr long long ptr) NtGdiSTROBJ_bGetAdvanceWidths -@ stdcall STROBJ_dwGetCodePage(ptr) NtGdiSTROBJ_dwGetCodePage -@ stdcall STROBJ_vEnumStart(ptr) NtGdiSTROBJ_vEnumStart @ stdcall StrokeAndFillPath(long) @ stdcall StrokePath(long) @ stdcall SwapBuffers(long) @@ -629,7 +598,6 @@ @ stdcall UnloadNetworkFonts(long) @ stdcall UnrealizeObject(long) @ stdcall UpdateColors(long) -@ stdcall UpdateICMRegKey(long str str long) UpdateICMRegKeyA @ stdcall UpdateICMRegKeyA(long str str long) @ stdcall UpdateICMRegKeyW(long wstr wstr long) @ stdcall WidenPath(long) @@ -639,6 +607,7 @@ @ stdcall XLATEOBJ_hGetColorTransform(ptr) NtGdiXLATEOBJ_hGetColorTransform @ stdcall XLATEOBJ_iXlate(ptr long) @ stdcall XLATEOBJ_piVector(ptr) -#@ extern pfnRealizePalette -#@ extern pfnSelectPalette -#@ stub pstackConnect +@ stdcall bInitSystemAndFontsDirectoriesW(wstr wstr) +@ stdcall bMakePathNameW(wstr wstr wstr long) +@ stdcall cGetTTFFromFOT(long long long long long long long) +@ stdcall gdiPlaySpoolStream(long long long long long long) Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Mon Dec 8 06:37:15 2008 @@ -940,7 +940,7 @@ */ DWORD WINAPI -GdiPlaySpoolStream( +gdiPlaySpoolStream( DWORD a0, DWORD a1, DWORD a2,
15 years, 9 months
1
0
0
0
[tkreuzer] 37932: revert 36672 (SIZEL counts as 2 parameters)
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 05:06:45 2008 New Revision: 37932 URL:
http://svn.reactos.org/svn/reactos?rev=37932&view=rev
Log: revert 36672 (SIZEL counts as 2 parameters) Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy…
============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Mon Dec 8 05:06:45 2008 @@ -604,9 +604,9 @@ NtUserRemoteStopScreenUpdates 0 NtUserCtxDisplayIOCtl 3 NtGdiEngAssociateSurface 3 -NtGdiEngCreateBitmap 5 -NtGdiEngCreateDeviceSurface 3 -NtGdiEngCreateDeviceBitmap 3 +NtGdiEngCreateBitmap 6 +NtGdiEngCreateDeviceSurface 4 +NtGdiEngCreateDeviceBitmap 4 NtGdiEngCreatePalette 6 NtGdiEngComputeGlyphSet 3 NtGdiEngCopyBits 6
15 years, 9 months
1
0
0
0
[tkreuzer] 37931: sync trunk head (r37928)
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 02:30:30 2008 New Revision: 37931 URL:
http://svn.reactos.org/svn/reactos?rev=37931&view=rev
Log: sync trunk head (r37928) Added: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.h - copied unchanged from r37928, trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c branches/ros-amd64-bringup/reactos/base/system/services/database.c branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c Modified: branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -114,7 +114,7 @@ if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) { - if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR)) + if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < (int)(4096 / sizeof(TCHAR))) { CharToOem(buff, buff); ConOutPuts(buff); @@ -145,7 +145,7 @@ 0); if (hFile == INVALID_HANDLE_VALUE) { - if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR)) + if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < (int)(sizeof(szMsg) / sizeof(TCHAR))) { _stprintf(buff, szMsg, szFullPath); CharToOem(buff, buff); Modified: branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/games/solitaire/solitaire.cpp [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -20,7 +20,7 @@ TCHAR MsgAbout[128]; TCHAR MsgWin[128]; TCHAR MsgDeal[128]; -DWORD dwOptions = 8; +DWORD dwOptions = OPTION_THREE_CARDS; CardWindow SolWnd; @@ -477,6 +477,13 @@ // Force the window to process WM_GETMINMAXINFO again GetWindowRect(hwndStatus, &rcStatus); nStatusHeight = rcStatus.bottom - rcStatus.top; + + // Hide status bar if options say so + if (!(dwOptions & OPTION_SHOW_STATUS)) + { + ShowWindow(hwndStatus, SW_HIDE); + } + SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER); NewGame(); @@ -497,8 +504,7 @@ if (dwOptions & OPTION_SHOW_STATUS) { MoveWindow(SolWnd, 0, 0, nWidth, nHeight - nStatusHeight, TRUE); - MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nHeight, TRUE); - SendMessage(hwndStatus, WM_SIZE, wParam, lParam); + MoveWindow(hwndStatus, 0, nHeight - nStatusHeight, nWidth, nStatusHeight, TRUE); } else { Modified: branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -162,9 +162,9 @@ DWORD dwDataSize, LPVOID lpRawData); -__inline void LogfFreeRecord(LPVOID Rec); +/* eventlog.c */ +extern HANDLE MyHeap; -/* eventlog.c */ VOID PRINT_HEADER(PFILE_HEADER header); VOID PRINT_RECORD(PEVENTLOGRECORD pRec); @@ -185,4 +185,9 @@ /* rpc.c */ DWORD WINAPI RpcThreadRoutine(LPVOID lpParameter); +static __inline void LogfFreeRecord(LPVOID Rec) +{ + HeapFree(MyHeap, 0, Rec); +} + #endif /* __EVENTLOG_H__ */ Modified: branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -14,7 +14,6 @@ static LIST_ENTRY LogFileListHead; static CRITICAL_SECTION LogFileListCs; -extern HANDLE MyHeap; /* FUNCTIONS ****************************************************************/ @@ -898,8 +897,3 @@ *lpRecSize = dwRecSize; return Buffer; } - -__inline void LogfFreeRecord(LPVOID Rec) -{ - HeapFree(MyHeap, 0, Rec); -} Modified: branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/eventlog/logport.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -15,7 +15,6 @@ HANDLE ConnectPortHandle = NULL; HANDLE MessagePortHandle = NULL; -extern HANDLE MyHeap; extern BOOL onLiveCD; /* FUNCTIONS ****************************************************************/ Modified: branches/ros-amd64-bringup/reactos/base/system/services/database.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/system/services/database.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/system/services/database.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -123,7 +123,7 @@ PSERVICE CurrentService; DPRINT("ScmGetServiceEntryByClientHandle() called\n"); - DPRINT("looking for %lu\n", Handle); + DPRINT("looking for %p\n", Handle); ServiceEntry = ServiceListHead.Flink; while (ServiceEntry != &ServiceListHead) Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/desk/general.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -70,31 +70,33 @@ InitRadioButtons(HWND hWnd) { HKEY hKey; - - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\Display"), - 0, KEY_READ, &hKey) == ERROR_SUCCESS) - { - TCHAR szBuf[64]; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\Display"), + 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + TCHAR szBuf[64]; DWORD dwSize = 64; if (RegQueryValueEx(hKey, _T("DynaSettingsChange"), 0, NULL, - (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS); - - switch (_ttoi(szBuf)) - { - case 0: - SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); - break; - case 1: - SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); - break; - case 3: - SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); - break; - } + (LPBYTE)szBuf, &dwSize) == ERROR_SUCCESS) + { + switch (_ttoi(szBuf)) + { + case 0: + SendDlgItemMessage(hWnd, IDC_RESTART_RB, BM_SETCHECK, 1, 1); + break; + case 1: + SendDlgItemMessage(hWnd, IDC_WITHOUTREBOOT_RB, BM_SETCHECK, 1, 1); + break; + case 3: + SendDlgItemMessage(hWnd, IDC_ASKME_RB, BM_SETCHECK, 1, 1); + break; + } + } RegCloseKey(hKey); - } + } } INT_PTR CALLBACK @@ -115,7 +117,7 @@ DispDevice = (PDISPLAY_DEVICE_ENTRY)(((LPPROPSHEETPAGE)lParam)->lParam); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)DispDevice); - InitFontSizeList(hwndDlg); + InitFontSizeList(hwndDlg); InitRadioButtons(hwndDlg); Ret = TRUE; Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -283,7 +283,7 @@ BITMAP bitmap; DWORD Result = 0; DWORD iDevNum = 0; - INT i; + DWORD i; DISPLAY_DEVICE displayDevice; PGLOBAL_DATA pGlobalData; @@ -333,7 +333,7 @@ else /* FIXME: incomplete! */ { PMONSL_MONINFO pMonitors; - INT i; + DWORD i; SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); @@ -341,7 +341,7 @@ pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result); if (pMonitors) { - INT hack = 1280; + DWORD hack = 1280; for (i = 0; i < Result; i++) { pMonitors[i].Position.x = hack * i; @@ -817,7 +817,7 @@ case WM_DESTROY: { - INT i; + DWORD i; PDISPLAY_DEVICE_ENTRY Current = pGlobalData->DisplayDeviceList; while (Current != NULL) Modified: branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/input/add.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -42,7 +42,7 @@ HKEY hKey; TCHAR szLayoutID[3 + 1], szPreload[CCH_LAYOUT_ID + 1], szLOLang[MAX_PATH]; DWORD dwIndex = 0, dwType, dwSize; - INT Count = 0, i, j; + UINT Count = 0, i, j; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) Modified: branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/input/settings.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -214,7 +214,7 @@ DWORD dwBufLen; TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; HANDLE hLib; - int i, j, k; + unsigned i, j, k; wsprintf(szBuf, _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); Modified: branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -37,7 +37,7 @@ Count = SetupGetLineCount(hIntlInf, _T("CodePages")); if (Count <= 0) return FALSE; - for (Number = 0; Number < Count; Number++) + for (Number = 0; Number < (UINT)Count; Number++) { if (SetupGetLineByIndex(hIntlInf, _T("CodePages"), Number, &infCont) && SetupGetIntField(&infCont, 0, (PINT)&uiCPage)) Modified: branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/powercfg/powershemes.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -169,7 +169,7 @@ memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); uiIndex = (UINT)SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETCURSEL, 0, 0); - if(uiIndex != CB_ERR) + if(uiIndex != (UINT)CB_ERR) { SendDlgItemMessage(hwndDlg, IDC_ENERGYLIST, CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -775,7 +775,7 @@ LRESULT lResult; lResult = SendDlgItemMessage(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_GETCURSEL, (WPARAM)0, (LPARAM)0); - if (lResult != CB_ERR && lResult != pStartInfo->dwCrashDumpEnabled) + if (lResult != CB_ERR && lResult != (LRESULT)pStartInfo->dwCrashDumpEnabled) { if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { @@ -786,7 +786,7 @@ SendDlgItemMessageW(hwndDlg, IDC_STRRECDUMPFILE, WM_GETTEXT, (WPARAM)sizeof(pStartInfo->szMinidumpDir) / sizeof(WCHAR), (LPARAM)pStartInfo->szMinidumpDir); } - pStartInfo->dwCrashDumpEnabled = lResult; + pStartInfo->dwCrashDumpEnabled = (DWORD)lResult; SetCrashDlgItems(hwndDlg, pStartInfo); } } Modified: branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/cpl/timedate/monthcal.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -553,7 +553,7 @@ szDayLen, &TextSize)) { - RECT rcHighlight = {0}; + RECT rcHighlight = { 0, 0, 0, 0 }; rcText.left = rcCell.left + (infoPtr->CellSize.cx / 2) - (TextSize.cx / 2); rcText.top = rcCell.top + (infoPtr->CellSize.cy / 2) - (TextSize.cy / 2); Modified: branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -478,7 +478,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK) + if (!(This->lpLcl->lpSurfMore->lpDD_lcl->lpDDCB->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UNLOCK)) { DX_STUB_str("DDERR_UNSUPPORTED"); return DDERR_UNSUPPORTED; @@ -539,7 +539,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_FLIP)) { return DDERR_GENERIC; } Modified: branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/ddraw/Surface/surface_stubs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -260,7 +260,7 @@ DX_WINDBG_trace(); - if (!This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY) + if (!(This->lpLcl->lpGbl->lpDD->lpDDCBtmp->cbDDSurfaceCallbacks.dwFlags & DDHAL_SURFCB32_UPDATEOVERLAY)) { return DDERR_GENERIC; } Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -786,7 +786,7 @@ IN LPCSTR lpSubKey OPTIONAL, IN HKEY hKeyDest) { - UNICODE_STRING SubKeyName = {0}; + UNICODE_STRING SubKeyName = { 0, 0, NULL }; LONG Ret; if (lpSubKey != NULL && @@ -816,7 +816,7 @@ IN HKEY hKey, OUT PHKEY phkResult) { - UNICODE_STRING MachineName = {0}; + UNICODE_STRING MachineName = { 0, 0, NULL }; LONG Ret; if (lpMachineName != NULL && @@ -1412,7 +1412,7 @@ IN LPCSTR lpSubKey OPTIONAL, IN LPCSTR lpValueName OPTIONAL) { - UNICODE_STRING SubKey = {0}, ValueName = {0}; + UNICODE_STRING SubKey = { 0, 0, NULL }, ValueName = { 0, 0, NULL }; LONG Ret; if (lpSubKey != NULL && @@ -1826,7 +1826,7 @@ RegDeleteTreeA(IN HKEY hKey, IN LPCSTR lpSubKey OPTIONAL) { - UNICODE_STRING SubKeyName = {0}; + UNICODE_STRING SubKeyName = { 0, 0, NULL }; LONG Ret; if (lpSubKey != NULL && Modified: branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -1530,7 +1530,7 @@ OUT PSID pSid, IN OUT DWORD* cbSid) { - int i; + unsigned int i; TRACE("(%d, %s, %p, %p)\n", WellKnownSidType, debugstr_sid(DomainSid), pSid, cbSid); if (DomainSid != NULL) @@ -1576,7 +1576,7 @@ IsWellKnownSid(IN PSID pSid, IN WELL_KNOWN_SID_TYPE WellKnownSidType) { - int i; + unsigned int i; TRACE("(%s, %d)\n", debugstr_sid(pSid), WellKnownSidType); for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) @@ -1638,7 +1638,7 @@ } else /* String constant format - Only available in winxp and above */ { - int i; + unsigned int i; for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) Modified: branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -660,10 +660,10 @@ DeviceInfo* device_info, MIDIHDR* header) { - int index = 0; + unsigned int index = 0; UCHAR* midi_bytes = (UCHAR*) header->lpData; - int msg_index = 0; + unsigned int msg_index = 0; UCHAR msg[3]; /* Initialize the buffer */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -53,11 +53,11 @@ PVOID *Reserved) { adns_state astate; - int quflags = 0, i; + int quflags = 0; int adns_error; adns_answer *answer; LPSTR CurrentName; - unsigned CNameLoop; + unsigned i, CNameLoop; *QueryResultSet = 0; Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -911,7 +911,7 @@ } // Poorly written apps are not ReactOS problem! // We fix it here if the size is larger than the default size. - if( cbSize > sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW); + if( cbSize > (int)sizeof(ENUMLOGFONTEXDVW) ) cbSize = sizeof(ENUMLOGFONTEXDVW); Result = NtGdiExtGetObjectW(hGdiObj, cbSize, lpBuffer); // Should handle the copy. Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -86,11 +86,10 @@ UINT cEntries, LPPALETTEENTRY ppe) { - PALETTEENTRY ippe[256]; - - if (cEntries < 0) return 0; - else - { + PALETTEENTRY ippe[256]; + // Make this work! + if ((INT)cEntries < 0 ) return 0; + if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); else @@ -103,9 +102,9 @@ if (iStartIndex < 256) { - INT Index = 256 - iStartIndex; - - if ( Index >= cEntries ) Index = cEntries; + UINT Index = 256 - iStartIndex; + + if ( Index > cEntries ) Index = cEntries; RtlCopyMemory( ppe, &ippe[iStartIndex], @@ -113,8 +112,8 @@ } } } - } - return 0; + + return 0; } UINT Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/region.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -90,7 +90,8 @@ if ( GetRegionData(hRgn, cRgnDSize, pRgnData) ) { HRGN hRgnex; - INT i, SaveL = pRgnData->rdh.rcBound.left; + UINT i; + INT SaveL = pRgnData->rdh.rcBound.left; pRgnData->rdh.rcBound.left = Width - pRgnData->rdh.rcBound.right; pRgnData->rdh.rcBound.right = Width - SaveL; if (pRgnData->rdh.nCount > 0) Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -232,7 +232,7 @@ CLIENT_ID ClientId; /* If we don't have a PID, look it up */ - if (dwProcessId == -1) dwProcessId = (ULONG_PTR)CsrGetProcessId(); + if (dwProcessId == -1U) dwProcessId = (DWORD_PTR)CsrGetProcessId(); /* Open a handle to the process */ ClientId.UniqueThread = NULL; Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/except/except.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -222,7 +222,7 @@ ULONG_PTR ErrorParameters[4]; ULONG ErrorResponse; - if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->NumberParameters >= 2) { switch(ExceptionInfo->ExceptionRecord->ExceptionInformation[0]) @@ -275,7 +275,7 @@ /* Print a stack trace. */ DbgPrint("Unhandled exception\n"); DbgPrint("ExceptionCode: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionCode); - if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionInfo->ExceptionRecord->NumberParameters == 2) { DbgPrint("Faulting Address: %8x\n", ExceptionInfo->ExceptionRecord->ExceptionInformation[1]); @@ -318,7 +318,7 @@ ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode; ErrorParameters[1] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress; - if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) + if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION) { /* get the type of operation that caused the access violation */ ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[0]; Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lcformat.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -88,7 +88,7 @@ 0, 0, &NLS_FormatsCS, { &NLS_FormatsCS_debug.ProcessLocksList, &NLS_FormatsCS_debug.ProcessLocksList }, - 0, 0, 0, 0 + 0, 0, 0, 0, 0 }; static RTL_CRITICAL_SECTION NLS_FormatsCS = { &NLS_FormatsCS_debug, -1, 0, 0, 0, 0 }; Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -532,7 +532,7 @@ SetThreadPriority(HANDLE hThread, int nPriority) { - ULONG Prio = nPriority; + LONG Prio = nPriority; NTSTATUS Status; /* Check if values forcing saturation should be used */ @@ -549,7 +549,7 @@ Status = NtSetInformationThread(hThread, ThreadBasePriority, &Prio, - sizeof(ULONG)); + sizeof(LONG)); if (!NT_SUCCESS(Status)) { /* Failure */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -6,6 +6,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> +#include "lsasrv.h" #include "lsa_s.h" #include <wine/debug.h> Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -3,12 +3,11 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> -DECLARE_HANDLE(LSAPR_HANDLE); +#include "lsasrv.h" -#define NDEBUG -#include <debug.h> +#include "wine/debug.h" -VOID LsarStartRpcServer(VOID); +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); NTSTATUS WINAPI @@ -16,7 +15,7 @@ { HANDLE hEvent; - DPRINT("LsapInitLsa() called\n"); + TRACE("LsapInitLsa()\n"); LsarStartRpcServer(); @@ -31,6 +30,7 @@ return STATUS_SUCCESS; } + void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); Modified: branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -11,4 +11,4 @@ <file>lsarpc.c</file> <file>lsasrv.c</file> <file>lsasrv.rc</file> -</module> +</module> Modified: branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -24,7 +24,7 @@ LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; ULONG SocketCount = 0; PSOCKET_INFORMATION *Sockets = NULL; -LIST_ENTRY SockHelpersListHead = {NULL}; +LIST_ENTRY SockHelpersListHead = { NULL, NULL }; ULONG SockAsyncThreadRefCount; HANDLE SockAsyncHelperAfdHandle; HANDLE SockAsyncCompletionPort; Modified: branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -650,7 +650,9 @@ } } else + { /* FIXME */; + } return TRUE; default: Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/font.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -676,9 +676,10 @@ assert (max >= n); max -= n; while (n--) + { if (*start_str++ == PREFIX && max--) start_str++; - else; + } start_count -= (start_str - str_on_entry); } else @@ -736,7 +737,6 @@ str++; ns--; } - else; i++; } return result; Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -395,7 +395,7 @@ lstrcpynW(libName, lpDriverName, sizeof(libName) / sizeof(WCHAR)); /* Try and open the driver by filename */ - if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) + if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) ) goto the_end; /* If we got here, the file wasn't found. So we assume the caller @@ -407,7 +407,7 @@ if ( DRIVER_GetLibName(lpDriverName, lsn, libName, sizeof(libName)) ) { /* Now we have the filename, we can try and load it */ - if ( lpDrv = DRIVER_TryOpenDriver32(libName, lParam) ) + if ( (lpDrv = DRIVER_TryOpenDriver32(libName, lParam)) ) goto the_end; } Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/directx/dxapi/main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -110,7 +110,7 @@ dwFunctionNum -= DD_FIRST_DXAPI; if ((lpvOutBuffer == NULL) || - (dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) || + /*(dwFunctionNum < (DD_FIRST_DXAPI - DD_FIRST_DXAPI)) ||*/ (dwFunctionNum > (DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI)) || (gDxApiEntryPoint[dwFunctionNum].pfn == NULL) || (cbInBuffer != tblCheckInBuffer[dwFunctionNum]) || Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/directx/dxg/main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -43,7 +43,7 @@ { PDRVFN drv_func; - INT i; + UINT i; /* Test see if the data is vaild we got from win32k.sys */ if ((SizeEngDrv != sizeof(DRVENABLEDATA)) || Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -357,7 +357,7 @@ RtlCopyMemory(NameInfo->FileName, FCB->PathNameU.Buffer, BytesToCopy); /* Check if we could write more but are not able to */ - if (*BufferLength < FCB->PathNameU.Length + FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) + if (*BufferLength < FCB->PathNameU.Length + (ULONG)FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0])) { /* Return number of bytes written */ *BufferLength -= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName[0]) + BytesToCopy; Modified: branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -58,7 +58,7 @@ OID_802_3_MAC_OPTIONS }; -DRIVER_INFORMATION DriverInfo = {0}; +DRIVER_INFORMATION DriverInfo = { NULL, NULL, { NULL, NULL } }; NDIS_PHYSICAL_ADDRESS HighestAcceptableMax = NDIS_PHYSICAL_ADDRESS_CONST(-1, -1); @@ -161,7 +161,7 @@ PNDIS_RESOURCE_LIST AssignedResources; UINT BufferSize = 0; PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; - int i; + UINT i; NdisMQueryAdapterResources(Status, WrapperConfigurationContext, Modified: branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/setup/blue/font.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -143,7 +143,7 @@ if(NT_SUCCESS(Status)) { - if(!bFoundFile && atoi(FileName) == CodePage) + if(!bFoundFile && (UINT32)atoi(FileName) == CodePage) { // We got the correct file. // Save the offset and loop through the rest of the file table to find the position, where the actual data starts. Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -1637,7 +1637,7 @@ KdPrint2((PRINT_PREFIX "SIISETCLK\n")); GetPciConfig1(0x8a, tmp8); if ((tmp8 & 0x30) != 0x10) - ChangePciConfig1(0x8a, (a & 0xcf | 0x10)); + ChangePciConfig1(0x8a, (a & 0xcf) | 0x10); GetPciConfig1(0x8a, tmp8); if ((tmp8 & 0x30) != 0x10) { KdPrint2((PRINT_PREFIX "Sil 0680 could not set ATA133 clock\n")); Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -1078,7 +1078,7 @@ UCHAR ChildDescriptor[256]; ULONG ChildId; ULONG Unused; - INT i; + UINT i; DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); if (DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor == NULL) @@ -1155,7 +1155,7 @@ #ifndef NDEBUG if (ChildType == Monitor) { - INT j; + UINT j; PUCHAR p = ChildDescriptor; INFO_(VIDEOPRT, "Monitor device enumerated! (ChildId = 0x%x)\n", ChildId); for (j = 0; j < sizeof (ChildDescriptor); j += 8) Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -97,10 +97,10 @@ #define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ #define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ +#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ +#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ +#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ +#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ #define APIC_LVT3_DM (0x7 << 8) #define APIC_LVT3_IIPP (0x1 << 13) @@ -165,30 +165,92 @@ } CPU_INFO, *PCPU_INFO; extern ULONG CPUCount; /* Total number of CPUs */ -extern ULONG BootCPU; /* Bootstrap processor */ +extern ULONG BootCPU; /* Bootstrap processor */ extern ULONG OnlineCPUs; /* Bitmask of online CPUs */ extern CPU_INFO CPUMap[MAX_CPU]; /* Map of all CPUs in the system */ +extern PULONG APICBase; /* Virtual address of local APIC */ +extern ULONG lastregr[MAX_CPU]; /* For debugging */ +extern ULONG lastvalr[MAX_CPU]; +extern ULONG lastregw[MAX_CPU]; +extern ULONG lastvalw[MAX_CPU]; /* Prototypes */ - -__inline VOID APICWrite(ULONG Offset, ULONG Value); -__inline ULONG APICRead(ULONG Offset); VOID APICSendIPI(ULONG Target, ULONG Mode); VOID APICSetup(VOID); VOID HaliInitBSP(VOID); VOID APICSyncArbIDs(VOID); -__inline VOID APICSendEOI(VOID); VOID APICCalibrateTimer(ULONG CPU); VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); +static __inline ULONG _APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} + +#if 0 +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#else +static __inline VOID APICWrite(ULONG Offset, + ULONG Value) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregw[CPU] = Offset; + lastvalw[CPU] = Value; + + p = (PULONG)((ULONG)APICBase + Offset); + + *p = Value; +} +#endif + +#if 0 +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + + p = (PULONG)((ULONG)APICBase + Offset); + return *p; +} +#else +static __inline ULONG APICRead(ULONG Offset) +{ + PULONG p; + ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; + + lastregr[CPU] = Offset; + lastvalr[CPU] = 0; + + p = (PULONG)((ULONG)APICBase + Offset); + + lastvalr[CPU] = *p; + return lastvalr[CPU]; +} +#endif + static __inline ULONG ThisCPU(VOID) { return (APICRead(APIC_ID) & APIC_ID_MASK) >> 24; } - -#endif - +static __inline VOID APICSendEOI(VOID) +{ + // Send the EOI + APICWrite(APIC_EOI, 0); +} + +#endif /* __INTERNAL_HAL_APIC_H */ /* EOF */ - Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -223,72 +223,6 @@ APICWrite(APIC_SIVR, tmp); } - -__inline ULONG _APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - return *p; -} - -#if 0 -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - - *p = Value; -} -#else -__inline VOID APICWrite(ULONG Offset, - ULONG Value) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregw[CPU] = Offset; - lastvalw[CPU] = Value; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - - *p = Value; -} -#endif - - -#if 0 -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - return *p; -} -#else -__inline ULONG APICRead(ULONG Offset) -{ - PULONG p; - ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; - - lastregr[CPU] = Offset; - lastvalr[CPU] = 0; - - p = (PULONG)((ULONG_PTR)APICBase + Offset); - - lastvalr[CPU] = *p; - return lastvalr[CPU]; -} -#endif - -__inline VOID APICSendEOI(VOID) -{ - // Send the EOI - APICWrite(APIC_EOI, 0); -} - static VOID APICDumpBit(ULONG base) { ULONG v, i, j; @@ -317,7 +251,6 @@ ULONG v, ver, maxlvt; ULONG r1, r2, w1, w2; ULONG CPU = ThisCPU();; - r1 = lastregr[CPU]; Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/library.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -180,10 +180,10 @@ #ifdef __i386__ # ifdef __GNUC__ # define __DEFINE_GET_SEG(seg) \ - extern inline unsigned short wine_get_##seg(void) \ + static inline unsigned short wine_get_##seg(void) \ { unsigned short res; __asm__("movw %%" #seg ",%w0" : "=r"(res)); return res; } # define __DEFINE_SET_SEG(seg) \ - extern inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } + static inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } # elif defined(_MSC_VER) # define __DEFINE_GET_SEG(seg) \ extern inline unsigned short wine_get_##seg(void) \ Modified: branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -520,7 +520,7 @@ BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); /* Some optimizations */ -extern inline LPVOID WINAPI MapSL( SEGPTR segptr ) +static inline LPVOID WINAPI MapSL( SEGPTR segptr ) { return (char *)wine_ldt_copy.base[SELECTOROF(segptr) >> __AHSHIFT] + OFFSETOF(segptr); } Modified: branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/f…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Inode.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -348,11 +348,11 @@ bool ext2_block_map(PEXT2_FILESYS Ext2Sys, PEXT2_INODE inode, ULONG block, ULONG *dwRet) { - ULONG dwSizes[4] = {12, 1, 1, 1}; + ULONG dwSizes[4] = { 12, 1, 1, 1 }; ULONG Index = 0; ULONG dwBlk = 0; PEXT2_SUPER_BLOCK pExt2Sb = Ext2Sys->ext2_sb; - int i; + UINT i; bool bRet = false; Index = block; Modified: branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/f…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Memory.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -93,8 +93,7 @@ PEXT2_BLOCK_BITMAP bmap) { bool retval; - ULONG group_blk, start_blk, last_blk, new_blk, blk; - int j; + ULONG group_blk, start_blk, last_blk, new_blk, blk, j; group_blk = fs->ext2_sb->s_first_data_block + (group * fs->ext2_sb->s_blocks_per_group); Modified: branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/f…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/fslib/ext2lib/Mke2fs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -885,7 +885,7 @@ * kludgy hack of using the UUID to derive a random jitter value. */ { - int i, val; + ULONG i, val; for (i = 0, val = 0 ; i < sizeof(Ext2Sb.s_uuid); i++) val += Ext2Sb.s_uuid[i]; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -40,6 +40,7 @@ #include <sys/utime.h> #include <direct.h> + int *__p__fmode(void); int *__p___mb_cur_max(void); @@ -3024,4 +3025,4 @@ /********************************************************************* * __badioinfo (MSVCRT.@) */ -ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT }; +ioinfo __badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT, { 0, } }; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdlib/mbstowcs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -7,12 +7,12 @@ size_t mbstowcs (wchar_t *widechar, const char *multibyte, size_t number) { int bytes; - int n = 0; + size_t n = 0; while (n < number) { if ((bytes = mbtowc (widechar, multibyte, MB_LEN_MAX)) < 0) - return -1; + return (size_t) -1; if (bytes == 0) { *widechar = (wchar_t) '\0'; Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/wcs.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -430,7 +430,7 @@ /* pf_integer_conv: prints x to buf, including alternate formats and additional precision digits, but not field characters or the sign */ -static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, +static void pf_integer_conv( char *buf, unsigned int buf_len, pf_flags *flags, LONGLONG x ) { unsigned int base; @@ -679,8 +679,8 @@ * Includes extra bytes: 1 byte for null, 1 byte for sign, 4 bytes for exponent, 2 bytes for alternate formats, 1 byte for a decimal, and 1 byte for an additional float digit. */ - int x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; + unsigned x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10; if( x_len >= sizeof number) x = HeapAlloc( GetProcessHeap(), 0, x_len ); @@ -702,8 +702,8 @@ * Includes extra bytes: 1 byte for null, 1 byte for sign, 4 bytes for exponent, 2 bytes for alternate formats, 1 byte for a decimal, and 1 byte for an additional float digit. */ - int x_len = ((flags.FieldLength > flags.Precision) ? - flags.FieldLength : flags.Precision) + 10; + unsigned x_len = ((flags.FieldLength > flags.Precision) ? + flags.FieldLength : flags.Precision) + 10; if( x_len >= sizeof number) x = HeapAlloc( GetProcessHeap(), 0, x_len ); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -245,7 +245,7 @@ PCHAR PartialString = NULL, BiosVersion; CHAR CpuString[48]; PVOID BaseAddress = NULL; - LARGE_INTEGER ViewBase = {{0}}; + LARGE_INTEGER ViewBase = {{0, 0}}; ULONG_PTR VideoRomBase; PCHAR CurrentVersion; extern UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -844,13 +844,13 @@ case DbgKmExceptionApi: /* Look at the exception code */ - if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == STATUS_BREAKPOINT) { /* Update this as a breakpoint exception */ WaitStateChange->NewState = DbgBreakpointStateChange; } - else if (DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == + else if ((NTSTATUS)DebugEvent->ApiMsg.Exception.ExceptionRecord.ExceptionCode == STATUS_SINGLE_STEP) { /* Update this as a single step exception */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -163,7 +163,7 @@ if (Page == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -301,7 +301,7 @@ if (PageOp == NULL) { DPRINT1("MmGetPageOp failed"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -322,12 +322,12 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageOp->Status == STATUS_PENDING) { DPRINT1("Woke for page op before completion\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* * If this wasn't a pagein then we need to restart the handling @@ -373,7 +373,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -387,7 +387,7 @@ Status = MmReadFromSwapPage(SwapEntry, Page); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmSetSavedSwapEntryPage(Page, SwapEntry); } @@ -414,7 +414,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(Status); } @@ -888,7 +888,7 @@ if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(&Process->VadRoot); MmReleasePageOp(PageOp); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -97,7 +97,7 @@ if (Page == 0) { DPRINT1("Tried to release page zero.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } KeAcquireSpinLock(&AllocationListLock, &oldIrql); @@ -169,7 +169,7 @@ Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Target = Target - NrFreedPages; } @@ -326,7 +326,7 @@ Status = MiMemoryConsumers[i].Trim(MiMinimumPagesPerRun, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -357,7 +357,7 @@ Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -366,7 +366,7 @@ else { DPRINT1("KeWaitForMultipleObjects failed, status = %x\n", Status); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } @@ -406,7 +406,7 @@ NULL); if (!NT_SUCCESS(Status)) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Priority = LOW_REALTIME_PRIORITY + 1; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -270,7 +270,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } else @@ -416,7 +416,7 @@ if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Mapping non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->MapCount++; Page->ReferenceCount++; @@ -438,12 +438,12 @@ if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { DPRINT1("Unmapping non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->MapCount == 0) { DPRINT1("Unmapping not mapped page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->MapCount--; Page->ReferenceCount--; @@ -511,7 +511,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Referencing non-used page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->ReferenceCount++; @@ -542,7 +542,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting reference count for free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } RCount = Page->ReferenceCount; @@ -577,12 +577,12 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Dereferencing free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->ReferenceCount == 0) { DPRINT1("Derefrencing page with reference count 0\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->ReferenceCount--; @@ -594,29 +594,29 @@ if (Page->RmapListHead != NULL) { DPRINT1("Freeing page with rmap entries.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->MapCount != 0) { DPRINT1("Freeing mapped page (0x%x count %d)\n", Pfn << PAGE_SHIFT, Page->MapCount); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->LockCount > 0) { DPRINT1("Freeing locked page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->SavedSwapEntry != 0) { DPRINT1("Freeing page with swap entry.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Freeing page with flags %x\n", Page->Flags.Type); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->Flags.Type = MM_PHYSICAL_PAGE_FREE; Page->Flags.Consumer = MC_MAXIMUM; @@ -647,7 +647,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting lock count for free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } LockCount = Page->LockCount; @@ -671,7 +671,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Locking free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->LockCount++; @@ -702,7 +702,7 @@ if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Unlocking free page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Page->LockCount--; @@ -757,17 +757,17 @@ if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE) { DPRINT1("Got non-free page from freelist\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageDescriptor->MapCount != 0) { DPRINT1("Got mapped page from freelist\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PageDescriptor->ReferenceCount != 0) { DPRINT1("%d\n", PageDescriptor->ReferenceCount); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; PageDescriptor->Flags.Consumer = Consumer; @@ -789,7 +789,7 @@ if (PageDescriptor->MapCount != 0) { DPRINT1("Returning mapped page.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } return PfnOffset; } @@ -970,7 +970,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("ZeroPageThread: Wait failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (ZeroPageThreadShouldTerminate) @@ -995,7 +995,7 @@ if (PageDescriptor->MapCount != 0) { DPRINT1("Mapped page on freelist.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PageDescriptor->Flags.Zero = 1; PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_FREE; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/iospace.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -104,7 +104,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } return (PVOID)((ULONG_PTR)Result + Offset); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -899,7 +899,7 @@ BaseAddress); if (MemoryArea == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } @@ -1039,7 +1039,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to allocate page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmCreateVirtualMapping (NULL, (PVOID)((ULONG_PTR)BaseAddress + (i * PAGE_SIZE)), @@ -1049,7 +1049,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -57,7 +57,7 @@ if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(MmGetKernelAddressSpace()); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -692,7 +692,7 @@ { return NULL; } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Base = (PVOID)((ULONG_PTR)MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE); if (MiMdlMappingRegionHint == StartingOffset) MiMdlMappingRegionHint += PageCount; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mpw.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -71,7 +71,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("MpwThread: Wait failed\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } if (MpwThreadShouldTerminate) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -936,7 +936,7 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", current); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (base_addr < MiNonPagedPoolStart || @@ -946,13 +946,13 @@ DbgPrint("Size %d\n",current->hdr.Size); DbgPrint("Limits are %x %x\n",MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart+MiNonPagedPoolLength); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } blocks_seen++; if (blocks_seen > EiNrFreeBlocks) { DbgPrint("Too many blocks on free list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } p = avl_get_next(FreeBlockListRoot, p); } @@ -979,7 +979,7 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", current); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (base_addr < MiNonPagedPoolStart || ((ULONG_PTR)base_addr+current->hdr.Size) > @@ -989,13 +989,13 @@ DbgPrint("Size %d\n",current->hdr.Size); DbgPrint("Limits are %x %x\n",MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart+MiNonPagedPoolLength); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } blocks_seen++; if (blocks_seen > EiNrUsedBlocks) { DbgPrint("Too many blocks on used list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (current->ListEntry.Flink != &UsedBlockListHead && current->ListEntry.Flink->Blink != ¤t->ListEntry) @@ -1004,7 +1004,7 @@ "current->next->previous %x)\n", __FILE__,__LINE__,current, current->ListEntry.Flink, current->ListEntry.Flink->Blink); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } current_entry = current_entry->Flink; @@ -1035,19 +1035,19 @@ { DbgPrint("Bad block magic (probable pool corruption) at %x\n", free); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)free > base && (ULONG_PTR)free < last ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)free < base && ((ULONG_PTR)free + free->hdr.Size) > base ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } p = avl_get_next(FreeBlockListRoot, p); } @@ -1060,13 +1060,13 @@ if ( (ULONG_PTR)used > base && (ULONG_PTR)used < last ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if ( (ULONG_PTR)used < base && ((ULONG_PTR)used + used->hdr.Size) > base ) { DbgPrint("intersecting blocks on list\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } current_entry = current_entry->Flink; @@ -1460,7 +1460,7 @@ { HDR_USED* blk=(HDR_USED*)((ULONG_PTR)Addr - HDR_USED_SIZE); if (blk->hdr.Magic != BLOCK_HDR_USED_MAGIC) - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return blk->Tag; } @@ -1510,7 +1510,7 @@ DbgPrint("NPPOL: High-side redzone overwritten, Block %x, Size %d, Tag %x(%s), Caller %x\n", (ULONG_PTR)hdr + HDR_USED_SIZE, hdr->UserSize, hdr->Tag, c, hdr->Caller); } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } #endif @@ -1728,7 +1728,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to allocate a page\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Status = MmCreateVirtualMapping(NULL, @@ -1739,7 +1739,7 @@ if (!NT_SUCCESS(Status)) { DbgPrint("Unable to create virtual mapping\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } Address = (PVOID)((ULONG_PTR)Address + PAGE_SIZE); } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -205,7 +205,7 @@ first = mid + 1; } } - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); #if defined(__GNUC__) return (LARGE_INTEGER)0LL; @@ -237,7 +237,7 @@ if (SwapEntry == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } @@ -247,13 +247,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInitializeMdl(Mdl, NULL, PAGE_SIZE); @@ -298,7 +298,7 @@ if (SwapEntry == 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } @@ -308,13 +308,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmInitializeMdl(Mdl, NULL, PAGE_SIZE); @@ -450,13 +450,13 @@ if (i >= MAX_PAGING_FILES) { DPRINT1("Bad swap entry 0x%.8X\n", Entry); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (PagingFileList[i] == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock); @@ -504,7 +504,7 @@ off = MiAllocPageFromPagingFile(PagingFileList[i]); if (off == 0xFFFFFFFF) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); KeReleaseSpinLock(&PagingFileListLock, oldIrql); return(STATUS_UNSUCCESSFUL); } @@ -518,7 +518,7 @@ } KeReleaseSpinLock(&PagingFileListLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(0); } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -66,7 +66,7 @@ PrevPageOp = PrevPageOp->Next; } KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } PMM_PAGEOP @@ -211,7 +211,7 @@ if (PageOp == NULL) { KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); return(NULL); } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -217,7 +217,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create thread stack\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* @@ -241,7 +241,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Could not create Virtual Mapping for Kernel Stack\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } /* Return the stack base */ @@ -715,7 +715,7 @@ break; default: - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -81,7 +81,7 @@ Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -177,7 +177,7 @@ } else { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -211,7 +211,7 @@ Address = entry->Address; if ((((ULONG_PTR)Address) & 0xFFF) != 0) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) @@ -301,7 +301,7 @@ } else { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } if (Address < MmSystemRangeStart) { @@ -321,7 +321,7 @@ if (current_entry == NULL) { DPRINT1("MmIsDirtyRmap: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } while (current_entry != NULL) { @@ -342,7 +342,7 @@ if (current_entry == NULL) { DPRINT1("MmIsDirtyRmap: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } while (current_entry != NULL) { @@ -392,7 +392,7 @@ new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList); if (new_entry == NULL) { - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; @@ -410,7 +410,7 @@ "address 0x%.8X\n", Process->UniqueProcessId, Address, MmGetPfnForProcess(Process, Address) << PAGE_SHIFT, Page << PAGE_SHIFT); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } ExAcquireFastMutex(&RmapListLock); @@ -427,7 +427,7 @@ DbgPrint("\n previous caller "); DbgPrint("%p", current_entry->Caller); DbgPrint("\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } current_entry = current_entry->Next; } @@ -463,7 +463,7 @@ if (current_entry == NULL) { DPRINT1("MmDeleteAllRmaps: No rmaps.\n"); - ASSERT(FALSE); + KeBugCheck(MEMORY_MANAGEMENT); } MmSetRmapListHeadPage(Page, NULL); ExReleaseFastMutex(&RmapListLock); @@ -527,5 +527,5 @@ previous_entry = current_entry; current_entry = current_entry->Next; } - ASSERT(FALSE); -} + KeBugCheck(MEMORY_MANAGEMENT); +} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -991,7 +991,6 @@ if (!KeInsertQueueApc(Apc, Apc, NULL, 2)) { /* The APC was already in the queue, fail */ - ExFreePool(Apc); Status = STATUS_UNSUCCESSFUL; } else Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/misc.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -39,7 +39,8 @@ NTSTATUS NTAPI RtlGetVersion(IN OUT PRTL_OSVERSIONINFOW lpVersionInformation) { - ULONG i, MaxLength; + LONG i; + ULONG MaxLength; if (lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) || lpVersionInformation->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOEXW)) { Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c [iso-8859-1] Mon Dec 8 02:30:30 2008 @@ -629,7 +629,7 @@ OUT PACCESS_MASK GrantedAccess, OUT PNTSTATUS AccessStatus) { - SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = {0}; + SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = { NULL, 0, NULL, NULL }; KPROCESSOR_MODE PreviousMode; PTOKEN Token; NTSTATUS Status;
15 years, 9 months
1
0
0
0
[tkreuzer] 37930: #define _INTEGRAL_MAX_BITS in _mingw.h
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 02:02:40 2008 New Revision: 37930 URL:
http://svn.reactos.org/svn/reactos?rev=37930&view=rev
Log: #define _INTEGRAL_MAX_BITS in _mingw.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/crt/_mingw.h [iso-8859-1] Mon Dec 8 02:02:40 2008 @@ -6,6 +6,8 @@ #ifndef _INC_CRTDEFS #define _INC_CRTDEFS + +#define _INTEGRAL_MAX_BITS 64 #ifndef MINGW64 #define MINGW64
15 years, 9 months
1
0
0
0
[tkreuzer] 37929: add framebased-gcchack.c to i386 build of pseh
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 02:02:07 2008 New Revision: 37929 URL:
http://svn.reactos.org/svn/reactos?rev=37929&view=rev
Log: add framebased-gcchack.c to i386 build of pseh Modified: branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/p…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/pseh/pseh.rbuild [iso-8859-1] Mon Dec 8 02:02:07 2008 @@ -6,6 +6,7 @@ <file>framebased.S</file> <file>framebased-gcchack.S</file> </directory> + <file>framebased-gcchack.c</file> </if> <if property="ARCH" value="powerpc"> <directory name="powerpc">
15 years, 9 months
1
0
0
0
[jimtabor] 37928: - Please dont break functionality due to a compiler problem, just fix it.
by jimtabor@svn.reactos.org
Author: jimtabor Date: Mon Dec 8 01:57:18 2008 New Revision: 37928 URL:
http://svn.reactos.org/svn/reactos?rev=37928&view=rev
Log: - Please dont break functionality due to a compiler problem, just fix it. Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa…
============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] Mon Dec 8 01:57:18 2008 @@ -87,6 +87,8 @@ LPPALETTEENTRY ppe) { PALETTEENTRY ippe[256]; + // Make this work! + if ((INT)cEntries < 0 ) return 0; if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE);
15 years, 9 months
1
0
0
0
[tkreuzer] 37927: forward AttachThreadInput to win32k
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 01:39:37 2008 New Revision: 37927 URL:
http://svn.reactos.org/svn/reactos?rev=37927&view=rev
Log: forward AttachThreadInput to win32k Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Mon Dec 8 01:39:37 2008 @@ -9,7 +9,7 @@ @ stdcall AppendMenuA(long long long ptr) @ stdcall AppendMenuW(long long long ptr) @ stdcall ArrangeIconicWindows(long) -@ stdcall AttachThreadInput(long long long) +@ stdcall AttachThreadInput(long long long) NtUserAttachThreadInput @ stdcall BeginDeferWindowPos(long) @ stdcall BeginPaint(long ptr) @ stdcall BlockInput(long)
15 years, 9 months
1
0
0
0
[tkreuzer] 37926: - fix *HOOKPROC definition - add 64 bit BitTest functions
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 01:37:16 2008 New Revision: 37926 URL:
http://svn.reactos.org/svn/reactos?rev=37926&view=rev
Log: - fix *HOOKPROC definition - add 64 bit BitTest functions Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/wdm.h [iso-8859-1] Mon Dec 8 01:37:16 2008 @@ -181,9 +181,14 @@ #endif } +#endif + #define BitScanForward _BitScanForward #define BitScanReverse _BitScanReverse +#ifdef _M_AMD64 +#define InterlockedBitTestAndSet64 _interlockedbittestandset64 +#define InterlockedBitTestAndReset64 _interlockedbittestandreset64 #endif Modified: branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/commdlg.h [iso-8859-1] Mon Dec 8 01:37:16 2008 @@ -213,7 +213,7 @@ #define CommDlg_OpenSave_HideControl(d,i) ((void)SNDMSG((d),CDM_HIDECONTROL,(i),0)) #define CommDlg_OpenSave_SetDefExt(d,e) ((void)SNDMSG((d),CDM_SETDEFEXT,0,(LPARAM)(e))) -typedef UINT_PTR (APIENTRY *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); +typedef UINT_PTR (CALLBACK *__CDHOOKPROC)(HWND,UINT,WPARAM,LPARAM); typedef __CDHOOKPROC LPCCHOOKPROC; typedef __CDHOOKPROC LPCFHOOKPROC; typedef __CDHOOKPROC LPFRHOOKPROC;
15 years, 9 months
1
0
0
0
[tkreuzer] 37925: - reduce differences to trunk
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Dec 8 01:36:10 2008 New Revision: 37925 URL:
http://svn.reactos.org/svn/reactos?rev=37925&view=rev
Log: - reduce differences to trunk Modified: branches/ros-amd64-bringup/reactos/base/applications/control/control.h branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec Modified: branches/ros-amd64-bringup/reactos/base/applications/control/control.h URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/control/control.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/control/control.h [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -15,4 +15,4 @@ /* Macro for calling "rundll32.exe" According to MSDN, ShellExecute returns a value greater than 32 if the operation was successful. */ -#define RUNDLL(param) ((int)(INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) +#define RUNDLL(param) ((INT_PTR)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32) Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/startuppage.c [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -185,10 +185,10 @@ switch (PtrToLong(hRootKey)) { - case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff): + case PtrToLong(HKEY_LOCAL_MACHINE): _tcscpy(Path, _T("HKLM\\\0")); break; - case (((LONG_PTR)HKEY_CURRENT_USER) & 0xff): + case PtrToLong(HKEY_CURRENT_USER): _tcscpy(Path, _T("HKCU\\\0")); break; default: Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -478,7 +478,7 @@ OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLETEMPLATE | OFN_ENABLEHOOK; saveas.lpstrDefExt = szDefaultExt; saveas.lpTemplateName = MAKEINTRESOURCE(DIALOG_ENCODING); - saveas.lpfnHook = (LPOFNHOOKPROC)DIALOG_FileSaveAs_Hook; + saveas.lpfnHook = DIALOG_FileSaveAs_Hook; if (GetSaveFileName(&saveas)) { SetFileName(szPath); Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
============================================================================== --- branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -307,7 +307,7 @@ ret = (hShExt)(NULL, _T("open"), filename, NULL, NULL, SW_SHOWNORMAL); - TRACE ("RunFile: ShellExecuteA/W returned %p\n", (DWORD_PTR)ret); + TRACE ("RunFile: ShellExecuteA/W returned 0x%p\n", ret); FreeLibrary(hShell32); return (((DWORD_PTR)ret) > 32); Modified: branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/d…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/debugsup/debugsup-ntos.spec [iso-8859-1] Mon Dec 8 01:36:10 2008 @@ -5,4 +5,4 @@ @ stdcall DbgPrompt(ptr ptr long) @ stdcall RtlAssert(ptr ptr long ptr) @ stdcall RtlUnwind(ptr ptr ptr ptr) -@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr) +@ stdcall vDbgPrintExWithPrefix(ptr long long ptr ptr)
15 years, 9 months
1
0
0
0
← Newer
1
...
54
55
56
57
58
59
60
...
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200