Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[cgutman] 54817: [NDISUIO] - Forgot a file
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 16:13:06 2012 New Revision: 54817 URL: http://svn.reactos.org/svn/reactos?rev=54817&view=rev Log: [NDISUIO] - Forgot a file Modified: branches/wlan-bringup/drivers/network/ndisuio/misc.c Modified: branches/wlan-bringup/drivers/network/ndisuio/misc.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] Tue Jan 3 16:13:06 2012 @@ -27,19 +27,8 @@ /* Check if the device name matches */ if (RtlEqualUnicodeString(&AdapterContext->DeviceName, DeviceName, TRUE)) { - KeAcquireSpinLockAtDpcLevel(&AdapterContext->Spinlock); - - /* Check that it's not being destroyed */ - if (AdapterContext->OpenCount > 0) - { - KeReleaseSpinLockFromDpcLevel(&AdapterContext->Spinlock); - KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); - return AdapterContext; - } - else - { - KeReleaseSpinLockFromDpcLevel(&Adaptercontext->Spinlock); - } + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + return AdapterContext; } CurrentEntry = CurrentEntry->Flink; @@ -50,24 +39,10 @@ } VOID -ReferenceAdapterContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext, BOOLEAN Locked) +ReferenceAdapterContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) { - KIRQL OldIrql; - - /* Lock if needed */ - if (!Locked) - { - KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); - } - /* Increment the open count */ AdapterContext->OpenCount++; - - /* Unlock if needed */ - if (!Locked) - { - KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); - } } VOID

1 0

[cgutman] 54816: [NDISUIO] - Fix a race condition during adapter context destruction - Add missing IRP completion in IRP_MJ_READ and IRP_MJ_WRITE handlers - Create an adapter context in response to...
by cgutman＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: cgutman Date: Tue Jan 3 16:08:24 2012 New Revision: 54816 URL: http://svn.reactos.org/svn/reactos?rev=54816&view=rev Log: [NDISUIO] - Fix a race condition during adapter context destruction - Add missing IRP completion in IRP_MJ_READ and IRP_MJ_WRITE handlers - Create an adapter context in response to PnP events Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c branches/wlan-bringup/drivers/network/ndisuio/protocol.c branches/wlan-bringup/drivers/network/ndisuio/readwrite.c Modified: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Tue Jan 3 16:08:24 2012 @@ -126,6 +126,7 @@ NTSTATUS Status; PNDISUIO_ADAPTER_CONTEXT AdapterContext; PNDISUIO_OPEN_ENTRY OpenEntry; + KIRQL OldIrql; NameLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (NameLength != 0) @@ -135,16 +136,17 @@ /* Check if this already has a context */ AdapterContext = FindAdapterContextByName(&DeviceName); - if (AdapterContext == NULL) - { - /* Create a new context */ - Status = BindAdapterByName(&DeviceName, &AdapterContext); + if (AdapterContext != NULL) + { + /* Reference the adapter context */ + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); + ReferenceAdapterContext(AdapterContext); + Status = STATUS_SUCCESS; } else { - /* Reference the existing context */ - ReferenceAdapterContext(AdapterContext, FALSE); - Status = STATUS_SUCCESS; + /* Invalid device name */ + Status = STATUS_INVALID_PARAMETER; } /* Check that the bind succeeded */ @@ -161,24 +163,25 @@ FileObject->FsContext2 = OpenEntry; /* Add it to the adapter's list */ - ExInterlockedInsertTailList(&AdapterContext->OpenEntryList, - &OpenEntry->ListEntry, - &AdapterContext->Spinlock); + InsertTailList(&AdapterContext->OpenEntryList, + &OpenEntry->ListEntry); /* Success */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); Status = STATUS_SUCCESS; } else { /* Remove the reference we added */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); DereferenceAdapterContext(AdapterContext, NULL); - Status = STATUS_NO_MEMORY; } } } else { + /* Invalid device name */ Status = STATUS_INVALID_PARAMETER; } Modified: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Tue Jan 3 16:08:24 2012 @@ -135,6 +135,11 @@ PLIST_ENTRY CurrentOpenEntry; PNDISUIO_OPEN_ENTRY OpenEntry; + /* Remove the adapter context from the global list */ + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + RemoveEntryList(&AdapterContext->ListEntry); + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + /* Invalidate all handles to this adapter */ CurrentOpenEntry = AdapterContext->OpenEntryList.Flink; while (CurrentOpenEntry != &AdapterContext->OpenEntryList) @@ -163,11 +168,6 @@ /* If this fails, we have a refcount mismatch somewhere */ ASSERT(AdapterContext->OpenCount == 0); - /* Remove the adapter context from the global list */ - KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); - RemoveEntryList(&AdapterContext->ListEntry); - KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); - /* Send the close request */ NdisCloseAdapter(Status, AdapterContext->BindingHandle); @@ -209,7 +209,7 @@ KeInitializeSpinLock(&AdapterContext->Spinlock); InitializeListHead(&AdapterContext->PacketList); InitializeListHead(&AdapterContext->OpenEntryList); - AdapterContext->OpenCount = 1; + AdapterContext->OpenCount = 0; /* Send the open request */ NdisOpenAdapter(&Status, @@ -261,8 +261,8 @@ PVOID SystemSpecific1, PVOID SystemSpecific2) { - /* We don't bind like this */ - *Status = NDIS_STATUS_SUCCESS; + /* Use our helper function to create a context for this adapter */ + *Status = BindAdapterByName(DeviceName); } VOID Modified: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] (original) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Tue Jan 3 16:08:24 2012 @@ -17,11 +17,13 @@ PIRP Irp) { ASSERT(DeviceObject == GlobalDeviceObject); - + /* FIXME: Not implemented */ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; - + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; } @@ -35,6 +37,8 @@ /* FIXME: Not implemented */ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Information = 0; - + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_IMPLEMENTED; }

1 0

[spetreolle] 54815: [ROSTESTS] Fix oleaut32_winetest cmake build.
by spetreolle＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: spetreolle Date: Tue Jan 3 11:38:21 2012 New Revision: 54815 URL: http://svn.reactos.org/svn/reactos?rev=54815&view=rev Log: [ROSTESTS] Fix oleaut32_winetest cmake build. Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt Modified: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Tue Jan 3 11:38:21 2012 @@ -5,8 +5,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_typelib(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl) -add_dependencies(oleaut32_typelibs stdole2) +add_typelib(test_reg.idl test_tlb.idl tmarshal.idl) add_idl_Headers(oleaut32_idlheaders test_reg.idl tmarshal.idl) generate_idl_iids(tmarshal.idl) @@ -30,5 +29,13 @@ target_link_libraries(oleaut32_winetest uuid wine) set_module_type(oleaut32_winetest win32cui) add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders) +SET(tmarshal.rc_DEPS +${CMAKE_CURRENT_BINARY_DIR}/test_reg.tlb +${CMAKE_CURRENT_BINARY_DIR}/test_tlb.tlb +${CMAKE_CURRENT_BINARY_DIR}/tmarshal.tlb) +#doesn't work, only includes test_reg.tlb +#set_source_files_properties(tmarshal.rc PROPERTIES OBJECT_DEPENDS ${tmarshal.rc_DEPS}) +add_custom_target(oleaut32_typelibs ALL DEPENDS ${tmarshal.rc_DEPS}) + +add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders stdole2) add_cd_file(TARGET oleaut32_winetest DESTINATION reactos/bin FOR all)

1 0

[pschweitzer] 54814: [SHELL32_WINETEST] Comment out yet another test. Let's hope it will take testbot back and allow debugging.
by pschweitzer＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: pschweitzer Date: Tue Jan 3 06:33:06 2012 New Revision: 54814 URL: http://svn.reactos.org/svn/reactos?rev=54814&view=rev Log: [SHELL32_WINETEST] Comment out yet another test. Let's hope it will take testbot back and allow debugging. Modified: trunk/rostests/winetests/shell32/shlfolder.c Modified: trunk/rostests/winetests/shell32/shlfolder.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfold… ============================================================================== --- trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfolder.c [iso-8859-1] Tue Jan 3 06:33:06 2012 @@ -348,7 +348,7 @@ RemoveDirectoryA(".\\testdir"); } - +#if 0 /* perform test */ static void test_EnumObjects(IShellFolder *iFolder) { @@ -434,6 +434,7 @@ for (i=0;i<5;i++) IMalloc_Free(ppM, idlArr[i]); } +#endif static void test_BindToObject(void) { @@ -1335,6 +1336,7 @@ ok(result, "SHGetPathFromIDListW failed\n"); } +#if 0 static void test_EnumObjects_and_CompareIDs(void) { ITEMIDLIST *newPIDL; @@ -1379,6 +1381,7 @@ IShellFolder_Release(IDesktopFolder); } +#endif /* A simple implementation of an IPropertyBag, which returns fixed values for * 'Target' and 'Attributes' properties. @@ -4588,7 +4591,9 @@ test_ParseDisplayName(); test_SHParseDisplayName(); test_BindToObject(); +#if 0 test_EnumObjects_and_CompareIDs(); +#endif test_GetDisplayName(); test_GetAttributesOf(); test_SHGetPathFromIDList();

1 0

[jgardou] 54813: [CMAKE] - add module module type, which is basically a DLL without entry point and use it for typelibs - get rid of custom targets for generating .tlb files and use source file dep...
by jgardou＠svn.reactos.org 03 Jan '12

03 Jan '12

Author: jgardou Date: Tue Jan 3 00:17:18 2012 New Revision: 54813 URL: http://svn.reactos.org/svn/reactos?rev=54813&view=rev Log: [CMAKE] - add module module type, which is basically a DLL without entry point and use it for typelibs - get rid of custom targets for generating .tlb files and use source file dependencies instead Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/idl-support.cmake trunk/reactos/dll/win32/jscript/CMakeLists.txt trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msxml3/CMakeLists.txt trunk/reactos/dll/win32/pstorec/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -294,7 +294,8 @@ set(__subsystem console) elseif(${TYPE} STREQUAL win32gui) set(__subsystem windows) - elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl))) + elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) + OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module))) message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") endif() @@ -336,6 +337,8 @@ elseif(${TYPE} STREQUAL nativedll) set(__entrypoint DllMain) set(__entrystack 12) + elseif(${TYPE} STREQUAL module) + set(__entrypoint 0) endif() if(DEFINED __entrypoint) 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 Jan 3 00:17:18 2012 @@ -53,7 +53,7 @@ set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) endfunction() -function(add_typelib TARGET) +function(add_typelib) get_includes(INCLUDES) get_defines(DEFINES) foreach(FILE ${ARGN}) @@ -64,7 +64,6 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} ${IDL_DEPENDS}) list(APPEND OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb) endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) endfunction() function(add_idl_headers TARGET) Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,7 +1,5 @@ -add_typelib(jsglobal jsglobal.idl) - -add_dependencies(jsglobal stdole2) +add_typelib(jsglobal.idl) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -60,9 +58,12 @@ ntdll) add_pch(jscript jscript.h) -add_dependencies(jscript jsglobal) +# jsglobal.tlb needs stdole2.tlb +add_dependencies(jscript stdole2) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) if(NOT MSVC) allow_warnings(jscript) endif() + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb) Modified: trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml.tlb/CMake… ============================================================================== --- trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,5 @@ -add_typelib(mshtml__tlb mshtml_tlb.idl) -add_dependencies(mshtml__tlb stdole2) +add_typelib(mshtml_tlb.idl) add_definitions(-D__WINESRC__) @@ -8,7 +7,9 @@ add_library(mshtml.tlb SHARED rsrc.rc) -set_module_type(mshtml.tlb win32dll ENTRYPOINT 0 ) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mshtml_tlb.tlb) + +set_module_type(mshtml.tlb module) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") -add_dependencies(mshtml.tlb mshtml__tlb) +add_dependencies(mshtml.tlb stdole2) add_cd_file(TARGET mshtml.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -70,10 +70,13 @@ add_library(msi SHARED ${SOURCE}) add_idl_headers(msi_idlheader msiserver.idl) -add_typelib(msi_tlb msiserver.idl) +add_typelib(msiserver.idl) + +set_source_files_properties(msi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msiserver.tlb) + set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) -add_dependencies(msi msi_idlheader msi_tlb) +add_dependencies(msi msi_idlheader) add_delay_importlibs(msi odbccp32) add_importlibs(msi Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,3 @@ - -add_typelib(msxml3_v1 msxml3_v1.idl) -add_dependencies(msxml3_v1 stdole2) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x601) @@ -19,6 +16,8 @@ set_rc_compiler() spec2def(msxml3.dll msxml3.spec) + +add_typelib(msxml3_v1.idl) list(APPEND SOURCE attribute.c @@ -59,6 +58,8 @@ set_module_type(msxml3 win32dll) +set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml3_v1.tlb) + target_link_libraries(msxml3 libxml2 uuid @@ -87,5 +88,7 @@ kernel32 ntdll) -add_dependencies(msxml3 msxml3_v1) +# msxml3_v1.tlb needs stdole2.tlb +add_dependencies(msxml3 stdole2) + add_cd_file(TARGET msxml3 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,5 @@ -add_typelib(pstorec_tlb pstorec_tlb.idl) -add_dependencies(pstorec_tlb stdole2) +add_typelib(pstorec_tlb.idl) add_definitions(-D__WINESRC__) @@ -13,10 +12,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/pstorec_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pstorec_tlb.tlb) + add_library(pstorec SHARED ${SOURCE}) set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) -add_dependencies(pstorec pstorec_tlb) +# pstorec_tlb.tlb needs stdole2.tlb +add_dependencies(pstorec stdole2) add_cd_file(TARGET pstorec DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -1,6 +1,5 @@ -add_typelib(shdocvw_v1 shdocvw_v1.idl) -add_dependencies(shdocvw_v1 stdole2) +add_typelib(shdocvw_v1.idl) add_definitions(-D_SHDOCVW_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -32,6 +31,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) +set_source_files_properties(shdocvw.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shdocvw_v1.tlb) + add_library(shdocvw SHARED ${SOURCE}) set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) @@ -49,7 +50,9 @@ kernel32 ntdll) -add_dependencies(shdocvw shdocvw_v1) +# shdocvw_v1.tlb needs stdole2.tlb +add_dependencies(shdocvw stdole2) + add_pch(shdocvw shdocvw.h) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) add_importlib_target(shdocvw.spec) Modified: trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/CMak… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -2,17 +2,19 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_typelib(std_ole_v2 std_ole_v2.idl) +add_typelib(std_ole_v2.idl) spec2def(stdole2.tlb stdole2.tlb.spec) list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def) + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v2.tlb) add_library(stdole2.tlb SHARED ${SOURCE}) -set_module_type(stdole2.tlb win32dll ENTRYPOINT 0 ) +set_module_type(stdole2.tlb module) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") -add_dependencies(stdole2.tlb std_ole_v2) + add_cd_file(TARGET stdole2.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/CMa… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -2,18 +2,19 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_typelib(std_ole_v1 std_ole_v1.idl) +add_typelib(std_ole_v1.idl) spec2def(stdole32.tlb stdole32.tlb.spec) list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb) add_library(stdole32.tlb SHARED ${SOURCE}) -set_module_type(stdole32.tlb win32dll ENTRYPOINT 0 ) +set_module_type(stdole32.tlb module) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") -add_dependencies(stdole32.tlb std_ole_v1) add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Tue Jan 3 00:17:18 2012 @@ -116,7 +116,8 @@ add_idl_headers(psdk ${SOURCE}) -add_typelib(stdole2 stdole2.idl) +add_typelib(stdole2.idl) +add_custom_target(stdole2 DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb) add_iid_library(wuguid wuapi.idl) add_iid_library(xml_uuids msxml2.idl)

