diff --git a/reactos/bootflop.bat b/reactos/bootflop.bat index 15fb87835fe..962ba9ff03c 100644 --- a/reactos/bootflop.bat +++ b/reactos/bootflop.bat @@ -6,30 +6,24 @@ COPY /Y BLUE.SYS C:\reactos\system\drivers\blue.SYS COPY /Y KEYBOARD.SYS C:\reactos\system\drivers\KEYBOARD.SYS COPY /Y NTDLL.DLL C:\reactos\system\NTDLL.DLL +COPY /Y KERNEL32.DLL C:\reactos\system\KERNEL32.DLL : COPY /Y CRTDLL.DLL C:\reactos\system\CRTDLL.DLL COPY /Y SHELL.EXE C:\reactos\system\SHELL.EXE : : present a menu to the booter... : -ECHO 1) Keyboard,IDE,VFatFSD -ECHO 2) IDE,VFatFSD -ECHO 3) No Drivers -CHOICE /C:123 /T:2,3 "Select kernel boot config" -IF ERRORLEVEL 3 GOTO :L3 +ECHO 1) IDE,VFatFSD +ECHO 2) No Drivers +CHOICE /C:123 /T:1,3 "Select kernel boot config" IF ERRORLEVEL 2 GOTO :L2 :L1 CLS -LOADROS NTOSKRNL.EXE KEYBOARD.O IDE.SYS VFATFSD.SYS -GOTO :END - -:L2 -CLS LOADROS NTOSKRNL.EXE IDE.SYS VFATFSD.SYS GOTO :END -:L3 +:L2 CLS LOADROS NTOSKRNL.EXE GOTO :END diff --git a/reactos/include/kernel32/kernel32.h b/reactos/include/kernel32/kernel32.h index 753a575abd9..2bcf0201789 100644 --- a/reactos/include/kernel32/kernel32.h +++ b/reactos/include/kernel32/kernel32.h @@ -2,8 +2,10 @@ #ifdef NDEBUG #define DPRINT(args...) +#define CHECKPOINT #else #define DPRINT(args...) do { dprintf("(KERNEL32:%s:%d) ",__FILE__,__LINE__); dprintf(args); } while(0); +#define CHECKPOINT do { dprintf("(KERNEL32:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0); #endif void dprintf(char* fmt, ...); diff --git a/reactos/lib/ntdll/stubs/stubs.c b/reactos/lib/ntdll/stubs/stubs.c index c8b30ecc620..536f2935d74 100644 --- a/reactos/lib/ntdll/stubs/stubs.c +++ b/reactos/lib/ntdll/stubs/stubs.c @@ -217,6 +217,7 @@ STUB(_memccpy) STUB(_memicmp) STUB(_snprintf) STUB(_snwprintf) +//STUB(_strlwr) STUB(_tolower) STUB(_toupper) STUB(_ultoa) diff --git a/reactos/makedisk.bat b/reactos/makedisk.bat index 14a44f26666..7c5e20fd061 100644 --- a/reactos/makedisk.bat +++ b/reactos/makedisk.bat @@ -9,4 +9,5 @@ copy /Y services\dd\keyboard\keyboard.sys a: copy /Y services\dd\ide\ide.sys a: copy /Y services\fs\vfat\vfatfsd.sys a: copy /Y lib\ntdll\ntdll.dll a: +copy /Y lib\kernel32\kernel32.dll a: : copy /Y lib\crtdll\crtdll.dll a: