Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cmihail] 52485: [IP] - fix system crash when failing to connect to a remote host - Set address length in the TDI address struct - Simplify copying the address - Zero the sin_zero member
by cmihail＠svn.reactos.org 28 Jun '11

28 Jun '11

Author: cmihail Date: Tue Jun 28 07:29:28 2011 New Revision: 52485 URL: http://svn.reactos.org/svn/reactos?rev=52485&view=rev Log: [IP] - fix system crash when failing to connect to a remote host - Set address length in the TDI address struct - Simplify copying the address - Zero the sin_zero member Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/datagram/datagram.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Tue Jun 28 07:29:28 2011 @@ -135,15 +135,14 @@ RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress; RTAIPAddress->TAAddressCount = 1; RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; + RTAIPAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP; RTAIPAddress->Address->Address->sin_port = SrcPort; + RTAIPAddress->Address->Address->in_addr = SrcAddress->Address.IPv4Address; + RtlZeroMemory(RTAIPAddress->Address->Address->sin_zero, 8); TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n", RTAIPAddress, SrcAddress->Address.IPv4Address, SrcPort)); - - RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr, - &SrcAddress->Address.IPv4Address, - sizeof(SrcAddress->Address.IPv4Address) ); ReferenceObject(AddrFile); UnlockObject(AddrFile, OldIrql); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Tue Jun 28 07:29:28 2011 @@ -77,7 +77,7 @@ ReferenceObject(Connection); - DbgPrint("[IP, FlushAllQueues] Flushing recv/all with status: 0x%x\n", Status); + DbgPrint("[IP, FlushAllQueues] Flushing recv/all with status: 0x%x fox Connection = 0x%x\n", Status, Connection); while ((Entry = ExInterlockedRemoveHeadList(&Connection->ReceiveRequest, &Connection->Lock))) { @@ -103,7 +103,7 @@ Bucket->Status = Status; Bucket->Information = 0; - DbgPrint("[IP, FlushAllQueues] Flushing Listen request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); + DbgPrint("[IP, FlushAllQueues] Completing Listen request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); DereferenceObject(Bucket->AssociatedEndpoint); CompleteBucket(Connection, Bucket, TRUE); @@ -129,22 +129,28 @@ Bucket->Status = Status; Bucket->Information = 0; + + DbgPrint("[IP, FlushAllQueues] Completing Connection request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); CompleteBucket(Connection, Bucket, TRUE); } DereferenceObject(Connection); + + DbgPrint("[IP, FlushAllQueues] Leaving\n"); } VOID TCPFinEventHandler(void *arg, err_t err) { PCONNECTION_ENDPOINT Connection = arg; - - FlushAllQueues(Connection, TCPTranslateError(err)); - + /* We're already closed so we don't want to call lwip_close */ Connection->SocketContext = NULL; + + DbgPrint("[IP, TCPFinEventHandler] Called for Connection( 0x%x )-> SocketContext = pcb (0x%x)\n", Connection, Connection->SocketContext); + + FlushAllQueues(Connection, TCPTranslateError(err)); } VOID

1 0

[jgardou] 52484: [CMAKE] - reapply 52463, it was a real fix :-) log: fix typo, batc.sys -> battc.sys
by jgardou＠svn.reactos.org 27 Jun '11

27 Jun '11

Author: jgardou Date: Mon Jun 27 17:26:59 2011 New Revision: 52484 URL: http://svn.reactos.org/svn/reactos?rev=52484&view=rev Log: [CMAKE] - reapply 52463, it was a real fix :-) log: fix typo, batc.sys -> battc.sys Modified: trunk/reactos/drivers/battery/battc/CMakeLists.txt Modified: trunk/reactos/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/CMak… ============================================================================== --- trunk/reactos/drivers/battery/battc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/battery/battc/CMakeLists.txt [iso-8859-1] Mon Jun 27 17:26:59 2011 @@ -1,7 +1,7 @@ add_definitions(-D_BATTERYCLASS_) -spec2def(batc.sys battc.spec) +spec2def(battc.sys battc.spec) add_library(battc SHARED battc.c

1 0

[jgardou] 52483: [CMAKE] - do not use half supported precompiled header wrongly for rosautotests
by jgardou＠svn.reactos.org 27 Jun '11

27 Jun '11

Author: jgardou Date: Mon Jun 27 17:20:02 2011 New Revision: 52483 URL: http://svn.reactos.org/svn/reactos?rev=52483&view=rev Log: [CMAKE] - do not use half supported precompiled header wrongly for rosautotests Modified: trunk/rostests/rosautotest/CMakeLists.txt Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Mon Jun 27 17:20:02 2011 @@ -19,12 +19,10 @@ shutdown.cpp tools.cpp) -add_executable(rosautotest -#${CMAKE_CURRENT_BINARY_DIR}/rosautotest_precomp.h.gch -${SOURCE}) +add_executable(rosautotest ${SOURCE}) -#add_pch(rosautotest ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) set_module_type(rosautotest win32cui) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) +add_pch(rosautotest precomp.h) add_cd_file(TARGET rosautotest DESTINATION reactos/system32 FOR all)

1 0

[tkreuzer] 52482: [KDCOM] Use KeStallExecutionProcessor, once its ready (after KdDebuggerInitialize1 was called) for the receive timeout. Repeat 100 times with 1 ms wait. This seems to work quite w...
by tkreuzer＠svn.reactos.org 27 Jun '11

27 Jun '11

Author: tkreuzer Date: Mon Jun 27 16:51:00 2011 New Revision: 52482 URL: http://svn.reactos.org/svn/reactos?rev=52482&view=rev Log: [KDCOM] Use KeStallExecutionProcessor, once its ready (after KdDebuggerInitialize1 was called) for the receive timeout. Repeat 100 times with 1 ms wait. This seems to work quite well, but might be tuned for better values. Modified: trunk/reactos/drivers/base/kddll/kdcom.c trunk/reactos/drivers/base/kddll/kddll.c trunk/reactos/drivers/base/kddll/kddll.h Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Mon Jun 27 16:51:00 2011 @@ -10,7 +10,7 @@ #include "kdcom.h" /* Define wait timeout value. */ -#define REPEAT_COUNT (1000 * 1000) +#define REPEAT_COUNT 100 /* serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ @@ -258,6 +258,20 @@ /* We successfully got a byte */ return KDP_PACKET_RECEIVED; } + + /* Check if phase 1 is complete */ + if (KdpPhase1Complete) + { + /* Use hal to wait 1ms */ + KeStallExecutionProcessor(1000); + } + else + { + volatile unsigned long i; + + /* Do some busy waiting */ + for (i = 0; i < 1000; i++); + } } /* Timed out */ Modified: trunk/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Mon Jun 27 16:51:00 2011 @@ -14,6 +14,7 @@ PFNDBGPRNT KdpDbgPrint = NULL; ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; ULONG RemotePacketId = 0; +BOOLEAN KdpPhase1Complete = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -88,11 +89,9 @@ KdDebuggerInitialize1( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { - // HACK: misuse this function to get a pointer to FrLdrDbgPrint - KdpDbgPrint = (PVOID)LoaderBlock; - KDDBGPRINT("KdDebuggerInitialize1\n"); - - return STATUS_NOT_IMPLEMENTED; + KdpPhase1Complete = TRUE; + + return STATUS_SUCCESS; } @@ -198,7 +197,7 @@ switch (Packet.PacketType) { case PACKET_TYPE_KD_ACKNOWLEDGE: - /* Are we waiting for an ACK packet? */ + /* Are we waiting for an ACK packet? */ if (PacketType == PACKET_TYPE_KD_ACKNOWLEDGE && Packet.PacketId == (CurrentPacketId & ~SYNC_PACKET_ID)) { @@ -276,7 +275,7 @@ if (MessageData) { /* Set the length of the message data */ - MessageData->Length = *DataLength; + MessageData->Length = (USHORT)*DataLength; /* Do we have data? */ if (MessageData->Length) @@ -359,7 +358,7 @@ /* Initialize a KD_PACKET */ Packet.PacketLeader = PACKET_LEADER; - Packet.PacketType = PacketType; + Packet.PacketType = (USHORT)PacketType; Packet.ByteCount = MessageHeader->Length; Packet.Checksum = KdpCalculateChecksum(MessageHeader->Buffer, MessageHeader->Length); Modified: trunk/reactos/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.h… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.h [iso-8859-1] Mon Jun 27 16:51:00 2011 @@ -25,6 +25,7 @@ typedef ULONG (*PFNDBGPRNT)(const char *Format, ...); extern PFNDBGPRNT KdpDbgPrint; +extern BOOLEAN KdpPhase1Complete; typedef enum {

1 0

[tkreuzer] 52481: [CRT] On amd64 builds, where we don't have underscored symbols, create an alias fabs for the function _fabs, since we cannot create fabs as a label directly
by tkreuzer＠svn.reactos.org 27 Jun '11

27 Jun '11

Author: tkreuzer Date: Mon Jun 27 10:50:09 2011 New Revision: 52481 URL: http://svn.reactos.org/svn/reactos?rev=52481&view=rev Log: [CRT] On amd64 builds, where we don't have underscored symbols, create an alias fabs for the function _fabs, since we cannot create fabs as a label directly Modified: trunk/reactos/lib/sdk/crt/math/amd64/fabs.S Modified: trunk/reactos/lib/sdk/crt/math/amd64/fabs.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fab… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] Mon Jun 27 10:50:09 2011 @@ -18,4 +18,8 @@ UNIMPLEMENTED fabs ret +#ifdef _USE_ML +ALIAS <fabs> = <_fabs> +#endif + END

1 0

[tfaber] 52480: [KMTESTS] - add mostly untouched ports of the easy-to-do tests from kmtest_old
by tfaber＠svn.reactos.org 27 Jun '11

27 Jun '11

Author: tfaber Date: Mon Jun 27 08:49:23 2011 New Revision: 52480 URL: http://svn.reactos.org/svn/reactos?rev=52480&view=rev Log: [KMTESTS] - add mostly untouched ports of the easy-to-do tests from kmtest_old Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_pools.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ex.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_fsrtl.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/deviface_test.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_io.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_io.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ke.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ob.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -14,6 +14,14 @@ kmtest_drv/testlist.c example/Example.c + ntos_ex/ExPools.c + ntos_ex/ExTimer.c + ntos_fsrtl/FsRtlExpression.c + ntos_io/IoDeviceInterface.c + ntos_io/IoIrp.c + ntos_io/IoMdl.c + ntos_ke/KeProcessor.c + ntos_ob/ObCreate.c kmtest_drv/kmtest_drv.rc) Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -12,6 +12,24 @@ </directory> <directory name="example"> <file>Example.c</file> + </directory> + <directory name="ntos_ex"> + <file>ExPools.c</file> + <file>ExTimer.c</file> + </directory> + <directory name="ntos_fsrtl"> + <file>FsRtlExpression.c</file> + </directory> + <directory name="ntos_io"> + <file>IoDeviceInterface.c</file> + <file>IoIrp.c</file> + <file>IoMdl.c</file> + </directory> + <directory name="ntos_ke"> + <file>KeProcessor.c</file> + </directory> + <directory name="ntos_ob"> + <file>ObCreate.c</file> </directory> </module> <module name="kmtest_printf" type="staticlibrary"> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -9,9 +9,25 @@ #include <kmt_test.h> KMT_TESTFUNC Test_Example; +KMT_TESTFUNC Test_ExPools; +KMT_TESTFUNC Test_ExTimer; +KMT_TESTFUNC Test_FsRtlExpression; +KMT_TESTFUNC Test_IoDeviceInterface; +KMT_TESTFUNC Test_IoIrp; +KMT_TESTFUNC Test_IoMdl; +KMT_TESTFUNC Test_KeProcessor; +KMT_TESTFUNC Test_ObCreate; const KMT_TEST TestList[] = { - { "Example", Test_Example }, - { NULL, NULL } + { "Example", Test_Example }, + { "ExPools", Test_ExPools }, + { "ExTimer", Test_ExTimer }, + { "FsRtlExpression", Test_FsRtlExpression }, + { "IoDeviceInterface", Test_IoDeviceInterface }, + { "IoIrp", Test_IoIrp }, + { "IoMdl", Test_IoMdl }, + { "KeProcessor", Test_KeProcessor }, + { "ObCreate", Test_ObCreate }, + { NULL, NULL } }; Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 27 08:49:23 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_pools.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_pools.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,49 +1,29 @@ /* - * NTOSKRNL Pools test routines KM-Test - * ReactOS Kernel Mode Regression Testing framework - * - * Copyright 2008 Aleksey Bragin <aleksey(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Pools test routines KM-Test + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ -/* INCLUDES *******************************************************************/ +/* TODO: PoolsCorruption tests fail because accessing invalid memory doesn't necessarily cause an access violation */ -#include <ddk/ntddk.h> +#include <ntddk.h> #include <ntifs.h> #include <ndk/ntndk.h> /* SEH support with PSEH */ #include <pseh/pseh2.h> -#include "kmtest.h" +#include <kmt_test.h> #define NDEBUG -#include "debug.h" +#include <debug.h> #define TAG_POOLTEST 'tstP' -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID -PoolsTest(HANDLE KeyHandle) +static VOID PoolsTest(VOID) { PVOID Ptr; ULONG AllocSize, i, AllocNumber; PVOID *Allocs; - - StartTest(); // Stress-test nonpaged pool for (i=1; i<10000; i++) @@ -122,19 +102,13 @@ ExFreePoolWithTag(Allocs, TAG_POOLTEST); - - - FinishTest(KeyHandle, L"MmPoolAllocTest"); } -VOID -PoolsCorruption(HANDLE KeyHandle) +static VOID PoolsCorruption(VOID) { PULONG Ptr, TestPtr; ULONG AllocSize; NTSTATUS Status = STATUS_SUCCESS; - - StartTest(); // start with non-paged pool AllocSize = 4096 + 0x10; @@ -173,6 +147,10 @@ // free the pool ExFreePoolWithTag(Ptr, TAG_POOLTEST); +} - FinishTest(KeyHandle, L"MmPoolCorruptionTest"); +START_TEST(ExPools) +{ + PoolsTest(); + PoolsCorruption(); } Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ex.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ex.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,37 +1,19 @@ /* - * NTOSKRNL Executive Regressions KM-Test - * ReactOS Kernel Mode Regression Testing framework - * - * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Executive Regressions KM-Test + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ -/* INCLUDES *******************************************************************/ - -#include <ddk/ntddk.h> +#include <ntddk.h> #include <ntifs.h> #include <ndk/ntndk.h> -#include "kmtest.h" +#include <kmt_test.h> #define NDEBUG -#include "debug.h" +#include <debug.h> -/* PRIVATE FUNCTIONS ***********************************************************/ - +static VOID NTAPI TestTimerApcRoutine(IN PVOID TimerContext, @@ -44,10 +26,7 @@ (*ApcCount)++; } -/* PUBLIC FUNCTIONS *************************************************************/ - -VOID -ExTimerTest(HANDLE KeyHandle) +START_TEST(ExTimer) { UNICODE_STRING TimerName; OBJECT_ATTRIBUTES ObjectAttributes; @@ -57,8 +36,6 @@ BOOLEAN PreviousState, CurrentState; NTSTATUS Status; ULONG ApcCount; - - StartTest(); // Create the timer RtlInitUnicodeString(&TimerName, L"\\TestTimer"); @@ -167,6 +144,4 @@ Status = ZwClose(TimerHandle); ok(Status == STATUS_SUCCESS, "ZwClose failed with Status=0x%08lX", Status); - - FinishTest(KeyHandle, L"ExTimerTest"); } Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 27 08:49:23 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_fsrtl.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,35 +1,19 @@ /* - * FsRtl Test - * - * Copyright 2010 Pierre Schweitzer <pierre.schweitzer(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite FsRtl Test + * PROGRAMMER: Pierre Schweitzer <pierre.schweitzer(a)reactos.org> */ -/* INCLUDES *******************************************************************/ - -#include "kmtest.h" +/* TODO: most of these calls fail the Windows checked build's !islower assertion and others */ + #include <ntifs.h> +#include <kmt_test.h> #define NDEBUG -#include "debug.h" - -/* PRIVATE FUNCTIONS **********************************************************/ - -VOID FsRtlIsNameInExpressionTest() +#include <debug.h> + +static VOID FsRtlIsNameInExpressionTest() { UNICODE_STRING Expression, Name; @@ -179,7 +163,7 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); } -VOID FsRtlIsDbcsInExpressionTest() +static VOID FsRtlIsDbcsInExpressionTest() { ANSI_STRING Expression, Name; @@ -329,15 +313,8 @@ ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); } -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID -NtoskrnlFsRtlTest(HANDLE KeyHandle) +START_TEST(FsRtlExpression) { - StartTest(); - FsRtlIsNameInExpressionTest(); FsRtlIsDbcsInExpressionTest(); - - FinishTest(KeyHandle, L"FsRtlTest"); } Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 27 08:49:23 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/deviface_test.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/deviface_test.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,36 +1,20 @@ /* - * PnP Test - * Device Interface functions test - * - * Copyright 2004 Filip Navara <xnavara(a)volny.cz> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Device Interface functions test + * PROGRAMMER: Filip Navara <xnavara(a)volny.cz> */ -/* INCLUDES *******************************************************************/ +/* TODO: what's with the prototypes at the top, what's with the if-ed out part? Doesn't process most results */ -#include <ddk/ntifs.h> +#include <ntifs.h> #include <ndk/iotypes.h> -#include "kmtest.h" +#include <kmt_test.h> #define NDEBUG -#include "debug.h" +#include <debug.h> -/* PRIVATE FUNCTIONS **********************************************************/ - +#if 0 NTSTATUS (NTAPI *IoGetDeviceInterfaces_Func)( IN CONST GUID *InterfaceClassGuid, @@ -44,8 +28,9 @@ IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, IN ULONG Flags, OUT PWSTR *SymbolicLinkList); +#endif /* 0 */ -VOID DeviceInterfaceTest_Func() +static VOID DeviceInterfaceTest_Func() { NTSTATUS Status; PWSTR SymbolicLinkList; @@ -102,7 +87,7 @@ ExFreePool(SymbolicLinkList); } -VOID RegisterDI_Test(HANDLE KeyHandle) +START_TEST(IoDeviceInterface) { GUID Guid = {0x378de44c, 0x56ef, 0x11d1, {0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd}}; DEVICE_OBJECT DeviceObject; @@ -110,8 +95,6 @@ DEVICE_NODE DeviceNode; UNICODE_STRING SymbolicLinkName; NTSTATUS Status; - - StartTest(); RtlInitUnicodeString(&SymbolicLinkName, L""); @@ -136,6 +119,4 @@ "IoRegisterDeviceInterface returned 0x%08lX\n", Status); DeviceInterfaceTest_Func(); - - FinishTest(KeyHandle, L"IoDeviceInterfaceTest"); } Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_io.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_io.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,93 +1,21 @@ /* - * NTOSKRNL Io Regressions KM-Test - * ReactOS Kernel Mode Regression Testing framework - * - * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> - * Copyright 2008 Etersoft (Alexander Morozov) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Io Regressions KM-Test (Irp) + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ +/* Based on code Copyright 2008 Etersoft (Alexander Morozov) */ -/* INCLUDES *******************************************************************/ - -#include <ddk/ntddk.h> -#include "kmtest.h" +#include <ntddk.h> +#include <kmt_test.h> #define NDEBUG -#include "debug.h" +#include <debug.h> - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID NtoskrnlIoMdlTest(HANDLE KeyHandle) -{ - PMDL Mdl; - PIRP Irp; - PVOID VirtualAddress; - ULONG MdlSize = 2*4096+184; // 2 pages and some random value - - StartTest(); - - // Try to alloc 2Gb MDL - Mdl = IoAllocateMdl(NULL, 2048UL*0x100000, FALSE, FALSE, NULL); - - ok(Mdl == NULL, - "IoAllocateMdl should fail allocation of 2Gb or more, but got Mdl=0x%X", - (UINT_PTR)Mdl); - - if (Mdl) - IoFreeMdl(Mdl); - - // Now create a valid MDL - VirtualAddress = ExAllocatePool(NonPagedPool, MdlSize); - Mdl = IoAllocateMdl(VirtualAddress, MdlSize, FALSE, FALSE, NULL); - ok(Mdl != NULL, "Mdl allocation failed"); - // Check fields of the allocated struct - ok(Mdl->Next == NULL, "Mdl->Next should be NULL, but is 0x%X", - (UINT_PTR)Mdl->Next); - ok(Mdl->ByteCount == MdlSize, - "Mdl->ByteCount should be equal to MdlSize, but is 0x%X", - (UINT_PTR)Mdl->ByteCount); - // TODO: Check other fields of MDL struct - - IoFreeMdl(Mdl); - // Allocate now with pointer to an Irp - Irp = IoAllocateIrp(1, FALSE); - ok(Irp != NULL, "IRP allocation failed"); - Mdl = IoAllocateMdl(VirtualAddress, MdlSize, FALSE, FALSE, Irp); - ok(Mdl != NULL, "Mdl allocation failed"); - ok(Irp->MdlAddress == Mdl, "Irp->MdlAddress should be 0x%X, but is 0x%X", - (UINT_PTR)Mdl, (UINT_PTR)Irp->MdlAddress); - - IoFreeMdl(Mdl); - - // TODO: Check a case when SecondaryBuffer == TRUE - - IoFreeIrp(Irp); - ExFreePool(VirtualAddress); - - FinishTest(KeyHandle, L"IoMdlTest"); -} - -VOID NtoskrnlIoIrpTest(HANDLE KeyHandle) +START_TEST(IoIrp) { USHORT size; IRP *iorp; - - StartTest(); // 1st test size = sizeof(IRP) + 5 * sizeof(IO_STACK_LOCATION); @@ -163,6 +91,4 @@ IoFreeIrp(iorp); } - - FinishTest(KeyHandle, L"IoIrpTest"); } Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_io.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_io.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,45 +1,22 @@ /* - * NTOSKRNL Io Regressions KM-Test - * ReactOS Kernel Mode Regression Testing framework - * - * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> - * Copyright 2008 Etersoft (Alexander Morozov) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Io Regressions KM-Test (Mdl) + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ -/* INCLUDES *******************************************************************/ - -#include <ddk/ntddk.h> -#include "kmtest.h" +#include <ntddk.h> +#include <kmt_test.h> #define NDEBUG -#include "debug.h" +#include <debug.h> - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID NtoskrnlIoMdlTest(HANDLE KeyHandle) +START_TEST(IoMdl) { PMDL Mdl; PIRP Irp; PVOID VirtualAddress; ULONG MdlSize = 2*4096+184; // 2 pages and some random value - - StartTest(); // Try to alloc 2Gb MDL Mdl = IoAllocateMdl(NULL, 2048UL*0x100000, FALSE, FALSE, NULL); @@ -78,91 +55,4 @@ IoFreeIrp(Irp); ExFreePool(VirtualAddress); - - FinishTest(KeyHandle, L"IoMdlTest"); } - -VOID NtoskrnlIoIrpTest(HANDLE KeyHandle) -{ - USHORT size; - IRP *iorp; - - StartTest(); - - // 1st test - size = sizeof(IRP) + 5 * sizeof(IO_STACK_LOCATION); - iorp = ExAllocatePool(NonPagedPool, size); - - if (NULL != iorp) - { - IoInitializeIrp(iorp, size, 5); - - ok(6 == iorp->Type, "Irp type should be 6, but got %d\n", iorp->Type); - ok(iorp->Size == size, "Irp size should be %d, but got %d\n", - iorp->Size, size); - ok(5 == iorp->StackCount, "Irp StackCount should be 5, but got %d\n", - iorp->StackCount); - ok(6 == iorp->CurrentLocation, "Irp CurrentLocation should be 6, but got %d\n", - iorp->CurrentLocation); - ok(IsListEmpty(&iorp->ThreadListEntry), "IRP thread list is not empty\n"); - ok ((PIO_STACK_LOCATION)(iorp + 1) + 5 == - iorp->Tail.Overlay.CurrentStackLocation, - "CurrentStackLocation mismatch\n"); - - ExFreePool(iorp); - } - - // 2nd test - size = sizeof(IRP) + 2 * sizeof(IO_STACK_LOCATION); - iorp = IoAllocateIrp(2, FALSE); - - if (NULL != iorp) - { - ok(6 == iorp->Type, "Irp type should be 6, but got %d\n", iorp->Type); - ok(iorp->Size >= size, - "Irp size should be more or equal to %d, but got %d\n", - iorp->Size, size); - ok(2 == iorp->StackCount, "Irp StackCount should be 2, but got %d\n", - iorp->StackCount); - ok(3 == iorp->CurrentLocation, "Irp CurrentLocation should be 3, but got %d\n", - iorp->CurrentLocation); - ok(IsListEmpty(&iorp->ThreadListEntry), "IRP thread list is not empty\n"); - ok ((PIO_STACK_LOCATION)(iorp + 1) + 2 == - iorp->Tail.Overlay.CurrentStackLocation, - "CurrentStackLocation mismatch\n"); - ok((IRP_ALLOCATED_FIXED_SIZE & iorp->AllocationFlags), - "IRP Allocation flags lack fixed size attribute\n"); - ok(!(IRP_LOOKASIDE_ALLOCATION & iorp->AllocationFlags), - "IRP Allocation flags should not have lookaside allocation\n"); - - IoFreeIrp(iorp); - } - - // 3rd test - size = sizeof(IRP) + 2 * sizeof(IO_STACK_LOCATION); - iorp = IoAllocateIrp(2, TRUE); - - if (NULL != iorp) - { - ok(6 == iorp->Type, "Irp type should be 6, but got %d\n", iorp->Type); - ok(iorp->Size >= size, - "Irp size should be more or equal to %d, but got %d\n", - iorp->Size, size); - ok(2 == iorp->StackCount, "Irp StackCount should be 2, but got %d\n", - iorp->StackCount); - ok(3 == iorp->CurrentLocation, "Irp CurrentLocation should be 3, but got %d\n", - iorp->CurrentLocation); - ok(IsListEmpty(&iorp->ThreadListEntry), "IRP thread list is not empty\n"); - ok ((PIO_STACK_LOCATION)(iorp + 1) + 2 == - iorp->Tail.Overlay.CurrentStackLocation, - "CurrentStackLocation mismatch\n"); - ok((IRP_ALLOCATED_FIXED_SIZE & iorp->AllocationFlags), - "IRP Allocation flags lack fixed size attribute\n"); - ok((IRP_LOOKASIDE_ALLOCATION & iorp->AllocationFlags), - "IRP Allocation flags lack lookaside allocation\n"); - - IoFreeIrp(iorp); - } - - FinishTest(KeyHandle, L"IoIrpTest"); -} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 27 08:49:23 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ke.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ke.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,44 +1,24 @@ /* - * NTOSKRNL Executive Regressions KM-Test - * ReactOS Kernel Mode Regression Testing framework - * - * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Executive Regressions KM-Test + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ -/* INCLUDES *******************************************************************/ +/* TODO: this test doesn't process any test results; it also takes very long */ -#include <ddk/ntddk.h> +#include <ntddk.h> #include <ntifs.h> #include <ndk/ntndk.h> -#include "kmtest.h" +#include <kmt_test.h> #define NDEBUG -#include "debug.h" +#include <debug.h> -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID -KeStallTest(HANDLE KeyHandle) +static VOID KeStallExecutionProcessorTest(VOID) { ULONG i; LARGE_INTEGER TimeStart, TimeFinish; - - StartTest(); DPRINT1("Waiting for 30 secs with 50us stalls...\n"); KeQuerySystemTime(&TimeStart); @@ -72,6 +52,9 @@ KeStallExecutionProcessor(30*1000000); KeQuerySystemTime(&TimeFinish); DPRINT1("Time elapsed: %d secs\n", (TimeFinish.QuadPart - TimeStart.QuadPart) / 10000000); // 30 +} - FinishTest(KeyHandle, L"KeStallmanExecutionTest"); -} +START_TEST(KeProcessor) +{ + KeStallExecutionProcessorTest(); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 27 08:49:23 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ ------------------------------------------------------------------------------ bugtraq:number = true Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ob.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_ob.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c [iso-8859-1] Mon Jun 27 08:49:23 2011 @@ -1,35 +1,19 @@ /* - * NTOSKRNL Ob Regressions KM-Test - * ReactOS Kernel Mode Regression Testing framework - * - * Copyright 2006 Aleksey Bragin <aleksey(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Ob Regressions KM-Test + * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ -/* INCLUDES *******************************************************************/ - -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> -#include "kmtest.h" +/* TODO: this test terminates with an access violation in Windows */ + +#include <ntddk.h> +#include <ntifs.h> +#include <ndk/ntndk.h> +#include <kmt_test.h> #define NDEBUG -#include "debug.h" - -#include "ntndk.h" +#include <debug.h> // I ment to make this test scalable, but for now // we work with two object types only @@ -46,25 +30,24 @@ ULONG SomeLong[10]; } MY_OBJECT2, *PMY_OBJECT2; -POBJECT_TYPE ObTypes[NUM_OBTYPES]; -UNICODE_STRING ObTypeName[NUM_OBTYPES]; -UNICODE_STRING ObName[NUM_OBTYPES]; -OBJECT_TYPE_INITIALIZER ObTypeInitializer[NUM_OBTYPES]; -UNICODE_STRING ObDirectoryName; -OBJECT_ATTRIBUTES ObDirectoryAttributes; -OBJECT_ATTRIBUTES ObAttributes[NUM_OBTYPES]; -PVOID ObBody[NUM_OBTYPES]; -PMY_OBJECT1 ObObject1; -PMY_OBJECT2 ObObject2; -HANDLE ObHandle1[NUM_OBTYPES]; -HANDLE ObHandle2[NUM_OBTYPES]; -HANDLE DirectoryHandle; - -USHORT DumpCount, OpenCount, CloseCount, DeleteCount, - ParseCount, OkayToCloseCount, QueryNameCount; - -/* PRIVATE FUNCTIONS **********************************************************/ - +static POBJECT_TYPE ObTypes[NUM_OBTYPES]; +static UNICODE_STRING ObTypeName[NUM_OBTYPES]; +static UNICODE_STRING ObName[NUM_OBTYPES]; +static OBJECT_TYPE_INITIALIZER ObTypeInitializer[NUM_OBTYPES]; +static UNICODE_STRING ObDirectoryName; +static OBJECT_ATTRIBUTES ObDirectoryAttributes; +static OBJECT_ATTRIBUTES ObAttributes[NUM_OBTYPES]; +static PVOID ObBody[NUM_OBTYPES]; +//static PMY_OBJECT1 ObObject1; +//static PMY_OBJECT2 ObObject2; +static HANDLE ObHandle1[NUM_OBTYPES]; +static HANDLE ObHandle2[NUM_OBTYPES]; +static HANDLE DirectoryHandle; + +static USHORT DumpCount, OpenCount, CloseCount, DeleteCount, + ParseCount, OkayToCloseCount, QueryNameCount; + +static VOID NTAPI DumpProc(IN PVOID Object, @@ -75,6 +58,7 @@ } // Tested in Win2k3 +static VOID NTAPI OpenProc(IN OB_OPEN_REASON OpenReason, @@ -89,6 +73,7 @@ } // Tested in Win2k3 +static VOID NTAPI CloseProc(IN PEPROCESS Process, @@ -103,6 +88,7 @@ } // Tested in Win2k3 +static VOID NTAPI DeleteProc(IN PVOID Object) @@ -111,6 +97,7 @@ DeleteCount++; } +static NTSTATUS NTAPI ParseProc(IN PVOID ParseObject, @@ -131,7 +118,9 @@ return STATUS_OBJECT_NAME_NOT_FOUND;//STATUS_SUCCESS; } +#if 0 // Tested in Win2k3 +static NTSTATUS NTAPI OkayToCloseProc(IN PEPROCESS Process OPTIONAL, @@ -145,6 +134,7 @@ return STATUS_SUCCESS; } +static NTSTATUS NTAPI QueryNameProc(IN PVOID Object, @@ -162,8 +152,9 @@ ReturnLength = 0; return STATUS_OBJECT_NAME_NOT_FOUND; } - - +#endif /* 0 */ + +static VOID ObtCreateObjectTypes() { @@ -215,6 +206,7 @@ } } +static VOID ObtCreateDirectory() { @@ -230,6 +222,7 @@ "Failed to create directory object with status=0x%lX", Status); } +static VOID ObtCreateObjects() { @@ -366,6 +359,7 @@ ok(ParseSave == ParseCount, "Parse method call mismatch\n"); } +static VOID ObtClose() { @@ -427,6 +421,8 @@ */ } +#if 0 +static VOID ObtReferenceTests() { @@ -483,14 +479,10 @@ ObDereferenceObject(ObBody[0]); ObDereferenceObject(ObBody[1]); } - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID -NtoskrnlObTest(HANDLE KeyHandle) -{ - StartTest(); - +#endif /* 0 */ + +START_TEST(ObCreate) +{ DumpCount = 0; OpenCount = 0; CloseCount = 0; DeleteCount = 0; ParseCount = 0; @@ -514,6 +506,4 @@ // Also it has problems with object types removal ObtClose(); DPRINT("Cleanup done\n"); - - FinishTest(KeyHandle, L"ObMgrTest"); -} +}

1 0

[tkreuzer] 52479: [NTOSKRNL] Use KeRainseIrql and KeLowerIrql instead of the fastcall versions. Fixes amd64 build
by tkreuzer＠svn.reactos.org 27 Jun '11

27 Jun '11

Author: tkreuzer Date: Mon Jun 27 00:20:47 2011 New Revision: 52479 URL: http://svn.reactos.org/svn/reactos?rev=52479&view=rev Log: [NTOSKRNL] Use KeRainseIrql and KeLowerIrql instead of the fastcall versions. Fixes amd64 build Modified: trunk/reactos/ntoskrnl/cache/section/io.c Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/io.c [iso-8859-1] Mon Jun 27 00:20:47 2011 @@ -81,7 +81,7 @@ MmUnlockPages(Mdl); Mdl = Mdl->Next; } - + /* Check if there's an MDL */ while ((Mdl = Irp->MdlAddress)) { @@ -96,9 +96,9 @@ NTSTATUS NTAPI MiSimpleRead -(PFILE_OBJECT FileObject, +(PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset, - PVOID Buffer, + PVOID Buffer, ULONG Length, #ifdef __ROS_CMAKE__ BOOLEAN Paging, @@ -110,28 +110,28 @@ KEVENT ReadWait; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION IrpSp; - + ASSERT(FileObject); ASSERT(FileOffset); ASSERT(Buffer); ASSERT(ReadStatus); - + DeviceObject = MmGetDeviceObjectForFile(FileObject); ReadStatus->Status = STATUS_INTERNAL_ERROR; ReadStatus->Information = 0; - + ASSERT(DeviceObject); DPRINT - ("PAGING READ: FileObject %x <%wZ> Offset %08x%08x Length %d\n", - &FileObject, + ("PAGING READ: FileObject %x <%wZ> Offset %08x%08x Length %d\n", + &FileObject, &FileObject->FileName, FileOffset->HighPart, FileOffset->LowPart, Length); KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); - + Irp = IoBuildAsynchronousFsdRequest (IRP_MJ_READ, DeviceObject, @@ -139,7 +139,7 @@ Length, FileOffset, ReadStatus); - + if (!Irp) { return STATUS_NO_MEMORY; @@ -169,10 +169,10 @@ DPRINT1("KeWaitForSingleObject(&ReadWait)\n"); if (!NT_SUCCESS (KeWaitForSingleObject - (&ReadWait, - Suspended, - KernelMode, - FALSE, + (&ReadWait, + Suspended, + KernelMode, + FALSE, NULL))) { DPRINT1("Warning: Failed to wait for synchronous IRP\n"); @@ -180,10 +180,10 @@ return Status; } } - + DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); - Status = - ReadStatus->Status == STATUS_END_OF_FILE ? + Status = + ReadStatus->Status == STATUS_END_OF_FILE ? STATUS_SUCCESS : ReadStatus->Status; return Status; } @@ -191,9 +191,9 @@ NTSTATUS NTAPI _MiSimpleWrite -(PFILE_OBJECT FileObject, +(PFILE_OBJECT FileObject, PLARGE_INTEGER FileOffset, - PVOID Buffer, + PVOID Buffer, ULONG Length, PIO_STATUS_BLOCK ReadStatus, const char *File, @@ -204,24 +204,24 @@ KEVENT ReadWait; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION IrpSp; - + ASSERT(FileObject); ASSERT(FileOffset); ASSERT(Buffer); ASSERT(ReadStatus); - + ObReferenceObject(FileObject); DeviceObject = MmGetDeviceObjectForFile(FileObject); ASSERT(DeviceObject); - + DPRINT - ("PAGING WRITE: FileObject %x Offset %x Length %d (%s:%d)\n", - &FileObject, + ("PAGING WRITE: FileObject %x Offset %x Length %d (%s:%d)\n", + &FileObject, FileOffset->LowPart, Length, File, Line); - + KeInitializeEvent(&ReadWait, NotificationEvent, FALSE); Irp = IoBuildAsynchronousFsdRequest @@ -231,15 +231,15 @@ Length, FileOffset, ReadStatus); - + if (!Irp) { ObDereferenceObject(FileObject); return STATUS_NO_MEMORY; } - + Irp->Flags = IRP_PAGING_IO | IRP_SYNCHRONOUS_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_API; - + Irp->UserEvent = &ReadWait; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -247,7 +247,7 @@ IrpSp->Control |= SL_INVOKE_ON_SUCCESS | SL_INVOKE_ON_ERROR; IrpSp->FileObject = FileObject; IrpSp->CompletionRoutine = MiSimpleReadComplete; - + DPRINT("Call Driver\n"); Status = IoCallDriver(DeviceObject, Irp); DPRINT("Status %x\n", Status); @@ -259,10 +259,10 @@ DPRINT1("KeWaitForSingleObject(&ReadWait)\n"); if (!NT_SUCCESS (KeWaitForSingleObject - (&ReadWait, - Suspended, - KernelMode, - FALSE, + (&ReadWait, + Suspended, + KernelMode, + FALSE, NULL))) { DPRINT1("Warning: Failed to wait for synchronous IRP\n"); @@ -270,7 +270,7 @@ return Status; } } - + DPRINT("Paging IO Done: %08x\n", ReadStatus->Status); return ReadStatus->Status; } @@ -296,11 +296,11 @@ if (!PageBuffer) return STATUS_NO_MEMORY; - OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Hyperspace = MmCreateHyperspaceMapping(Page); RtlCopyMemory(PageBuffer, Hyperspace, PAGE_SIZE); MmDeleteHyperspaceMapping(Hyperspace); - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); DPRINT1("MiWriteBackPage(%wZ,%08x%08x,%s:%d)\n", &FileObject->FileName, FileOffset->u.HighPart, FileOffset->u.LowPart, File, Line); Status = MiSimpleWrite @@ -311,7 +311,7 @@ &Iosb); ExFreePool(PageBuffer); - + if (!NT_SUCCESS(Status)) { DPRINT1("MiSimpleWrite failed (%x)\n", Status);

1 0

[tkreuzer] 52478: [CRT] - comment out gcc specific code on MSVC builds - add some files for amd64 to msvcrtex
by tkreuzer＠svn.reactos.org 26 Jun '11

26 Jun '11

Author: tkreuzer Date: Sun Jun 26 22:57:12 2011 New Revision: 52478 URL: http://svn.reactos.org/svn/reactos?rev=52478&view=rev Log: [CRT] - comment out gcc specific code on MSVC builds - add some files for amd64 to msvcrtex Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crt_handler.c trunk/reactos/lib/sdk/crt/startup/crtexe.c Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Sun Jun 26 22:57:12 2011 @@ -13,7 +13,8 @@ /* CODE **********************************************************************/ .code64 -EXTERN MsgUnimplemented:BYTE +MsgUnimplemented: + .ascii "Unimplemented", CR, LF, NUL FUNC __chkstk .endprolog Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_ms.s [iso-8859-1] Sun Jun 26 22:57:12 2011 @@ -28,17 +28,17 @@ lea rcx, [rsp + 24] /* point past return addr */ jb l_LessThanAPage -.l_MoreThanAPage: +l_MoreThanAPage: sub rcx, PAGE_SIZE /* yes, move pointer down 4k */ - or [rcx], 0 /* probe there */ + or byte ptr [rcx], 0 /* probe there */ sub rax, PAGE_SIZE /* decrement count */ cmp rax, PAGE_SIZE ja l_MoreThanAPage /* and do it again */ -.l_LessThanAPage: +l_LessThanAPage: sub rcx, rax - or [rcx], 0 /* less than 4k, just peek here */ + or byte ptr [rcx], 0 /* less than 4k, just peek here */ pop rax //cfi_pop(%rax) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Jun 26 22:57:12 2011 @@ -49,6 +49,11 @@ math/i386/ftol2_asm.s math/i386/alldiv_asm.s ) +elseif(ARCH MATCHES amd64) +list(APPEND MSVCRTEX_SOURCE + except/amd64/chkstk_asm.s + except/amd64/chkstk_ms.s + math/amd64/alldiv.S) endif() if(MSVC) Modified: trunk/reactos/lib/sdk/crt/startup/crt_handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crt_ha… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crt_handler.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crt_handler.c [iso-8859-1] Sun Jun 26 22:57:12 2011 @@ -40,7 +40,7 @@ int __mingw_init_ehandler (void); extern void _fpreset (void); -#ifdef _WIN64 +#if defined(_WIN64) && !defined(_MSC_VER) EXCEPTION_DISPOSITION __mingw_SEH_error_handler(struct _EXCEPTION_RECORD *, void *, struct _CONTEXT *, void *); #define MAX_PDATA_ENTRIES 32 Modified: trunk/reactos/lib/sdk/crt/startup/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtexe… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtexe.c [iso-8859-1] Sun Jun 26 22:57:12 2011 @@ -277,7 +277,7 @@ _pei386_runtime_relocator (); #endif __mingw_oldexcpt_handler = SetUnhandledExceptionFilter (_gnu_exception_handler); -#ifdef _WIN64 +#if defined(_WIN64) && !defined(_MSC_VER) __mingw_init_ehandler (); #endif __mingw_prepare_except_for_msvcr80_and_higher ();