1 0

[pschweitzer] 54812: [SHELL32_WINETEST] Fix build *grmbl*
by pschweitzer＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: pschweitzer Date: Mon Jan 2 23:56:55 2012 New Revision: 54812 URL: http://svn.reactos.org/svn/reactos?rev=54812&view=rev Log: [SHELL32_WINETEST] Fix build *grmbl* Modified: trunk/rostests/winetests/shell32/shlfileop.c Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Mon Jan 2 23:56:55 2012 @@ -116,6 +116,7 @@ return GetFileAttributesW(name) != INVALID_FILE_ATTRIBUTES; } +#if 0 static BOOL file_has_content(const CHAR *name, const CHAR *content) { CHAR buf[MAX_PATH]; @@ -130,6 +131,7 @@ CloseHandle(file); return strcmp(buf, content)==0; } +#endif /* initializes the tests */ static void init_shfo_tests(void) @@ -811,6 +813,7 @@ } /* tests the FO_COPY action */ +#if 0 static void test_copy(void) { SHFILEOPSTRUCTA shfo, shfo2; @@ -1757,8 +1760,10 @@ ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); } +#endif /* tests the FO_MOVE action */ +#if 0 static void test_move(void) { SHFILEOPSTRUCTA shfo, shfo2; @@ -2036,6 +2041,7 @@ ok(file_exists("test3.txt"), "Expected test3.txt to exist\n"); } } +#endif static void test_sh_create_dir(void) {

1 0

[pschweitzer] 54811: [SHELL32_WINETEST] Comment out two series of tests untill a proper fix is available. Those lead to memory misuse in shell32. This has been revealed by r54804. Should fix both t...
by pschweitzer＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: pschweitzer Date: Mon Jan 2 23:47:32 2012 New Revision: 54811 URL: http://svn.reactos.org/svn/reactos?rev=54811&view=rev Log: [SHELL32_WINETEST] Comment out two series of tests untill a proper fix is available. Those lead to memory misuse in shell32. This has been revealed by r54804. Should fix both test bots. Modified: trunk/rostests/winetests/shell32/shlfileop.c Modified: trunk/rostests/winetests/shell32/shlfileop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/shlfile… ============================================================================== --- trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/shlfileop.c [iso-8859-1] Mon Jan 2 23:47:32 2012 @@ -2396,6 +2396,7 @@ test_rename(); clean_after_shfo_tests(); +#if 0 init_shfo_tests(); test_copy(); clean_after_shfo_tests(); @@ -2403,6 +2404,7 @@ init_shfo_tests(); test_move(); clean_after_shfo_tests(); +#endif test_sh_create_dir(); clean_after_shfo_tests();

1 0

[cgutman] 54810: [NDISUIO] - Add the NDISUIO driver to allow communication between user-mode and kernel-mode NIC drivers - Only the IOCTLs required for WLAN are implemented right now - Initial sour...
by cgutman＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: cgutman Date: Mon Jan 2 21:38:57 2012 New Revision: 54810 URL: http://svn.reactos.org/svn/reactos?rev=54810&view=rev Log: [NDISUIO] - Add the NDISUIO driver to allow communication between user-mode and kernel-mode NIC drivers - Only the IOCTLs required for WLAN are implemented right now - Initial source drop without build testing Added: branches/wlan-bringup/drivers/network/ndisuio/ branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt (with props) branches/wlan-bringup/drivers/network/ndisuio/createclose.c (with props) branches/wlan-bringup/drivers/network/ndisuio/ioctl.c (with props) branches/wlan-bringup/drivers/network/ndisuio/main.c (with props) branches/wlan-bringup/drivers/network/ndisuio/misc.c (with props) branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h (with props) branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild (with props) branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc (with props) branches/wlan-bringup/drivers/network/ndisuio/protocol.c (with props) branches/wlan-bringup/drivers/network/ndisuio/readwrite.c (with props) Added: branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt (added) +++ branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,22 @@ +add_definitions( + -DNDIS50 + -D_NTDRIVER_) + +spec2def(ndisuio.sys ndisuio.spec) + +list(APPEND SOURCE + main.c + ndisuio.rc + ${CMAKE_CURRENT_BINARY_DIR}/ndisuio.def) + +add_library(ndisuio SHARED ${SOURCE}) + +target_link_libraries(ndisuio + ${PSEH_LIB}) + +set_module_type(ndisuio kernelmodedriver) +add_importlibs(ndisuio ndis ntoskrnl hal) + +add_pch(ndisuio ndisuio.h) + +add_cd_file(TARGET ndisuio DESTINATION reactos/system32/drivers FOR all) Propchange: branches/wlan-bringup/drivers/network/ndisuio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/createclose.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/createclose.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/createclose.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,64 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: createclose.c + * PURPOSE: IRP_MJ_CREATE and IRP_MJ_CLOSE handling + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +NduDispatchCreate(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(DeviceObject == GlobalDeviceObject); + + /* This is associated with an adapter during IOCTL_NDISUIO_OPEN_(WRITE_)DEVICE */ + IrpSp->FileObject->FsContext = NULL; + IrpSp->FileObject->FsContext2 = NULL; + + /* Completed successfully */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Return success */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +NduDispatchClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_OPEN_ENTRY OpenEntry = IrpSp->FileObject->FsContext2; + KIRQL OldIrql; + + ASSERT(DeviceObject == GlobalDeviceObject); + + /* Check if this handle was ever associated with an adapter */ + if (AdapterContext != NULL) + { + ASSERT(OpenEntry != NULL); + + /* Call the our helper */ + DereferenceAdapterContextWithOpenEntry(AdapterContext, OpenEntry); + } + + /* Completed */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Return success */ + return STATUS_SUCCESS; +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/createclose.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ioctl.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ioctl.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,247 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: ioctl.c + * PURPOSE: IOCTL handling + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +NTSTATUS +SetAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_SET_OID SetOidRequest; + NDIS_REQUEST NdisRequest; + ULONG RequestLength; + NDIS_STATUS Status; + + Irp->IoStatus.Information = 0; + + SetOidRequest = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + RequestLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + if (QueryOidRequest && RequestLength >= sizeof(NDIS_OID)) + { + /* Setup the NDIS request */ + NdisRequest.RequestType = NdisRequestSetInformation; + NdisRequest.Oid = SetOidRequest->Oid; + NdisRequest.InformationBuffer = SetOidRequest->Data; + NdisRequest.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + + /* Dispatch the request */ + NdisRequest(&Status, + AdapterContext->BindingHandle, + &NdisRequest); + + /* Wait for the request */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + + /* Return the bytes read */ + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = NdisRequest.BytesRead; + } + else + { + /* Bad parameters */ + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +QueryAdapterOid(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = IrpSp->FileObject->FsContext; + PNDISUIO_QUERY_OID QueryOidRequest; + NDIS_REQUEST NdisRequest; + ULONG RequestLength; + NDIS_STATUS Status; + + Irp->IoStatus.Information = 0; + + QueryOidRequest = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + RequestLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + if (QueryOidRequest && RequestLength >= sizeof(NDIS_OID)) + { + /* Setup the NDIS request */ + NdisRequest.RequestType = NdisRequestQueryInformation; + NdisRequest.Oid = QueryOidRequest->Oid; + NdisRequest.InformationBuffer = QueryOidRequest->Data; + NdisRequest.InformationBufferLength = RequestLength - sizeof(NDIS_OID); + + /* Dispatch the request */ + NdisRequest(&Status, + AdapterContext->BindingHandle, + &NdisRequest); + + /* Wait for the request */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + + /* Return the bytes written */ + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = NdisRequest.BytesWritten; + } + else + { + /* Bad parameters */ + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +OpenDeviceReadWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + PFILE_OBJECT FileObject = IrpSp->FileObject; + UNICODE_STRING DeviceName; + ULONG NameLength; + NTSTATUS Status; + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + PNDISUIO_OPEN_ENTRY OpenEntry; + + NameLength = IrpSp->Parameters.DeviceIoControl.InputBufferLength; + if (NameLength != 0) + { + DeviceName.MaximumLength = DeviceName.Length = NameLength; + DeviceName.Buffer = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + /* Check if this already has a context */ + AdapterContext = FindAdapterContextByName(&DeviceName); + if (AdapterContext == NULL) + { + /* Create a new context */ + Status = BindAdapterByName(&DeviceName, &AdapterContext); + } + else + { + /* Reference the existing context */ + ReferenceAdapterContext(AdapterContext, FALSE); + Status = STATUS_SUCCESS; + } + + /* Check that the bind succeeded */ + if (NT_SUCCESS(Status)) + { + OpenEntry = ExAllocatePool(NonPagedPool, sizeof(*OpenEntry)); + if (OpenEntry) + { + /* Set the file object pointer */ + OpenEntry->FileObject = FileObject; + + /* Associate this FO with the adapter */ + FileObject->FsContext = AdapterContext; + FileObject->FsContext2 = OpenEntry; + + /* Add it to the adapter's list */ + ExInterlockedInsertTailList(&AdapterContext->OpenEntryList, + &OpenEntry->ListEntry, + &AdapterContext->Spinlock); + + /* Success */ + Status = STATUS_SUCCESS; + } + else + { + /* Remove the reference we added */ + DereferenceAdapterContext(AdapterContext, NULL); + + Status = STATUS_NO_MEMORY; + } + } + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +OpenDeviceWrite(PIRP Irp, PIO_STACK_LOCATION IrpSp) +{ + /* FIXME: Handle this correctly */ + return OpenDeviceReadWrite(Irp, IrpSp); +} + +NTSTATUS +NTAPI +NduDispatchDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + ASSERT(DeviceObject == GlobalDeviceObject); + + /* Handle open IOCTLs first */ + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_NDISUIO_OPEN_DEVICE: + return OpenDeviceReadWrite(Irp, IrpSp); + + case IOCTL_NDISUIO_OPEN_WRITE_DEVICE: + return OpenDeviceWrite(Irp, IrpSp); + + default: + /* Fail if this file object has no adapter associated */ + if (IrpSp->FileObject->FsContext == NULL) + { + Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_INVALID_PARAMETER; + } + + /* Now handle other IOCTLs */ + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_NDISUIO_QUERY_OID_VALUE: + return QueryAdapterOid(Irp, IrpSp); + + case IOCTL_NDISUIO_SET_OID_VALUE: + return SetAdapterOid(Irp, IrpSp); + + default: + DPRINT1("Unimplemented\n"); + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + } + break; + } +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/ioctl.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/main.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/main.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/main.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,88 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: main.c + * PURPOSE: Driver entry point and protocol initialization + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +PDEVICE_OBJECT GlobalDeviceObject; +NDIS_HANDLE GlobalProtocolHandle; + +VOID NTAPI NduUnload(PDRIVER_OBJECT DriverObject) +{ + IoDeleteDevice(GlobalDeviceObject); + + DPRINT("NDISUIO: Unloaded\n"); +} + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status; + NDIS_PROTOCOL_CHARACTERISTICS Chars; + + /* Setup dispatch functions */ + DriverObject->MajorFunction[IRP_MJ_CREATE] = NduDispatchCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = NduDispatchClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = NduDispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_READ] = NduDispatchRead; + DriverObject->MajorFunction[IRP_MJ_WRITE] = NduDispatchWrite; + DriverObject->DriverUnload = NduUnload; + + /* Create the NDISUIO device object */ + Status = IoCreateDevice(DriverObject, + 0, + NULL, // FIXME + NDISUIO_DEVICE_NAME, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &GlobalDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create device object with status 0x%x\n", Status); + return Status; + } + + /* Register the protocol with NDIS */ + RtlZeroMemory(&Chars, sizeof(Chars)); + Chars.MajorNdisVersion = NDIS_MAJOR_VERSION; + Chars.MinorNdisVersion = NDIS_MINOR_VERSION; + Chars.OpenAdapterCompleteHandler = NduOpenAdapterComplete; + Chars.CloseAdapterCompleteHandler = NduCloseAdapterComplete; + Chars.SendCompleteHandler = NduSendComplete; + Chars.TransferDataCompleteHandler = NduTransferDataComplete; + Chars.ResetCompleteHandler = NduResetComplete; + Chars.RequestCompleteHandler = NduRequestComplete; + Chars.ReceiveHandler = NduReceive; + Chars.ReceiveComplete = NduReceiveComplete; + Chars.StatusHandler = NduStatus; + Chars.StatusCompleteHandler = NduStatusComplete; + Chars.Name = NULL; //FIXME + Chars.ReceivePacketHandler = NULL; //NduReceivePacket + Chars.BindAdapterHandler = NduBindAdapter; + Chars.UnbindAdapterHandler = NduUnbindAdapter; + Chars.PnPEventHandler = NduPnPEvent; + + NdisRegisterProtocol(&Status, + &GlobalProtocolHandle, + &Chars, + sizeof(Chars)); + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to register protocol with status 0x%x\n", Status); + IoDeleteDevice(GlobalDeviceObject); + return Status; + } + + DPRINT("NDISUIO: Loaded\n"); + + return STATUS_SUCCESS; +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/misc.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/misc.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/misc.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,113 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: misc.c + * PURPOSE: Helper functions + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +PNDISUIO_ADAPTER_CONTEXT +FindAdapterContextByName(PNDIS_STRING DeviceName) +{ + KIRQL OldIrql; + PLIST_ENTRY CurrentEntry; + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + CurrentEntry = GlobalAdapterList.Flink; + while (CurrentEntry != &GlobalAdapterList) + { + AdapterContext = CONTAINING_RECORD(CurrentEntry, NDISUIO_ADAPTER_CONTEXT, ListEntry); + + /* Check if the device name matches */ + if (RtlEqualUnicodeString(&AdapterContext->DeviceName, DeviceName, TRUE)) + { + KeAcquireSpinLockAtDpcLevel(&AdapterContext->Spinlock); + + /* Check that it's not being destroyed */ + if (AdapterContext->OpenCount > 0) + { + KeReleaseSpinLockFromDpcLevel(&AdapterContext->Spinlock); + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + return AdapterContext; + } + else + { + KeReleaseSpinLockFromDpcLevel(&Adaptercontext->Spinlock); + } + } + + CurrentEntry = CurrentEntry->Flink; + } + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + + return NULL; +} + +VOID +ReferenceAdapterContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext, BOOLEAN Locked) +{ + KIRQL OldIrql; + + /* Lock if needed */ + if (!Locked) + { + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); + } + + /* Increment the open count */ + AdapterContext->OpenCount++; + + /* Unlock if needed */ + if (!Locked) + { + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + } +} + +VOID +DereferenceAdapterContextWithOpenEntry(PNDISUIO_ADAPTER_CONTEXT AdapterContext, + PNDISUIO_OPEN_ENTRY OpenEntry) +{ + KIRQL OldIrql; + + /* Lock the adapter context */ + KeAcquireSpinLock(&AdapterContext->Spinlock, &OldIrql); + + /* Decrement the open count */ + AdapterContext->OpenCount--; + + /* Cleanup the open entry if we were given one */ + if (OpenEntry != NULL) + { + /* Remove the open entry */ + RemoveEntryList(&OpenEntry->ListEntry); + + /* Invalidate the FO */ + OpenEntry->FileObject->FsContext = NULL; + OpenEntry->FileObject->FsContext2 = NULL; + + /* Free the open entry */ + ExFreePool(OpenEntry); + } + + /* See if this binding can be destroyed */ + if (AdapterContext->OpenCount == 0) + { + /* Unlock the context */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + + /* Destroy the adapter context */ + UnbindAdapterByContext(AdapterContext); + } + else + { + /* Still more references on it */ + KeReleaseSpinLock(&AdapterContext->Spinlock, OldIrql); + } +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,55 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: ndisuio.h + * PURPOSE: NDISUIO definitions + */ +#ifndef __NDISUIO_H +#define __NDISUIO_H + +#include <wdm.h> +#include <ndis.h> +//#include <nuiouser.h> +#include <ndistapi.h> +#include <ndisguid.h> + +struct _NDISUIO_ADAPTER_CONTEXT +{ + /* Asynchronous completion */ + NDIS_STATUS AsyncStatus; + KEVENT AsyncEvent; + + /* NDIS binding information */ + NDIS_HANDLE BindingHandle; + + /* Reference count information */ + ULONG OpenCount; + LIST_ENTRY OpenEntryList; + + /* Receive packet list */ + LIST_ENTRY PacketList; + + /* Cancel read */ + BOOLEAN CancelRead; + + /* Global list entry */ + LIST_ENTRY ListEntry; + + /* Spin lock */ + KSPIN_LOCK Spinlock; +} NDISUIO_ADAPTER_CONTEXT, *PNDISUIO_ADAPTER_CONTEXT; + +struct _NDISUIO_OPEN_ENTRY +{ + /* File object */ + PFILE_OBJECT FileObject; + + /* List entry */ + LIST_ENTRY ListEntry; +} NDISUIO_OPEN_ENTRY, *PNDISUIO_OPEN_ENTRY; + +/* NDIS version info */ +#define NDIS_MAJOR_VERISON 5 +#define NDIS_MINOR_VERSION 0 + +#endif /* __NDISUIO_H */ Propchange: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ndisuio" type="kernelmodedriver" installbase="system32/drivers" installname="ndisuio.sys"> + <include base="ndisuio">.</include> + <define name="NDIS50" /> + <define name="_NTDRIVER_" /> + <library>ndis</library> + <library>pseh</library> + <library>ntoskrnl</library> + <library>hal</library> + <pch>ndisuio.h</pch> + <file>main.c</file> + <file>ndisuio.rc</file> +</module> Propchange: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc (added) +++ branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "NDIS User-Mode I/O Protocol Driver\0" +#define REACTOS_STR_INTERNAL_NAME "ndisuio\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ndisuio.sys\0" +#include <reactos/version.rc> Propchange: branches/wlan-bringup/drivers/network/ndisuio/ndisuio.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/protocol.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/protocol.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,278 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: protocol.c + * PURPOSE: Protocol stuff + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +PNDIS_MEDIUM SupportedMedia = {NdisMedium802_3}; + +VOID +NTAPI +NduOpenAdapterComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status, + NDIS_STATUS OpenStatus) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter open completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +VOID +NTAPI +NduCloseAdapterComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter close completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +VOID +NTAPI +NduSendComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status) +{ + /* FIXME: Implement send/receive */ +} + +VOID +NTAPI +NduTransferDataComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_PACKET Packet, + NDIS_STATUS Status, + UINT BytesTransferred) +{ + /* FIXME: Implement send/receive */ +} + +VOID +NTAPI +NduResetComplete(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS Status) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter reset completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +VOID +NTAPI +NduRequestComplete(NDIS_HANDLE ProtocolBindingContext, + PNDIS_REQUEST NdisRequest, + NDIS_STATUS Status) +{ + PNDISUIO_ADAPTER_CONTEXT AdapterContext = ProtocolBindingContext; + + DPRINT("Asynchronous adapter request completed\n"); + + /* Store the final status and signal the event */ + AdapterContext->AsyncStatus = Status; + KeSetEvent(&AdapterContext->AsyncEvent, IO_NO_INCREMENT, FALSE); +} + +NDIS_STATUS +NTAPI +NduReceive(NDIS_HANDLE ProtocolBindingContext, + NDIS_HANDLE MacReceiveContext, + PVOID HeaderBuffer, + UINT HeaderBufferSize, + PVOID LookAheadBuffer, + UINT LookaheadBufferSize, + UINT PacketSize) +{ + /* FIXME: Implement send/receive */ + return NDIS_STATUS_NOT_ACCEPTED; +} + +VOID +NTAPI +NduReceiveComplete(NDIS_HANDLE ProtocolBindingContext) +{ + /* No op */ +} + +VOID +NTAPI +NduStatus(NDIS_HANDLE ProtocolBindingContext, + NDIS_STATUS GeneralStatus, + PVOID StatusBuffer, + UINT StatusBufferSize) +{ + /* FIXME: Implement status tracking */ +} + +VOID +NTAPI +NduStatusComplete(NDIS_HANDLE ProtocolBindingContext) +{ + /* FIXME: Implement status tracking */ +} + +NDIS_STATUS +UnbindAdapterByContext(PNDISUIO_ADAPTER_CONTEXT AdapterContext) +{ + KIRQL OldIrql; + PLIST_ENTRY CurrentOpenEntry; + PNDISUIO_OPEN_ENTRY OpenEntry; + + /* Invalidate all handles to this adapter */ + CurrentOpenEntry = AdapterContext->OpenEntryList.Flink; + while (CurrentOpenEntry != &AdapterContext->OpenEntryList) + { + OpenEntry = CONTAINING_RECORD(CurrentOpenEntry, NDISUIO_OPEN_ENTRY, ListEntry); + + /* Make sure the entry is sane */ + ASSERT(OpenEntry->FileObject); + + /* Remove the adapter context pointer */ + ASSERT(AdapterContext == OpenEntry->FileObject->FsContext); + OpenEntry->FileObject->FsContext = NULL; + AdapterContext->OpenCount--; + + /* Remove the open entry pointer */ + ASSERT(OpenEntry == OpenEntry->FileObject->FsContext2); + OpenEntry->FileObject->FsContext2 = NULL; + + /* Move to the next entry */ + CurrentOpenEntry = CurrentOpenEntry->Flink; + + /* Free the open entry */ + ExFreePool(OpenEntry); + } + + /* If this fails, we have a refcount mismatch somewhere */ + ASSERT(AdapterContext->OpenCount == 0); + + /* Remove the adapter context from the global list */ + KeAcquireSpinLock(&GlobalAdapterListLock, &OldIrql); + RemoveEntryList(&AdapterContext->ListEntry); + KeReleaseSpinLock(&GlobalAdapterListLock, OldIrql); + + /* Send the close request */ + NdisCloseAdapter(Status, + AdapterContext->BindingHandle); + + /* Wait for a pending close */ + if (*Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + *Status = AdapterContext->AsyncStatus; + } + + /* Free the context */ + ExFreePool(AdapterContext); +} + + +NDIS_STATUS +BindAdapterByName(PNDIS_STRING DeviceName, PNDISUIO_ADAPTER_CONTEXT *Context) +{ + NDIS_STATUS OpenErrorStatus; + PNDISUIO_ADAPTER_CONTEXT AdapterContext; + UINT SelectedMedium; + NDIS_STATUS Status; + + /* Allocate the adapter context */ + AdapterContext = ExAllocatePool(NonPagedPool, sizeof(*AdapterContext)); + if (!AdapterContext) + { + return NDIS_STATUS_RESOURCES; + } + + /* Set up the adapter context */ + RtlZeroMemory(AdapterContext, sizeof(*AdapterContext)); + KeInitializeEvent(&AdapterContext->AsyncEvent, SynchronizationEvent, FALSE); + KeInitializeSpinLock(&AdapterContext->Spinlock); + InitializeListHead(&AdapterContext->PacketList); + InitializeListHead(&AdapterContext->OpenEntryList); + AdapterContext->OpenCount = 1; + + /* Send the open request */ + NdisOpenAdapter(&Status, + &OpenErrorStatus, + &AdapterContext->BindingHandle, + &SelectedMedium, + SupportedMedia, + sizeof(SupportedMedia), + GlobalProtocolHandle, + AdapterContext, + DeviceName, + 0, + NULL); + + /* Wait for a pending open */ + if (Status == NDIS_STATUS_PENDING) + { + KeWaitForSingleObject(&AdapterContext->AsyncEvent, + Executive, + KernelMode, + FALSE, + NULL); + Status = AdapterContext->AsyncStatus; + } + + /* Check the final status */ + if (Status != NDIS_STATUS_SUCCESS) + { + DPRINT1("Failed to open adapter for bind with status 0x%x\n", *Status); + ExFreePool(AdapterContext); + return; + } + + /* Add the adapter context to the global list */ + ExInterlockedInsertTailList(&GlobalAdapterList, + &AdapterContext->ListEntry, + &GlobalAdapterListLock); + + /* Return the context */ + *Context = AdapterContext; + return STATUS_SUCCESS; +} + +VOID +NTAPI +NduBindAdapter(PNDIS_STATUS Status, + NDIS_HANDLE BindContext, + PNDIS_STRING DeviceName, + PVOID SystemSpecific1, + PVOID SystemSpecific2) +{ + /* We don't bind like this */ + *Status = NDIS_STATUS_SUCCESS; +} + +VOID +NTAPI +NduUnbindAdapter(PNDIS_STATUS Status, + NDIS_HANDLE ProtocolBindingContext, + NDIS_HANDLE UnbindContext) +{ + /* This is forced unbind. UnbindAdapterByContext() will take care of + * invalidating file handles pointer to this adapter for us */ + *Status = UnbindAdapterByContext(ProtocolBindingContext); +} + Propchange: branches/wlan-bringup/drivers/network/ndisuio/protocol.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/wlan-bringup/drivers/network/nd… ============================================================================== --- branches/wlan-bringup/drivers/network/ndisuio/readwrite.c (added) +++ branches/wlan-bringup/drivers/network/ndisuio/readwrite.c [iso-8859-1] Mon Jan 2 21:38:57 2012 @@ -1,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS User I/O driver + * FILE: readwrite.c + * PURPOSE: Handles IRP_MJ_READ and IRP_MJ_WRITE + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include "ndisuio.h" + +#define NDEBUG +#include <debug.h> + +VOID +NTAPI +NduDispatchRead(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + ASSERT(DeviceObject == GlobalDeviceObject); + + /* FIXME: Not implemented */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + return STATUS_NOT_IMPLEMENTED; +} + +VOID +NTAPI +NduDispatchWrite(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + ASSERT(DeviceObject == GlobalDeviceObject); + + /* FIXME: Not implemented */ + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + Irp->IoStatus.Information = 0; + + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/wlan-bringup/drivers/network/ndisuio/readwrite.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 54809: [WLAN-BRINGUP] - Create a branch to drop my ndisuio work
by cgutman＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: cgutman Date: Mon Jan 2 20:53:24 2012 New Revision: 54809 URL: http://svn.reactos.org/svn/reactos?rev=54809&view=rev Log: [WLAN-BRINGUP] - Create a branch to drop my ndisuio work Added: branches/wlan-bringup/ (props changed) - copied from r54807, trunk/reactos/ Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jan 2 20:53:24 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Jan 2 20:53:24 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Jan 2 20:53:24 2012 @@ -1,0 +1,12 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 Propchange: branches/wlan-bringup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[janderwald] 54808: [USB-BRINGUP] - Create PDO for each top level collection found - Use the specified collection index instead of the first - add collection id to hardware id when the device has m...
by janderwald＠svn.reactos.org 02 Jan '12

02 Jan '12

Author: janderwald Date: Mon Jan 2 12:00:51 2012 New Revision: 54808 URL: http://svn.reactos.org/svn/reactos?rev=54808&view=rev Log: [USB-BRINGUP] - Create PDO for each top level collection found - Use the specified collection index instead of the first - add collection id to hardware id when the device has more than one top level collection, see http://msdn.microsoft.com/en-us/windows/hardware/gg487473 for details Modified: branches/usb-bringup/drivers/hid/hidclass/fdo.c branches/usb-bringup/drivers/hid/hidclass/hidclass.c branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup/drivers/hid/hidclass/precomp.h Modified: branches/usb-bringup/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/fdo.c [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -180,8 +180,6 @@ // IoStack->DeviceObject = DeviceObject; - - // // call driver // @@ -409,7 +407,7 @@ // // allocate result // - DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations.Count-1) * sizeof(PDEVICE_OBJECT)); + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS) + (FDODeviceExtension->DeviceRelations->Count-1) * sizeof(PDEVICE_OBJECT)); if (!DeviceRelations) { // @@ -422,24 +420,23 @@ // // copy device objects // - for(Index = 0; Index < FDODeviceExtension->DeviceRelations.Count; Index++) + for(Index = 0; Index < FDODeviceExtension->DeviceRelations->Count; Index++) { // // reference pdo // - ObReferenceObject(FDODeviceExtension->DeviceRelations.Objects[Index]); + ObReferenceObject(FDODeviceExtension->DeviceRelations->Objects[Index]); // // store object // - DeviceRelations->Objects[Index] = FDODeviceExtension->DeviceRelations.Objects[Index]; + DeviceRelations->Objects[Index] = FDODeviceExtension->DeviceRelations->Objects[Index]; } // // set object count // - DeviceRelations->Count = FDODeviceExtension->DeviceRelations.Count; - + DeviceRelations->Count = FDODeviceExtension->DeviceRelations->Count; // // store result @@ -481,12 +478,12 @@ return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); } - if (FDODeviceExtension->DeviceRelations.Count == 0) + if (FDODeviceExtension->DeviceRelations == NULL) { // // time to create the pdos // - Status = HidClassPDO_CreatePDO(DeviceObject); + Status = HidClassPDO_CreatePDO(DeviceObject, &FDODeviceExtension->DeviceRelations); if (!NT_SUCCESS(Status)) { // @@ -500,7 +497,7 @@ // // sanity check // - ASSERT(FDODeviceExtension->DeviceRelations.Count > 0); + ASSERT(FDODeviceExtension->DeviceRelations->Count > 0); } // Modified: branches/usb-bringup/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/hidclass.c [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -304,8 +304,8 @@ KIRQL OldLevel; PUCHAR Address; ULONG Offset; - PHIDP_DEVICE_DESC DeviceDescription; - ULONG CollectionIndex; + PHIDP_COLLECTION_DESC CollectionDescription; + PHIDP_REPORT_IDS ReportDescription; // // get irp context @@ -328,20 +328,34 @@ // // get address // - Address = HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); + Address = (PUCHAR)HidClass_GetSystemAddress(IrpContext->OriginalIrp->MdlAddress); if (Address) { // // reports may have a report id prepended // - CollectionIndex = IrpContext->FileOp->DeviceExtension->CollectionIndex; - DeviceDescription = &IrpContext->FileOp->DeviceExtension->Common.DeviceDescription; - - // - // calculate offset - // - ASSERT(DeviceDescription->CollectionDesc[CollectionIndex].InputLength >= DeviceDescription->ReportIDs[CollectionIndex].InputLength); - Offset = DeviceDescription->CollectionDesc[CollectionIndex].InputLength - DeviceDescription->ReportIDs[CollectionIndex].InputLength; + Offset = 0; + + // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + // + // get report description + // + ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(ReportDescription); + + if (CollectionDescription && ReportDescription) + { + // + // calculate offset + // + ASSERT(CollectionDescription->InputLength >= ReportDescription->InputLength); + Offset = CollectionDescription->InputLength - ReportDescription->InputLength; + } // // copy result @@ -451,6 +465,8 @@ PIO_STACK_LOCATION IoStack; PHIDCLASS_IRP_CONTEXT IrpContext; PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + PHIDP_COLLECTION_DESC CollectionDescription; + PHIDP_REPORT_IDS ReportDescription; // // get an irp from fresh list @@ -498,20 +514,33 @@ ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // - // sanity checks - // - ASSERT(PDODeviceExtension->CollectionIndex < PDODeviceExtension->Common.DeviceDescription.CollectionDescLength); - ASSERT(PDODeviceExtension->CollectionIndex < PDODeviceExtension->Common.DeviceDescription.ReportIDsLength); - ASSERT(PDODeviceExtension->Common.DeviceDescription.ReportIDs[PDODeviceExtension->CollectionIndex].InputLength > 0); - ASSERT(PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].InputLength == BufferLength); - - // // init irp context // RtlZeroMemory(IrpContext, sizeof(HIDCLASS_IRP_CONTEXT)); - IrpContext->InputReportBufferLength = PDODeviceExtension->Common.DeviceDescription.ReportIDs[PDODeviceExtension->CollectionIndex].InputLength; IrpContext->OriginalIrp = RequestIrp; IrpContext->FileOp = Context; + + // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + // + // get report description + // + ReportDescription = HidClassPDO_GetReportDescription(&IrpContext->FileOp->DeviceExtension->Common.DeviceDescription, IrpContext->FileOp->DeviceExtension->CollectionNumber); + ASSERT(ReportDescription); + + // + // sanity check + // + ASSERT(CollectionDescription->InputLength >= ReportDescription->InputLength); + + // + // store report length + // + IrpContext->InputReportBufferLength = ReportDescription->InputLength; // // allocate buffer @@ -677,11 +706,19 @@ PIO_STACK_LOCATION IoStack; PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; PHID_COLLECTION_INFORMATION CollectionInformation; + PHIDP_COLLECTION_DESC CollectionDescription; + PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; // // get device extension // CommonDeviceExtension = (PHIDCLASS_COMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(CommonDeviceExtension->IsFDO == FALSE); + + // + // get pdo device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; // // get stack location @@ -712,9 +749,15 @@ ASSERT(CollectionInformation); // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, PDODeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + // // init result buffer // - CollectionInformation->DescriptorSize = CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; //FIXME which collection is to be retrieved for composite devices / multi collection devices? + CollectionInformation->DescriptorSize = CollectionDescription->PreparsedDataLength; CollectionInformation->Polled = CommonDeviceExtension->DriverExtension->DevicesArePolled; CollectionInformation->VendorID = CommonDeviceExtension->Attributes.VendorID; CollectionInformation->ProductID = CommonDeviceExtension->Attributes.ProductID; @@ -731,13 +774,15 @@ case IOCTL_HID_GET_COLLECTION_DESCRIPTOR: { // - // FIXME: which collection to use for composite / multi collection devices... - // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&CommonDeviceExtension->DeviceDescription, PDODeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); // // check if output buffer is big enough // - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength) + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < CollectionDescription->PreparsedDataLength) { // // invalid buffer size @@ -751,12 +796,12 @@ // copy result // ASSERT(Irp->UserBuffer); - RtlCopyMemory(Irp->UserBuffer, CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedData, CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength); + RtlCopyMemory(Irp->UserBuffer, CollectionDescription->PreparsedData, CollectionDescription->PreparsedDataLength); // // complete request // - Irp->IoStatus.Information = CommonDeviceExtension->DeviceDescription.CollectionDesc[0].PreparsedDataLength; + Irp->IoStatus.Information = CollectionDescription->PreparsedDataLength; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; Modified: branches/usb-bringup/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/pdo.c [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -9,6 +9,58 @@ */ #include "precomp.h" +PHIDP_COLLECTION_DESC +HidClassPDO_GetCollectionDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber) +{ + ULONG Index; + + for(Index = 0; Index < DeviceDescription->CollectionDescLength; Index++) + { + if (DeviceDescription->CollectionDesc[Index].CollectionNumber == CollectionNumber) + { + // + // found collection + // + return &DeviceDescription->CollectionDesc[Index]; + } + } + + // + // failed to find collection + // + DPRINT1("[HIDCLASS] GetCollectionDescription CollectionNumber %x not found\n", CollectionNumber); + ASSERT(FALSE); + return NULL; +} + +PHIDP_REPORT_IDS +HidClassPDO_GetReportDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber) +{ + ULONG Index; + + for(Index = 0; Index < DeviceDescription->ReportIDsLength; Index++) + { + if (DeviceDescription->ReportIDs[Index].CollectionNumber == CollectionNumber) + { + // + // found collection + // + return &DeviceDescription->ReportIDs[Index]; + } + } + + // + // failed to find collection + // + DPRINT1("[HIDCLASS] GetReportDescription CollectionNumber %x not found\n", CollectionNumber); + ASSERT(FALSE); + return NULL; +} + NTSTATUS HidClassPDO_HandleQueryDeviceId( IN PDEVICE_OBJECT DeviceObject, @@ -93,6 +145,7 @@ WCHAR Buffer[100]; ULONG Offset = 0; LPWSTR Ptr; + PHIDP_COLLECTION_DESC CollectionDescription; // // get device extension @@ -117,15 +170,32 @@ return Status; } - // - // store hardware ids - // - Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; - Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; - - if (PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_GENERIC) - { - switch(PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage) + if (PDODeviceExtension->Common.DeviceDescription.CollectionDescLength > 1) + { + // + // multi-tlc device + // + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x&Col%02x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber, PDODeviceExtension->CollectionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Col%02x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->CollectionNumber) + 1; + } + else + { + // + // single tlc device + // + Offset = swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x&Rev_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID, PDODeviceExtension->Common.Attributes.VersionNumber) + 1; + Offset += swprintf(&Buffer[Offset], L"HID\\Vid_%04x&Pid_%04x", PDODeviceExtension->Common.Attributes.VendorID, PDODeviceExtension->Common.Attributes.ProductID) + 1; + } + + // + // get collection description + // + CollectionDescription = HidClassPDO_GetCollectionDescription(&PDODeviceExtension->Common.DeviceDescription, PDODeviceExtension->CollectionNumber); + ASSERT(CollectionDescription); + + if (CollectionDescription->UsagePage == HID_USAGE_PAGE_GENERIC) + { + switch(CollectionDescription->Usage) { case HID_USAGE_GENERIC_POINTER: case HID_USAGE_GENERIC_MOUSE: @@ -156,7 +226,7 @@ break; } } - else if (PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].UsagePage == HID_USAGE_PAGE_CONSUMER && PDODeviceExtension->Common.DeviceDescription.CollectionDesc[PDODeviceExtension->CollectionIndex].Usage == HID_USAGE_CONSUMERCTRL) + else if (CollectionDescription->UsagePage == HID_USAGE_PAGE_CONSUMER && CollectionDescription->Usage == HID_USAGE_CONSUMERCTRL) { // // Consumer Audio Control @@ -501,12 +571,16 @@ NTSTATUS HidClassPDO_CreatePDO( - IN PDEVICE_OBJECT DeviceObject) + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS *OutDeviceRelations) { PHIDCLASS_FDO_EXTENSION FDODeviceExtension; NTSTATUS Status; PDEVICE_OBJECT PDODeviceObject; PHIDCLASS_PDO_DEVICE_EXTENSION PDODeviceExtension; + ULONG Index; + PDEVICE_RELATIONS DeviceRelations; + ULONG Length; // // get device extension @@ -515,64 +589,121 @@ ASSERT(FDODeviceExtension->Common.IsFDO); // - // lets create the device object - // - Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, sizeof(HIDCLASS_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_UNKNOWN, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + // first allocate device relations + // + Length = sizeof(DEVICE_RELATIONS) + sizeof(PDEVICE_OBJECT) * FDODeviceExtension->Common.DeviceDescription.CollectionDescLength; + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(NonPagedPool, Length); + if (!DeviceRelations) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero device relations + // + RtlZeroMemory(DeviceRelations, Length); + + // + // lets create a PDO for top level collection + // + Index = 0; + do + { + // + // lets create the device object + // + Status = IoCreateDevice(FDODeviceExtension->Common.DriverExtension->DriverObject, sizeof(HIDCLASS_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_UNKNOWN, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &PDODeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed to create device + // + DPRINT1("[HIDCLASS] Failed to create PDO %x\n", Status); + break; + } + + // + // patch stack size + // + PDODeviceObject->StackSize = DeviceObject->StackSize + 1; + + // + // get device extension + // + PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // init device extension + // + PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; + PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; + PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; + PDODeviceExtension->Common.IsFDO = FALSE; + PDODeviceExtension->FDODeviceObject = DeviceObject; + PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; + PDODeviceExtension->CollectionNumber = FDODeviceExtension->Common.DeviceDescription.CollectionDesc[Index].CollectionNumber; + + // + // copy device data + // + RtlCopyMemory(&PDODeviceExtension->Common.Attributes, &FDODeviceExtension->Common.Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); + RtlCopyMemory(&PDODeviceExtension->Common.DeviceDescription, &FDODeviceExtension->Common.DeviceDescription, sizeof(HIDP_DEVICE_DESC)); + RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); + + // + // set device flags + // + PDODeviceObject->Flags |= DO_MAP_IO_BUFFER; + + // + // device is initialized + // + PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + // + // store device object in device relations + // + DeviceRelations->Objects[Index] = PDODeviceObject; + DeviceRelations->Count++; + + // + // move to next + // + Index++; + + }while(Index < FDODeviceExtension->Common.DeviceDescription.CollectionDescLength); + + + // + // check if creating succeeded + // if (!NT_SUCCESS(Status)) { // - // failed to create device - // - DPRINT1("[HIDCLASS] Failed to create device %x\n", Status); + // failed + // + for(Index = 0; Index < DeviceRelations->Count; Index++) + { + // + // delete device + // + IoDeleteDevice(DeviceRelations->Objects[Index]); + } + + // + // free device relations + // + ExFreePool(DeviceRelations); return Status; } // - // patch stack size - // - PDODeviceObject->StackSize = DeviceObject->StackSize + 1; - - // - // get device extension - // - PDODeviceExtension = (PHIDCLASS_PDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; - - // - // init device extension - // - PDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension = FDODeviceExtension->Common.HidDeviceExtension.MiniDeviceExtension; - PDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject; - PDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject = FDODeviceExtension->Common.HidDeviceExtension.PhysicalDeviceObject; - PDODeviceExtension->Common.IsFDO = FALSE; - PDODeviceExtension->FDODeviceObject = DeviceObject; - PDODeviceExtension->Common.DriverExtension = FDODeviceExtension->Common.DriverExtension; - RtlCopyMemory(&PDODeviceExtension->Common.Attributes, &FDODeviceExtension->Common.Attributes, sizeof(HID_DEVICE_ATTRIBUTES)); - RtlCopyMemory(&PDODeviceExtension->Common.DeviceDescription, &FDODeviceExtension->Common.DeviceDescription, sizeof(HIDP_DEVICE_DESC)); - RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); - - // - // FIXME: support composite devices - // - PDODeviceExtension->CollectionIndex = 0; - ASSERT(PDODeviceExtension->Common.DeviceDescription.CollectionDescLength == 1); - - // - // store in device relations struct - // - FDODeviceExtension->DeviceRelations.Count = 1; - FDODeviceExtension->DeviceRelations.Objects[0] = PDODeviceObject; - - // - // set device flags - // - PDODeviceObject->Flags |= DO_MAP_IO_BUFFER; - - // - // device is initialized - // - PDODeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - ObReferenceObject(PDODeviceObject); + // store device relations + // + *OutDeviceRelations = DeviceRelations; // // done Modified: branches/usb-bringup/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidclas… ============================================================================== --- branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidclass/precomp.h [iso-8859-1] Mon Jan 2 12:00:51 2012 @@ -76,7 +76,7 @@ // // device relations // - DEVICE_RELATIONS DeviceRelations; + PDEVICE_RELATIONS DeviceRelations; }HIDCLASS_FDO_EXTENSION, *PHIDCLASS_FDO_EXTENSION; @@ -95,7 +95,7 @@ // // collection index // - ULONG CollectionIndex; + ULONG CollectionNumber; // // device interface @@ -176,12 +176,22 @@ /* pdo.c */ NTSTATUS HidClassPDO_CreatePDO( - IN PDEVICE_OBJECT DeviceObject); + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_RELATIONS *OutDeviceRelations); NTSTATUS HidClassPDO_PnP( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +PHIDP_COLLECTION_DESC +HidClassPDO_GetCollectionDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber); + +PHIDP_REPORT_IDS +HidClassPDO_GetReportDescription( + PHIDP_DEVICE_DESC DeviceDescription, + ULONG CollectionNumber); /* eof */

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 January 2012