Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[akhaldi] 53181: [NETSHELL] * Improve the PCH.
by akhaldi＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: akhaldi Date: Thu Aug 11 15:09:52 2011 New Revision: 53181 URL: http://svn.reactos.org/svn/reactos?rev=53181&view=rev Log: [NETSHELL] * Improve the PCH. Modified: trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/precomp.h Modified: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.c [iso-8859-1] Thu Aug 11 15:09:52 2011 @@ -1,6 +1,4 @@ #include "precomp.h" -#include <initguid.h> -#include <devguid.h> HINSTANCE netshell_hInstance; const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Thu Aug 11 15:09:52 2011 @@ -29,13 +29,13 @@ #include <iphlpapi.h> #include <shtypes.h> #include <setupapi.h> +#include <initguid.h> #include <devguid.h> #include <netcon.h> #include <docobj.h> #include <netcfgx.h> #include <netcfgn.h> #include <prsht.h> - #include "wine/debug.h" #include "wine/unicode.h"

1 0

[akhaldi] 53180: [MSWSOCK] * Add a PCH.
by akhaldi＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: akhaldi Date: Thu Aug 11 15:07:19 2011 New Revision: 53180 URL: http://svn.reactos.org/svn/reactos?rev=53180&view=rev Log: [MSWSOCK] * Add a PCH. Added: trunk/reactos/dll/win32/mswsock/precomp.h (with props) Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/mswsock/extensions.c trunk/reactos/dll/win32/mswsock/mswsock.rbuild trunk/reactos/dll/win32/mswsock/stubs.c Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Thu Aug 11 15:07:19 2011 @@ -16,5 +16,6 @@ set_module_type(mswsock win32dll) add_importlibs(mswsock ws2_32 msvcrt kernel32) +add_pch(mswsock precomp.h) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) add_importlib_target(mswsock.spec) Modified: trunk/reactos/dll/win32/mswsock/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/extensio… ============================================================================== --- trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/extensions.c [iso-8859-1] Thu Aug 11 15:07:19 2011 @@ -8,9 +8,7 @@ * REVISIONS: */ -#include <windows.h> -#include <winsock2.h> -#include <mswsock.h> +#include "precomp.h" /* * @implemented Modified: trunk/reactos/dll/win32/mswsock/mswsock.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/mswsock.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/mswsock.rbuild [iso-8859-1] Thu Aug 11 15:07:19 2011 @@ -5,4 +5,5 @@ <file>extensions.c</file> <file>stubs.c</file> <file>mswsock.rc</file> + <pch>precomp.h</pch> </module> Added: trunk/reactos/dll/win32/mswsock/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/precomp.… ============================================================================== --- trunk/reactos/dll/win32/mswsock/precomp.h (added) +++ trunk/reactos/dll/win32/mswsock/precomp.h [iso-8859-1] Thu Aug 11 15:07:19 2011 @@ -1,0 +1,6 @@ +#include <windows.h> +#include <stdlib.h> +#include <winsock2.h> +#include <mswsock.h> +#include <ws2spi.h> +#include <nspapi.h> Propchange: trunk/reactos/dll/win32/mswsock/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mswsock/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/stubs.c [iso-8859-1] Thu Aug 11 15:07:19 2011 @@ -8,12 +8,7 @@ * REVISIONS: */ -#include <windows.h> -#include <stdlib.h> -#include <winsock2.h> -#include <mswsock.h> -#include <ws2spi.h> -#include <nspapi.h> +#include "precomp.h" typedef DWORD (* LPFN_NSPAPI)(VOID); typedef struct _NS_ROUTINE {

1 0

[akhaldi] 53179: [MSPORTS] * Add a PCH.
by akhaldi＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: akhaldi Date: Thu Aug 11 15:06:36 2011 New Revision: 53179 URL: http://svn.reactos.org/svn/reactos?rev=53179&view=rev Log: [MSPORTS] * Add a PCH. Added: trunk/reactos/dll/win32/msports/precomp.h (with props) Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/msports/classinst.c trunk/reactos/dll/win32/msports/comdb.c trunk/reactos/dll/win32/msports/msports.c trunk/reactos/dll/win32/msports/msports.rbuild trunk/reactos/dll/win32/msports/serial.c Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/CMakeLists.txt [iso-8859-1] Thu Aug 11 15:06:36 2011 @@ -13,12 +13,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/msports.def) add_library(msports SHARED ${SOURCE}) - set_module_type(msports win32dll) - target_link_libraries(msports wine) - add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) - +add_pch(msports precomp.h) add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) add_importlib_target(msports.spec) Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Thu Aug 11 15:06:36 2011 @@ -6,13 +6,7 @@ * PROGRAMMERS: Copyright 2011 Eric Kohl */ -#define WIN32_NO_STATUS -#include <windows.h> -#include <cmtypes.h> -#include <stdio.h> -#include <msports.h> -#include <setupapi.h> -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(msports); Modified: trunk/reactos/dll/win32/msports/comdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/comdb.c?… ============================================================================== --- trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/comdb.c [iso-8859-1] Thu Aug 11 15:06:36 2011 @@ -6,10 +6,7 @@ * COPYRIGHT: Copyright 2011 Eric Kohl */ -#include <windows.h> -#include <msports.h> - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(msports); Modified: trunk/reactos/dll/win32/msports/msports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.c [iso-8859-1] Thu Aug 11 15:06:36 2011 @@ -6,9 +6,7 @@ * COPYRIGHT: Copyright 2011 Eric Kohl */ -#include <windows.h> -#include <wine/debug.h> - +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(msports); Modified: trunk/reactos/dll/win32/msports/msports.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/msports.… ============================================================================== --- trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/msports.rbuild [iso-8859-1] Thu Aug 11 15:06:36 2011 @@ -12,4 +12,5 @@ <file>msports.c</file> <file>serial.c</file> <file>msports.rc</file> + <pch>precomp.h</pch> </module> Added: trunk/reactos/dll/win32/msports/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/precomp.… ============================================================================== --- trunk/reactos/dll/win32/msports/precomp.h (added) +++ trunk/reactos/dll/win32/msports/precomp.h [iso-8859-1] Thu Aug 11 15:06:36 2011 @@ -1,0 +1,15 @@ +#define WIN32_NO_STATUS +#include <windows.h> +#include <cmtypes.h> +#include <stdio.h> +#include <msports.h> +#include <setupapi.h> +#include <commctrl.h> +#include <prsht.h> + +#include <wine/debug.h> + +//#include <windows.h> + +#include "internal.h" +#include "resource.h" Propchange: trunk/reactos/dll/win32/msports/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msports/serial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/serial.c… ============================================================================== --- trunk/reactos/dll/win32/msports/serial.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/serial.c [iso-8859-1] Thu Aug 11 15:06:36 2011 @@ -6,15 +6,7 @@ * COPYRIGHT: Copyright 2011 Eric Kohl */ -#include <windows.h> -#include <commctrl.h> -#include <prsht.h> -#include <setupapi.h> - -#include <wine/debug.h> - -#include "internal.h" -#include "resource.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(msports);

1 0

[tkreuzer] 53178: [CMAKE] Add add_delay_importlibs for MSVC
by tkreuzer＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: tkreuzer Date: Thu Aug 11 13:39:06 2011 New Revision: 53178 URL: http://svn.reactos.org/svn/reactos?rev=53178&view=rev Log: [CMAKE] Add add_delay_importlibs for MSVC Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53178… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Aug 11 13:39:06 2011 @@ -177,8 +177,12 @@ endfunction() macro(add_delay_importlibs MODULE) - # TODO. For now forward to normal import libs - add_importlibs(${MODULE} ${ARGN}) + foreach(LIB ${ARGN}) + add_linkerflag(${MODULE} "/DELAYLOAD:${LIB}.dll") + target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.LIB) + add_dependencies(${MODULE} lib${LIB}) + endforeach() + target_link_libraries(${MODULE} delayimp) endmacro() function(spec2def _dllname _spec_file) Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Thu Aug 11 13:39:06 2011 @@ -1,11 +1,5 @@ add_rpc_files(client epm.idl) - -# HACK!!!!!! -if(MSVC) - set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> /nologo <DEFINES> /Fo<OBJECT> /Fd<TARGET_PDB> -c <SOURCE> <FLAGS>") - set_source_files_properties(rpc_transport.c PROPERTIES COMPILE_FLAGS "/link /DELAYLOAD:wininet.dll") -endif() list(APPEND SOURCE cproxy.c @@ -43,7 +37,7 @@ -D_RPCRT4_ -DCOM_NO_WINDOWS_H -DMSWMSG) - + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(rpcrt4.dll rpcrt4.spec) @@ -56,16 +50,9 @@ wine uuid ${PSEH_LIB}) - -if(NOT MSVC) - add_delay_importlibs(rpcrt4 wininet) -else() - add_importlibs(rpcrt4 wininet) - add_linkerflag(rpcrt4 "/DELAYLOAD:wininet.dll") - target_link_libraries(rpcrt4 delayimp) -endif() - add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) +add_delay_importlibs(rpcrt4 wininet) + add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all) add_importlib_target(rpcrt4.spec)

1 0

[tfaber] 53177: [KMTESTS] - Add a dummy IoHelper driver that can be loaded by driver/device tests - Minor changes to other standalone drivers
by tfaber＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: tfaber Date: Thu Aug 11 11:37:50 2011 New Revision: 53177 URL: http://svn.reactos.org/svn/reactos?rev=53177&view=rev Log: [KMTESTS] - Add a dummy IoHelper driver that can be loaded by driver/device tests - Minor changes to other standalone drivers Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoHelper_drv.c - copied, changed from r53083, branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoHelper_drv.rbuild - copied, changed from r53083, branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_drv.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] Thu Aug 11 11:37:50 2011 @@ -87,7 +87,11 @@ # Group targets # add_custom_target(kmtest_drivers) -add_dependencies(kmtest_drivers kmtest_drv example_drv iodriverobject_drv) +add_dependencies(kmtest_drivers + kmtest_drv + example_drv + iodriverobject_drv + iohelper_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest) Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] Thu Aug 11 11:37:50 2011 @@ -49,13 +49,14 @@ IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, - OUT INT *Flags) + IN OUT INT *Flags) { NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); DPRINT("Entry!\n"); Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Thu Aug 11 11:37:50 2011 @@ -68,7 +68,7 @@ TESTENTRY_NO_REGISTER_UNLOAD = 4, } KMT_TESTENTRY_FLAGS; -NTSTATUS TestEntry(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, OUT INT *Flags); +NTSTATUS TestEntry(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, IN OUT INT *Flags); VOID TestUnload(IN PDRIVER_OBJECT DriverObject); #endif /* defined KMT_STANDALONE_DRIVER */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/CMakeLists.txt [iso-8859-1] Thu Aug 11 11:37:50 2011 @@ -1,11 +1,14 @@ include_directories( ../include) -list(APPEND EXAMPLE_DRV_SOURCE +# +# IoDriverObject +# +list(APPEND IODRIVEROBJECT_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c IoDriverObject_drv.c) -add_library(iodriverobject_drv SHARED ${EXAMPLE_DRV_SOURCE}) +add_library(iodriverobject_drv SHARED ${IODRIVEROBJECT_DRV_SOURCE}) set_module_type(iodriverobject_drv kernelmodedriver) target_link_libraries(iodriverobject_drv kmtest_printf ${PSEH_LIB}) @@ -13,3 +16,19 @@ set_property(TARGET iodriverobject_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER) add_cd_file(TARGET iodriverobject_drv DESTINATION reactos/bin FOR all) + +# +# IoHelper +# +list(APPEND IOHELPER_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + IoHelper_drv.c) + +add_library(iohelper_drv SHARED ${IOHELPER_DRV_SOURCE}) + +set_module_type(iohelper_drv kernelmodedriver) +target_link_libraries(iohelper_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(iohelper_drv ntoskrnl hal) +set_property(TARGET iohelper_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER) + +add_cd_file(TARGET iohelper_drv DESTINATION reactos/bin FOR all) Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_drv.c [iso-8859-1] Thu Aug 11 11:37:50 2011 @@ -26,13 +26,14 @@ IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, - OUT INT *Flags) + IN OUT INT *Flags) { NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); *DeviceName = L"IoDriverObject"; @@ -61,6 +62,8 @@ IN PIO_STACK_LOCATION IoStackLocation) { NTSTATUS Status = STATUS_SUCCESS; + + UNREFERENCED_PARAMETER(IoStackLocation); TestDriverObject(DeviceObject->DriverObject, DriverIrp); Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoHelper_drv.c (from r53083, branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoHelper_drv.c [iso-8859-1] Thu Aug 11 11:37:50 2011 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS kernel-mode tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Example Test Driver + * PURPOSE: Kernel-Mode Test Suite I/O Test Helper driver * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ @@ -10,210 +10,40 @@ //#define NDEBUG #include <debug.h> -#include "Example.h" - -/* prototypes */ -static KMT_MESSAGE_HANDLER TestMessageHandler; static KMT_IRP_HANDLER TestIrpHandler; -/* globals */ -static PDRIVER_OBJECT TestDriverObject; - -/** - * @name TestEntry - * - * Test entry point. - * This is called by DriverEntry as early as possible, but with ResultBuffer - * initialized, so that test macros work correctly - * - * @param DriverObject - * Driver Object. - * This is guaranteed not to have been touched by DriverEntry before - * the call to TestEntry - * @param RegistryPath - * Driver Registry Path - * This is guaranteed not to have been touched by DriverEntry before - * the call to TestEntry - * @param DeviceName - * Pointer to receive a test-specific name for the device to create - * @param Flags - * Pointer to a flags variable instructing DriverEntry how to proceed. - * See the KMT_TESTENTRY_FLAGS enumeration for possible values - * Initialized to zero on entry - * - * @return Status. - * DriverEntry will fail if this is a failure status - */ NTSTATUS TestEntry( IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, - OUT INT *Flags) + IN OUT INT *Flags) { NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); + UNREFERENCED_PARAMETER(DriverObject); UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); - DPRINT("Entry!\n"); - - ok_irql(PASSIVE_LEVEL); - TestDriverObject = DriverObject; - - *DeviceName = L"Example"; - - trace("Hi, this is the example driver\n"); + *DeviceName = L"IoHelper"; KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler); KmtRegisterIrpHandler(IRP_MJ_CLOSE, NULL, TestIrpHandler); - KmtRegisterMessageHandler(0, NULL, TestMessageHandler); return Status; } -/** - * @name TestUnload - * - * Test unload routine. - * This is called by the driver's Unload routine as early as possible, with - * ResultBuffer and the test device object still valid, so that test macros - * work correctly - * - * @param DriverObject - * Driver Object. - * This is guaranteed not to have been touched by Unload before the call - * to TestEntry - * - * @return Status - */ VOID TestUnload( IN PDRIVER_OBJECT DriverObject) { PAGED_CODE(); - DPRINT("Unload!\n"); - - ok_irql(PASSIVE_LEVEL); - ok_eq_pointer(DriverObject, TestDriverObject); - - trace("Unloading example driver\n"); + UNREFERENCED_PARAMETER(DriverObject); } -/** - * @name TestMessageHandler - * - * Test message handler routine - * - * @param DeviceObject - * Device Object. - * This is guaranteed not to have been touched by the dispatch function - * before the call to the IRP handler - * @param Irp - * Device Object. - * This is guaranteed not to have been touched by the dispatch function - * before the call to the IRP handler, except for passing it to - * IoGetCurrentStackLocation - * @param IoStackLocation - * Device Object. - * This is guaranteed not to have been touched by the dispatch function - * before the call to the IRP handler - * - * @return Status - */ -static -NTSTATUS -TestMessageHandler( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG ControlCode, - IN PVOID Buffer OPTIONAL, - IN SIZE_T InLength, - IN OUT PSIZE_T OutLength) -{ - NTSTATUS Status = STATUS_SUCCESS; - - switch (ControlCode) - { - case IOCTL_NOTIFY: - { - static int TimesReceived = 0; - - ++TimesReceived; - ok(TimesReceived == 1, "Received control code 1 %d times\n", TimesReceived); - ok_eq_pointer(Buffer, NULL); - ok_eq_ulong((ULONG)InLength, 0LU); - ok_eq_ulong((ULONG)*OutLength, 0LU); - break; - } - case IOCTL_SEND_STRING: - { - static int TimesReceived = 0; - ANSI_STRING ExpectedString = RTL_CONSTANT_STRING("yay"); - ANSI_STRING ReceivedString; - - ++TimesReceived; - ok(TimesReceived == 1, "Received control code 2 %d times\n", TimesReceived); - ok(Buffer != NULL, "Buffer is NULL\n"); - ok_eq_ulong((ULONG)InLength, (ULONG)ExpectedString.Length); - ok_eq_ulong((ULONG)*OutLength, 0LU); - ReceivedString.MaximumLength = ReceivedString.Length = (USHORT)InLength; - ReceivedString.Buffer = Buffer; - ok(RtlCompareString(&ExpectedString, &ReceivedString, FALSE) == 0, "Received string: %Z\n", &ReceivedString); - break; - } - case IOCTL_SEND_MYSTRUCT: - { - static int TimesReceived = 0; - MY_STRUCT ExpectedStruct = { 123, ":D" }; - MY_STRUCT ResultStruct = { 456, "!!!" }; - - ++TimesReceived; - ok(TimesReceived == 1, "Received control code 3 %d times\n", TimesReceived); - ok(Buffer != NULL, "Buffer is NULL\n"); - ok_eq_ulong((ULONG)InLength, (ULONG)sizeof ExpectedStruct); - ok_eq_ulong((ULONG)*OutLength, 2LU * sizeof ExpectedStruct); - if (!skip(Buffer && InLength >= sizeof ExpectedStruct, "Cannot read from buffer!\n")) - ok(RtlCompareMemory(&ExpectedStruct, Buffer, sizeof ExpectedStruct) == sizeof ExpectedStruct, "Buffer does not contain expected values\n"); - - if (!skip(Buffer && *OutLength >= 2 * sizeof ExpectedStruct, "Cannot write to buffer!\n")) - { - RtlCopyMemory((PCHAR)Buffer + sizeof ExpectedStruct, &ResultStruct, sizeof ResultStruct); - *OutLength = 2 * sizeof ExpectedStruct; - } - break; - } - default: - ok(0, "Got an unknown message! DeviceObject=%p, ControlCode=%lu, Buffer=%p, In=%lu, Out=%lu bytes\n", - DeviceObject, ControlCode, Buffer, InLength, *OutLength); - break; - } - - return Status; -} - -/** - * @name TestIrpHandler - * - * Test IRP handler routine - * - * @param DeviceObject - * Device Object. - * This is guaranteed not to have been touched by the dispatch function - * before the call to the IRP handler - * @param Irp - * Device Object. - * This is guaranteed not to have been touched by the dispatch function - * before the call to the IRP handler, except for passing it to - * IoGetCurrentStackLocation - * @param IoStackLocation - * Device Object. - * This is guaranteed not to have been touched by the dispatch function - * before the call to the IRP handler - * - * @return Status - */ static NTSTATUS TestIrpHandler( @@ -223,17 +53,10 @@ { NTSTATUS Status = STATUS_SUCCESS; - DPRINT("IRP!\n"); - - ok_irql(PASSIVE_LEVEL); - ok_eq_pointer(DeviceObject->DriverObject, TestDriverObject); - if (IoStackLocation->MajorFunction == IRP_MJ_CREATE) - trace("Got IRP_MJ_CREATE!\n"); + DPRINT("Helper Driver: Create Device %p", DeviceObject); else if (IoStackLocation->MajorFunction == IRP_MJ_CLOSE) - trace("Got IRP_MJ_CLOSE!\n"); - else - trace("Got an IRP!\n"); + DPRINT("Helper Driver: Close Device %p", DeviceObject); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoHelper_drv.rbuild (from r53083, branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoHelper_drv.rbuild [iso-8859-1] Thu Aug 11 11:37:50 2011 @@ -1,11 +1,11 @@ -<module name="example_drv" type="kernelmodedriver" installbase="bin" installname="example_drv.sys"> +<module name="iohelper_drv" type="kernelmodedriver" installbase="bin" installname="iohelper_drv.sys"> <include base="kmtest_drv">include</include> <library>ntoskrnl</library> <library>hal</library> <library>pseh</library> <library>kmtest_printf</library> <define name="KMT_STANDALONE_DRIVER" /> - <file>Example_drv.c</file> + <file>IoHelper_drv.c</file> <directory name=".."> <directory name="kmtest_drv"> <file>kmtest_standalone.c</file>

1 0

[tfaber] 53176: [KMTESTS] - In fact... don't use WriteConsole at all, as it doesn't allow redirection to a file.
by tfaber＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: tfaber Date: Thu Aug 11 08:59:34 2011 New Revision: 53176 URL: http://svn.reactos.org/svn/reactos?rev=53176&view=rev Log: [KMTESTS] - In fact... don't use WriteConsole at all, as it doesn't allow redirection to a file. Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Thu Aug 11 08:59:34 2011 @@ -221,7 +221,8 @@ DWORD BytesWritten; DWORD LogBufferLength; DWORD Offset = 0; - /* WriteConsole seems to handle at most ~32kB */ + /* A console window can't handle a single + * huge block of data, so split it up */ const DWORD BlockSize = 8 * 1024; KmtFinishTest(TestName); @@ -230,7 +231,7 @@ for (Offset = 0; Offset < LogBufferLength; Offset += BlockSize) { DWORD Length = min(LogBufferLength - Offset, BlockSize); - if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer + Offset, Length, &BytesWritten, NULL)) + if (!WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer + Offset, Length, &BytesWritten, NULL)) error(Error); }

1 0

[tfaber] 53175: [KMTESTS] - Handle WriteConsole's inability to write large buffers
by tfaber＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: tfaber Date: Thu Aug 11 08:50:46 2011 New Revision: 53175 URL: http://svn.reactos.org/svn/reactos?rev=53175&view=rev Log: [KMTESTS] - Handle WriteConsole's inability to write large buffers Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Thu Aug 11 08:50:46 2011 @@ -219,11 +219,20 @@ { DWORD Error = ERROR_SUCCESS; DWORD BytesWritten; + DWORD LogBufferLength; + DWORD Offset = 0; + /* WriteConsole seems to handle at most ~32kB */ + const DWORD BlockSize = 8 * 1024; KmtFinishTest(TestName); - if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer, ResultBuffer->LogBufferLength, &BytesWritten, NULL)) - error(Error); + LogBufferLength = ResultBuffer->LogBufferLength; + for (Offset = 0; Offset < LogBufferLength; Offset += BlockSize) + { + DWORD Length = min(LogBufferLength - Offset, BlockSize); + if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer + Offset, Length, &BytesWritten, NULL)) + error(Error); + } return Error; }

1 0

[cgutman] 53174: [MSAFD] - Implement SO_LINGER and SO_DONTLINGER for getsockopt and setsockopt - Fix and add buffer size checks - Yes, we've gone this long without SO_LINGER support
by cgutman＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: cgutman Date: Thu Aug 11 07:08:16 2011 New Revision: 53174 URL: http://svn.reactos.org/svn/reactos?rev=53174&view=rev Log: [MSAFD] - Implement SO_LINGER and SO_DONTLINGER for getsockopt and setsockopt - Fix and add buffer size checks - Yes, we've gone this long without SO_LINGER support Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Aug 11 07:08:16 2011 @@ -2034,7 +2034,7 @@ PSOCKET_INFORMATION Socket = NULL; PVOID Buffer; INT BufferSize; - BOOLEAN BoolBuffer; + BOOL BoolBuffer; /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); @@ -2069,29 +2069,38 @@ case SO_ACCEPTCONN: BoolBuffer = Socket->SharedData.Listening; Buffer = &BoolBuffer; - BufferSize = sizeof(BOOLEAN); + BufferSize = sizeof(BOOL); break; case SO_BROADCAST: BoolBuffer = Socket->SharedData.Broadcast; Buffer = &BoolBuffer; - BufferSize = sizeof(BOOLEAN); + BufferSize = sizeof(BOOL); break; case SO_DEBUG: BoolBuffer = Socket->SharedData.Debug; Buffer = &BoolBuffer; - BufferSize = sizeof(BOOLEAN); + BufferSize = sizeof(BOOL); break; + case SO_DONTLINGER: + BoolBuffer = (Socket->SharedData.LingerData.l_onoff == 0); + Buffer = &BoolBuffer; + BufferSize = sizeof(BOOL); + break; + + case SO_LINGER: + Buffer = &Socket->SharedData.LingerData; + BufferSize = sizeof(struct linger); + break; + /* case SO_CONDITIONAL_ACCEPT: */ - case SO_DONTLINGER: case SO_DONTROUTE: case SO_ERROR: case SO_GROUP_ID: case SO_GROUP_PRIORITY: case SO_KEEPALIVE: - case SO_LINGER: case SO_MAX_MSG_SIZE: case SO_OOBINLINE: case SO_PROTOCOL_INFO: @@ -2155,8 +2164,36 @@ switch (optname) { case SO_BROADCAST: + if (optlen < sizeof(BOOL)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } Socket->SharedData.Broadcast = (*optval != 0) ? 1 : 0; return 0; + + case SO_DONTLINGER: + if (optlen < sizeof(BOOL)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + Socket->SharedData.LingerData.l_onoff = (*optval != 0) ? 0 : 1; + return 0; + + case SO_LINGER: + if (optlen < sizeof(struct linger)) + { + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + RtlCopyMemory(&Socket->SharedData.LingerData, + optval, + sizeof(struct linger)); + return 0; + + default: + break; } }

1 0

[cgutman] 53173: [LWIP] - Fix user-initiated hard connection closures
by cgutman＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: cgutman Date: Thu Aug 11 06:39:17 2011 New Revision: 53173 URL: http://svn.reactos.org/svn/reactos?rev=53173&view=rev Log: [LWIP] - Fix user-initiated hard connection closures Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Thu Aug 11 06:39:17 2011 @@ -643,7 +643,6 @@ { struct lwip_callback_msg *msg = arg; PTCP_PCB pcb = msg->Input.Close.Connection->SocketContext; - int state; /* Empty the queue even if we're already "closed" */ LibTCPEmptyQueue(msg->Input.Close.Connection); @@ -657,29 +656,36 @@ /* Clear the PCB pointer */ msg->Input.Close.Connection->SocketContext = NULL; - /* Save the old PCB state */ - state = pcb->state; - - msg->Output.Close.Error = tcp_close(pcb); - if (!msg->Output.Close.Error) - { - if (msg->Input.Close.Callback) - { - /* Call the FIN handler in the cases where it will not be called by lwIP */ - switch (state) - { - case CLOSED: - case LISTEN: - case SYN_SENT: - TCPFinEventHandler(msg->Input.Close.Connection, ERR_OK); - break; - - default: - break; - } - } - } - else + switch (pcb->state) + { + case CLOSED: + case LISTEN: + case SYN_SENT: + msg->Output.Close.Error = tcp_close(pcb); + + if (!msg->Output.Close.Error && msg->Input.Close.Callback) + TCPFinEventHandler(msg->Input.Close.Connection, ERR_OK); + break; + + default: + if (msg->Input.Close.Connection->SendShutdown && + msg->Input.Close.Connection->ReceiveShutdown) + { + /* Abort the connection */ + tcp_abort(pcb); + + /* Aborts always succeed */ + msg->Output.Close.Error = ERR_OK; + } + else + { + /* Start the graceful close process (or send RST for pending data) */ + msg->Output.Close.Error = tcp_close(pcb); + } + break; + } + + if (msg->Output.Close.Error) { /* Restore the PCB pointer */ msg->Input.Close.Connection->SocketContext = pcb;

1 0

[akhaldi] 53172: [WDMAUD.DRV] * Set wdmaud.h as a PCH.
by akhaldi＠svn.reactos.org 11 Aug '11

11 Aug '11

Author: akhaldi Date: Thu Aug 11 00:11:30 2011 New Revision: 53172 URL: http://svn.reactos.org/svn/reactos?rev=53172&view=rev Log: [WDMAUD.DRV] * Set wdmaud.h as a PCH. Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt trunk/reactos/dll/win32/wdmaud.drv/legacy.c trunk/reactos/dll/win32/wdmaud.drv/mixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/CMake… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Thu Aug 11 00:11:30 2011 @@ -31,4 +31,5 @@ mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) +add_pch(wdmaud.drv wdmaud.h) add_cd_file(TARGET wdmaud.drv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wdmaud.drv/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/legac… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/legacy.c [iso-8859-1] Thu Aug 11 00:11:30 2011 @@ -14,8 +14,6 @@ */ #include "wdmaud.h" - -#include <stdio.h> #define KERNEL_DEVICE_NAME L"\\\\.\\wdmaud" Modified: trunk/reactos/dll/win32/wdmaud.drv/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mixer… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mixer.c [iso-8859-1] Thu Aug 11 00:11:30 2011 @@ -7,19 +7,7 @@ * PROGRAMMERS: Johannes Anderwald */ -#include <windows.h> -#include <ntddsnd.h> -#include <sndtypes.h> -#include <mmddk.h> -#include <mmebuddy.h> - -#include <ks.h> -#include <ksmedia.h> -#include <samplerate.h> -#include <float_cast.h> -#include <debug.h> -#include "interface.h" - +#include "wdmaud.h" extern HANDLE KernelHandle; Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Thu Aug 11 00:11:30 2011 @@ -1,15 +1,17 @@ #ifndef WDMAUD_H__ #define WDMAUD_H__ +#include <stdio.h> #include <windows.h> #include <ntddsnd.h> #include <sndtypes.h> #include <setupapi.h> #include <mmddk.h> #include <mmebuddy.h> - #include <ks.h> #include <ksmedia.h> +#include <samplerate.h> +#include <float_cast.h> #include "interface.h" #include "mmixer.h" #include <debug.h> Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Thu Aug 11 00:11:30 2011 @@ -23,4 +23,5 @@ <file>mmixer.c</file> <file>legacy.c</file> <file>wdmaud.rc</file> + <pch>wdmaud.h</pch> </module>

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
50
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 August 2011