Ros-dev

ros-dev@reactos.org

1 participants
5790 discussions

by Love Nystrom

stefan__100__(a)hotmail.com wrote: >> And the reason you couldn't pass Parameters? > Because KeBugCheck expects the array to contain 4 entries, and Parameters isn't guranteed to be that big. > What do you think of the following? > > NTSTATUS NTAPI ExpSystemErrorHandler ( > // ... abbreviated ... > { > ULONG_PTR BugCheckParameters[MAXIMUM_HARDERROR_PARAMETERS] = {0, 0, 0, 0}; > // ... abbreviated ... > for (i = 0; i < NumberOfParameters; i++) > { > /* Copy them over */ > BugCheckParameters[i] = Parameters[i]; > } If you are going to use that, you'd better include something like this first: if (NumberOfParameters > MAXIMUM_HARDERROR_PARAMETERS) NumberOfParameters = MAXIMUM_HARDERROR_PARAMETERS; or make it for (i = 0; i < min( NumberOfParameters, MAXIMUM_HARDERROR_PARAMETERS ); i++) or you might create more problems than you solve, unless you're 100% guarateed you can never receive more than MAXIMUM_HARDERROR_PARAMETERS. (This said without studying the actual problem at hand). Best Regards // Love _________________________________________________________________ Keep your friends updated—even when you’re not signed in. http://www.microsoft.com/middleeast/windows/windowslive/see-it-in-action/so…

15 years, 11 months

Re: [ros-dev] [ros-diffs] [cgutman] 43251: - Get the length from each packet header instead of assuming that all packets will be the length of the first one

by Matthieu Suiche

Lol, this bug is really nice. -- Matthieu Suiche On Thu, Oct 1, 2009 at 11:00 PM, <cgutman(a)svn.reactos.org> wrote: > Author: cgutman > Date: Thu Oct 1 23:00:41 2009 > New Revision: 43251 > > URL: http://svn.reactos.org/svn/reactos?rev=43251&view=rev > Log: > - Get the length from each packet header instead of assuming that all packets will be the length of the first one > > Modified: > trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > > Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… > ============================================================================== > --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) > +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Thu Oct 1 23:00:41 2009 > @@ -517,8 +517,8 @@ > error = ENOBUFS; > goto done; > } > - m_copydata( m, 0, htons(ip->ip_len), new_m->m_data ); > - new_m->m_len = htons(ip->ip_len); > + m_copydata( m, 0, m->m_pkthdr.len, new_m->m_data ); > + new_m->m_len = m->m_pkthdr.len; > error = OtcpEvent.PacketSend( OtcpEvent.ClientData, > (OSK_PCHAR)new_m->m_data, new_m->m_len ); > m_free( new_m ); > > >

15 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43241: - KeBugCheckEx expects BugCheckParameter2 to point to an array when the bug code is FATAL_UNHANDLED_HARD_ERROR -- properly stub out ExpSystemErrorHandler so we don't crash in KeBugCheckEx.

by Alex Ionescu

And the reason you couldn't pass Parameters? Best regards, Alex Ionescu On Wed, Sep 30, 2009 at 2:31 PM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Wed Sep 30 20:31:26 2009 > New Revision: 43241 > > URL: http://svn.reactos.org/svn/reactos?rev=43241&view=rev > Log: > - KeBugCheckEx expects BugCheckParameter2 to point to an array when the bug code is FATAL_UNHANDLED_HARD_ERROR -- properly stub out ExpSystemErrorHandler so we don't crash in KeBugCheckEx. > > Modified: > trunk/reactos/ntoskrnl/ex/harderr.c > > Modified: trunk/reactos/ntoskrnl/ex/harderr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/harderr.c?rev=… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/harderr.c [iso-8859-1] Wed Sep 30 20:31:26 2009 > @@ -58,10 +58,12 @@ > IN PULONG_PTR Parameters, > IN BOOLEAN Shutdown) > { > + ULONG_PTR Dummy[4] = {0, 0, 0, 0}; > + > /* FIXME: STUB */ > KeBugCheckEx(FATAL_UNHANDLED_HARD_ERROR, > ErrorStatus, > - 0, > + (ULONG_PTR)Dummy, > 0, > 0); > return STATUS_SUCCESS; > > >

15 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43236: - Goodbye __USE_W32API

by WaxDragon

AND THE CROWD GOES WILD! On Oct 1, 2009 9:56 AM, "Steven Edwards" <winehacker(a)gmail.com> wrote: On Wed, Sep 30, 2009 at 9:32 AM, <sginsberg(a)svn.reactos.org> wrote: > URL: http://svn.reactos.org/svn/reactos?rev=43236&view=rev > Log: > - Goodbye __USE_W32API This is a historic day in ReactOS that unfortunately no one will really remember. Let us celebrate while we can and have much rejoicing! Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

15 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43236: - Goodbye __USE_W32API

by Steven Edwards

On Wed, Sep 30, 2009 at 9:32 AM, <sginsberg(a)svn.reactos.org> wrote: > URL: http://svn.reactos.org/svn/reactos?rev=43236&view=rev > Log: > - Goodbye __USE_W32API This is a historic day in ReactOS that unfortunately no one will really remember. Let us celebrate while we can and have much rejoicing! Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

15 years, 11 months

Re: [ros-dev] [ros-diffs] [cgutman] 43229: - Fix a nasty bug that caused us to exit the loop before sending all the data

by Aleksey Bragin

Is this an import from a new oskittcp lib release or our own modification/implementation? On Sep 30, 2009, at 5:30 AM, cgutman(a)svn.reactos.org wrote: > Author: cgutman > Date: Wed Sep 30 03:30:45 2009 > New Revision: 43229 > > URL: http://svn.reactos.org/svn/reactos?rev=43229&view=rev > Log: > - Fix a nasty bug that caused us to exit the loop before sending > all the data > > Modified: > trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > > Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ > oskittcp/oskittcp/ip_output.c?rev=43229&r1=43228&r2=43229&view=diff > ====================================================================== > ======== > --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > [iso-8859-1] (original) > +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c > [iso-8859-1] Wed Sep 30 03:30:45 2009 > @@ -522,7 +522,6 @@ > error = OtcpEvent.PacketSend( OtcpEvent.ClientData, > (OSK_PCHAR)new_m->m_data, new_m->m_len ); > m_free( new_m ); > - goto done; > } > > OS_DbgPrint(OSK_MID_TRACE,("Error from upper layer: %d\n", error)); > >

15 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43206: - Comment fixes

by Timo Kreuzer

I disagree. sginsberg(a)svn.reactos.org schrieb: > Author: sginsberg > Date: Mon Sep 28 20:02:45 2009 > New Revision: 43206 > > URL: http://svn.reactos.org/svn/reactos?rev=43206&view=rev > Log: > - Comment fixes > > Modified: > trunk/reactos/include/psdk/sdkddkver.h > > Modified: trunk/reactos/include/psdk/sdkddkver.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sdkddkver.h?r… > ============================================================================== > --- trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] (original) > +++ trunk/reactos/include/psdk/sdkddkver.h [iso-8859-1] Mon Sep 28 20:02:45 2009 > @@ -1,4 +1,4 @@ > -/* ReactOS DDK > +/* ReactOS PSDK/DDK > > This file is in the public domain. > > @@ -151,7 +151,7 @@ > #endif > #endif > > -/* Make Sure NTDDI_VERSION and _WIN32_WINNT Match */ > +/* Make Sure NTDDI_VERSION and _WIN32_WINNT Matches */ > #if ((OSVER(NTDDI_VERSION) == NTDDI_WIN2K) && (_WIN32_WINNT != _WIN32_WINNT_WIN2K)) || \ > ((OSVER(NTDDI_VERSION) == NTDDI_WINXP) && (_WIN32_WINNT != _WIN32_WINNT_WINXP)) || \ > ((OSVER(NTDDI_VERSION) == NTDDI_WS03) && (_WIN32_WINNT != _WIN32_WINNT_WS03)) || \ > > > >

15 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43167: - HAL: Make /W3 friendly - Everywhere else: Use casts instead of -1U to fix C4146 (this is compatible with both compilers)

by Alex Ionescu

No. 0xFFFFFFFF. Best regards, Alex Ionescu On Sat, Sep 26, 2009 at 9:41 AM, <sginsberg(a)svn.reactos.org> wrote: > Author: sginsberg > Date: Sat Sep 26 15:41:57 2009 > New Revision: 43167 > > URL: http://svn.reactos.org/svn/reactos?rev=43167&view=rev > Log: > - HAL: Make /W3 friendly > - Everywhere else: Use casts instead of -1U to fix C4146 (this is compatible with both compilers) > > Modified: > trunk/reactos/boot/freeldr/freeldr/debug.c > trunk/reactos/dll/cpl/console/colors.c > trunk/reactos/dll/cpl/console/layout.c > trunk/reactos/dll/cpl/main/mouse.c > trunk/reactos/dll/win32/kernel32/debug/debugger.c > trunk/reactos/dll/win32/kernel32/file/file.c > trunk/reactos/dll/win32/opengl32/opengl32.c > trunk/reactos/hal/halx86/generic/dma.c > trunk/reactos/hal/halx86/generic/pci.c > trunk/reactos/hal/halx86/include/ioapic.h > trunk/reactos/hal/halx86/mp/apic.c > trunk/reactos/hal/halx86/mp/ioapic.c > trunk/reactos/hal/halx86/mp/mpconfig.c > trunk/reactos/lib/cmlib/hivedata.h > trunk/reactos/lib/rtl/debug.c > trunk/reactos/ntoskrnl/ex/init.c > trunk/reactos/ntoskrnl/ps/psmgr.c > > Modified: trunk/reactos/boot/freeldr/freeldr/debug.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… > ============================================================================== > --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) > +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -311,7 +311,7 @@ > Length = _vsnprintf(Buffer, 512, Format, ap); > > /* Check if we went past the buffer */ > - if (Length == -1U) > + if (Length == (ULONG)-1) > { > /* Terminate it if we went over-board */ > Buffer[sizeof(Buffer) - 1] = '\n'; > > Modified: trunk/reactos/dll/cpl/console/colors.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/colors.c?r… > ============================================================================== > --- trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/console/colors.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -116,7 +116,7 @@ > break; > } > > - if (red == -1U) > + if (red == (DWORD)-1) > { > red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0); > if (HIWORD(red)) > @@ -127,7 +127,7 @@ > red = LOBYTE(red); > } > > - if (green == -1U) > + if (green == (DWORD)-1) > { > green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0); > if (HIWORD(green)) > @@ -138,7 +138,7 @@ > green = LOBYTE(green); > } > > - if (blue == -1U) > + if (blue == (DWORD)-1) > { > blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0); > if (HIWORD(blue)) > > Modified: trunk/reactos/dll/cpl/console/layout.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… > ============================================================================== > --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -160,7 +160,7 @@ > SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); > SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); > > - if (pConInfo->WindowPosition != -1U) > + if (pConInfo->WindowPosition != (DWORD)-1) > { > SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, LOWORD(pConInfo->WindowPosition), FALSE); > SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, HIWORD(pConInfo->WindowPosition), FALSE); > > Modified: trunk/reactos/dll/cpl/main/mouse.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=4… > ============================================================================== > --- trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/main/mouse.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -968,7 +968,7 @@ > GetSysColor(COLOR_WINDOWTEXT)); > } > > - if (lpdis->itemID != -1U) > + if (lpdis->itemID != (UINT)-1) > { > CopyRect(&rc, &lpdis->rcItem); > rc.left += 5; > > Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -232,7 +232,7 @@ > CLIENT_ID ClientId; > > /* If we don't have a PID, look it up */ > - if (dwProcessId == -1U) dwProcessId = (DWORD)CsrGetProcessId(); > + if (dwProcessId == (DWORD)-1) dwProcessId = (DWORD)CsrGetProcessId(); > > /* Open a handle to the process */ > ClientId.UniqueThread = NULL; > > Modified: trunk/reactos/dll/win32/kernel32/file/file.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… > ============================================================================== > --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -534,7 +534,7 @@ > *lpDistanceToMoveHigh = FilePosition.CurrentByteOffset.u.HighPart; > } > > - if (FilePosition.CurrentByteOffset.u.LowPart == -1U) > + if (FilePosition.CurrentByteOffset.u.LowPart == (DWORD)-1) > { > /* The value of -1 is valid here, especially when the new > file position is greater than 4 GB. Since NtSetInformationFile > > Modified: trunk/reactos/dll/win32/opengl32/opengl32.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/opengl3… > ============================================================================== > --- trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/opengl32/opengl32.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -21,7 +21,7 @@ > > /* global vars */ > /* Do not assume it have the free value -1 set, any value can be in here */ > -DWORD OPENGL32_tls = -1U; > +DWORD OPENGL32_tls = -1; > GLPROCESSDATA OPENGL32_processdata; > > > @@ -103,7 +103,7 @@ > TRUE /* bInheritHandle */ }; > > OPENGL32_tls = TlsAlloc(); > - if (-1U == OPENGL32_tls) > + if ((DWORD)-1 == OPENGL32_tls) > return FALSE; > > memset( &OPENGL32_processdata, 0, sizeof (OPENGL32_processdata) ); > @@ -179,7 +179,7 @@ > CloseHandle( OPENGL32_processdata.dcdata_mutex ); > > /* free TLS */ > - if (OPENGL32_tls != -1U) > + if (OPENGL32_tls != (DWORD)-1) > TlsFree(OPENGL32_tls); > } > > > Modified: trunk/reactos/hal/halx86/generic/dma.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -1991,7 +1991,7 @@ > 0); > > /* Check if nothing was found */ > - if (MapRegisterNumber == -1U) > + if (MapRegisterNumber == (ULONG)-1) > { > /* No free registers found, so use the base registers */ > RtlSetBits(MasterAdapter->MapRegisters, > > Modified: trunk/reactos/hal/halx86/generic/pci.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pci.c?r… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/pci.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -572,7 +572,7 @@ > { > ResourceCount++; > > - Offset = FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); > + Offset = (UCHAR)FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); > > /* Write 0xFFFFFFFF there */ > WriteBuffer = 0xffffffff; > > Modified: trunk/reactos/hal/halx86/include/ioapic.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/ioapic.… > ============================================================================== > --- trunk/reactos/hal/halx86/include/ioapic.h [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/include/ioapic.h [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -15,7 +15,7 @@ > #define IOAPIC_REDTBL 0x0010 /* Redirection Table (0-23 64-bit registers) (R/W) */ > > #define IOAPIC_ID_MASK (0xF << 24) > -#define GET_IOAPIC_ID(x) (((x) & IOAPIC_ID_MASK) >> 24) > +#define GET_IOAPIC_ID(x) ((UCHAR)(((x) & IOAPIC_ID_MASK) >> 24)) > #define SET_IOAPIC_ID(x) ((x) << 24) > > #define IOAPIC_VER_MASK (0xFF) > @@ -68,8 +68,8 @@ > > typedef struct _IOAPIC_INFO > { > - ULONG ApicId; /* APIC ID */ > - ULONG ApicVersion; /* APIC version */ > + UCHAR ApicId; /* APIC ID */ > + UCHAR ApicVersion; /* APIC version */ > ULONG ApicAddress; /* APIC address */ > ULONG EntryCount; /* Number of redirection entries */ > } IOAPIC_INFO, *PIOAPIC_INFO; > > Modified: trunk/reactos/hal/halx86/mp/apic.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… > ============================================================================== > --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -823,7 +823,7 @@ > if (TSCPresent) > { > t2.QuadPart = (LONGLONG)__rdtsc(); > - CPUMap[CPU].CoreSpeed = (HZ * (t2.QuadPart - t1.QuadPart)); > + CPUMap[CPU].CoreSpeed = (HZ * (ULONG)(t2.QuadPart - t1.QuadPart)); > DPRINT("CPU clock speed is %ld.%04ld MHz.\n", > CPUMap[CPU].CoreSpeed/1000000, > CPUMap[CPU].CoreSpeed%1000000); > @@ -856,10 +856,10 @@ > Access.SegmentType = I386_INTERRUPT_GATE; > > idt = (KIDTENTRY*)((ULONG)KeGetPcr()->IDT + index * sizeof(KIDTENTRY)); > - idt->Offset = address & 0xffff; > + idt->Offset = (USHORT)(address & 0xffff); > idt->Selector = KGDT_R0_CODE; > idt->Access = Access.Value; > - idt->ExtendedOffset = address >> 16; > + idt->ExtendedOffset = (USHORT)(address >> 16); > } > > VOID HaliInitBSP(VOID) > > Modified: trunk/reactos/hal/halx86/mp/ioapic.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/ioapic.c?rev… > ============================================================================== > --- trunk/reactos/hal/halx86/mp/ioapic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/mp/ioapic.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -661,7 +661,7 @@ > > VOID Disable8259AIrq(ULONG irq) > { > - ULONG tmp; > + UCHAR tmp; > > if (irq >= 8) > { > > Modified: trunk/reactos/hal/halx86/mp/mpconfig.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/mpconfig.c?r… > ============================================================================== > --- trunk/reactos/hal/halx86/mp/mpconfig.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/mp/mpconfig.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -83,7 +83,7 @@ > static VOID > HaliMPProcessorInfo(PMP_CONFIGURATION_PROCESSOR m) > { > - ULONG ver; > + UCHAR ver; > > if (!(m->CpuFlags & CPU_FLAG_ENABLED)) > return; > @@ -176,7 +176,7 @@ > static VOID > HaliMPBusInfo(PMP_CONFIGURATION_BUS m) > { > - static ULONG CurrentPCIBusId = 0; > + static UCHAR CurrentPCIBusId = 0; > > DPRINT("Bus #%d is %.*s\n", m->BusId, 6, m->BusType); > > @@ -357,7 +357,7 @@ > HaliConstructDefaultIOIrqMPTable(ULONG Type) > { > MP_CONFIGURATION_INTSRC intsrc; > - ULONG i; > + UCHAR i; > > intsrc.Type = MPCTE_INTSRC; > intsrc.IrqFlag = 0; /* conforming */ > @@ -394,8 +394,8 @@ > MP_CONFIGURATION_BUS bus; > MP_CONFIGURATION_IOAPIC ioapic; > MP_CONFIGURATION_INTLOCAL lintsrc; > - ULONG linttypes[2] = { INT_EXTINT, INT_NMI }; > - ULONG i; > + UCHAR linttypes[2] = { INT_EXTINT, INT_NMI }; > + UCHAR i; > > /* > * 2 CPUs, numbered 0 & 1. > > Modified: trunk/reactos/lib/cmlib/hivedata.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=4… > ============================================================================== > --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) > +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -80,7 +80,7 @@ > // > // Cell Magic Values > // > -#define HCELL_NIL -1U > +#define HCELL_NIL (ULONG)-1 > #define HCELL_CACHED 1 > > #define HCELL_TYPE_MASK 0x80000000 > > Modified: trunk/reactos/lib/rtl/debug.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=43167&… > ============================================================================== > --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) > +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -61,7 +61,7 @@ > EXCEPTION_RECORD ExceptionRecord; > > /* Check if we should print it or not */ > - if ((ComponentId != -1U) && > + if ((ComponentId != (ULONG)-1) && > !(NtQueryDebugFilterState(ComponentId, Level))) > { > /* This message is masked */ > @@ -96,7 +96,7 @@ > _SEH2_END; > > /* Check if we went past the buffer */ > - if (Length == -1U) > + if (Length == (ULONG)-1) > { > /* Terminate it if we went over-board */ > Buffer[sizeof(Buffer) - 1] = '\n'; > > Modified: trunk/reactos/ntoskrnl/ex/init.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=431… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -466,7 +466,7 @@ > > /* Make sure the buffer is a valid string which within the given length */ > if ((NtInitialUserProcessBufferType != REG_SZ) || > - ((NtInitialUserProcessBufferLength != -1U) && > + ((NtInitialUserProcessBufferLength != (ULONG)-1) && > ((NtInitialUserProcessBufferLength < sizeof(WCHAR)) || > (NtInitialUserProcessBufferLength > > sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR))))) > @@ -1429,7 +1429,7 @@ > if (!ExpRealTimeIsUniversal) > { > /* Check if we don't have a valid bias */ > - if (ExpLastTimeZoneBias == -1U) > + if (ExpLastTimeZoneBias == (ULONG)-1) > { > /* Reset */ > ResetBias = TRUE; > > Modified: trunk/reactos/ntoskrnl/ps/psmgr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=43… > ============================================================================== > --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sat Sep 26 15:41:57 2009 > @@ -443,7 +443,7 @@ > /* Now multiply limits by 1MB */ > PspDefaultPagedLimit <<= 20; > PspDefaultNonPagedLimit <<= 20; > - if (PspDefaultPagefileLimit != -1U) PspDefaultPagefileLimit <<= 20; > + if (PspDefaultPagefileLimit != (ULONG)-1) PspDefaultPagefileLimit <<= 20; > > /* Initialize the Active Process List */ > InitializeListHead(&PsActiveProcessHead); > > >

15 years, 11 months

Re: [ros-dev] [ros-diffs] [sginsberg] 43167: - HAL: Make /W3friendly - Everywhere else: Use casts instead of -1U to fixC4146 (this is compatible with both compilers)

by WaxDragon

And now you have added zero to this discussion. Just because Alex questions someone's basic skills doesn't mean that noobs are working on critical components. For some, this is an entirely academic endeavor, and Alex's feedback is essential criticisim. Blah, blah, blah, WD (Sent from my G1) On Sep 26, 2009 2:29 PM, <betam4x(a)gmail.com> wrote: I'm sorry, had to reply to this one. I may be way off base here since the contents of this email are based solely upon alex's reply. People that don't understand the basics of programming are working on system components? I understand that people want to help, but allowing this does more harm than good. What happened to all of the talent anyway? In my opinion, someone that does nor understand C should not be tasked with working on the hardware abstraction layer. This was not meant to be an insult or attack in any way, shape, or form to anyone involved with this thread. Posted from my crackberry. Regards, Richard Campbell Sent from my Verizon Wireless BlackBerry -----Original Message----- From: Alex Ionescu <ionucu(a)videotron.ca> Date: Sat, 26 Sep 2009 14:06:4...

15 years, 11 months

Re: [ros-dev] [ros-diffs] [hpoussin] 43145: Revert r43141 to try to fix ReactOS boot style...

by Alex Ionescu

Fuck. Best regards, Alex Ionescu On Fri, Sep 25, 2009 at 11:10 AM, <hpoussin(a)svn.reactos.org> wrote: > Author: hpoussin > Date: Fri Sep 25 17:10:28 2009 > New Revision: 43145 > > URL: http://svn.reactos.org/svn/reactos?rev=43145&view=rev > Log: > Revert r43141 to try to fix ReactOS boot style... > > Modified: > trunk/reactos/ntoskrnl/io/iomgr/arcname.c > > Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… > ============================================================================== > --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Fri Sep 25 17:10:28 2009 > @@ -19,6 +19,107 @@ > PCHAR IoLoaderArcBootDeviceName; > > /* FUNCTIONS *****************************************************************/ > + > +BOOLEAN > +INIT_FUNCTION > +NTAPI > +IopApplyRosCdromArcHack(IN ULONG i) > +{ > + ULONG DeviceNumber = -1; > + OBJECT_ATTRIBUTES ObjectAttributes; > + ANSI_STRING InstallName; > + UNICODE_STRING DeviceName; > + CHAR Buffer[128], RosSysPath[16]; > + FILE_BASIC_INFORMATION FileInfo; > + NTSTATUS Status; > + PCHAR p, q; > + PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); > + extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; > + > + /* Change this if you want ROS to boot properly from another directory */ > + sprintf(RosSysPath, "%s", "reactos"); > + > + /* Only ARC Name left - Build full ARC Name */ > + p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); > + if (p) > + { > + /* Build installer name */ > + sprintf(Buffer, "\\Device\\CdRom%lu\\%s\\ntoskrnl.exe", i, RosSysPath); > + RtlInitAnsiString(&InstallName, Buffer); > + Status = RtlAnsiStringToUnicodeString(&DeviceName, &InstallName, TRUE); > + if (!NT_SUCCESS(Status)) return FALSE; > + > + /* Try to find the installer */ > + InitializeObjectAttributes(&ObjectAttributes, > + &DeviceName, > + 0, > + NULL, > + NULL); > + Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); > + > + /* Free the string */ > + RtlFreeUnicodeString(&DeviceName); > + > + /* Check if we found the file */ > + if (NT_SUCCESS(Status)) > + { > + /* We did, save the device number */ > + DeviceNumber = i; > + } > + else > + { > + /* Build live CD kernel name */ > + sprintf(Buffer, > + "\\Device\\CdRom%lu\\%s\\system32\\ntoskrnl.exe", > + i, RosSysPath); > + RtlInitAnsiString(&InstallName, Buffer); > + Status = RtlAnsiStringToUnicodeString(&DeviceName, > + &InstallName, > + TRUE); > + if (!NT_SUCCESS(Status)) return FALSE; > + > + /* Try to find it */ > + InitializeObjectAttributes(&ObjectAttributes, > + &DeviceName, > + 0, > + NULL, > + NULL); > + Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); > + if (NT_SUCCESS(Status)) DeviceNumber = i; > + > + /* Free the string */ > + RtlFreeUnicodeString(&DeviceName); > + } > + > + if (!InitIsWinPEMode) > + { > + /* Build the name */ > + sprintf(p, "cdrom(%lu)", DeviceNumber); > + > + /* Adjust original command line */ > + q = strchr(p, ')'); > + if (q) > + { > + q++; > + strcpy(Buffer, q); > + sprintf(p, "cdrom(%lu)", DeviceNumber); > + strcat(p, Buffer); > + } > + } > + } > + > + /* OK, how many disks are there? */ > + DeviceNumber += ConfigInfo->DiskCount; > + > + /* Return whether this is the CD or not */ > + if ((InitIsWinPEMode) || (ExpInTextModeSetup)) > + { > + return TRUE; > + } > + > + /* Failed */ > + return FALSE; > +} > > BOOLEAN > INIT_FUNCTION > @@ -177,8 +278,7 @@ > BOOLEAN > INIT_FUNCTION > NTAPI > -IopAssignArcNamesToCdrom(IN PLOADER_PARAMETER_BLOCK LoaderBlock, > - IN PULONG Buffer, > +IopAssignArcNamesToCdrom(IN PULONG Buffer, > IN ULONG DiskNumber) > { > CHAR ArcBuffer[128]; > @@ -192,10 +292,6 @@ > ULONG i, CheckSum = 0; > PDEVICE_OBJECT DeviceObject; > PFILE_OBJECT FileObject; > - PARC_DISK_INFORMATION ArcDiskInfo = LoaderBlock->ArcDiskInformation; > - PLIST_ENTRY NextEntry; > - PARC_DISK_SIGNATURE ArcDiskEntry; > - BOOLEAN IsBootCdRom = FALSE; > > /* Build the device name */ > sprintf(ArcBuffer, "\\Device\\CdRom%lu", DiskNumber); > @@ -252,24 +348,22 @@ > /* Now calculate the checksum */ > for (i = 0; i < 2048 / sizeof(ULONG); i++) CheckSum += Buffer[i]; > > - /* Search if this device is the actual boot CD */ > - for (NextEntry = ArcDiskInfo->DiskSignatureListHead.Flink; > - NextEntry != &ArcDiskInfo->DiskSignatureListHead; > - NextEntry = NextEntry->Flink) > - { > - /* Get the current ARC disk signature entry */ > - ArcDiskEntry = CONTAINING_RECORD(NextEntry, > - ARC_DISK_SIGNATURE, > - ListEntry); > - if (CheckSum == ArcDiskEntry->CheckSum && > - strcmp(KeLoaderBlock->ArcBootDeviceName, ArcDiskEntry->ArcName) == 0) > - { > - IsBootCdRom = TRUE; > - break; > - } > - } > - > - if (IsBootCdRom) > + /* > + * FIXME: In normal conditions, NTLDR/FreeLdr sends the *proper* CDROM > + * ARC Path name, and what happens here is a comparision of both checksums > + * in order to see if this is the actual boot CD. > + * > + * In ReactOS this doesn't currently happen, instead we have a hack on top > + * of this file which scans the CD for the ntoskrnl.exe file, then modifies > + * the LoaderBlock's ARC Path with the right CDROM path. Consequently, we > + * get the same state as if NTLDR had properly booted us, except that we do > + * not actually need to check the signature, since the hack already did the > + * check for ntoskrnl.exe, which is just as good. > + * > + * The signature code stays however, because eventually FreeLDR will work > + * like NTLDR, and, conversly, we do want to be able to be booted by NTLDR. > + */ > + if (IopApplyRosCdromArcHack(DiskNumber)) > { > /* This is the boot CD-ROM, build the ARC name */ > sprintf(ArcBuffer, "\\ArcName\\%s", KeLoaderBlock->ArcBootDeviceName); > @@ -489,7 +583,7 @@ > for (i = 0; i < ConfigInfo->CdRomCount; i++) > { > /* Give it an ARC name */ > - if (IopAssignArcNamesToCdrom(LoaderBlock, PartitionBuffer, i)) break; > + if (IopAssignArcNamesToCdrom(PartitionBuffer, i)) break; > } > > /* Free the buffer */ > > >

15 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev