Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[weiden] 14813: don't request write access in NtReadVirtualMemory, this should fix the listdlls.exe issues
by weiden＠svn.reactos.com 26 Apr '05

26 Apr '05

don't request write access in NtReadVirtualMemory, this should fix the listdlls.exe issues Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-04-26 07:11:02 UTC (rev 14812) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-04-26 09:40:30 UTC (rev 14813) @@ -504,7 +504,7 @@ Buffer,NumberOfBytesToRead); Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_WRITE, + PROCESS_VM_READ, NULL, PreviousMode, (PVOID*)(&Process),

1 0

[arty] 14812: Fixes by WaxDragon:
by arty＠svn.reactos.com 26 Apr '05

26 Apr '05

Fixes by WaxDragon: - Implement get* integer reading. - Properly implement ipv4addrs (validates a set of IPv4 addresses) - Limit returned DNS servers to 1 until we fix iphlpapi. Modified: trunk/reactos/subsys/system/dhcp/dhclient.c Modified: trunk/reactos/subsys/system/dhcp/util.c _____ Modified: trunk/reactos/subsys/system/dhcp/dhclient.c --- trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-26 05:13:49 UTC (rev 14811) +++ trunk/reactos/subsys/system/dhcp/dhclient.c 2005-04-26 07:11:02 UTC (rev 14812) @@ -448,6 +448,8 @@ int i, addrs = new_lease->options[DHO_DOMAIN_NAME_SERVERS].len / sizeof(ULONG); + /* XXX I'm setting addrs to 1 until we are ready up the chain */ + addrs = 1; nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) ); nsbuf[0] = 0; @@ -1896,7 +1898,7 @@ case DHO_FONT_SERVERS: case DHO_DHCP_SERVER_IDENTIFIER: if (!ipv4addrs(opbuf)) { - warning("Invalid IP address in option: %s", opbuf); + warning("Invalid IP address in option(%d): %s", option, opbuf); return (0); } return (1) ; @@ -1991,19 +1993,20 @@ int ipv4addrs(char * buf) { - struct in_addr jnk; - int count = 0; + char *tmp; + struct in_addr jnk; + int i = 0; + + note("Input: %s\n", buf); - while (inet_aton(buf, &jnk) == 1){ - count++; - while (periodchar(*buf) || digitchar(*buf)) - buf++; - if (*buf == '\0') - return (count); - while (*buf == ' ') - buf++; - } - return (0); + do { + tmp = strtok(buf, " "); + note("got %s\n", tmp); + if( tmp && inet_aton(tmp, &jnk) ) i++; + buf = NULL; + } while( tmp ); + + return (i); } _____ Modified: trunk/reactos/subsys/system/dhcp/util.c --- trunk/reactos/subsys/system/dhcp/util.c 2005-04-26 05:13:49 UTC (rev 14811) +++ trunk/reactos/subsys/system/dhcp/util.c 2005-04-26 07:11:02 UTC (rev 14812) @@ -70,19 +70,19 @@ } int16_t getShort( unsigned char *data ) { - return 0; + return (int16_t) ntohs(*(int16_t*) data); } u_int16_t getUShort( unsigned char *data ) { - return 0; + return (u_int16_t) ntohs(*(u_int16_t*) data); } int32_t getLong( unsigned char *data ) { - return 0; + return (int32_t) ntohl(*(u_int32_t*) data); } u_int32_t getULong( unsigned char *data ) { - return 0; + return ntohl(*(u_int32_t*)data); } int addr_eq( struct iaddr a, struct iaddr b ) { @@ -93,6 +93,7 @@ void dfree( void *v, char *name ) { free( v ); } int read_client_conf(void) { + error("util.c read_client_conf not implemented!"); return 0; }

1 0

[ion] 14811: Do not strip if KDBG is used
by ion＠svn.reactos.com 26 Apr '05

26 Apr '05

Do not strip if KDBG is used Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-04-26 05:10:58 UTC (rev 14810) +++ trunk/reactos/tools/helper.mk 2005-04-26 05:13:49 UTC (rev 14811) @@ -661,8 +661,15 @@ # ifneq ($(DBG),1) MK_CFLAGS += -Os -Wno-strict-aliasing -funit-at-a-time -fweb -ftracer -momit-leaf-frame-pointer + MK_CFLAGS += -mpreferred-stack-boundary=2 + + # + # Remove Symbols if no debugging is used at all + # + ifneq ($(KDBG),1) TARGET_LFLAGS += -Wl,-O1 -Wl,--sort-common -s - MK_CFLAGS += -mpreferred-stack-boundary=2 + endif + MK_CPPFLAGS += -O2 -Wno-strict-aliasing MK_CPPFLAGS += -mpreferred-stack-boundary=2 endif

1 0

[ion] 14810: Change optimization settings for retail builds. Change to -Os for smaller executables which are not slower, and enable more advanced optimizations. funitatatime is already included by default in GCC 4.0. Strip debug info from retail builds, since we don't parse the symbols anyways. I hope these options don't break anything, they don't for me; Debugging is unaffected.
by ion＠svn.reactos.com 26 Apr '05

26 Apr '05

Change optimization settings for retail builds. Change to -Os for smaller executables which are not slower, and enable more advanced optimizations. funitatatime is already included by default in GCC 4.0. Strip debug info from retail builds, since we don't parse the symbols anyways. I hope these options don't break anything, they don't for me; Debugging is unaffected. Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-04-26 04:58:32 UTC (rev 14809) +++ trunk/reactos/tools/helper.mk 2005-04-26 05:10:58 UTC (rev 14810) @@ -644,16 +644,6 @@ endif # -# Enable Tree-Wide Optimization if Debug is on. -# Protect uncompatible files here with an ifneq -# if needed, until their problems can be found -# -ifneq ($(DBG),1) - MK_CFLAGS += -O2 -Wno-strict-aliasing - MK_CPPFLAGS += -O2 -Wno-strict-aliasing -endif - -# # Force Optimization for w3seek # ifeq ($(OPTIMIZE),yes) @@ -664,6 +654,19 @@ endif endif +# +# Enable Tree-Wide Optimization if Debug is on. +# Protect uncompatible files here with an ifneq +# if needed, until their problems can be found +# +ifneq ($(DBG),1) + MK_CFLAGS += -Os -Wno-strict-aliasing -funit-at-a-time -fweb -ftracer -momit-leaf-frame-pointer + TARGET_LFLAGS += -Wl,-O1 -Wl,--sort-common -s + MK_CFLAGS += -mpreferred-stack-boundary=2 + MK_CPPFLAGS += -O2 -Wno-strict-aliasing + MK_CPPFLAGS += -mpreferred-stack-boundary=2 +endif + ifneq ($(TARGET_LIBS),) MK_LIBS := $(TARGET_LIBS) $(MK_LIBS) endif

1 0

[ion] 14809: Fix compilation with optimizations
by ion＠svn.reactos.com 26 Apr '05

26 Apr '05

Fix compilation with optimizations Modified: trunk/reactos/drivers/fs/ms/create.c _____ Modified: trunk/reactos/drivers/fs/ms/create.c --- trunk/reactos/drivers/fs/ms/create.c 2005-04-25 20:35:37 UTC (rev 14808) +++ trunk/reactos/drivers/fs/ms/create.c 2005-04-26 04:58:32 UTC (rev 14809) @@ -28,7 +28,7 @@ PMSFS_DEVICE_EXTENSION DeviceExtension; PMSFS_MAILSLOT Mailslot; PMSFS_FCB Fcb; - PMSFS_MAILSLOT current; + PMSFS_MAILSLOT current = NULL; PLIST_ENTRY current_entry; KIRQL oldIrql;

1 0

[hbirr] 14808: Fixed the initialising of bochs debug.
by hbirr＠svn.reactos.com 25 Apr '05

25 Apr '05

Fixed the initialising of bochs debug. Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c _____ Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2005-04-25 19:43:50 UTC (rev 14807) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c 2005-04-25 20:35:37 UTC (rev 14808) @@ -31,12 +31,14 @@ } } + + VOID STDCALL KdpBochsInit(PKD_DISPATCH_TABLE WrapperTable, ULONG BootPhase) { - if (!KdDebuggerEnabled || !KdpDebugMode.Bochs) return; + if (!KdpDebugMode.Bochs) return; if (BootPhase == 0) {

1 0

[ion] 14807: Remove excess header
by ion＠svn.reactos.com 25 Apr '05

25 Apr '05

Remove excess header Deleted: trunk/reactos/ntoskrnl/include/internal/dbg.h _____ Deleted: trunk/reactos/ntoskrnl/include/internal/dbg.h --- trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-25 19:42:48 UTC (rev 14806) +++ trunk/reactos/ntoskrnl/include/internal/dbg.h 2005-04-25 19:43:50 UTC (rev 14807) @@ -1,80 +0,0 @@ -#ifndef __INCLUDE_INTERNAL_DBG_H -#define __INCLUDE_INTERNAL_DBG_H - -#include <napi/dbg.h> -#include <internal/port.h> - -#define KdPrintEx(_x_) DbgPrintEx _x_ - -#if defined(KDBG) || defined(DBG) - -VOID -KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule); - -VOID -KdbSymFreeProcessSymbols(IN PEPROCESS Process); - -VOID -KdbSymLoadDriverSymbols(IN PUNICODE_STRING Filename, - IN PMODULE_OBJECT Module); - -VOID -KdbSymUnloadDriverSymbols(IN PMODULE_OBJECT ModuleObject); - -VOID -KdbSymProcessBootSymbols(IN PCHAR FileName); - -VOID -KdbSymInit(IN PMODULE_TEXT_SECTION NtoskrnlTextSection, - IN PMODULE_TEXT_SECTION LdrHalTextSection); - -BOOLEAN -KdbSymPrintAddress(IN PVOID Address); - -VOID -KdbDeleteProcessHook(IN PEPROCESS Process); - -NTSTATUS -KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo, - IN ULONG_PTR RelativeAddress, - OUT PULONG LineNumber OPTIONAL, - OUT PCH FileName OPTIONAL, - OUT PCH FunctionName OPTIONAL); - -typedef struct _KDB_MODULE_INFO -{ - WCHAR Name[256]; - ULONG_PTR Base; - ULONG Size; - PROSSYM_INFO RosSymInfo; -} KDB_MODULE_INFO, *PKDB_MODULE_INFO; - -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) -# define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) -# define KDB_LOADERINIT_HOOK(NTOS, HAL) KdbSymInit(NTOS, HAL) -# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessBootSymbols(FILENAME) -#else -# define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) -# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) -# define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) -# define KDB_LOADERINIT_HOOK(NTOS, HAL) do { } while (0) -# define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) -# define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) -#endif - -#ifdef KDBG -# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) -# define KdbInit() KdbpCliInit() -# define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) -# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) -#else -# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) -# define KdbEnterDebuggerException(ER, PM, C, TF, F) kdHandleException -# define KdbInit() do { } while (0) -# define KdbEnter() do { } while (0) -# define KdbModuleLoaded(X) do { } while (0) -# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) -#endif - -#endif /* __INCLUDE_INTERNAL_DBG_H */

1 0

[ion] 14806: Remove dbg.h and move it to kd.h, it was getting confusing to have so many debug files. Also fixes hal to compile
by ion＠svn.reactos.com 25 Apr '05

25 Apr '05

Remove dbg.h and move it to kd.h, it was getting confusing to have so many debug files. Also fixes hal to compile Modified: trunk/reactos/ntoskrnl/include/internal/debug.h Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-04-25 18:31:20 UTC (rev 14805) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-04-25 19:42:48 UTC (rev 14806) @@ -19,9 +19,7 @@ #define __INTERNAL_DEBUG #include <internal/ntoskrnl.h> -#include <internal/dbg.h> - #if defined(_MSC_VER) && (_MSC_VER < 1300) /* TODO: Verify which version the MS compiler learned the __FUNCTION__ macro */ #define __FUNCTION__ "<unknown>" _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-04-25 18:31:20 UTC (rev 14805) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-04-25 19:42:48 UTC (rev 14806) @@ -11,12 +11,88 @@ #include <ntdll/ldr.h> struct _KD_DISPATCH_TABLE; +#define KdPrintEx(_x_) DbgPrintEx _x_ #ifdef DBG #include "kdgdb.h" #include "kdbochs.h" #endif +/* SYMBOL ROUTINES **********************************************************/ + +#if defined(KDBG) || defined(DBG) + +VOID +KdbSymLoadUserModuleSymbols(IN PLDR_MODULE LdrModule); + +VOID +KdbSymFreeProcessSymbols(IN PEPROCESS Process); + +VOID +KdbSymLoadDriverSymbols(IN PUNICODE_STRING Filename, + IN PMODULE_OBJECT Module); + +VOID +KdbSymUnloadDriverSymbols(IN PMODULE_OBJECT ModuleObject); + +VOID +KdbSymProcessBootSymbols(IN PCHAR FileName); + +VOID +KdbSymInit(IN PMODULE_TEXT_SECTION NtoskrnlTextSection, + IN PMODULE_TEXT_SECTION LdrHalTextSection); + +BOOLEAN +KdbSymPrintAddress(IN PVOID Address); + +VOID +KdbDeleteProcessHook(IN PEPROCESS Process); + +NTSTATUS +KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo, + IN ULONG_PTR RelativeAddress, + OUT PULONG LineNumber OPTIONAL, + OUT PCH FileName OPTIONAL, + OUT PCH FunctionName OPTIONAL); + +typedef struct _KDB_MODULE_INFO +{ + WCHAR Name[256]; + ULONG_PTR Base; + ULONG Size; + PROSSYM_INFO RosSymInfo; +} KDB_MODULE_INFO, *PKDB_MODULE_INFO; + +/* MACROS FOR NON-KDBG BUILDS ************************************************/ + +# define KDB_LOADUSERMODULE_HOOK(LDRMOD) KdbSymLoadUserModuleSymbols(LDRMOD) +# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) KdbSymLoadDriverSymbols(FILENAME, MODULE) +# define KDB_UNLOADDRIVER_HOOK(MODULE) KdbSymUnloadDriverSymbols(MODULE) +# define KDB_LOADERINIT_HOOK(NTOS, HAL) KdbSymInit(NTOS, HAL) +# define KDB_SYMBOLFILE_HOOK(FILENAME) KdbSymProcessBootSymbols(FILENAME) +#else +# define KDB_LOADUSERMODULE_HOOK(LDRMOD) do { } while (0) +# define KDB_LOADDRIVER_HOOK(FILENAME, MODULE) do { } while (0) +# define KDB_UNLOADDRIVER_HOOK(MODULE) do { } while (0) +# define KDB_LOADERINIT_HOOK(NTOS, HAL) do { } while (0) +# define KDB_SYMBOLFILE_HOOK(FILENAME) do { } while (0) +# define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0) +#endif + +#ifdef KDBG +# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS) +# define KdbInit() KdbpCliInit() +# define KdbModuleLoaded(FILENAME) KdbpCliModuleLoaded(FILENAME) +# define KDB_DELETEPROCESS_HOOK(PROCESS) KdbDeleteProcessHook(PROCESS) +#else +# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS) +# define KdbEnterDebuggerException(ER, PM, C, TF, F) kdHandleException +# define KdbInit() do { } while (0) +# define KdbEnter() do { } while (0) +# define KdbModuleLoaded(X) do { } while (0) +# define KDB_DELETEPROCESS_HOOK(PROCESS) do { } while (0) +#endif + /* KD ROUTINES ***************************************************************/ typedef enum _KD_CONTINUE_TYPE _____ Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-25 18:31:20 UTC (rev 14805) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h 2005-04-25 19:42:48 UTC (rev 14806) @@ -53,7 +53,6 @@ #include <internal/ifs.h> #include <internal/port.h> #include <internal/nls.h> -#include <internal/dbg.h> #ifdef KDBG #include <internal/kdb.h> #endif

1 0

[hbirr] 14803: Replaced a dirty hack by another.
by hbirr＠svn.reactos.com 25 Apr '05

25 Apr '05

Replaced a dirty hack by another. Modified: trunk/reactos/ntoskrnl/ke/main.c _____ Modified: trunk/reactos/ntoskrnl/ke/main.c --- trunk/reactos/ntoskrnl/ke/main.c 2005-04-25 16:17:35 UTC (rev 14802) +++ trunk/reactos/ntoskrnl/ke/main.c 2005-04-25 17:57:57 UTC (rev 14803) @@ -103,8 +103,18 @@ MiFreeInitMemory(); /* Never returns */ - PsIdleThreadMain(NULL); - +#if 0 + /* FIXME: + * The initial thread isn't a real ETHREAD object, we cannot call PspExitThread. + */ + PspExitThread(STATUS_SUCCESS); +#else + while (1) { + LARGE_INTEGER Timeout; + Timeout.QuadPart = 0x7fffffffffffffffLL; + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + } +#endif } else { /* Do application processor initialization */

3 3

[ion] 14805: Merge in wrappers with DBG setting as requested
by ion＠svn.reactos.com 25 Apr '05

25 Apr '05

Merge in wrappers with DBG setting as requested Modified: trunk/reactos/config Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/include/internal/kd.h Modified: trunk/reactos/ntoskrnl/kd/kdinit.c _____ Modified: trunk/reactos/config --- trunk/reactos/config 2005-04-25 18:29:16 UTC (rev 14804) +++ trunk/reactos/config 2005-04-25 18:31:20 UTC (rev 14805) @@ -23,9 +23,9 @@ # # Whether to compile for debugging +# Enabling this enables ASSERTS, GDB and Special Debug Routines # DBG := 0 -GDB := 1 # # Whether to compile a multiprocessor or single processor version _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-04-25 18:29:16 UTC (rev 14804) +++ trunk/reactos/ntoskrnl/Makefile 2005-04-25 18:31:20 UTC (rev 14805) @@ -332,8 +332,13 @@ kd/kdinit.o \ kd/kdmain.o \ kd/kdio.o \ + +ifeq ($(DBG), 1) +OBJECTS_KD := \ + $(OBJECTS_KD) \ kd/wrappers/gdbstub.o \ kd/wrappers/bochs.o +endif # User-Mode Debugging (Dbgk) OBJECTS_DBGK = \ _____ Modified: trunk/reactos/ntoskrnl/include/internal/kd.h --- trunk/reactos/ntoskrnl/include/internal/kd.h 2005-04-25 18:29:16 UTC (rev 14804) +++ trunk/reactos/ntoskrnl/include/internal/kd.h 2005-04-25 18:31:20 UTC (rev 14805) @@ -12,10 +12,8 @@ struct _KD_DISPATCH_TABLE; -#ifdef GDB +#ifdef DBG #include "kdgdb.h" -#endif -#ifdef BOCHS #include "kdbochs.h" #endif _____ Modified: trunk/reactos/ntoskrnl/kd/kdinit.c --- trunk/reactos/ntoskrnl/kd/kdinit.c 2005-04-25 18:29:16 UTC (rev 14804) +++ trunk/reactos/ntoskrnl/kd/kdinit.c 2005-04-25 18:31:20 UTC (rev 14805) @@ -34,7 +34,7 @@ { PCHAR p2 = Currentp2; -#ifdef BOCHS +#ifdef DBG /* Check for BOCHS Debugging */ if (!_strnicmp(p2, "BOCHS", 5)) { @@ -43,9 +43,7 @@ KdpDebugMode.Bochs = TRUE; WrapperInitRoutine = KdpBochsInit; } -#endif -#ifdef GDB /* Check for GDB Debugging */ if (!_strnicmp(p2, "GDB", 3)) { @@ -62,9 +60,7 @@ PortInfo.ComPort = DEFAULT_DEBUG_PORT; PortInfo.BaudRate = DEFAULT_DEBUG_BAUD_RATE; } -#endif - -#ifdef ICE + /* Check for PICE Debugging */ else if (!_strnicmp(p2, "PICE", 4)) {

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
48
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 April 2005