1 0

[tkreuzer] 52477: [WINE] - demote an #error to a #pragma warning for amd64 MSVC builds
by tkreuzer＠svn.reactos.org 26 Jun '11

26 Jun '11

Author: tkreuzer Date: Sun Jun 26 22:26:42 2011 New Revision: 52477 URL: http://svn.reactos.org/svn/reactos?rev=52477&view=rev Log: [WINE] - demote an #error to a #pragma warning for amd64 MSVC builds Modified: trunk/reactos/include/reactos/wine/port.h Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Sun Jun 26 22:26:42 2011 @@ -172,6 +172,8 @@ "\tnop\n" \ "\t.section \".text\",#alloc,#execinstr\n" ); } \ static void func(void) +#elif defined(_M_AMD64) +#pragma message("You must define the DECL_GLOBAL_CONSTRUCTOR macro for amd64") #else # error You must define the DECL_GLOBAL_CONSTRUCTOR macro for your platform #endif

1 0

[tkreuzer] 52476: [SPEC2DEF] change the way import libs are created for MSVC. Since we don't use underscores in symbols on other architectures than x86, its not possible to create labels like "div"...
by tkreuzer＠svn.reactos.org 26 Jun '11

26 Jun '11

Author: tkreuzer Date: Sun Jun 26 22:23:08 2011 New Revision: 52476 URL: http://svn.reactos.org/svn/reactos?rev=52476&view=rev Log: [SPEC2DEF] change the way import libs are created for MSVC. Since we don't use underscores in symbols on other architectures than x86, its not possible to create labels like "div", since it conflicts with the opcode. Therefore add a prefix and redirect all exports to the prefixed version when building an importlib Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=52476… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Jun 26 22:23:08 2011 @@ -141,7 +141,7 @@ # Generate the asm stub file and the export def file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -r -n=${_name}${_suffix} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_name}${_suffix} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) # Assemble the stub file Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Sun Jun 26 22:23:08 2011 @@ -32,13 +32,14 @@ typedef int (*PFNOUTLINE)(FILE *, EXPORT *); int gbKillAt = 0; -int gbUseDeco = 0; int gbMSComp = 0; +int gbImportLib = 0; int no_redirections = 0; int giArch = ARCH_X86; char *pszArchString = "i386"; char *pszArchString2; char *pszDllName = 0; +char *gpszUnderscore = ""; enum { @@ -242,37 +243,37 @@ /* Handle autoname */ if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') { - fprintf(fileDest, "PUBLIC ordinal%d\nordinal%d: nop\n", - pexp->nOrdinal, pexp->nOrdinal); - } - else if (giArch == ARCH_AMD64) - { - fprintf(fileDest, "PUBLIC %.*s\n%.*s: nop\n", + fprintf(fileDest, "PUBLIC %sordinal%d\n%sordinal%d: nop\n", + gpszUnderscore, pexp->nOrdinal, gpszUnderscore, pexp->nOrdinal); + } + else if (giArch != ARCH_X86) + { + fprintf(fileDest, "PUBLIC _stub_%.*s\n_stub_%.*s: nop\n", pexp->nNameLength, pexp->pcName, pexp->nNameLength, pexp->pcName); } else if (pexp->nCallingConvention == CC_STDCALL) { - fprintf(fileDest, "PUBLIC _%.*s@%d\n_%.*s@%d: nop\n", + fprintf(fileDest, "PUBLIC __stub_%.*s@%d\n__stub_%.*s@%d: nop\n", pexp->nNameLength, pexp->pcName, pexp->nStackBytes, pexp->nNameLength, pexp->pcName, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_FASTCALL) { - fprintf(fileDest, "PUBLIC @%.*s@%d\n@%.*s@%d: nop\n", + fprintf(fileDest, "PUBLIC @_stub_%.*s@%d\n@_stub_%.*s@%d: nop\n", pexp->nNameLength, pexp->pcName, pexp->nStackBytes, pexp->nNameLength, pexp->pcName, pexp->nStackBytes); } else if (pexp->nCallingConvention == CC_CDECL || pexp->nCallingConvention == CC_STUB) { - fprintf(fileDest, "PUBLIC _%.*s\n_%.*s: nop\n", + fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s: nop\n", pexp->nNameLength, pexp->pcName, pexp->nNameLength, pexp->pcName); } else if (pexp->nCallingConvention == CC_EXTERN) { - fprintf(fileDest, "PUBLIC _%.*s\n_%.*s:\n", + fprintf(fileDest, "PUBLIC __stub_%.*s\n__stub_%.*s:\n", pexp->nNameLength, pexp->pcName, pexp->nNameLength, pexp->pcName); } @@ -291,18 +292,26 @@ } void -PrintName(FILE *fileDest, EXPORT *pexp, int fRedir, int fDeco) +PrintName(FILE *fileDest, EXPORT *pexp, char *pszPrefix, int fRedir, int fDeco) { char *pcName = fRedir ? pexp->pcRedirection : pexp->pcName; size_t nNameLength = fRedir ? pexp->nRedirectionLength : pexp->nNameLength; - if (fDeco && pexp->nCallingConvention == CC_FASTCALL) - fprintf(fileDest, "@"); - fprintf(fileDest, "%.*s", nNameLength, pcName); - if ((pexp->nCallingConvention == CC_STDCALL || - pexp->nCallingConvention == CC_FASTCALL) && fDeco) - { - fprintf(fileDest, "@%d", pexp->nStackBytes); + /* Handle autoname */ + if (nNameLength == 1 && pcName[0] == '@') + { + fprintf(fileDest, "ordinal%d", pexp->nOrdinal); + } + else + { + if (fDeco && pexp->nCallingConvention == CC_FASTCALL) + fprintf(fileDest, "@"); + fprintf(fileDest, "%s%.*s", pszPrefix, nNameLength, pcName); + if ((pexp->nCallingConvention == CC_STDCALL || + pexp->nCallingConvention == CC_FASTCALL) && fDeco) + { + fprintf(fileDest, "@%d", pexp->nStackBytes); + } } } @@ -311,29 +320,26 @@ { fprintf(fileDest, " "); - /* Handle autoname */ - if (pexp->nNameLength == 1 && pexp->pcName[0] == '@') - { - fprintf(fileDest, "ordinal%d", pexp->nOrdinal); - } - else - { - PrintName(fileDest, pexp, 0, gbUseDeco && !gbKillAt); - } - - if (pexp->pcRedirection && !no_redirections) - { - int fDeco = (gbUseDeco && !ScanToken(pexp->pcRedirection, '.')); - + PrintName(fileDest, pexp, "", 0, (giArch == ARCH_X86) && !gbKillAt); + + if (gbImportLib) + { fprintf(fileDest, "="); - PrintName(fileDest, pexp, 1, fDeco && !gbMSComp); - } - else if (gbUseDeco && gbKillAt && !gbMSComp && + PrintName(fileDest, pexp, "_stub_", 0, 0); + } + else if (pexp->pcRedirection) + { + int fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); + + fprintf(fileDest, "="); + PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); + } + else if ((giArch == ARCH_X86) && gbKillAt && !gbMSComp && (pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL)) { fprintf(fileDest, "="); - PrintName(fileDest, pexp, 0, 1); + PrintName(fileDest, pexp, "", 0, 1); } if (pexp->nOrdinal != -1) @@ -691,6 +697,11 @@ { pszDllName = argv[i] + 3; } + else if ((strcasecmp(argv[i], "--implib") == 0)) + { + no_redirections = 1; + gbImportLib = 1; + } else if ((strcasecmp(argv[i], "--kill-at") == 0)) { gbKillAt = 1; @@ -714,7 +725,11 @@ } } - if (strcasecmp(pszArchString, "i386") == 0) giArch = ARCH_X86; + if (strcasecmp(pszArchString, "i386") == 0) + { + giArch = ARCH_X86; + gpszUnderscore = "_"; + } else if (strcasecmp(pszArchString, "x86_64") == 0) giArch = ARCH_AMD64; else if (strcasecmp(pszArchString, "ia64") == 0) giArch = ARCH_IA64; else if (strcasecmp(pszArchString, "arm") == 0) giArch = ARCH_ARM; @@ -727,11 +742,6 @@ else pszArchString2 = "win32"; - if (giArch == ARCH_X86) - { - gbUseDeco = 1; - } - /* Set a default dll name */ if (!pszDllName) {

1 0

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 June 2011