Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 53509: - Fix build (let it be "define").
by fireball＠svn.reactos.org 31 Aug '11

31 Aug '11

Author: fireball Date: Wed Aug 31 10:01:33 2011 New Revision: 53509 URL: http://svn.reactos.org/svn/reactos?rev=53509&view=rev Log: - Fix build (let it be "define"). Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] Wed Aug 31 10:01:33 2011 @@ -13,7 +13,7 @@ <define name="__ROS_LONG64__" /> <redefine name="_WIN32_WINNT">0x0500</redefine>  - <define name="s_IServer_v0_0_s_ifspec">IServer_v0_0_s_ifspec</redefine> + <define name="s_IServer_v0_0_s_ifspec">IServer_v0_0_s_ifspec</define> <library>wine</library> <library>pseh</library> <library>ole32</library>

1 0

[jgardou] 53508: [CMAKE] - try to fix gcc build without breaking msvc
by jgardou＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: jgardou Date: Tue Aug 30 21:51:13 2011 New Revision: 53508 URL: http://svn.reactos.org/svn/reactos?rev=53508&view=rev Log: [CMAKE] - try to fix gcc build without breaking msvc Modified: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Tue Aug 30 21:51:13 2011 @@ -3,7 +3,7 @@ if(MSVC) set(IDL_COMPILER midl) set(IDL_HEADER_ARG /h) #.h - set(IDL_HEADER_ARG2 /header) #.h + set(IDL_HEADER_ARG2 /h) #.h set(IDL_TYPELIB_ARG /tlb) #.tlb set(IDL_SERVER_ARG /sstub) #.c for stub server library set(IDL_CLIENT_ARG /cstub) #.c for stub client library @@ -140,7 +140,7 @@ endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} DEPENDS ${FILE} ${IDL_DEPENDS}) endforeach() endfunction()

1 0

[jgardou] 53507: [CMAKE] - fix build
by jgardou＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: jgardou Date: Tue Aug 30 21:26:11 2011 New Revision: 53507 URL: http://svn.reactos.org/svn/reactos?rev=53507&view=rev Log: [CMAKE] - fix build Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Tue Aug 30 21:26:11 2011 @@ -5,6 +5,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) if(MSVC) set(IDL_FLAGS ${IDL_FLAGS} /prefix server s_ /app_config)

1 0

[jgardou] 53506: [WINETESTS/RPCRT4] - fix MSVC build
by jgardou＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: jgardou Date: Tue Aug 30 21:02:14 2011 New Revision: 53506 URL: http://svn.reactos.org/svn/reactos?rev=53506&view=rev Log: [WINETESTS/RPCRT4] - fix MSVC build Modified: trunk/rostests/winetests/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Tue Aug 30 21:02:14 2011 @@ -75,9 +75,7 @@ add_subdirectory(rasapi32) add_subdirectory(riched20) add_subdirectory(riched32) -if(NOT MSVC) - add_subdirectory(rpcrt4) # FIXME: msvc build. -endif() +add_subdirectory(rpcrt4) add_subdirectory(rsabase) add_subdirectory(rsaenh) add_subdirectory(schannel) Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Tue Aug 30 21:02:14 2011 @@ -7,7 +7,7 @@ -D_DLL -D__USE_CRTIMP) if(MSVC) - set(IDL_FLAGS ${IDL_FLAGS} /prefix server s_) + set(IDL_FLAGS ${IDL_FLAGS} /prefix server s_ /app_config) else() set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_) endif()

1 0

[spetreolle] 53505: Add msvcrt to KnownDLLs. This will enforce use of reactos msvcrt when apps provide one. Its required because cmake dlls currently depend on msvcrt for their startup code.
by spetreolle＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: spetreolle Date: Tue Aug 30 21:01:44 2011 New Revision: 53505 URL: http://svn.reactos.org/svn/reactos?rev=53505&view=rev Log: Add msvcrt to KnownDLLs. This will enforce use of reactos msvcrt when apps provide one. Its required because cmake dlls currently depend on msvcrt for their startup code. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Aug 30 21:01:44 2011 @@ -1147,6 +1147,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","imagehlp",0x00000000,"imagehlp.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","kernel32",0x00000000,"kernel32.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","lz32",0x00000000,"lz32.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","msvcrt",0x00000000,"msvcrt.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","ole32",0x00000000,"ole32.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","oleaut32",0x00000000,"oleaut32.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\KnownDlls","olecli32",0x00000000,"olecli32.dll"

