Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 15520: Strip files on retail builds and do not send file/section alignment twice
by ion＠svn.reactos.com 26 May '05

26 May '05

Strip files on retail builds and do not send file/section alignment twice Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-05-26 13:53:15 UTC (rev 15519) +++ trunk/reactos/tools/helper.mk 2005-05-26 13:55:13 UTC (rev 15520) @@ -277,6 +277,8 @@ MK_BOOTCDDIR := . MK_DISTDIR := drivers MK_RES_BASE := $(TARGET_NAME) + MK_LFLAGS := -Wl,--file-alignment,0x1000 \ + -Wl,--section-alignment,0x1000 endif ifeq ($(TARGET_TYPE),hal) @@ -697,6 +699,7 @@ MK_CPPFLAGS += -O2 -Wno-strict-aliasing MK_CPPFLAGS += -mpreferred-stack-boundary=2 + OPTIMIZE = yes endif ifneq ($(TARGET_LIBS),) @@ -877,6 +880,11 @@ $(MK_FULLNAME): $(MK_NOSTRIPNAME) $(MK_EXTRADEP) $(HALFVERBOSEECHO) [RSYM] $(MK_FULLNAME) $(RSYM) $(MK_NOSTRIPNAME) $(MK_FULLNAME) + +# Strip the files on release builds +ifeq ($(DBG),0) + $(STRIP) -x $(MK_FULLNAME) +endif # DBG endif # KM_MODE @@ -908,8 +916,6 @@ $(LD_CC) $(TARGET_LFLAGS) \ -Wl,--subsystem,native \ -Wl,--image-base,$(TARGET_BASE) \ - -Wl,--file-alignment,0x1000 \ - -Wl,--section-alignment,0x1000 \ -Wl,--entry,$(TARGET_ENTRY) \ -Wl,temp.exp -mdll \ -o $(MK_NOSTRIPNAME) \ @@ -929,6 +935,11 @@ $(HALFVERBOSEECHO) [RSYM] $(MK_FULLNAME) $(RSYM) $(MK_NOSTRIPNAME) $(MK_FULLNAME) +# Strip the files on release builds +ifeq ($(DBG),0) + $(STRIP) -x $(MK_FULLNAME) +endif # DBG + endif # MK_MODE # Static library target

1 0

[ion] 15519: DEBUG1 on checked only
by ion＠svn.reactos.com 26 May '05

26 May '05

DEBUG1 on checked only Modified: trunk/reactos/ntoskrnl/include/internal/debug.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-05-26 13:52:30 UTC (rev 15518) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-05-26 13:53:15 UTC (rev 15519) @@ -73,9 +73,16 @@ #define CPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint #endif +#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ +#define DPRINT1(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) +#else +#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint +#endif + #else /* DBG */ #define CPRINT(args...) +#define DPRINT1(args...) #define assert(x) #define ASSERT(x) #define assertmsg(_c_, _m_) @@ -83,12 +90,6 @@ #endif /* DBG */ -#ifdef __GNUC__ /* using GNU C/C99 macro ellipsis */ -#define DPRINT1(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) -#else -#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint -#endif - #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0) #ifndef NDEBUG

1 0

[ion] 15518: make PE loader more lenient with alignment. it could previously not load PEs that I can load on Windows
by ion＠svn.reactos.com 26 May '05

26 May '05

make PE loader more lenient with alignment. it could previously not load PEs that I can load on Windows Modified: trunk/reactos/ntoskrnl/mm/pe.c _____ Modified: trunk/reactos/ntoskrnl/mm/pe.c --- trunk/reactos/ntoskrnl/mm/pe.c 2005-05-26 13:50:52 UTC (rev 15517) +++ trunk/reactos/ntoskrnl/mm/pe.c 2005-05-26 13:52:30 UTC (rev 15518) @@ -518,8 +518,8 @@ /* size of the executable's headers */ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders)) { - if(!IsAligned(piohOptHeader->SizeOfHeaders, nFileAlignment)) - DIE(("SizeOfHeaders is not aligned\n")); + //if(!IsAligned(piohOptHeader->SizeOfHeaders, nFileAlignment)) + //DIE(("SizeOfHeaders is not aligned\n")); if(cbSectionHeadersSize > piohOptHeader->SizeOfHeaders) DIE(("The section headers overflow SizeOfHeaders\n")); @@ -611,7 +611,7 @@ /* initialize the headers segment */ pssSegments = ImageSectionObject->Segments; - ASSERT(IsAligned(cbHeadersSize, nFileAlignment)); + //ASSERT(IsAligned(cbHeadersSize, nFileAlignment)); if(!AlignUp(&nFileSizeOfHeaders, cbHeadersSize, nFileAlignment)) DIE(("Cannot align the size of the section headers\n")); @@ -655,8 +655,8 @@ DIE(("SizeOfRawData[%u] is not aligned\n", i)); #endif - if(!IsAligned(pishSectionHeaders[i].PointerToRawData, nFileAlignment)) - DIE(("PointerToRawData[%u] is not aligned\n", i)); + //if(!IsAligned(pishSectionHeaders[i].PointerToRawData, nFileAlignment)) + //DIE(("PointerToRawData[%u] is not aligned\n", i)); /* conversion */ pssSegments[i].FileOffset = pishSectionHeaders[i].PointerToRawData;

1 0

[ion] 15517: Set non-retail (checked) build as default. Developers should have no reason to use a retail build unless testing a final release version. This also speeds up compilation and reduces the number of compile errors due to developers building with dbg=0 and breaking dbg=1 code. Please do not code with dbg=0 without testing your patches in dbg=1.
by ion＠svn.reactos.com 26 May '05

26 May '05

Set non-retail (checked) build as default. Developers should have no reason to use a retail build unless testing a final release version. This also speeds up compilation and reduces the number of compile errors due to developers building with dbg=0 and breaking dbg=1 code. Please do not code with dbg=0 without testing your patches in dbg=1. Modified: trunk/reactos/config _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-05-26 13:48:55 UTC (rev 15516) +++ trunk/reactos/config 2005-05-26 13:50:52 UTC (rev 15517) @@ -14,7 +14,7 @@ # be optimized for. # -OARCH := i486 +OARCH := i486 # # Whether to compile in the kernel debugger @@ -25,7 +25,7 @@ # Whether to compile for debugging # Enabling this enables ASSERTS, GDB and Special Debug Routines # -DBG := 0 +DBG := 1 # # Whether to compile a multiprocessor or single processor version

1 0

[ion] 15516: Do not print DPRINT1s on retail builds
by ion＠svn.reactos.com 26 May '05

26 May '05

Do not print DPRINT1s on retail builds Modified: trunk/reactos/include/debug.h Modified: trunk/reactos/include/ntdll/ntdll.h Modified: trunk/reactos/include/win32k/debug1.h Modified: trunk/reactos/include/wine/debug.h _____ Modified: trunk/reactos/include/debug.h --- trunk/reactos/include/debug.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/debug.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -48,12 +48,20 @@ #endif #endif - /* TODO: Make the output of file/line and the debug message atomic */ +#ifdef DBG #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); +#else +#ifdef __GNUC__ +#define DPRINT1(args...) +#define CHECKPOINT1 +#else +#define DPRINT1 +#define CHECKPOINT1 +#endif /* __GNUC__ */ +#endif - #ifndef NDEBUG #define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); _____ Modified: trunk/reactos/include/ntdll/ntdll.h --- trunk/reactos/include/ntdll/ntdll.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/ntdll/ntdll.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -29,12 +29,17 @@ #define CHECKPOINT do { DbgPrint("(NTDLL:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) #endif +#ifdef DBG #if defined(__GNUC__) #define DPRINT1(args...) do { DbgPrint("(NTDLL:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) #else #define DPRINT1 DbgPrint("(NTDLL:%s:%d) ",__FILE__,__LINE__); DbgPrint #endif #define CHECKPOINT1 do { DbgPrint("(NTDLL:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) +#else +#define DPRINT1(args...) +#define CHECKPOINT1(args...) +#endif #define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) #define ROUNDDOWN(a,b) (((a)/(b))*(b)) _____ Modified: trunk/reactos/include/win32k/debug1.h --- trunk/reactos/include/win32k/debug1.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/win32k/debug1.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -39,10 +39,14 @@ #endif #endif +#ifdef DBG #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("%s:%d\n",__FILE__,__LINE__); +#else +#define DPRINT1(args...) +#define CHECKPOINT1(args...) +#endif - #ifdef __NTOSKRNL__ #define DPRINT_CHECKS #else _____ Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/wine/debug.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -12,7 +12,11 @@ unsigned long DbgPrint(char *Format,...); +#if DBG #define DPRINT1 DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint +#else +#define DPRINT1(args...) +#endif #if !defined(DBG) || !defined(YDEBUG) #ifdef __GNUC__

1 0

[ion] 15515: Enable and fix NE2000 settings so it works out-of-the-box for QEMU users
by ion＠svn.reactos.com 26 May '05

26 May '05

Enable and fix NE2000 settings so it works out-of-the-box for QEMU users Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-26 13:45:48 UTC (rev 15514) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-26 13:47:21 UTC (rev 15515) @@ -532,7 +532,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Group",0x00000000,"De bug" HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","ImagePath",0x00020000 ,"system32\drivers\debugout.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x 00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Start",0x00010001,0x 00000004 HKLM,"SYSTEM\CurrentControlSet\Services\DebugOut","Type",0x00010001,0x00 000001 ; Disk class driver @@ -678,7 +678,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","ErrorControl",0x0001000 1,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Group",0x00000000,"NDIS " HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","ImagePath",0x00020000," system32\drivers\ne2000.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Start",0x00010001,0x00 000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Start",0x00010001,0x00 000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Type",0x00010001,0x0000 0001 HKLM,"SYSTEM\CurrentControlSet\Services\Ne2000","Route",0x00000000,"Ne20 001" @@ -690,8 +690,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0001\Linkage","Export",0x00000000,"\Device\Ne20001" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0001\Linkage","RootDevice",0x00000000,"Ne20001" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0001\Linkage","UpperBind",0x00000000,"Tcpip" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","Port",0x00000000,"280" -HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","Irq",0x00000000,"9" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","Port",0x00000000,"c100" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-0 8002BE10318}\0001","Irq",0x00000000,"B" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08 002BE10318}\0001","NetworkAddress",0x00000000,"001122334455" HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","Defau ltGateway",0x00010000,"0.0.0.0" HKLM,"SYSTEM\CurrentControlSet\Services\Ne20001\Parameters\Tcpip","IPAdd ress",0x00010000,"0.0.0.0"

