Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 56131: [ROSTESTS] * Addendum to my previous commit.
by akhaldi＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: akhaldi Date: Mon Mar 12 13:34:01 2012 New Revision: 56131 URL: http://svn.reactos.org/svn/reactos?rev=56131&view=rev Log: [ROSTESTS] * Addendum to my previous commit. Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/gdi32/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/user32/CMakeLists.txt Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012 @@ -6,8 +6,6 @@ remove_definitions(-D_WIN32_IE=0x600) add_definitions(-D_WIN32_IE=0x500) - -set_rc_compiler() list(APPEND SOURCE comboex.c @@ -31,17 +29,21 @@ trackbar.c treeview.c updown.c - testlist.c + testlist.c) + +add_executable(comctl32_winetest + ${SOURCE} rsrc.rc) -add_executable(comctl32_winetest ${SOURCE}) target_link_libraries(comctl32_winetest wine) if(MSVC) target_link_libraries(comctl32_winetest uuid) else() - add_target_compile_flags(comctl32_winetest "-Wno-format") - allow_warnings(comctl32_winetest) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(comctl32_winetest "-Wno-format") + #allow_warnings(comctl32_winetest) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error") endif() set_module_type(comctl32_winetest win32cui) Modified: trunk/rostests/winetests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/CMakeList… ============================================================================== --- trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() add_definitions( -D__ROS_LONG64__ @@ -22,11 +20,18 @@ palette.c path.c pen.c - testlist.c + testlist.c) + +add_executable(gdi32_winetest + ${SOURCE} resource.rc) -add_executable(gdi32_winetest ${SOURCE}) -allow_warnings(gdi32_winetest) +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(gdi32_winetest) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + set_module_type(gdi32_winetest win32cui) add_importlibs(gdi32_winetest gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET gdi32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012 @@ -3,8 +3,6 @@ -D__ROS_LONG64__) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) - -set_rc_compiler() list(APPEND SOURCE actctx.c @@ -42,16 +40,21 @@ virtual.c volume.c dosdev.c - testlist.c + testlist.c) + +add_executable(kernel32_winetest + ${SOURCE} resource.rc) -add_executable(kernel32_winetest ${SOURCE}) target_link_libraries(kernel32_winetest wine) set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) + if(NOT MSVC) - add_target_compile_flags(kernel32_winetest "-Wno-format") - allow_warnings(kernel32_winetest) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(kernel32_winetest "-Wno-format") + #allow_warnings(kernel32_winetest) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error") endif() -add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all) +add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Mon Mar 12 13:34:01 2012 @@ -1,8 +1,6 @@ add_definitions( -D__ROS_LONG64__) - -set_rc_compiler() list(APPEND SOURCE broadcast.c @@ -29,15 +27,19 @@ win.c winstation.c wsprintf.c - testlist.c + testlist.c) + +add_executable(user32_winetest + ${SOURCE} resource.rc) -add_executable(user32_winetest ${SOURCE}) target_link_libraries(user32_winetest wine) set_module_type(user32_winetest win32cui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET user32_winetest DESTINATION reactos/bin FOR all) if(NOT MSVC) - add_target_compile_flags(user32_winetest "-Wno-format") -endif() + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(user32_winetest "-Wno-format") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") +endif()

1 0

[cgutman] 56130: [VIDEOPRT] - Add missing ObReferenceObject call - Found by Johannes Anderwald
by cgutman＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: cgutman Date: Mon Mar 12 13:30:57 2012 New Revision: 56130 URL: http://svn.reactos.org/svn/reactos?rev=56130&view=rev Log: [VIDEOPRT] - Add missing ObReferenceObject call - Found by Johannes Anderwald Modified: trunk/reactos/drivers/video/videoprt/dispatch.c Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Mon Mar 12 13:30:57 2012 @@ -444,6 +444,7 @@ { ChildExtension = CONTAINING_RECORD(CurrentEntry, VIDEO_PORT_CHILD_EXTENSION, ListEntry); + ObReferenceObject(ChildExtension->PhysicalDeviceObject); DeviceRelations->Objects[i] = ChildExtension->PhysicalDeviceObject; i++;

1 0

[akhaldi] 56129: [CMAKE] * Temporarily work around the cmake rc handling bug when it comes to allowing warnings.
by akhaldi＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: akhaldi Date: Mon Mar 12 12:39:51 2012 New Revision: 56129 URL: http://svn.reactos.org/svn/reactos?rev=56129&view=rev Log: [CMAKE] * Temporarily work around the cmake rc handling bug when it comes to allowing warnings. Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt trunk/reactos/base/applications/wordpad/CMakeLists.txt trunk/reactos/base/applications/write/CMakeLists.txt trunk/reactos/dll/directx/ksproxy/CMakeLists.txt trunk/reactos/dll/directx/quartz/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/win32/aclui/CMakeLists.txt trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/itss/CMakeLists.txt trunk/reactos/dll/win32/jscript/CMakeLists.txt trunk/reactos/dll/win32/localspl/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt Modified: trunk/reactos/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -9,13 +7,16 @@ -Dfileno=_fileno -Disatty=_isatty) -add_executable(winhlp32 +list(APPEND SOURCE callback.c hlpfile.c macro.c string.c winhelp.c - lex.yy.c + lex.yy.c) + +add_executable(winhlp32 + ${SOURCE} rsrc.rc) set_module_type(winhlp32 win32gui) @@ -24,5 +25,7 @@ add_cd_file(TARGET winhlp32 DESTINATION reactos FOR all) if(NOT MSVC) - allow_warnings(winhlp32) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(winhlp32) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() Modified: trunk/reactos/base/applications/wordpad/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -1,18 +1,16 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-D__ROS_LONG64__) - -set_rc_compiler() list(APPEND SOURCE olecallback.c print.c registry.c - wordpad.c + wordpad.c) + +add_executable(wordpad + ${SOURCE} rsrc.rc) - -add_executable(wordpad ${SOURCE}) set_module_type(wordpad win32gui) target_link_libraries(wordpad wine uuid) @@ -20,5 +18,7 @@ add_cd_file(TARGET wordpad DESTINATION reactos/system32 FOR all) if(NOT MSVC) - allow_warnings(wordpad) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(wordpad) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() Modified: trunk/reactos/base/applications/write/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/CM… ============================================================================== --- trunk/reactos/base/applications/write/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/write/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -1,5 +1,3 @@ - -set_rc_compiler() add_executable(write write.c rsrc.rc) set_module_type(write win32gui UNICODE) @@ -7,5 +5,7 @@ add_cd_file(TARGET write DESTINATION reactos/system32 FOR all) if(NOT MSVC) - allow_warnings(write) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(write) + set_source_files_properties(write.c PROPERTIES COMPILE_FLAGS "-Wno-error") endif() Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -3,7 +3,7 @@ spec2def(ksproxy.ax ksproxy.spec) -add_library(ksproxy SHARED +list(APPEND SOURCE allocator.cpp basicaudio.cpp classfactory.cpp @@ -16,7 +16,6 @@ input_pin.cpp interface.cpp ksproxy.cpp - ksproxy.rc mediasample.cpp node.cpp output_pin.cpp @@ -24,13 +23,19 @@ qualityforward.cpp ${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def) +add_library(ksproxy SHARED + ${SOURCE} + ksproxy.rc) + set_module_type(ksproxy win32dll ENTRYPOINT 0) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") if(MSVC) add_target_compile_flags(ksproxy "/GR-") else() - add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti") + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #add_target_compile_flags(ksproxy "-fno-exceptions -fno-rtti") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") endif() target_link_libraries(ksproxy strmiids) @@ -45,3 +50,4 @@ ntdll) add_cd_file(TARGET ksproxy DESTINATION reactos/system32 FOR all) + Modified: trunk/reactos/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/CMakeLi… ============================================================================== --- trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -39,12 +39,13 @@ enummedia.c control.c avisplit.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) -add_library(quartz SHARED ${SOURCE}) +add_library(quartz SHARED + ${SOURCE} + version.rc) set_module_type(quartz win32dll) @@ -74,5 +75,7 @@ add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all) if(NOT MSVC) - allow_warnings(quartz) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(quartz) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -5,8 +5,6 @@ -DUSE_WIN32_OPENGL) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() if(MSVC) add_definitions(-Disnan=_isnan) @@ -42,7 +40,6 @@ view.c volume.c wined3d_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) if(ARCH MATCHES amd64) @@ -51,7 +48,9 @@ sqrtf.c) endif() -add_library(wined3d SHARED ${SOURCE}) +add_library(wined3d SHARED + ${SOURCE} + version.rc) set_module_type(wined3d win32dll ENTRYPOINT 0) target_link_libraries(wined3d wine) @@ -69,7 +68,8 @@ add_pch(wined3d wined3d_private.h) add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all) - if(NOT MSVC) - allow_warnings(wined3d) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(wined3d) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -10,11 +10,18 @@ guid.c misc.c sidcache.c - aclui.rc ${CMAKE_CURRENT_BINARY_DIR}/aclui.def) -add_library(aclui SHARED ${SOURCE}) -allow_warnings(aclui) +add_library(aclui SHARED + ${SOURCE} + aclui.rc) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(aclui) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + set_module_type(aclui win32dll UNICODE) add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -40,12 +40,19 @@ toolsband.cpp travellog.cpp utility.cpp - browseui.rc dllinstall.c ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) -add_library(browseui SHARED ${SOURCE}) -allow_warnings(browseui) +add_library(browseui SHARED + ${SOURCE} + browseui.rc) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(browseui) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + set_module_type(browseui win32dll UNICODE) target_link_libraries(browseui @@ -68,3 +75,4 @@ add_pch(browseui precomp.h) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) + Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -37,12 +37,19 @@ sip.c store.c str.c - crypt32.rc ${CMAKE_CURRENT_BINARY_DIR}/crypt32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/crypt32.def) -add_library(crypt32 SHARED ${SOURCE}) -allow_warnings(crypt32) +add_library(crypt32 SHARED + ${SOURCE} + crypt32.rc) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(crypt32) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + set_module_type(crypt32 win32dll) target_link_libraries(crypt32 wine ${PSEH_LIB} oldnames) add_importlibs(crypt32 user32 advapi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -40,16 +40,24 @@ storage.c symbol.c type.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/dbghelp_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) -add_library(dbghelp SHARED ${SOURCE}) -allow_warnings(dbghelp) +add_library(dbghelp SHARED + ${SOURCE} + version.rc) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(dbghelp) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + set_module_type(dbghelp win32dll) target_link_libraries(dbghelp wine ${PSEH_LIB} oldnames) add_delay_importlibs(dbghelp version) add_importlibs(dbghelp psapi msvcrt kernel32 ntdll) add_pch(dbghelp dbghelp_private.h) + add_cd_file(TARGET dbghelp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -13,19 +13,22 @@ moniker.c protocol.c storage.c - rsrc.rc #${REACTOS_BINARY_DIR}/include/reactos/wine/itss_i.c ${CMAKE_CURRENT_BINARY_DIR}/itss_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/itss.def) -add_library(itss SHARED ${SOURCE}) +add_library(itss SHARED + ${SOURCE} + rsrc.rc) set_module_type(itss win32dll) target_link_libraries(itss uuid wine) if(MSVC) target_link_libraries(itss itss_guid) else() - allow_warnings(itss) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(itss) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() add_importlibs(itss 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] Mon Mar 12 12:39:51 2012 @@ -36,10 +36,11 @@ bool.c function.c global.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) -add_library(jscript SHARED ${SOURCE}) +add_library(jscript SHARED + ${SOURCE} + rsrc.rc) set_module_type(jscript win32dll) @@ -63,7 +64,9 @@ add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) if(NOT MSVC) - allow_warnings(jscript) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(jscript) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb) Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -14,11 +14,12 @@ localmon.c localspl_main.c provider.c - localspl.rc ${CMAKE_CURRENT_BINARY_DIR}/localspl_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/localspl.def) -add_library(localspl SHARED ${SOURCE}) +add_library(localspl SHARED + ${SOURCE} + localspl.rc) set_module_type(localspl win32dll) @@ -35,5 +36,8 @@ add_cd_file(TARGET localspl DESTINATION reactos/system32 FOR all) if(NOT MSVC) - allow_warnings(localspl) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(localspl) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() + Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -19,7 +19,6 @@ rpc_binding.c rpc_epmap.c rpc_message.c - rpcrt4.rc rpcrt4_main.c rpc_server.c rpc_transport.c @@ -42,7 +41,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(rpcrt4 SHARED ${SOURCE}) +add_library(rpcrt4 SHARED + ${SOURCE} + rpcrt4.rc) + set_module_type(rpcrt4 win32dll) target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) @@ -52,5 +54,7 @@ if(NOT MSVC) - allow_warnings(rpcrt4) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(rpcrt4) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() 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] Mon Mar 12 12:39:51 2012 @@ -3,8 +3,6 @@ add_definitions(-D_SHDOCVW_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -set_rc_compiler() spec2def(shdocvw.dll shdocvw.spec ADD_IMPORTLIB) @@ -27,13 +25,15 @@ urlhist.c view.c webbrowser.c - shdocvw.rc ${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}) +add_library(shdocvw SHARED + ${SOURCE} + shdocvw.rc) + set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) add_delay_importlibs(shdocvw version ole32 oleaut32) @@ -56,7 +56,8 @@ add_pch(shdocvw shdocvw.h) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) - if(NOT MSVC) - allow_warnings(shdocvw) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(shdocvw) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -71,12 +71,19 @@ folder_options.cpp filedefext.cpp drvdefext.cpp - shell32.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) -add_library(shell32 SHARED ${SOURCE}) -allow_warnings(shell32) +add_library(shell32 SHARED + ${SOURCE} + shell32.rc) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(shell32) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 @@ -103,8 +110,5 @@ ntdll) add_dependencies(shdocvw shdocvw_v1) - add_pch(shell32 precomp.h) - add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) - Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -8,8 +8,6 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib) spec2def(wininet.dll wininet.spec ADD_IMPORTLIB) - -set_rc_compiler() list(APPEND SOURCE cookie.c @@ -22,12 +20,13 @@ urlcache.c utility.c wininet_main.c - rsrc.rc - version.rc ${CMAKE_CURRENT_BINARY_DIR}/wininet_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) -add_library(wininet SHARED ${SOURCE}) +add_library(wininet SHARED + ${SOURCE} + rsrc.rc + version.rc) set_module_type(wininet win32dll) target_link_libraries(wininet wine ${PSEH_LIB} zlib) @@ -35,7 +34,8 @@ add_importlibs(wininet mpr shlwapi shell32 user32 advapi32 ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wininet DESTINATION reactos/system32 FOR all) - if(NOT MSVC) - allow_warnings(wininet) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(wininet) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Mon Mar 12 12:39:51 2012 @@ -3,8 +3,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(winmm.dll winmm.spec ADD_IMPORTLIB) - -set_rc_compiler() list(APPEND SOURCE driver.c @@ -16,17 +14,21 @@ registry.c time.c winmm.c - winmm_res.rc ${CMAKE_CURRENT_BINARY_DIR}/winmm_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/winmm.def) -add_library(winmm SHARED ${SOURCE}) -allow_warnings(winmm) +add_library(winmm SHARED + ${SOURCE} + winmm_res.rc) + +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(winmm) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + set_module_type(winmm win32dll) target_link_libraries(winmm wine ${PSEH_LIB}) - add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) - add_subdirectory(midimap) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) -

1 0

[cgutman] 56128: [VIDEOPRT] - Fix broken VIDEO_PORT_GET_DEVICE_EXTENSION macro - Add support for child devices (monitors only for now) - Monitors now show up in device manager ("Plug and Play Monit...
by cgutman＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: cgutman Date: Mon Mar 12 03:29:36 2012 New Revision: 56128 URL: http://svn.reactos.org/svn/reactos?rev=56128&view=rev Log: [VIDEOPRT] - Fix broken VIDEO_PORT_GET_DEVICE_EXTENSION macro - Add support for child devices (monitors only for now) - Monitors now show up in device manager ("Plug and Play Monitor" shows up if EDID data is reported, otherwise "Default Monitor" is displayed) Added: trunk/reactos/drivers/video/videoprt/child.c (with props) Modified: trunk/reactos/drivers/video/videoprt/CMakeLists.txt trunk/reactos/drivers/video/videoprt/dispatch.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/drivers/video/videoprt/videoprt.h Modified: trunk/reactos/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/CMa… ============================================================================== --- trunk/reactos/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Mon Mar 12 03:29:36 2012 @@ -7,6 +7,7 @@ list(APPEND SOURCE agp.c + child.c ddc.c dispatch.c dma.c Added: trunk/reactos/drivers/video/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/chi… ============================================================================== --- trunk/reactos/drivers/video/videoprt/child.c (added) +++ trunk/reactos/drivers/video/videoprt/child.c [iso-8859-1] Mon Mar 12 03:29:36 2012 @@ -1,0 +1,396 @@ +/* + * VideoPort driver + * + * Copyright (C) 2012 ReactOS Team + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include "videoprt.h" + +/* PRIVATE FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +IntVideoPortGetMonitorId( + IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, + IN OUT PWCHAR Buffer) +{ + USHORT Manufacturer, Model; + UNICODE_STRING UnicodeModelStr; + + /* This must be valid to call this function */ + ASSERT(ChildExtension->EdidValid); + + /* 3 letters 5-bit ANSI manufacturer code (big endian) */ + Manufacturer = *(PUSHORT)(&ChildExtension->ChildDescriptor[8]); + + /* Letters encoded as A=1 to Z=26 */ + Buffer[0] = (WCHAR)((Manufacturer & 0x7C00) + 'A' - 1); + Buffer[1] = (WCHAR)((Manufacturer & 0x03E0) + 'A' - 1); + Buffer[2] = (WCHAR)((Manufacturer & 0x001F) + 'A' - 1); + + /* Model number (16-bit little endian) */ + Model = *(PUSHORT)(&ChildExtension->ChildDescriptor[10]); + + /* Use Rtl helper for conversion */ + UnicodeModelStr.Buffer = &Buffer[3]; + UnicodeModelStr.Length = 0; + UnicodeModelStr.MaximumLength = 4 * sizeof(WCHAR); + RtlIntegerToUnicodeString(Model, 16, &UnicodeModelStr); + + /* Terminate it */ + Buffer[7] = UNICODE_NULL; + + /* And we're done */ + return TRUE; +} + +NTSTATUS NTAPI +IntVideoPortChildQueryId( + IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PWCHAR Buffer = NULL, StaticBuffer; + UNICODE_STRING UnicodeStr; + ULONG Length; + + switch (IrpSp->Parameters.QueryId.IdType) + { + case BusQueryDeviceID: + switch (ChildExtension->ChildType) + { + case Monitor: + if (ChildExtension->EdidValid) + { + StaticBuffer = L"DISPLAY\\"; + Length = 8 * sizeof(WCHAR); + Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 8) * sizeof(WCHAR)); + if (!Buffer) return STATUS_NO_MEMORY; + + /* Write the static portion */ + RtlCopyMemory(Buffer, StaticBuffer, wcslen(StaticBuffer) * sizeof(WCHAR)); + + /* Add the dynamic portion */ + IntVideoPortGetMonitorId(ChildExtension, + &Buffer[wcslen(StaticBuffer)]); + } + else + { + StaticBuffer = L"DISPLAY\\Default_Monitor"; + Length = wcslen(StaticBuffer) * sizeof(WCHAR); + Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); + if (!Buffer) return STATUS_NO_MEMORY; + + /* Copy the default id */ + RtlCopyMemory(Buffer, StaticBuffer, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); + } + break; + default: + ASSERT(FALSE); + break; + } + break; + case BusQueryInstanceID: + Buffer = ExAllocatePool(PagedPool, 5 * sizeof(WCHAR)); + if (!Buffer) return STATUS_NO_MEMORY; + + UnicodeStr.Buffer = Buffer; + UnicodeStr.Length = 0; + UnicodeStr.MaximumLength = 4 * sizeof(WCHAR); + RtlIntegerToUnicodeString(ChildExtension->ChildId, 16, &UnicodeStr); + break; + case BusQueryHardwareIDs: + switch (ChildExtension->ChildType) + { + case Monitor: + if (ChildExtension->EdidValid) + { + StaticBuffer = L"MONITOR\\"; + Length = 8 * sizeof(WCHAR); + Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 9) * sizeof(WCHAR)); + if (!Buffer) return STATUS_NO_MEMORY; + + /* Write the static portion */ + RtlCopyMemory(Buffer, StaticBuffer, wcslen(StaticBuffer) * sizeof(WCHAR)); + + /* Add the dynamic portion */ + IntVideoPortGetMonitorId(ChildExtension, + &Buffer[wcslen(StaticBuffer)]); + + /* Add the second null termination char */ + Buffer[wcslen(StaticBuffer) + 8] = UNICODE_NULL; + } + else + { + StaticBuffer = L"MONITOR\\Default_Monitor"; + Length = wcslen(StaticBuffer) * sizeof(WCHAR); + Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 2) * sizeof(WCHAR)); + if (!Buffer) return STATUS_NO_MEMORY; + + /* Copy the default id */ + RtlCopyMemory(Buffer, StaticBuffer, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); + + /* Add the second null terminator */ + Buffer[wcslen(StaticBuffer) + 1] = UNICODE_NULL; + } + break; + default: + ASSERT(FALSE); + break; + } + break; + case BusQueryCompatibleIDs: + switch (ChildExtension->ChildType) + { + case Monitor: + if (ChildExtension->EdidValid) + { + StaticBuffer = L"*PNP09FF"; + Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 2) * sizeof(WCHAR)); + if (!Buffer) return STATUS_NO_MEMORY; + + RtlCopyMemory(Buffer, StaticBuffer, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); + + Buffer[wcslen(StaticBuffer)+1] = UNICODE_NULL; + } + else + { + /* No PNP ID for non-PnP monitors */ + return Irp->IoStatus.Status; + } + break; + default: + ASSERT(FALSE); + break; + } + break; + default: + return Irp->IoStatus.Status; + } + + INFO_(VIDEOPRT, "Reporting ID: %S\n", Buffer); + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +IntVideoPortChildQueryText( + IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PWCHAR Buffer, StaticBuffer; + + if (IrpSp->Parameters.QueryDeviceText.DeviceTextType != DeviceTextDescription) + return Irp->IoStatus.Status; + + switch (ChildExtension->ChildType) + { + case Monitor: + /* FIXME: We can return a better description I think */ + StaticBuffer = L"Monitor"; + break; + + case VideoChip: + /* FIXME: No idea what we return here */ + StaticBuffer = L"Video chip"; + break; + + default: /* Other */ + StaticBuffer = L"Other device"; + break; + } + + Buffer = ExAllocatePool(PagedPool, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); + if (!Buffer) return STATUS_NO_MEMORY; + + RtlCopyMemory(Buffer, StaticBuffer, (wcslen(StaticBuffer) + 1) * sizeof(WCHAR)); + + INFO_(VIDEOPRT, "Reporting description: %S\n", Buffer); + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +IntVideoPortChildQueryRelations( + IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PDEVICE_RELATIONS DeviceRelations; + + if (IrpSp->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) + { + WARN_(VIDEOPRT, "Unsupported device relations type\n"); + return Irp->IoStatus.Status; + } + + DeviceRelations = ExAllocatePool(NonPagedPool, sizeof(DEVICE_RELATIONS)); + if (!DeviceRelations) return STATUS_NO_MEMORY; + + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = ChildExtension->PhysicalDeviceObject; + + ObReferenceObject(DeviceRelations->Objects[0]); + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +IntVideoPortChildQueryCapabilities( + IN PVIDEO_PORT_CHILD_EXTENSION ChildExtension, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PDEVICE_CAPABILITIES DeviceCaps = IrpSp->Parameters.DeviceCapabilities.Capabilities; + ULONG i; + + /* Set some values */ + DeviceCaps->LockSupported = FALSE; + DeviceCaps->EjectSupported = FALSE; + DeviceCaps->DockDevice = FALSE; + DeviceCaps->UniqueID = FALSE; + DeviceCaps->RawDeviceOK = FALSE; + DeviceCaps->WakeFromD0 = FALSE; + DeviceCaps->WakeFromD1 = FALSE; + DeviceCaps->WakeFromD2 = FALSE; + DeviceCaps->WakeFromD3 = FALSE; + DeviceCaps->HardwareDisabled = FALSE; + DeviceCaps->NoDisplayInUI = FALSE; + + /* Address and UI number are set by default */ + + DeviceCaps->DeviceState[PowerSystemWorking] = PowerDeviceD0; + for (i = 1; i < POWER_SYSTEM_MAXIMUM; i++) + { + DeviceCaps->DeviceState[i] = PowerDeviceD3; + } + + DeviceCaps->SystemWake = PowerSystemUnspecified; + DeviceCaps->DeviceWake = PowerDeviceUnspecified; + + /* FIXME: Device power states */ + DeviceCaps->DeviceD1 = FALSE; + DeviceCaps->DeviceD2 = FALSE; + DeviceCaps->D1Latency = 0; + DeviceCaps->D2Latency = 0; + DeviceCaps->D3Latency = 0; + + switch (ChildExtension->ChildType) + { + case VideoChip: + /* FIXME: Copy capabilities from parent */ + ASSERT(FALSE); + break; + + case NonPrimaryChip: /* Reserved */ + ASSERT(FALSE); + break; + + case Monitor: + DeviceCaps->SilentInstall = TRUE; + DeviceCaps->Removable = TRUE; + DeviceCaps->SurpriseRemovalOK = TRUE; + break; + + default: /* Other */ + DeviceCaps->SilentInstall = FALSE; + DeviceCaps->Removable = FALSE; + DeviceCaps->SurpriseRemovalOK = FALSE; + break; + } + + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +IntVideoPortDispatchPdoPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + NTSTATUS Status = Irp->IoStatus.Status; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + case IRP_MN_STOP_DEVICE: + /* Nothing to do */ + Status = STATUS_SUCCESS; + break; + + case IRP_MN_QUERY_RESOURCES: + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + /* None (keep old status) */ + break; + + case IRP_MN_QUERY_ID: + /* Call our helper */ + Status = IntVideoPortChildQueryId(DeviceObject->DeviceExtension, + Irp, + IrpSp); + break; + + case IRP_MN_QUERY_CAPABILITIES: + /* Call our helper */ + Status = IntVideoPortChildQueryCapabilities(DeviceObject->DeviceExtension, + Irp, + IrpSp); + break; + + case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_QUERY_REMOVE_DEVICE: + Status = STATUS_SUCCESS; + break; + + case IRP_MN_REMOVE_DEVICE: + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoDeleteDevice(DeviceObject); + return STATUS_SUCCESS; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + /* Call our helper */ + Status = IntVideoPortChildQueryRelations(DeviceObject->DeviceExtension, + Irp, + IrpSp); + break; + + case IRP_MN_QUERY_DEVICE_TEXT: + /* Call our helper */ + Status = IntVideoPortChildQueryText(DeviceObject->DeviceExtension, + Irp, + IrpSp); + break; + + default: + break; + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: trunk/reactos/drivers/video/videoprt/child.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/video/videoprt/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dis… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/dispatch.c [iso-8859-1] Mon Mar 12 03:29:36 2012 @@ -410,6 +410,51 @@ return STATUS_MORE_PROCESSING_REQUIRED; } +NTSTATUS +NTAPI +IntVideoPortQueryBusRelations(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PDEVICE_RELATIONS DeviceRelations; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PVIDEO_PORT_CHILD_EXTENSION ChildExtension; + ULONG i; + PLIST_ENTRY CurrentEntry; + + /* Count the children */ + i = 0; + CurrentEntry = DeviceExtension->ChildDeviceList.Flink; + while (CurrentEntry != &DeviceExtension->ChildDeviceList) + { + i++; + CurrentEntry = CurrentEntry->Flink; + } + + if (i == 0) + return Irp->IoStatus.Status; + + DeviceRelations = ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS) + ((i - 1) * sizeof(PVOID))); + if (!DeviceRelations) return STATUS_NO_MEMORY; + + DeviceRelations->Count = i; + + /* Add the children */ + i = 0; + CurrentEntry = DeviceExtension->ChildDeviceList.Flink; + while (CurrentEntry != &DeviceExtension->ChildDeviceList) + { + ChildExtension = CONTAINING_RECORD(CurrentEntry, VIDEO_PORT_CHILD_EXTENSION, ListEntry); + + DeviceRelations->Objects[i] = ChildExtension->PhysicalDeviceObject; + + i++; + CurrentEntry = CurrentEntry->Flink; + } + + INFO_(VIDEOPRT, "Reported %d PDOs\n", i); + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + return STATUS_SUCCESS; +} NTSTATUS NTAPI @@ -433,14 +478,14 @@ return Status; } - -NTSTATUS NTAPI -IntVideoPortDispatchPnp( +NTSTATUS NTAPI +IntVideoPortDispatchFdoPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IrpSp; NTSTATUS Status; + PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -464,6 +509,20 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); break; + case IRP_MN_QUERY_DEVICE_RELATIONS: + if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) + { + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + } + else + { + Status = IntVideoPortQueryBusRelations(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + break; + case IRP_MN_REMOVE_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE: @@ -496,6 +555,19 @@ } NTSTATUS NTAPI +IntVideoPortDispatchPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PVIDEO_PORT_COMMON_EXTENSION CommonExtension = DeviceObject->DeviceExtension; + + if (CommonExtension->Fdo) + return IntVideoPortDispatchFdoPnp(DeviceObject, Irp); + else + return IntVideoPortDispatchPdoPnp(DeviceObject, Irp); +} + +NTSTATUS NTAPI IntVideoPortDispatchCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Mon Mar 12 03:29:36 2012 @@ -250,11 +250,14 @@ */ DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)((*DeviceObject)->DeviceExtension); + DeviceExtension->Common.Fdo = TRUE; DeviceExtension->DeviceNumber = DeviceNumber; DeviceExtension->DriverObject = DriverObject; DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; DeviceExtension->FunctionalDeviceObject = *DeviceObject; DeviceExtension->DriverExtension = DriverExtension; + + InitializeListHead(&DeviceExtension->ChildDeviceList); /* * Get the registry path associated with this driver. @@ -1097,14 +1100,14 @@ PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; ULONG Status; VIDEO_CHILD_ENUM_INFO ChildEnumInfo; - VIDEO_CHILD_TYPE ChildType; BOOLEAN bHaveLastMonitorID = FALSE; UCHAR LastMonitorID[10]; - UCHAR ChildDescriptor[256]; - ULONG ChildId; ULONG Unused; UINT i; - + PDEVICE_OBJECT ChildDeviceObject; + PVIDEO_PORT_CHILD_EXTENSION ChildExtension; + + INFO_(VIDEOPRT, "Starting child device probe\n"); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); if (DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor == NULL) { @@ -1112,95 +1115,144 @@ return NO_ERROR; } - /* Setup the ChildEnumInfo */ - ChildEnumInfo.Size = sizeof (ChildEnumInfo); - ChildEnumInfo.ChildDescriptorSize = sizeof (ChildDescriptor); - ChildEnumInfo.ACPIHwId = 0; - ChildEnumInfo.ChildHwDeviceExtension = NULL; /* FIXME: must be set to - ChildHwDeviceExtension... */ + if (!IsListEmpty(&DeviceExtension->ChildDeviceList)) + { + ERR_(VIDEOPRT, "FIXME: Support calling VideoPortEnumerateChildren again!\n"); + return NO_ERROR; + } /* Enumerate the children */ for (i = 1; ; i++) { - ChildEnumInfo.ChildIndex = i; - RtlZeroMemory(ChildDescriptor, sizeof(ChildDescriptor)); + Status = IoCreateDevice(DeviceExtension->DriverObject, + sizeof(VIDEO_PORT_CHILD_EXTENSION) + + DeviceExtension->DriverExtension->InitializationData.HwChildDeviceExtensionSize, + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &ChildDeviceObject); + if (!NT_SUCCESS(Status)) + return Status; + + ChildExtension = ChildDeviceObject->DeviceExtension; + + RtlZeroMemory(ChildExtension, sizeof(VIDEO_PORT_CHILD_EXTENSION) + + DeviceExtension->DriverExtension->InitializationData.HwChildDeviceExtensionSize); + + ChildExtension->Common.Fdo = FALSE; + ChildExtension->ChildId = i; + ChildExtension->PhysicalDeviceObject = ChildDeviceObject; + ChildExtension->DriverObject = DeviceExtension->DriverObject; + + /* Setup the ChildEnumInfo */ + ChildEnumInfo.Size = sizeof(ChildEnumInfo); + ChildEnumInfo.ChildDescriptorSize = sizeof(ChildExtension->ChildDescriptor); + ChildEnumInfo.ACPIHwId = 0; + + if (DeviceExtension->DriverExtension->InitializationData.HwChildDeviceExtensionSize) + ChildEnumInfo.ChildHwDeviceExtension = VIDEO_PORT_GET_CHILD_EXTENSION(ChildExtension); + else + ChildEnumInfo.ChildHwDeviceExtension = NULL; + + ChildEnumInfo.ChildIndex = ChildExtension->ChildId; + + INFO_(VIDEOPRT, "Probing child: %d\n", ChildEnumInfo.ChildIndex); Status = DeviceExtension->DriverExtension->InitializationData.HwGetVideoChildDescriptor( HwDeviceExtension, &ChildEnumInfo, - &ChildType, - ChildDescriptor, - &ChildId, + &ChildExtension->ChildType, + ChildExtension->ChildDescriptor, + &ChildExtension->ChildId, &Unused); if (Status == VIDEO_ENUM_MORE_DEVICES) { - if (ChildType == Monitor) + if (ChildExtension->ChildType == Monitor) { // Check if the EDID is valid - if (ChildDescriptor[0] == 0x00 && - ChildDescriptor[1] == 0xFF && - ChildDescriptor[2] == 0xFF && - ChildDescriptor[3] == 0xFF && - ChildDescriptor[4] == 0xFF && - ChildDescriptor[5] == 0xFF && - ChildDescriptor[6] == 0xFF && - ChildDescriptor[7] == 0x00) + if (ChildExtension->ChildDescriptor[0] == 0x00 && + ChildExtension->ChildDescriptor[1] == 0xFF && + ChildExtension->ChildDescriptor[2] == 0xFF && + ChildExtension->ChildDescriptor[3] == 0xFF && + ChildExtension->ChildDescriptor[4] == 0xFF && + ChildExtension->ChildDescriptor[5] == 0xFF && + ChildExtension->ChildDescriptor[6] == 0xFF && + ChildExtension->ChildDescriptor[7] == 0x00) { if (bHaveLastMonitorID) { // Compare the previous monitor ID with the current one, break the loop if they are identical - if (RtlCompareMemory(LastMonitorID, &ChildDescriptor[8], sizeof(LastMonitorID)) == sizeof(LastMonitorID)) + if (RtlCompareMemory(LastMonitorID, &ChildExtension->ChildDescriptor[8], sizeof(LastMonitorID)) == sizeof(LastMonitorID)) { INFO_(VIDEOPRT, "Found identical Monitor ID two times, stopping enumeration\n"); + IoDeleteDevice(ChildDeviceObject); break; } } // Copy 10 bytes from the EDID, which can be used to uniquely identify the monitor - RtlCopyMemory(LastMonitorID, &ChildDescriptor[8], sizeof(LastMonitorID)); + RtlCopyMemory(LastMonitorID, &ChildExtension->ChildDescriptor[8], sizeof(LastMonitorID)); bHaveLastMonitorID = TRUE; + + /* Mark it valid */ + ChildExtension->EdidValid = TRUE; + } + else + { + /* Mark it invalid */ + ChildExtension->EdidValid = FALSE; } } } else if (Status == VIDEO_ENUM_INVALID_DEVICE) { WARN_(VIDEOPRT, "Child device %d is invalid!\n", ChildEnumInfo.ChildIndex); + IoDeleteDevice(ChildDeviceObject); continue; } else if (Status == VIDEO_ENUM_NO_MORE_DEVICES) { INFO_(VIDEOPRT, "End of child enumeration! (%d children enumerated)\n", i - 1); + IoDeleteDevice(ChildDeviceObject); break; } else { WARN_(VIDEOPRT, "HwGetVideoChildDescriptor returned unknown status code 0x%x!\n", Status); + IoDeleteDevice(ChildDeviceObject); break; } -#ifndef NDEBUG - if (ChildType == Monitor) + if (ChildExtension->ChildType == Monitor) { UINT j; - PUCHAR p = ChildDescriptor; - INFO_(VIDEOPRT, "Monitor device enumerated! (ChildId = 0x%x)\n", ChildId); - for (j = 0; j < sizeof (ChildDescriptor); j += 8) + PUCHAR p = ChildExtension->ChildDescriptor; + INFO_(VIDEOPRT, "Monitor device enumerated! (ChildId = 0x%x)\n", ChildExtension->ChildId); + for (j = 0; j < sizeof (ChildExtension->ChildDescriptor); j += 8) { INFO_(VIDEOPRT, "%02x %02x %02x %02x %02x %02x %02x %02x\n", p[j+0], p[j+1], p[j+2], p[j+3], p[j+4], p[j+5], p[j+6], p[j+7]); } } - else if (ChildType == Other) - { - INFO_(VIDEOPRT, "\"Other\" device enumerated: DeviceId = %S\n", (PWSTR)ChildDescriptor); + else if (ChildExtension->ChildType == Other) + { + INFO_(VIDEOPRT, "\"Other\" device enumerated: DeviceId = %S\n", (PWSTR)ChildExtension->ChildDescriptor); } else { - WARN_(VIDEOPRT, "HwGetVideoChildDescriptor returned unsupported type: %d\n", ChildType); - } -#endif /* NDEBUG */ - - } + ERR_(VIDEOPRT, "HwGetVideoChildDescriptor returned unsupported type: %d\n", ChildExtension->ChildType); + } + + /* Clear the init flag */ + ChildDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + InsertTailList(&DeviceExtension->ChildDeviceList, + &ChildExtension->ListEntry); + } + + /* Trigger reenumeration by the PnP manager */ + IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, BusRelations); return NO_ERROR; } Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Mon Mar 12 03:29:36 2012 @@ -78,8 +78,14 @@ UNICODE_STRING RegistryPath; } VIDEO_PORT_DRIVER_EXTENSION, *PVIDEO_PORT_DRIVER_EXTENSION; +typedef struct _VIDEO_PORT_COMMON_EXTENSION +{ + BOOLEAN Fdo; +} VIDEO_PORT_COMMON_EXTENSION, *PVIDEO_PORT_COMMON_EXTENSION; + typedef struct _VIDEO_PORT_DEVICE_EXTENSTION { + VIDEO_PORT_COMMON_EXTENSION Common; ULONG DeviceNumber; PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT PhysicalDeviceObject; @@ -101,13 +107,37 @@ ULONG DeviceOpened; AGP_BUS_INTERFACE_STANDARD AgpInterface; KMUTEX DeviceLock; - LIST_ENTRY DmaAdapterList; + LIST_ENTRY DmaAdapterList, ChildDeviceList; CHAR MiniPortDeviceExtension[1]; } VIDEO_PORT_DEVICE_EXTENSION, *PVIDEO_PORT_DEVICE_EXTENSION; +typedef struct _VIDEO_PORT_CHILD_EXTENSION +{ + VIDEO_PORT_COMMON_EXTENSION Common; + + ULONG ChildId; + VIDEO_CHILD_TYPE ChildType; + UCHAR ChildDescriptor[256]; + + BOOLEAN EdidValid; + + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT PhysicalDeviceObject; + + LIST_ENTRY ListEntry; + + CHAR ChildDeviceExtension[1]; +} VIDEO_PORT_CHILD_EXTENSION, *PVIDEO_PORT_CHILD_EXTENSION; + +#define VIDEO_PORT_GET_CHILD_EXTENSION(MiniportExtension) \ + CONTAINING_RECORD( \ + MiniportExtension, \ + VIDEO_PORT_CHILD_EXTENSION, \ + ChildDeviceExtension) + #define VIDEO_PORT_GET_DEVICE_EXTENSION(MiniportExtension) \ CONTAINING_RECORD( \ - HwDeviceExtension, \ + MiniportExtension, \ VIDEO_PORT_DEVICE_EXTENSION, \ MiniPortDeviceExtension) @@ -130,6 +160,13 @@ IN PVOID HwDeviceExtension, IN OUT PINTERFACE Interface); +/* child.c */ + +NTSTATUS NTAPI +IntVideoPortDispatchPdoPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + /* dispatch.c */ NTSTATUS NTAPI

1 0

[cgutman] 56127: [VBEMP] - Report a single non-PnP monitor if no EDID data could be retrieved [INF] - Add monitor.inf to build
by cgutman＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: cgutman Date: Mon Mar 12 03:15:34 2012 New Revision: 56127 URL: http://svn.reactos.org/svn/reactos?rev=56127&view=rev Log: [VBEMP] - Report a single non-PnP monitor if no EDID data could be retrieved [INF] - Add monitor.inf to build Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c trunk/reactos/media/inf/CMakeLists.txt trunk/reactos/media/inf/syssetup.inf trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/drivers/video/miniport/vbe/edid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/edid.c [iso-8859-1] Mon Mar 12 03:15:34 2012 @@ -273,6 +273,11 @@ { VideoPortDebugPrint(Info, "VBEMP: EDID information read using I²C\n"); } + else if (ChildEnumInfo->ChildIndex == 1) + { + /* We must have 1 monitor, so just report it with no EDID information */ + VideoPortDebugPrint(Info, "VBEMP: Reporting monitor with no EDID information\n"); + } else { VideoPortDebugPrint(Warn, "VBEMP: Unable to read EDID information\n"); Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Mon Mar 12 03:15:34 2012 @@ -18,6 +18,7 @@ kscaptur.inf layout.inf machine.inf + monitor.inf msmouse.inf NET_NIC.inf netamd.inf Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Mon Mar 12 03:15:34 2012 @@ -13,7 +13,8 @@ hdc.inf input.inf keyboard.inf -machine.inf +machine.inf +monitor.inf msmouse.inf NET_NIC.inf ports.inf Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 56126: [INF] - Add monitor.inf
by cgutman＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: cgutman Date: Mon Mar 12 03:14:46 2012 New Revision: 56126 URL: http://svn.reactos.org/svn/reactos?rev=56126&view=rev Log: [INF] - Add monitor.inf Added: trunk/reactos/media/inf/monitor.inf (with props) Added: trunk/reactos/media/inf/monitor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/monitor.inf?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/monitor.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[cgutman] 56125: [NTOSKRNL] - It appears that the driver unloading code is more profoundly broken that I had previously thought. I ran into issues testing with videoprt which would call IoCreateDev...
by cgutman＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: cgutman Date: Mon Mar 12 01:53:20 2012 New Revision: 56125 URL: http://svn.reactos.org/svn/reactos?rev=56125&view=rev Log: [NTOSKRNL] - It appears that the driver unloading code is more profoundly broken that I had previously thought. I ran into issues testing with videoprt which would call IoCreateDevice and IoDeleteDevice during enumeration of child devices. The issue arose when the IoDeleteDevice call unloaded the video driver which was currently initializing. This caused video initialization to fail and the system to shutdown. - Disable this code completely for now until the proper algorithm for determining when a driver should unload is found Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Mon Mar 12 01:53:20 2012 @@ -364,6 +364,7 @@ NTAPI IopUnloadDevice(IN PDEVICE_OBJECT DeviceObject) { +#if 0 PDRIVER_OBJECT DriverObject = DeviceObject->DriverObject; PEXTENDED_DEVOBJ_EXTENSION ThisExtension = IoGetDevObjExtension(DeviceObject); PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); @@ -463,7 +464,7 @@ /* Dereference once more, referenced at driver object creation */ ObDereferenceObject(DriverObject); - +#endif } VOID

1 0

[cgutman] 56124: [VIDEOPRT] - Don't add legacy resources twice in VideoPortGetAccessRanges - Fixes Cirrus driver initialization
by cgutman＠svn.reactos.org 12 Mar '12

12 Mar '12

Author: cgutman Date: Mon Mar 12 01:38:21 2012 New Revision: 56124 URL: http://svn.reactos.org/svn/reactos?rev=56124&view=rev Log: [VIDEOPRT] - Don't add legacy resources twice in VideoPortGetAccessRanges - Fixes Cirrus driver initialization Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Mon Mar 12 01:38:21 2012 @@ -567,7 +567,7 @@ PCI_COMMON_CONFIG Config; PCM_RESOURCE_LIST AllocatedResources; NTSTATUS Status; - UINT AssignedCount; + UINT AssignedCount = 0; CM_FULL_RESOURCE_DESCRIPTOR *FullList; CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor; PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; @@ -682,6 +682,21 @@ } DeviceExtension->AllocatedResources = AllocatedResources; DeviceExtension->SystemIoSlotNumber = PciSlotNumber.u.AsULONG; + + /* Add legacy resources to the resources from HAL */ + Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, + &LegacyAccessRanges, &LegacyAccessRangeCount); + if (!NT_SUCCESS(Status)) + return ERROR_DEV_NOT_EXIST; + + if (NumAccessRanges < LegacyAccessRangeCount) + { + ERR_(VIDEOPRT, "Too many legacy access ranges found\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + + RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); + AssignedCount = LegacyAccessRangeCount; } } else @@ -725,18 +740,7 @@ /* Return the slot number if the caller wants it */ if (Slot != NULL) *Slot = DeviceExtension->SystemIoBusNumber; - - Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension, - &LegacyAccessRanges, &LegacyAccessRangeCount); - if (!NT_SUCCESS(Status)) - return ERROR_DEV_NOT_EXIST; - if (NumAccessRanges < LegacyAccessRangeCount) - { - ERR_(VIDEOPRT, "Too many legacy access ranges found\n"); - return ERROR_NOT_ENOUGH_MEMORY; - } - RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); - AssignedCount = LegacyAccessRangeCount; + for (FullList = AllocatedResources->List; FullList < AllocatedResources->List + AllocatedResources->Count; FullList++)

1 0

[tfaber] 56123: [CLT2012] - Partly revert r53422 to allow hybrid CD booting again. Thanks to Giannis.
by tfaber＠svn.reactos.org 11 Mar '12

11 Mar '12

Author: tfaber Date: Sun Mar 11 21:09:16 2012 New Revision: 56123 URL: http://svn.reactos.org/svn/reactos?rev=56123&view=rev Log: [CLT2012] - Partly revert r53422 to allow hybrid CD booting again. Thanks to Giannis. Modified: branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini Modified: branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/boot/… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Mar 11 21:09:16 2012 @@ -231,15 +231,20 @@ IniOpenSection("Operating Systems", &SectionId); IniReadSettingByName(SectionId, SectionName, SettingValue, sizeof(SettingValue)); +#ifndef _M_ARM // Install the drive mapper according to this sections drive mappings #if defined(_M_IX86) && !defined(_MSC_VER) DriveMapMapDrivesInSection(SectionName); #endif #ifdef FREELDR_REACTOS_SETUP - // WinLdr-style boot - LoadReactOSSetup(); -#elif defined(_M_IX86) + if (_stricmp(BootType, "ReactOSSetup") == 0) + { + LoadReactOSSetup(); + } + else +#endif +#ifdef _M_IX86 if (_stricmp(BootType, "Windows") == 0) { LoadAndBootWindows(SectionName, SettingValue, 0); @@ -268,6 +273,7 @@ { LoadAndBootDrive(SectionName); } +#endif #else LoadAndBootWindows(SectionName, SettingValue, _WIN32_WINNT_WS03); #endif Modified: branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14-clt2012/hybri… ============================================================================== --- branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini [iso-8859-1] (original) +++ branches/ros-branch-0_3_14-clt2012/hybridcd_freeldr.ini [iso-8859-1] Sun Mar 11 21:09:16 2012 @@ -24,7 +24,7 @@ Live="ReactOS Live-System starten" [Install] -BootType=ReactOSSetup2 +BootType=ReactOSSetup [Live] BootType=Windows2003

1 0

[cgutman] 56122: [VIDEOPRT] - Add more debugging in resource code
by cgutman＠svn.reactos.org 11 Mar '12

11 Mar '12

Author: cgutman Date: Sun Mar 11 20:24:29 2012 New Revision: 56122 URL: http://svn.reactos.org/svn/reactos?rev=56122&view=rev Log: [VIDEOPRT] - Add more debugging in resource code Modified: trunk/reactos/drivers/video/videoprt/resource.c Modified: trunk/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/res… ============================================================================== --- trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sun Mar 11 20:24:29 2012 @@ -64,7 +64,9 @@ *AccessRanges = DriverExtension->InitializationData.HwLegacyResourceList; *AccessRangeCount = DriverExtension->InitializationData.HwLegacyResourceCount; } - + + INFO_(VIDEOPRT, "Got %d legacy access ranges\n", *AccessRangeCount); + return STATUS_SUCCESS; } @@ -580,7 +582,7 @@ PIO_RESOURCE_REQUIREMENTS_LIST ResReqList; BOOLEAN DeviceAndVendorFound = FALSE; - TRACE_(VIDEOPRT, "VideoPortGetAccessRanges\n"); + TRACE_(VIDEOPRT, "VideoPortGetAccessRanges(%d, %p, %d, %p)\n", NumRequestedResources, RequestedResources, NumAccessRanges, AccessRanges); DeviceExtension = VIDEO_PORT_GET_DEVICE_EXTENSION(HwDeviceExtension); DriverObject = DeviceExtension->DriverObject; @@ -729,7 +731,10 @@ if (!NT_SUCCESS(Status)) return ERROR_DEV_NOT_EXIST; if (NumAccessRanges < LegacyAccessRangeCount) + { + ERR_(VIDEOPRT, "Too many legacy access ranges found\n"); return ERROR_NOT_ENOUGH_MEMORY; + } RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE)); AssignedCount = LegacyAccessRangeCount; for (FullList = AllocatedResources->List; @@ -751,7 +756,7 @@ Descriptor->Type == CmResourceTypePort) && AssignedCount >= NumAccessRanges) { - WARN_(VIDEOPRT, "Too many access ranges found\n"); + ERR_(VIDEOPRT, "Too many access ranges found\n"); return ERROR_NOT_ENOUGH_MEMORY; } if (Descriptor->Type == CmResourceTypeMemory)

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