Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[cwittich] 29379: fix some of the build errors
by cwittich＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: cwittich Date: Wed Oct 3 20:52:31 2007 New Revision: 29379 URL: http://svn.reactos.org/svn/reactos?rev=29379&view=rev Log: fix some of the build errors Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/rosboot_test.cpp Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Wed Oct 3 20:52:31 2007 @@ -17,8 +17,9 @@ void OsSupport::checkAlarms() { struct timeval tm; + size_t i; gettimeofday(&tm, 0); - for (size_t i = 0; i < s_Entries.size(); i++) + for (i = 0; i < s_Entries.size(); i++) { long diffsec = s_Entries[i]->tm.tv_sec - tm.tv_sec; if (diffsec < 0) @@ -34,7 +35,7 @@ #ifdef __LINUX__ if (s_Entries.size()) { - long secs = Entries[i]->tm.tv_sec - tm.tv_sec; + long secs = s_Entries[i]->tm.tv_sec - tm.tv_sec; alarm(secs); } #endif @@ -64,7 +65,6 @@ #ifndef __LINUX__ - HANDLE OsSupport::s_hTimer = INVALID_HANDLE_VALUE; HANDLE OsSupport::s_hThread = 0; static HANDLE hTimer; bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Wed Oct 3 20:52:31 2007 @@ -27,7 +27,6 @@ #include <assert.h> #include <math.h> #include <signal.h> - namespace Sysreg_ { @@ -754,7 +753,7 @@ OsSupport::cancelAlarms(); OsSupport::setAlarm (m_MaxTime, m_Pid); #ifdef __LINUX__ - OsSupport::setAlarm(m_MaxTime, _getpid()); + OsSupport::setAlarm(m_MaxTime, getpid()); #else OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); #endif

1 0

[hpoussin] 29377: Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 18:09:45 2007 New Revision: 29377 URL: http://svn.reactos.org/svn/reactos?rev=29377&view=rev Log: Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29377&r1=2937… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Oct 3 18:09:45 2007 @@ -298,7 +298,6 @@ objcopy = $(Q)$(PREFIX_)objcopy dlltool = $(Q)$(PREFIX_)dlltool strip = $(Q)$(PREFIX_)strip -windres = $(Q)$(PREFIX_)windres # Set utilities ifeq ($(OSTYPE),msys) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Wed Oct 3 18:09:45 2007 @@ -1095,55 +1095,39 @@ const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); - if ( module.useWRC ) - { - string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); - FileLocation rciFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".rci.tmp" ); - FileLocation resFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".res.tmp" ); - - fprintf ( fMakefile, - "%s: %s $(WRC_TARGET) | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); - fprintf ( fMakefile, - "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( *sourceFile ).c_str (), - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( rciFilename ).c_str (), - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t${windres} %s -o $@\n", - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( resFilename ).c_str () ); - } - else - { - fprintf ( fMakefile, - "%s: %s $(WRC_TARGET) | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); - fprintf ( fMakefile, - "\t${windres} $(%s) %s -o $@\n", - windresflagsMacro.c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - } + string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); + FileLocation rciFilename ( TemporaryDirectory, + "", + sourceFilenamePart + ".rci.tmp" ); + FileLocation resFilename ( TemporaryDirectory, + "", + sourceFilenamePart + ".res.tmp" ); + + fprintf ( fMakefile, + "%s: %s $(WRC_TARGET) | %s\n", + backend->GetFullName ( *objectFilename ).c_str (), + dependencies.c_str (), + backend->GetFullPath ( *objectFilename ).c_str () ); + fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); + fprintf ( fMakefile, + "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", + windresflagsMacro.c_str (), + backend->GetFullName ( *sourceFile ).c_str (), + backend->GetFullName ( rciFilename ).c_str () ); + fprintf ( fMakefile, + "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", + windresflagsMacro.c_str (), + backend->GetFullName ( rciFilename ).c_str (), + backend->GetFullName ( resFilename ).c_str () ); + fprintf ( fMakefile, + "\t-@${rm} %s 2>$(NUL)\n", + backend->GetFullName ( rciFilename ).c_str () ); + fprintf ( fMakefile, + "\t${windres} %s -o $@\n", + backend->GetFullName ( resFilename ).c_str () ); + fprintf ( fMakefile, + "\t-@${rm} %s 2>$(NUL)\n", + backend->GetFullName ( resFilename ).c_str () ); } void Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Wed Oct 3 18:09:45 2007 @@ -414,12 +414,6 @@ } else install = NULL; - - att = moduleNode.GetAttribute ( "usewrc", false ); - if ( att != NULL ) - useWRC = att->value == "true"; - else - useWRC = true; att = moduleNode.GetAttribute ( "allowwarnings", false ); if ( att == NULL ) Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Wed Oct 3 18:09:45 2007 @@ -123,7 +123,6 @@ underscoresymbols (true|yes|false|no) "no" installbase %Text; #IMPLIED installname %Text; #IMPLIED - usewrc %Text; #IMPLIED allowwarnings (true|false) "false" aliasof %Text; #IMPLIED unicode (true|yes|false|no) "no" Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Wed Oct 3 18:09:45 2007 @@ -355,7 +355,6 @@ std::string prefix; HostType host; std::string aliasedModuleName; - bool useWRC; bool allowWarnings; bool enabled; bool isStartupLib;

1 0

[hpoussin] 29376: Remove hack added in r28961. It seems that wrc works well now.
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 18:02:04 2007 New Revision: 29376 URL: http://svn.reactos.org/svn/reactos?rev=29376&view=rev Log: Remove hack added in r28961. It seems that wrc works well now. Modified: trunk/reactos/base/shell/explorer/explorer.rbuild Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild Wed Oct 3 18:02:04 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" usewrc="false"> +<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> <linkerflag>-fexceptions</linkerflag> <include base="explorer">.</include> <define name="__USE_W32API" />

1 0

[hpoussin] 29375: Implement NdisMWriteLogData, enough to see something
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 17:48:51 2007 New Revision: 29375 URL: http://svn.reactos.org/svn/reactos?rev=29375&view=rev Log: Implement NdisMWriteLogData, enough to see something Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c Wed Oct 3 17:48:51 2007 @@ -2048,9 +2048,36 @@ IN PVOID LogBuffer, IN UINT LogBufferSize) { - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; + PUCHAR Buffer = LogBuffer; + UINT i, j, idx; + + UNIMPLEMENTED; + for (i = 0; i < LogBufferSize; i += 16) + { + DbgPrint("%08x |", i); + for (j = 0; j < 16; j++) + { + idx = i + j; + if (idx < LogBufferSize) + DbgPrint(" %02x", Buffer[idx]); + else + DbgPrint(" "); + } + DbgPrint(" | "); + for (j = 0; j < 16; j++) + { + idx = i + j; + if (idx == LogBufferSize) + break; + if (Buffer[idx] >= ' ') /* FIXME: not portable! replace by if (isprint(Buffer[idx])) ? */ + DbgPrint("%c", Buffer[idx]); + else + DbgPrint("."); + } + DbgPrint("\n"); + } + + return NDIS_STATUS_FAILURE; }

1 0

[fireball] 29374: - Silence badly placed debug message. DPRINT1 equals FIXME and ERR, but not TRACE!
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 16:01:13 2007 New Revision: 29374 URL: http://svn.reactos.org/svn/reactos?rev=29374&view=rev Log: - Silence badly placed debug message. DPRINT1 equals FIXME and ERR, but not TRACE! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Oct 3 16:01:13 2007 @@ -1505,8 +1505,8 @@ { NTSTATUS Status = STATUS_SUCCESS; - /* remove this when all spi are implement */ - DPRINT1("UserSystemParametersInfo_StructSet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); + DPRINT("UserSystemParametersInfo_StructSet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n", + uiAction, uiParam, fWinIni); _SEH_TRY {

1 0

[fireball] 29373: - Use IopLoanUnloadDriver() for calling unload routine too, in the context of system process, when needed.
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 15:54:31 2007 New Revision: 29373 URL: http://svn.reactos.org/svn/reactos?rev=29373&view=rev Log: - Use IopLoanUnloadDriver() for calling unload routine too, in the context of system process, when needed. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Wed Oct 3 15:54:31 2007 @@ -358,6 +358,7 @@ PUNICODE_STRING ServiceName; WORK_QUEUE_ITEM WorkItem; KEVENT Event; + PDRIVER_OBJECT DriverObject; } LOAD_UNLOAD_PARAMS, *PLOAD_UNLOAD_PARAMS; // @@ -840,6 +841,12 @@ IopLoadServiceModule( IN PUNICODE_STRING ServiceName, OUT PLDR_DATA_TABLE_ENTRY *ModuleObject +); + +VOID +NTAPI +IopLoadUnloadDriver( + IN OUT PLOAD_UNLOAD_PARAMS LoadParams ); NTSTATUS Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Oct 3 15:54:31 2007 @@ -927,6 +927,7 @@ UNICODE_STRING ServiceName; UNICODE_STRING ObjectName; PDRIVER_OBJECT DriverObject; + LOAD_UNLOAD_PARAMS LoadParams; NTSTATUS Status; LPWSTR Start; @@ -1019,8 +1020,35 @@ * Unload the module and release the references to the device object */ + /* Call the load/unload routine, depending on current process */ if (DriverObject->DriverUnload) - (*DriverObject->DriverUnload)(DriverObject); + { + if (PsGetCurrentProcess() == PsInitialSystemProcess) + { + /* Just call right away */ + (*DriverObject->DriverUnload)(DriverObject); + } + else + { + /* Load/Unload must be called from system process */ + + /* Prepare parameters block */ + LoadParams.DriverObject = DriverObject; + KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); + + ExInitializeWorkItem(&LoadParams.WorkItem, + (PWORKER_THREAD_ROUTINE)IopLoadUnloadDriver, + (PVOID)&LoadParams); + + /* Queue it */ + ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); + + /* And wait when it completes */ + KeWaitForSingleObject(&LoadParams.Event, UserRequest, KernelMode, + FALSE, NULL); + } + } + ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); MmUnloadSystemImage(DriverObject->DriverSection); @@ -1477,6 +1505,17 @@ PLDR_DATA_TABLE_ENTRY ModuleObject; PDRIVER_OBJECT DriverObject; WCHAR *cur; + + /* Check if it's an unload request */ + if (LoadParams->DriverObject) + { + (*DriverObject->DriverUnload)(DriverObject); + + /* Return success and signal the event */ + LoadParams->Status = STATUS_SUCCESS; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } RtlInitUnicodeString(&ImagePath, NULL); @@ -1675,6 +1714,7 @@ DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); LoadParams.ServiceName = &CapturedDriverServiceName; + LoadParams.DriverObject = NULL; KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); /* Call the load/unload routine, depending on current process */

1 0

[hpoussin] 29372: Try to fix Linux build
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 15:24:56 2007 New Revision: 29372 URL: http://svn.reactos.org/svn/reactos?rev=29372&view=rev Log: Try to fix Linux build Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29372&r1=2937… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Oct 3 15:24:56 2007 @@ -277,7 +277,11 @@ ifneq ($(ROS_PREFIX),) PREFIX_ := $(ROS_PREFIX)- else - PREFIX_ := + ifeq ($(HOST),mingw32-linux) + PREFIX_ := mingw32- + else + PREFIX_ := + endif endif ifeq ($(TARGET_CC),) TARGET_CC = $(PREFIX_)gcc

1 0

[hpoussin] 29371: Support custom C and C++ compilers, by variables HOST_CC, HOST_CPP, TARGET_CC and TARGET_CPP Simplify usage of ROS_PREFIX variable
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 15:12:25 2007 New Revision: 29371 URL: http://svn.reactos.org/svn/reactos?rev=29371&view=rev Log: Support custom C and C++ compilers, by variables HOST_CC, HOST_CPP, TARGET_CC and TARGET_CPP Simplify usage of ROS_PREFIX variable Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29371&r1=2937… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Oct 3 15:12:25 2007 @@ -260,77 +260,67 @@ ECHO_STRIP = endif - -host_gcc = $(Q)gcc -host_gpp = $(Q)g++ +# Set host compiler/linker +ifeq ($(HOST_CC),) + HOST_CC = gcc +endif +ifeq ($(HOST_CPP),) + HOST_CPP = g++ +endif +host_gcc = $(Q)$(HOST_CC) +host_gpp = $(Q)$(HOST_CPP) host_ld = $(Q)ld host_ar = $(Q)ar host_objcopy = $(Q)objcopy + +# Set target compiler/linker +ifneq ($(ROS_PREFIX),) + PREFIX_ := $(ROS_PREFIX)- +else + PREFIX_ := +endif +ifeq ($(TARGET_CC),) + TARGET_CC = $(PREFIX_)gcc +endif +ifeq ($(TARGET_CPP),) + TARGET_CPP = $(PREFIX_)g++ +endif +gcc = $(Q)$(TARGET_CC) +gpp = $(Q)$(TARGET_CPP) +ld = $(Q)$(PREFIX_)ld +nm = $(Q)$(PREFIX_)nm +objdump = $(Q)$(PREFIX_)objdump +ar = $(Q)$(PREFIX_)ar +objcopy = $(Q)$(PREFIX_)objcopy +dlltool = $(Q)$(PREFIX_)dlltool +strip = $(Q)$(PREFIX_)strip +windres = $(Q)$(PREFIX_)windres + +# Set utilities +ifeq ($(OSTYPE),msys) + HOST=mingw32-linux +endif ifeq ($(HOST),mingw32-linux) export EXEPREFIX = ./ -ifeq ($(OSTYPE),msys) - export EXEPOSTFIX = .exe -else - export EXEPOSTFIX = -endif + ifeq ($(OSTYPE),msys) + export EXEPOSTFIX = .exe + else + export EXEPOSTFIX = + endif export SEP = / mkdir = -$(Q)mkdir -p - gcc = $(Q)$(PREFIX)-gcc - gpp = $(Q)$(PREFIX)-g++ - ld = $(Q)$(PREFIX)-ld - nm = $(Q)$(PREFIX)-nm - objdump = $(Q)$(PREFIX)-objdump - ar = $(Q)$(PREFIX)-ar - objcopy = $(Q)$(PREFIX)-objcopy - dlltool = $(Q)$(PREFIX)-dlltool - strip = $(Q)$(PREFIX)-strip - windres = $(Q)$(PREFIX)-windres rm = $(Q)rm -f cp = $(Q)cp NUL = /dev/null else # mingw32-windows - ifeq ($(OSTYPE),msys) - HOST=mingw32-linux - export EXEPREFIX = ./ - export EXEPOSTFIX = .exe - export SEP = / - mkdir = -$(Q)mkdir -p - rm = $(Q)rm -f - cp = $(Q)cp - NUL = /dev/null - else - export EXEPREFIX = - export EXEPOSTFIX = .exe - ROS_EMPTY = - export SEP = \$(ROS_EMPTY) - mkdir = -$(Q)mkdir - rm = $(Q)del /f /q - cp = $(Q)copy /y - NUL = NUL - endif - ifeq ($(ROS_PREFIX),) - gcc = $(Q)gcc - gpp = $(Q)g++ - ld = $(Q)ld - nm = $(Q)nm - objdump = $(Q)objdump - ar = $(Q)ar - objcopy = $(Q)objcopy - dlltool = $(Q)dlltool - strip = $(Q)strip - windres = $(Q)windres - else - gcc = $(Q)$(ROS_PREFIX)-gcc - gpp = $(Q)$(ROS_PREFIX)-g++ - ld = $(Q)$(ROS_PREFIX)-ld - nm = $(Q)$(ROS_PREFIX)-nm - objdump = $(Q)$(ROS_PREFIX)-objdump - ar = $(Q)$(ROS_PREFIX)-ar - objcopy = $(Q)$(ROS_PREFIX)-objcopy - dlltool = $(Q)$(ROS_PREFIX)-dlltool - strip = $(Q)$(ROS_PREFIX)-strip - windres = $(Q)$(ROS_PREFIX)-windres - endif + export EXEPREFIX = + export EXEPOSTFIX = .exe + ROS_EMPTY = + export SEP = \$(ROS_EMPTY) + mkdir = -$(Q)mkdir + rm = $(Q)del /f /q + cp = $(Q)copy /y + NUL = NUL endif ifneq ($(ROS_INTERMEDIATE),)

1 0

[fireball] 29370: - NtLoadDriver APIs refactor/improvent: * Move loading of a driver to the common (in future) routine IopLoadUnloadDriver (name taken from http://wasm.ru/forum/viewtopic.php?pid=166891). * Fix a bug: NtLoadDriver should always load drivers in a context of the system process, explanation here: http://www.osronline.com/showthread.cfm?link=114687 * Reformat NtLoadDriver's code.
by fireball＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: fireball Date: Wed Oct 3 14:17:04 2007 New Revision: 29370 URL: http://svn.reactos.org/svn/reactos?rev=29370&view=rev Log: - NtLoadDriver APIs refactor/improvent: * Move loading of a driver to the common (in future) routine IopLoadUnloadDriver (name taken from http://wasm.ru/forum/viewtopic.php?pid=166891). * Fix a bug: NtLoadDriver should always load drivers in a context of the system process, explanation here: http://www.osronline.com/showthread.cfm?link=114687 * Reformat NtLoadDriver's code. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Wed Oct 3 14:17:04 2007 @@ -350,6 +350,17 @@ } OPEN_PACKET, *POPEN_PACKET; // +// Parameters packet for Load/Unload work item's context +// +typedef struct _LOAD_UNLOAD_PARAMS +{ + NTSTATUS Status; + PUNICODE_STRING ServiceName; + WORK_QUEUE_ITEM WorkItem; + KEVENT Event; +} LOAD_UNLOAD_PARAMS, *PLOAD_UNLOAD_PARAMS; + +// // List of Bus Type GUIDs // typedef struct _IO_BUS_TYPE_GUID_LIST Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Oct 3 14:17:04 2007 @@ -1465,29 +1465,12 @@ return DriverExtensions + 1; } -/* - * NtLoadDriver - * - * Loads a device driver. - * - * Parameters - * DriverServiceName - * Name of the service to load (registry key). - * - * Return Value - * Status - * - * Status - * implemented - */ -NTSTATUS STDCALL -NtLoadDriver(IN PUNICODE_STRING DriverServiceName) +VOID NTAPI +IopLoadUnloadDriver(PLOAD_UNLOAD_PARAMS LoadParams) { RTL_QUERY_REGISTRY_TABLE QueryTable[3]; UNICODE_STRING ImagePath; UNICODE_STRING ServiceName; - UNICODE_STRING CapturedDriverServiceName = {0}; - KPROCESSOR_MODE PreviousMode; NTSTATUS Status; ULONG Type; PDEVICE_NODE DeviceNode; @@ -1495,50 +1478,24 @@ PDRIVER_OBJECT DriverObject; WCHAR *cur; - PAGED_CODE(); - - PreviousMode = KeGetPreviousMode(); - - /* - * Check security privileges - */ - -/* FIXME: Uncomment when privileges will be correctly implemented. */ -#if 0 - if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, PreviousMode)) - { - DPRINT("Privilege not held\n"); - return STATUS_PRIVILEGE_NOT_HELD; - } -#endif - - Status = ProbeAndCaptureUnicodeString(&CapturedDriverServiceName, - PreviousMode, - DriverServiceName); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); - RtlInitUnicodeString(&ImagePath, NULL); /* * Get the service name from the registry key name. */ - ASSERT(CapturedDriverServiceName.Length >= sizeof(WCHAR)); - - ServiceName = CapturedDriverServiceName; - cur = CapturedDriverServiceName.Buffer + (CapturedDriverServiceName.Length / sizeof(WCHAR)) - 1; - while (CapturedDriverServiceName.Buffer != cur) + ASSERT(LoadParams->ServiceName->Length >= sizeof(WCHAR)); + + ServiceName = *LoadParams->ServiceName; + cur = LoadParams->ServiceName->Buffer + + (LoadParams->ServiceName->Length / sizeof(WCHAR)) - 1; + while (LoadParams->ServiceName->Buffer != cur) { if(*cur == L'\\') { ServiceName.Buffer = cur + 1; - ServiceName.Length = CapturedDriverServiceName.Length - + ServiceName.Length = LoadParams->ServiceName->Length - (USHORT)((ULONG_PTR)ServiceName.Buffer - - (ULONG_PTR)CapturedDriverServiceName.Buffer); + (ULONG_PTR)LoadParams->ServiceName->Buffer); break; } cur--; @@ -1561,13 +1518,15 @@ QueryTable[1].EntryContext = &ImagePath; Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - CapturedDriverServiceName.Buffer, QueryTable, NULL, NULL); + LoadParams->ServiceName->Buffer, QueryTable, NULL, NULL); if (!NT_SUCCESS(Status)) { DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); ExFreePool(ImagePath.Buffer); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } /* @@ -1579,7 +1538,9 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } DPRINT("FullImagePath: '%wZ'\n", &ImagePath); @@ -1595,7 +1556,9 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDeviceNode() failed (Status %lx)\n", Status); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } /* Get existing DriverObject pointer (in case the driver has @@ -1617,7 +1580,9 @@ { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } /* @@ -1644,7 +1609,9 @@ DPRINT("IopInitializeDriver() failed (Status %lx)\n", Status); MmUnloadSystemImage(ModuleObject); IopFreeDeviceNode(DeviceNode); - goto ReleaseCapturedString; + LoadParams->Status = Status; + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + return; } } @@ -1653,13 +1620,88 @@ } IopInitializeDevice(DeviceNode, DriverObject); - Status = IopStartDevice(DeviceNode); - -ReleaseCapturedString: - ReleaseCapturedUnicodeString(&CapturedDriverServiceName, - PreviousMode); - - return Status; + LoadParams->Status = IopStartDevice(DeviceNode); + (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); +} + +/* + * NtLoadDriver + * + * Loads a device driver. + * + * Parameters + * DriverServiceName + * Name of the service to load (registry key). + * + * Return Value + * Status + * + * Status + * implemented + */ +NTSTATUS STDCALL +NtLoadDriver(IN PUNICODE_STRING DriverServiceName) +{ + UNICODE_STRING CapturedDriverServiceName = {0}; + KPROCESSOR_MODE PreviousMode; + LOAD_UNLOAD_PARAMS LoadParams; + NTSTATUS Status; + + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + /* + * Check security privileges + */ + + /* FIXME: Uncomment when privileges will be correctly implemented. */ +#if 0 + if (!SeSinglePrivilegeCheck(SeLoadDriverPrivilege, PreviousMode)) + { + DPRINT("Privilege not held\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } +#endif + + Status = ProbeAndCaptureUnicodeString(&CapturedDriverServiceName, + PreviousMode, + DriverServiceName); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT("NtLoadDriver('%wZ')\n", &CapturedDriverServiceName); + + LoadParams.ServiceName = &CapturedDriverServiceName; + KeInitializeEvent(&LoadParams.Event, NotificationEvent, FALSE); + + /* Call the load/unload routine, depending on current process */ + if (PsGetCurrentProcess() == PsInitialSystemProcess) + { + /* Just call right away */ + IopLoadUnloadDriver(&LoadParams); + } + else + { + /* Load/Unload must be called from system process */ + ExInitializeWorkItem(&LoadParams.WorkItem, + (PWORKER_THREAD_ROUTINE)IopLoadUnloadDriver, + (PVOID)&LoadParams); + + /* Queue it */ + ExQueueWorkItem(&LoadParams.WorkItem, DelayedWorkQueue); + + /* And wait when it completes */ + KeWaitForSingleObject(&LoadParams.Event, UserRequest, KernelMode, + FALSE, NULL); + } + + ReleaseCapturedUnicodeString(&CapturedDriverServiceName, + PreviousMode); + + return LoadParams.Status; } /*

1 0

[hpoussin] 29369: Separe right code from hack
by hpoussin＠svn.reactos.org 03 Oct '07

03 Oct '07

Author: hpoussin Date: Wed Oct 3 12:28:16 2007 New Revision: 29369 URL: http://svn.reactos.org/svn/reactos?rev=29369&view=rev Log: Separe right code from hack Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Wed Oct 3 12:28:16 2007 @@ -388,20 +388,30 @@ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); /* Check if this is a direct open */ - /* FIXME: Small hack still exists, because there is probably - a small bug somewhere in vfat */ if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject) && - (((DesiredAccess & ~(SYNCHRONIZE | + ((DesiredAccess & ~(SYNCHRONIZE | FILE_READ_ATTRIBUTES | READ_CONTROL | ACCESS_SYSTEM_SECURITY | WRITE_OWNER | - WRITE_DAC)) == 0) || - (wcsstr(CompleteName->Buffer, L"Harddisk"))) && + WRITE_DAC)) == 0) && !(UseDummyFile)) { /* Remember this for later */ + DirectOpen = TRUE; + } + + /* FIXME: Small hack still exists, have to check why... + * This is triggered multiple times by usetup and then once per boot. + */ + if (!(DirectOpen) && + !(RemainingName->Length) && + !(OpenPacket->RelatedFileObject) && + ((wcsstr(CompleteName->Buffer, L"Harddisk"))) && + !(UseDummyFile)) + { + DPRINT1("Using IopParseDevice() hack\n"); DirectOpen = TRUE; }

1 0

← Newer
1
...
63
64
65
66
67
68
69
70
71
Older →

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-diffs October 2007