1 0

[ion] 15514: Fix debug messages which previously forced NDEBUG to be off
by ion＠svn.reactos.com 26 May '05

26 May '05

Fix debug messages which previously forced NDEBUG to be off Modified: trunk/reactos/hal/halx86/mp/mpconfig.c _____ Modified: trunk/reactos/hal/halx86/mp/mpconfig.c --- trunk/reactos/hal/halx86/mp/mpconfig.c 2005-05-26 13:45:08 UTC (rev 15513) +++ trunk/reactos/hal/halx86/mp/mpconfig.c 2005-05-26 13:45:48 UTC (rev 15514) @@ -16,7 +16,7 @@ #include <apic.h> #include <ioapic.h> -//#define NDEBUG +#define NDEBUG #include <internal/debug.h> /* GLOBALS ******************************************************************/ @@ -58,7 +58,7 @@ IRQCount++; } -static PCHAR +PCHAR HaliMPFamily(ULONG Family, ULONG Model) { @@ -275,9 +275,9 @@ { PUCHAR pc = (PUCHAR)&Table->Signature; - DPRINT1("Bad MP configuration block signature: %c%c%c%c\n", + DPRINT1("Bad MP configuration block signature: %c%c%c%c\n", pc[0], pc[1], pc[2], pc[3]); - KEBUGCHECK(0); + KEBUGCHECKEX(0, pc[0], pc[1], pc[2], pc[3]); return FALSE; }

1 0

[ion] 15513: Dynamically load and detect iphlpapi. Makes rpcrt4 work on systems without the DLL and also does not force every app on the system to load the network libraries like before
by ion＠svn.reactos.com 26 May '05

26 May '05

Dynamically load and detect iphlpapi. Makes rpcrt4 work on systems without the DLL and also does not force every app on the system to load the network libraries like before Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4_main.c --- trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-05-26 13:44:14 UTC (rev 15512) +++ trunk/reactos/lib/rpcrt4/rpcrt4_main.c 2005-05-26 13:45:08 UTC (rev 15513) @@ -319,6 +319,8 @@ *time += TICKS_15_OCT_1582_TO_1601; } +typedef DWORD WINAPI (*LPGETADAPTERSINFO)(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen); + /* Assume that a hardware address is at least 6 bytes long */ #define ADDRESS_BYTES_NEEDED 6 @@ -329,28 +331,46 @@ ULONG buflen = sizeof(IP_ADAPTER_INFO); PIP_ADAPTER_INFO adapter = HeapAlloc(GetProcessHeap(), 0, buflen); + HANDLE hIpHlpApi; + LPGETADAPTERSINFO pGetAdaptersInfo; + + hIpHlpApi = LoadLibrary("iphlpapi.dll"); + if (hIpHlpApi) + { + pGetAdaptersInfo = (LPGETADAPTERSINFO)GetProcAddress(hIpHlpApi, "GetAdaptersInfo"); + if (pGetAdaptersInfo) + { + if (pGetAdaptersInfo(adapter, &buflen) == ERROR_BUFFER_OVERFLOW) { + HeapFree(GetProcessHeap(), 0, adapter); + adapter = HeapAlloc(GetProcessHeap(), 0, buflen); + } - if (GetAdaptersInfo(adapter, &buflen) == ERROR_BUFFER_OVERFLOW) { - HeapFree(GetProcessHeap(), 0, adapter); - adapter = HeapAlloc(GetProcessHeap(), 0, buflen); - } - - if (GetAdaptersInfo(adapter, &buflen) == NO_ERROR) { - for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { - address[i] = adapter->Address[i]; + if (pGetAdaptersInfo(adapter, &buflen) == NO_ERROR) { + for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { + address[i] = adapter->Address[i]; + } + } + else + { + goto local; + } } + + /* Free the Library */ + FreeLibrary(hIpHlpApi); + goto exit; } + +local: /* We can't get a hardware address, just use random numbers. - Set the multicast bit to prevent conflicts with real cards. */ - else { - for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { - address[i] = rand() & 0xff; - } - - address[0] |= 0x01; - status = RPC_S_UUID_LOCAL_ONLY; + Set the multicast bit to prevent conflicts with real cards. */ + for (i = 0; i < ADDRESS_BYTES_NEEDED; i++) { + address[i] = rand() & 0xff; } - + address[0] |= 0x01; + status = RPC_S_UUID_LOCAL_ONLY; + +exit: HeapFree(GetProcessHeap(), 0, adapter); return status; }

1 0

[ion] 15512: Mark initial loader APIs are INIT_FUNCTION so they can be freed
by ion＠svn.reactos.com 26 May '05

26 May '05

Mark initial loader APIs are INIT_FUNCTION so they can be freed Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c _____ Modified: trunk/reactos/ntoskrnl/ldr/sysdll.c --- trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-05-26 13:43:52 UTC (rev 15511) +++ trunk/reactos/ntoskrnl/ldr/sysdll.c 2005-05-26 13:44:14 UTC (rev 15512) @@ -56,6 +56,7 @@ NTSTATUS STDCALL +INIT_FUNCTION LdrpGetSystemDllEntryPoints(VOID) { ANSI_STRING ProcedureName; @@ -169,6 +170,7 @@ NTSTATUS STDCALL +INIT_FUNCTION LdrpInitializeSystemDll(VOID) { UNICODE_STRING DllPathname = ROS_STRING_INITIALIZER(L"\\SystemRoot\\system32\\ntdll.dll");

1 0

[ion] 15511: Do not build debug PS function on reatail build
by ion＠svn.reactos.com 26 May '05

26 May '05

Do not build debug PS function on reatail build Modified: trunk/reactos/ntoskrnl/ps/debug.c _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2005-05-26 13:43:13 UTC (rev 15510) +++ trunk/reactos/ntoskrnl/ps/debug.c 2005-05-26 13:43:52 UTC (rev 15511) @@ -267,6 +267,7 @@ return Status; } +#ifdef DBG VOID STDCALL PspDumpThreads(BOOLEAN IncludeSystem) @@ -339,5 +340,6 @@ CurrentProcess = CurrentProcess->Flink; } } +#endif /* EOF */

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
82
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005