1 0

[jgardou] 53504: [CMAKE/MSVC] - use /h to specify header file name when producing rpc proxy file. Don't ask me why /header doesn't work, I have no idea.
by jgardou＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: jgardou Date: Tue Aug 30 21:01:16 2011 New Revision: 53504 URL: http://svn.reactos.org/svn/reactos?rev=53504&view=rev Log: [CMAKE/MSVC] - use /h to specify header file name when producing rpc proxy file. Don't ask me why /header doesn't work, I have no idea. Modified: trunk/reactos/cmake/idl-support.cmake Modified: trunk/reactos/cmake/idl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/idl-support.cmake?re… ============================================================================== --- trunk/reactos/cmake/idl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/idl-support.cmake [iso-8859-1] Tue Aug 30 21:01:16 2011 @@ -140,7 +140,7 @@ endif() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h - COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG2} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} + COMMAND ${IDL_COMPILER} ${INCLUDES} ${DEFINES} ${IDL_FLAGS} ${IDL_HEADER_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.h ${__server_client} ${CMAKE_CURRENT_BINARY_DIR}/${__name}.c ${FILE} DEPENDS ${FILE} ${IDL_DEPENDS}) endforeach() endfunction()

1 0

[jgardou] 53503: [WINETESTS/RPCRT4] Until now, rpcrt4 winetests where badly broken : client calls remotely forwarded to serverside functions which called... client side functions. One has to wonder...
by jgardou＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: jgardou Date: Tue Aug 30 20:49:31 2011 New Revision: 53503 URL: http://svn.reactos.org/svn/reactos?rev=53503&view=rev Log: [WINETESTS/RPCRT4] Until now, rpcrt4 winetests where badly broken : client calls remotely forwarded to serverside functions which called... client side functions. One has to wonder how testbot survived the operation - Cmake : fix that - rbuild : add a hack keeping the old behaviour, because I don't know how to make this right Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild trunk/rostests/winetests/rpcrt4/server.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Tue Aug 30 20:49:31 2011 @@ -5,9 +5,16 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +if(MSVC) + set(IDL_FLAGS ${IDL_FLAGS} /prefix server s_) +else() + set(IDL_FLAGS ${IDL_FLAGS} --prefix-server=s_) +endif() add_rpc_files(client server.idl) add_rpc_files(server server.idl) +unset(IDL_FLAGS) list(APPEND SOURCE cstub.c Modified: trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpcrt4.r… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpcrt4.rbuild [iso-8859-1] Tue Aug 30 20:49:31 2011 @@ -12,6 +12,8 @@ <include root="intermediate" base="rpcrt4_winetest">.</include> <define name="__ROS_LONG64__" /> <redefine name="_WIN32_WINNT">0x0500</redefine> +  + <define name="s_IServer_v0_0_s_ifspec">IServer_v0_0_s_ifspec</redefine> <library>wine</library> <library>pseh</library> <library>ole32</library> Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Tue Aug 30 20:49:31 2011 @@ -1542,12 +1542,12 @@ if (pRpcServerRegisterIfEx) { trace("Using RpcServerRegisterIfEx\n"); - status = pRpcServerRegisterIfEx(IServer_v0_0_s_ifspec, NULL, NULL, + status = pRpcServerRegisterIfEx(s_IServer_v0_0_s_ifspec, NULL, NULL, RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH, RPC_C_LISTEN_MAX_CALLS_DEFAULT, NULL); } else - status = RpcServerRegisterIf(IServer_v0_0_s_ifspec, NULL, NULL); + status = RpcServerRegisterIf(s_IServer_v0_0_s_ifspec, NULL, NULL); ok(status == RPC_S_OK, "RpcServerRegisterIf failed with status %d\n", status); status = RpcServerListen(1, 20, TRUE); ok(status == RPC_S_OK, "RpcServerListen failed with status %d\n", status);

1 0

[jgardou] 53502: [WINETEST/ADVAPI32] - use a service name that exists on Reactos
by jgardou＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: jgardou Date: Tue Aug 30 20:41:27 2011 New Revision: 53502 URL: http://svn.reactos.org/svn/reactos?rev=53502&view=rev Log: [WINETEST/ADVAPI32] - use a service name that exists on Reactos Modified: trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Tue Aug 30 20:41:27 2011 @@ -32,7 +32,8 @@ #include "wine/test.h" -static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms */ +//static const CHAR spooler[] = "Spooler"; /* Should be available on all platforms */ +static const CHAR spooler[] = "Eventlog"; /* All platform except reactos :-/ */ static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD,

1 0

[cgutman] 53501: [ACPI] - Assign unique IDs to all special case devices (thermal zones, power resources, processors, power/sleep buttons)
by cgutman＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: cgutman Date: Tue Aug 30 20:35:31 2011 New Revision: 53501 URL: http://svn.reactos.org/svn/reactos?rev=53501&view=rev Log: [ACPI] - Assign unique IDs to all special case devices (thermal zones, power resources, processors, power/sleep buttons) Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Tue Aug 30 20:35:31 2011 @@ -60,7 +60,8 @@ KEVENT AcpiEventQueue; KDPC event_dpc; -int ProcessorCount; +int ProcessorCount, PowerDeviceCount, PowerButtonCount, FixedPowerButtonCount; +int FixedSleepButtonCount, SleepButtonCount, ThermalZoneCount; static int acpi_device_register ( @@ -1146,7 +1147,7 @@ char *uid = NULL; ACPI_DEVICE_ID_LIST *cid_list = NULL; int i = 0; - char processor_uid[5]; + char static_uid_buffer[5]; if (!child) return_VALUE(AE_BAD_PARAMETER); @@ -1271,10 +1272,12 @@ break; case ACPI_BUS_TYPE_POWER: hid = ACPI_POWER_HID; + uid = static_uid_buffer; + sprintf(uid, "%d", (PowerDeviceCount++)); break; case ACPI_BUS_TYPE_PROCESSOR: hid = ACPI_PROCESSOR_HID; - uid = processor_uid; + uid = static_uid_buffer; sprintf(uid, "%d", (ProcessorCount++)); break; case ACPI_BUS_TYPE_SYSTEM: @@ -1282,18 +1285,28 @@ break; case ACPI_BUS_TYPE_THERMAL: hid = ACPI_THERMAL_HID; + uid = static_uid_buffer; + sprintf(uid, "%d", (ThermalZoneCount++)); break; case ACPI_BUS_TYPE_POWER_BUTTON: hid = ACPI_BUTTON_HID_POWER; + uid = static_uid_buffer; + sprintf(uid, "%d", (PowerButtonCount++)); break; case ACPI_BUS_TYPE_POWER_BUTTONF: hid = ACPI_BUTTON_HID_POWERF; + uid = static_uid_buffer; + sprintf(uid, "%d", (FixedPowerButtonCount++)); break; case ACPI_BUS_TYPE_SLEEP_BUTTON: hid = ACPI_BUTTON_HID_SLEEP; + uid = static_uid_buffer; + sprintf(uid, "%d", (SleepButtonCount++)); break; case ACPI_BUS_TYPE_SLEEP_BUTTONF: hid = ACPI_BUTTON_HID_SLEEPF; + uid = static_uid_buffer; + sprintf(uid, "%d", (FixedSleepButtonCount++)); break; }

1 0

[janderwald] 53500: [HIDUSB] - Add stub hidusb driver - Hidusb driver is reponsible to connect with the hidclass driver (not yet present) and connect hid framework with usb hid devices
by janderwald＠svn.reactos.org 30 Aug '11

30 Aug '11

Author: janderwald Date: Tue Aug 30 16:01:00 2011 New Revision: 53500 URL: http://svn.reactos.org/svn/reactos?rev=53500&view=rev Log: [HIDUSB] - Add stub hidusb driver - Hidusb driver is reponsible to connect with the hidclass driver (not yet present) and connect hid framework with usb hid devices Added: branches/usb-bringup/drivers/usb/hidusb/ (with props) branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt (with props) branches/usb-bringup/drivers/usb/hidusb/hidusb.c (with props) branches/usb-bringup/drivers/usb/hidusb/hidusb.h (with props) Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Aug 30 16:01:00 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/usb/hidusb/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt [iso-8859-1] Tue Aug 30 16:01:00 2011 @@ -1,0 +1,11 @@ + +list(APPEND SOURCE + hidusb.c + usbhub.rc) + +add_library(hidusb SHARED ${SOURCE}) + +set_module_type(hidusb kernelmodedriver) +add_importlibs(hidusb hidclass ntoskrnl usbd) + +add_cab_target(usbhub 2) Propchange: branches/usb-bringup/drivers/usb/hidusb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/usb/hidusb/hidusb.c (added) +++ branches/usb-bringup/drivers/usb/hidusb/hidusb.c [iso-8859-1] Tue Aug 30 16:01:00 2011 @@ -1,0 +1,151 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Human Interface Device Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/hidusb/hidusb.c + * PURPOSE: HID USB Interface Driver + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "hidusb.h" + +NTSTATUS +NTAPI +HidCreate( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity check for hidclass driver + // + ASSERT(IoStack->MajorFunction == IRP_MJ_CREATE || IoStack->MajorFunction == IRP_MJ_CLOSE); + + // + // complete request + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // informal debug print + // + DPRINT1("HIDUSB Request: %x\n", IoStack->MajorFunction); + + // + // done + // + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HidInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HidSystemControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PHID_DEVICE_EXTENSION DeviceExtension; + + // + // get hid device extension + // + DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // copy stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // submit request + // + return IoCallDriver(DeviceExtension->NextDeviceObject); +} + +NTSTATUS +NTAPI +HidPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegPath) +{ + HID_MINIDRIVER_REGISTRATION Registration; + NTSTATUS Status; + + // + // initialize driver object + // + DriverObject->MajorFunction[IRP_MJ_CREATE] = HidCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = HidCreate; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = HidInternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_POWER] = HidPower; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = HidSystemControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = HidPnp; + + // + // prepare registration info + // + RtlZeroMemory(&Registration, sizeof(HID_MINIDRIVER_REGISTRATION)); + + // + // fill in registration info + // + Registration.Revision = HID_REVISION; + Registration.DriverObject = DriverObject; + Registration.RegistryPath = RegPath; + Registration.DeviceExtensionSize = sizeof(HID_USB_DEVICE_EXTENSION); + Registration.DevicesArePolled = FALSE; + + // + // register driver + // + Status = HidRegisterMinidriver(&Registration); + + // + // informal debug + // + DPRINT1("********* HIDUSB *********\n"); + DPRINT1("HIDUSB Registration Status %x\n", Status); + + return Status; +} Propchange: branches/usb-bringup/drivers/usb/hidusb/hidusb.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/hidusb/… ============================================================================== --- branches/usb-bringup/drivers/usb/hidusb/hidusb.h (added) +++ branches/usb-bringup/drivers/usb/hidusb/hidusb.h [iso-8859-1] Tue Aug 30 16:01:00 2011 @@ -1,0 +1,22 @@ +#pragma once + +#define _HIDPI_ +#define _HIDPI_NO_FUNCTION_MACROS_ +#include <ntddk.h> +#include <hidport.h> +#include <debug.h> + +typedef struct +{ + // + // event for completion + // + KEVENT Event; + + // + // list for pending requests + // + LIST_ENTRY PendingRequests; + +}HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION; + Propchange: branches/usb-bringup/drivers/usb/hidusb/hidusb.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs