Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 51628: [KMTestSuite] Update to HEAD
by tfaber＠svn.reactos.org 07 May '11

07 May '11

Author: tfaber Date: Sat May 7 19:47:38 2011 New Revision: 51628 URL: http://svn.reactos.org/svn/reactos?rev=51628&view=rev Log: [KMTestSuite] Update to HEAD Added: branches/GSoC_2011/KMTestSuite/apitests/kernel32/ (props changed) - copied from r51625, trunk/rostests/apitests/kernel32/ branches/GSoC_2011/KMTestSuite/apitests/kernel32/CMakeLists.txt - copied unchanged from r51625, trunk/rostests/apitests/kernel32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/kernel32/GetDriveType.c - copied unchanged from r51625, trunk/rostests/apitests/kernel32/GetDriveType.c branches/GSoC_2011/KMTestSuite/apitests/kernel32/kernel32_apitest.rbuild - copied unchanged from r51625, trunk/rostests/apitests/kernel32/kernel32_apitest.rbuild branches/GSoC_2011/KMTestSuite/apitests/kernel32/testlist.c - copied unchanged from r51625, trunk/rostests/apitests/kernel32/testlist.c branches/GSoC_2011/KMTestSuite/apitests/user32/GetKeyState.c - copied unchanged from r51625, trunk/rostests/apitests/user32/GetKeyState.c branches/GSoC_2011/KMTestSuite/apitests/user32/SetCursorPos.c - copied unchanged from r51625, trunk/rostests/apitests/user32/SetCursorPos.c branches/GSoC_2011/KMTestSuite/winetests/kernel32/dosdev.c - copied unchanged from r51625, trunk/rostests/winetests/kernel32/dosdev.c Modified: branches/GSoC_2011/KMTestSuite/apitests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/directory.rbuild branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_ros/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_vista/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt branches/GSoC_2011/KMTestSuite/apitests/w32knapi/CMakeLists.txt branches/GSoC_2011/KMTestSuite/dibtests/bltrop/bltrop.rbuild branches/GSoC_2011/KMTestSuite/dibtests/vbltest/vbltest.rbuild branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_fsrtl.c branches/GSoC_2011/KMTestSuite/dxtest/win32kdxtest/win32kdxtest.rbuild branches/GSoC_2011/KMTestSuite/win32/smss/movefile/movefile.rbuild branches/GSoC_2011/KMTestSuite/win32/user32/drawcaption/drawcaption.rbuild branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/cryptui/cryptui.rbuild branches/GSoC_2011/KMTestSuite/winetests/itss/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/jscript/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/kernel32/kernel32.rbuild branches/GSoC_2011/KMTestSuite/winetests/kernel32/testlist.c branches/GSoC_2011/KMTestSuite/winetests/mshtml/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt branches/GSoC_2011/KMTestSuite/winetests/user32/msg.c branches/GSoC_2011/KMTestSuite/winetests/user32/win.c Modified: branches/GSoC_2011/KMTestSuite/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -5,6 +5,7 @@ add_subdirectory(gdi32) add_subdirectory(ntdll) add_subdirectory(user32) +add_subdirectory(kernel32) if(NOT MSVC) if(ARCH MATCHES i386) Modified: branches/GSoC_2011/KMTestSuite/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/directory.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/directory.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -21,6 +21,10 @@ <directory name="user32"> <xi:include href="user32/user32_apitest.rbuild" /> </directory> + + <directory name="kernel32"> + <xi:include href="kernel32/kernel32_apitest.rbuild" /> + </directory> <if property="ARCH" value="i386"> <directory name="w32kdll"> Propchange: branches/GSoC_2011/KMTestSuite/apitests/kernel32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat May 7 19:47:38 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/KMTestSuite/apitests/kernel32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/KMTestSuite/apitests/kernel32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/KMTestSuite/apitests/kernel32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/user32/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -1,15 +1,19 @@ add_definitions(-D_DLL -D__USE_CRTIMP) +set_rc_compiler() + list(APPEND SOURCE + DeferWindowPos.c + GetIconInfo.c + GetKeyState.c + GetPeekMessage.c + GetSystemMetrics.c InitializeLpkHooks.c RealGetWindowClass.c ScrollDC.c ScrollWindowEx.c - GetSystemMetrics.c - GetIconInfo.c - GetPeekMessage.c - DeferWindowPos.c + SetCursorPos.c testlist.c user32_apitest.rc) Modified: branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/user32/testlist.c [iso-8859-1] Sat May 7 19:47:38 2011 @@ -13,6 +13,8 @@ extern void func_GetIconInfo(void); extern void func_GetPeekMessage(void); extern void func_DeferWindowPos(void); +extern void func_GetKeyState(void); +extern void func_SetCursorPos(void); const struct test winetest_testlist[] = { @@ -24,7 +26,8 @@ { "GetIconInfo", func_GetIconInfo }, { "GetPeekMessage", func_GetPeekMessage }, { "DeferWindowPos", func_DeferWindowPos }, - + { "GetKeyState", func_GetKeyState }, + { "SetCursorPos", func_SetCursorPos }, { 0, 0 } }; Modified: branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/user32/user32_apitest.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -10,6 +10,7 @@ <file>testlist.c</file> <file>user32_apitest.rc</file> + <file>GetKeyState.c</file> <file>InitializeLpkHooks.c</file> <file>RealGetWindowClass.c</file> <file>ScrollDC.c</file> @@ -18,6 +19,7 @@ <file>GetIconInfo.c</file> <file>GetPeekMessage.c</file> <file>DeferWindowPos.c</file> + <file>SetCursorPos.c</file> </module> </group> Modified: branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,5 +2,5 @@ add_library(w32kdll_2k3sp2 SHARED main.c w32kdll_2k3sp2.S) set_entrypoint(w32kdll_2k3sp2 0) target_link_libraries(w32kdll_2k3sp2 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_2k3sp2.def) -add_dependencies(w32kdll_2k3sp2 psdk buildno_header) +add_dependencies(w32kdll_2k3sp2 psdk ) add_importlib_target(w32kdll_2k3sp2.def) Modified: branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,5 +2,5 @@ add_library(w32kdll_2ksp4 SHARED main.c w32kdll_2ksp4.S) set_entrypoint(w32kdll_2ksp4 0) target_link_libraries(w32kdll_2ksp4 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_2ksp4.def) -add_dependencies(w32kdll_2ksp4 psdk buildno_header) +add_dependencies(w32kdll_2ksp4 psdk ) add_importlib_target(w32kdll_2ksp4.def) Modified: branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_ros/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -7,5 +7,5 @@ ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_ros.def win32ksys) -add_dependencies(w32kdll psdk buildno_header) +add_dependencies(w32kdll psdk ) add_importlib_target(w32kdll_ros.def) Modified: branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_vista/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,5 +2,5 @@ add_library(w32kdll_vista SHARED main.c w32kdll_vista.S) set_entrypoint(w32kdll_vista 0) target_link_libraries(w32kdll_vista ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_vista.def) -add_dependencies(w32kdll_vista psdk buildno_header) +add_dependencies(w32kdll_vista psdk ) add_importlib_target(w32kdll_vista.def) Modified: branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,5 +2,5 @@ add_library(w32kdll_xpsp2 SHARED main.c w32kdll_xpsp2.S) set_entrypoint(w32kdll_xpsp2 0) target_link_libraries(w32kdll_xpsp2 ${CMAKE_CURRENT_SOURCE_DIR}/w32kdll_xpsp2.def) -add_dependencies(w32kdll_xpsp2 psdk buildno_header) +add_dependencies(w32kdll_xpsp2 psdk ) add_importlib_target(w32kdll_xpsp2.def) Modified: branches/GSoC_2011/KMTestSuite/apitests/w32knapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/apitests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/apitests/w32knapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/apitests/w32knapi/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -1,5 +1,7 @@ add_definitions(-D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE osver.c Modified: branches/GSoC_2011/KMTestSuite/dibtests/bltrop/bltrop.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/dibtests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/dibtests/bltrop/bltrop.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/dibtests/bltrop/bltrop.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -4,3 +4,4 @@ <library>user32</library> <file>bltrop.c</file> <file>bltrop.rc</file> +</module> Modified: branches/GSoC_2011/KMTestSuite/dibtests/vbltest/vbltest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/dibtests/… ============================================================================== --- branches/GSoC_2011/KMTestSuite/dibtests/vbltest/vbltest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/dibtests/vbltest/vbltest.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -4,3 +4,4 @@ <library>gdi32</library> <file>vbltest.c</file> <file>vbltest.rc</file> +</module> Modified: branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/drivers/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Sat May 7 19:47:38 2011 @@ -334,6 +334,8 @@ VOID NtoskrnlFsRtlTest(HANDLE KeyHandle) { + StartTest(); + FsRtlIsNameInExpressionTest(); FsRtlIsDbcsInExpressionTest(); Modified: branches/GSoC_2011/KMTestSuite/dxtest/win32kdxtest/win32kdxtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/dxtest/wi… ============================================================================== --- branches/GSoC_2011/KMTestSuite/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/dxtest/win32kdxtest/win32kdxtest.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -11,3 +11,4 @@ <file>NtGdiDdWaitForVerticalBlank.c</file> <file>NtGdiDdCanCreateSurface.c</file> <file>dump.c</file> +</module> Modified: branches/GSoC_2011/KMTestSuite/win32/smss/movefile/movefile.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/win32/sms… ============================================================================== --- branches/GSoC_2011/KMTestSuite/win32/smss/movefile/movefile.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/win32/smss/movefile/movefile.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -4,3 +4,4 @@ <library>user32</library> <file>movefile.cpp</file> <file>movefile.rc</file> +</module> Modified: branches/GSoC_2011/KMTestSuite/win32/user32/drawcaption/drawcaption.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/win32/use… ============================================================================== --- branches/GSoC_2011/KMTestSuite/win32/user32/drawcaption/drawcaption.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/win32/user32/drawcaption/drawcaption.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -16,3 +16,4 @@ <file>capicon.c</file> <file>capicon.rc</file> </module> +</group> Modified: branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -8,6 +8,8 @@ remove_definitions(-D_WIN32_IE=0x600) add_definitions(-D_WIN32_IE=0x500) + +set_rc_compiler() list(APPEND SOURCE comboex.c Modified: branches/GSoC_2011/KMTestSuite/winetests/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/cryptui/cryptui.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -8,3 +8,4 @@ <library>crypt32</library> <library>user32</library> <library>ntdll</library> +</module> Modified: branches/GSoC_2011/KMTestSuite/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/itss/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/itss/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() add_executable(itss_winetest protocol.c testlist.c rsrc.rc) target_link_libraries(itss_winetest wine) Modified: branches/GSoC_2011/KMTestSuite/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/jscript/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/jscript/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE activex.c Modified: branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/kernel32/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE actctx.c @@ -38,6 +40,7 @@ version.c virtual.c volume.c + dosdev.c testlist.c resource.rc) Modified: branches/GSoC_2011/KMTestSuite/winetests/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/kernel32/kernel32.rbuild [iso-8859-1] Sat May 7 19:47:38 2011 @@ -40,6 +40,7 @@ <file>version.c</file> <file>virtual.c</file> <file>volume.c</file> + <file>dosdev.c</file> <file>testlist.c</file> <file>resource.rc</file> </module> Modified: branches/GSoC_2011/KMTestSuite/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/kernel32/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/kernel32/testlist.c [iso-8859-1] Sat May 7 19:47:38 2011 @@ -42,6 +42,7 @@ extern void func_virtual(void); extern void func_version(void); extern void func_volume(void); +extern void func_dosdev(void); const struct test winetest_testlist[] = { @@ -78,6 +79,7 @@ { "virtual", func_virtual }, { "version", func_version }, { "volume", func_volume }, + { "dosdev", func_dosdev }, { 0, 0 } }; Modified: branches/GSoC_2011/KMTestSuite/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/mshtml/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -1,3 +1,5 @@ + +set_rc_compiler() add_definitions( -D__ROS_LONG64__ Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/user32/CMakeLists.txt [iso-8859-1] Sat May 7 19:47:38 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE broadcast.c Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/user32/msg.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/user32/msg.c [iso-8859-1] Sat May 7 19:47:38 2011 @@ -12572,10 +12572,7 @@ test_paint_messages(); test_interthread_messages(); test_message_conversion(); - if(!winetest_interactive) - skip("skipping test_accelerators, that hangs on reactos\n"); - else - test_accelerators(); + test_accelerators(); test_timers(); test_timers_no_wnd(); if (hCBT_hook) test_set_hook(); @@ -12596,10 +12593,7 @@ test_dialog_messages(); test_nullCallback(); test_dbcs_wm_char(); - if(!winetest_interactive) - skip("skipping test_menu_messages, that hangs on reactos\n"); - else - test_menu_messages(); + test_menu_messages(); test_paintingloop(); test_defwinproc(); test_clipboard_viewers(); Modified: branches/GSoC_2011/KMTestSuite/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/winetests… ============================================================================== --- branches/GSoC_2011/KMTestSuite/winetests/user32/win.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/winetests/user32/win.c [iso-8859-1] Sat May 7 19:47:38 2011 @@ -6058,11 +6058,7 @@ test_capture_1(); test_capture_2(); test_capture_3(hwndMain, hwndMain2); - - if(!winetest_interactive) - skip("skipping test_capture_4, that hangs on reactos\n"); - else - test_capture_4(); + test_capture_4(); test_CreateWindow(); test_parent_owner();

1 0

[tkreuzer] 51627: [GDI FONT DRIVER] - Improve getting pitch in the ifimetrics - Resort code to only set certain members of the ifimetrics, if querying the OS/2 table failed
by tkreuzer＠svn.reactos.org 07 May '11

07 May '11

Author: tkreuzer Date: Sat May 7 19:14:51 2011 New Revision: 51627 URL: http://svn.reactos.org/svn/reactos?rev=51627&view=rev Log: [GDI FONT DRIVER] - Improve getting pitch in the ifimetrics - Resort code to only set certain members of the ifimetrics, if querying the OS/2 table failed Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Sat May 7 19:14:51 2011 @@ -7,6 +7,7 @@ #include "ftfd.h" +static FWORD CalculateAveCharWidth( FT_Face ftface) @@ -44,7 +45,7 @@ if (fterror) continue; /* Calculate accumulative char width */ - ulAccumCharWidth += ftface->glyph->metrics.width; // fIXME: weighted + ulAccumCharWidth += ftface->glyph->metrics.width; // FIXME: weighted cGlyphs++; } @@ -69,7 +70,7 @@ /* Get the freetype face pointer */ ftface = pface->ftface; - /* Fill IFIMETRICS */ + /* Init header */ pifiex = &pface->ifiex; pifi = &pface->ifiex.ifi; pifi->cjThis = sizeof(FTFD_IFIMETRICS); @@ -94,7 +95,11 @@ pifi->lEmbedId = 0; pifi->lCharBias = 0; - /* Set flags */ + /* Set pitch */ + pifi->jWinPitchAndFamily = FT_IS_FIXED_WIDTH(ftface) ? FIXED_PITCH : + VARIABLE_PITCH; + + /* Feature flags */ pifi->flInfo = FM_INFO_RETURNS_BITMAPS | FM_INFO_1BPP | FM_INFO_4BPP; if (pface->ulFontFormat == FMT_TYPE1) pifi->flInfo |= FM_INFO_TECH_TYPE1; @@ -110,48 +115,15 @@ pifi->flInfo |= /*FM_INFO_RETURNS_OUTLINES |*/ FM_INFO_ARB_XFORMS; pifi->flInfo |= FM_INFO_RIGHT_HANDED; // FIXME: how to determine? - /* Font style */ - pifi->fsSelection = FM_SEL_REGULAR; - pifi->usWinWeight = FW_REGULAR; - if (ftface->style_flags & FT_STYLE_FLAG_BOLD) - { - pifi->fsSelection &= ~FM_SEL_REGULAR; - pifi->fsSelection |= FM_SEL_BOLD; - pifi->usWinWeight = FW_BOLD; - } - if (ftface->style_flags & FT_STYLE_FLAG_ITALIC) - { - pifi->fsSelection &= ~FM_SEL_REGULAR; // ??? remove it? - pifi->fsSelection |= FM_SEL_ITALIC; - } - - pifi->fsType = 0; - /* Font resolution */ pifi->fwdUnitsPerEm = ftface->units_per_EM; pifi->fwdLowestPPEm = 3; // FIXME /* Font metrics */ - pifi->fwdWinAscender = (ftface->ascender * 213) / 170; - pifi->fwdWinDescender = -(ftface->descender * 213) / 170; pifi->fwdMacAscender = ftface->ascender; pifi->fwdMacDescender = ftface->descender; pifi->fwdMacLineGap = 0; - pifi->fwdAveCharWidth = 0; - pifi->fwdTypoAscender = ftface->ascender; - pifi->fwdTypoDescender = ftface->descender; - pifi->fwdTypoLineGap = ftface->units_per_EM / 10; pifi->fwdMaxCharInc = ftface->max_advance_width; - pifi->fwdCapHeight = 0; - pifi->fwdXHeight = 0; - pifi->fwdSubscriptXSize = 0; - pifi->fwdSubscriptYSize = 0; - pifi->fwdSubscriptXOffset = 0; - pifi->fwdSubscriptYOffset = 0; - pifi->fwdSuperscriptXSize = 0; - pifi->fwdSuperscriptYSize = 0; - pifi->fwdSuperscriptXOffset = 0; - pifi->fwdSuperscriptYOffset = 0; pifi->fwdUnderscoreSize = ftface->underline_thickness; pifi->fwdUnderscorePosition = ftface->underline_position; // FIXME: off by 10 pifi->fwdStrikeoutSize = pifi->fwdUnitsPerEm / 20; @@ -170,17 +142,6 @@ pifi->rclFontBox.top = ftface->bbox.yMax; pifi->rclFontBox.bottom = ftface->bbox.yMin; - /* Special characters */ - pifi->chFirstChar = 0x00; - pifi->chLastChar = 0xff; - pifi->chDefaultChar = 0x20; - pifi->chBreakChar = 0x20; - //pifi->wcFirstChar = 0; - //pifi->wcLastChar = 0x00ff; - pifi->wcDefaultChar = 0x0020; - pifi->wcBreakChar = 0x0020; - - *(DWORD*)&pifi->achVendId = '0000'; pifi->cKerningPairs = 0; pifi->ulPanoseCulture = FM_PANOSE_CULTURE_LATIN; @@ -195,26 +156,70 @@ pifi->panose.bMidline = PAN_ANY; pifi->panose.bXHeight = PAN_ANY; + /* Try to get OS/2 TrueType or OpenType metrics */ + if (!FtfdGetWinMetrics(pface, pifi)) + { + /* No success, use fallback */ + + /* Font style flags */ + pifi->fsType = 0; + pifi->fsSelection = FM_SEL_REGULAR; + pifi->usWinWeight = FW_REGULAR; + if (ftface->style_flags & FT_STYLE_FLAG_BOLD) + { + pifi->fsSelection &= ~FM_SEL_REGULAR; + pifi->fsSelection |= FM_SEL_BOLD; + pifi->usWinWeight = FW_BOLD; + } + if (ftface->style_flags & FT_STYLE_FLAG_ITALIC) + { + pifi->fsSelection &= ~FM_SEL_REGULAR; + pifi->fsSelection |= FM_SEL_ITALIC; + } + + /* Metrics */ + pifi->fwdWinAscender = (ftface->ascender * 213) / 170; + pifi->fwdWinDescender = -(ftface->descender * 213) / 170; + pifi->fwdTypoAscender = ftface->ascender; + pifi->fwdTypoDescender = ftface->descender; + pifi->fwdTypoLineGap = ftface->units_per_EM / 10; + pifi->fwdAveCharWidth = 0; + pifi->fwdCapHeight = 0; + pifi->fwdXHeight = 0; + pifi->fwdSubscriptXSize = 0; + pifi->fwdSubscriptYSize = 0; + pifi->fwdSubscriptXOffset = 0; + pifi->fwdSubscriptYOffset = 0; + pifi->fwdSuperscriptXSize = 0; + pifi->fwdSuperscriptYSize = 0; + pifi->fwdSuperscriptXOffset = 0; + pifi->fwdSuperscriptYOffset = 0; + pifi->fwdAveCharWidth = CalculateAveCharWidth(ftface); + + /* Special characters (first and last char are already enumerated) */ + pifi->wcDefaultChar = 0x0020; + pifi->wcBreakChar = 0x0020; + + *(DWORD*)&pifi->achVendId = '0000'; + } + /* Try to get type1 info from freetype */ fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); if (fterror == 0) { /* Set italic angle */ pifi->lItalicAngle = fontinfo.italic_angle; - - /* Set pitch */ - if (fontinfo.is_fixed_pitch) - pifi->jWinPitchAndFamily = FIXED_PITCH; - else - pifi->jWinPitchAndFamily = VARIABLE_PITCH; } else { /* Set fallback values */ pifi->lItalicAngle = 0; - pifi->jWinPitchAndFamily = 0; - } - + } + + /* Convert the special characters from unicode to ansi */ + EngUnicodeToMultiByteN(&pifi->chFirstChar, 4, NULL, &pifi->wcFirstChar, 3); + + /* Convert names to unicode */ EngMultiByteToUnicodeN(pifiex->awcFamilyName, LF_FACESIZE, NULL, @@ -233,26 +238,16 @@ ftface->family_name, strnlen(ftface->family_name, MAX_PATH)); - /* Use OS/2 TrueType or OpenType tables */ - FtfdGetWinMetrics(pface, pifi); - - if (pifi->fwdAveCharWidth == 0) - pifi->fwdAveCharWidth = CalculateAveCharWidth(ftface); - /* Create a unique name */ wcscpy(pifiex->awcUniqueName, L"1.000;ABCD;"); wcsncat(pifiex->awcUniqueName, pifiex->awcFamilyName, LF_FACESIZE); pifiex->awcUniqueName[0] = L'1'; // + version? - //pifiex->awcUniqueName[2] = L'0'; // + version? + pifiex->awcUniqueName[2] = L'0'; // + version? EngMultiByteToUnicodeN(pifiex->awcUniqueName + 6, 4, NULL, pifi->achVendId, 4); - - - TRACE("Finished with the ifi: %p\n", pifi); - //__debugbreak(); return TRUE; } Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sat May 7 19:14:51 2011 @@ -39,8 +39,6 @@ #define FATAL(...) #endif -// move to appropriate header -#define STAMP_DESIGNVECTOR (0x8000000 + 'd' + ('v' << 8)) /** Driver specific types *****************************************************/ @@ -311,7 +309,7 @@ ULONG ulTag, PULONG pulLength); -VOID +BOOL NTAPI FtfdGetWinMetrics( PFTFD_FACE pface, Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Sat May 7 19:14:51 2011 @@ -303,7 +303,7 @@ return 0; } -VOID +BOOL NTAPI FtfdGetWinMetrics( PFTFD_FACE pface, @@ -319,14 +319,12 @@ if (!pOs2) { WARN("Couldn't find OS/2 table\n"); - return; + return FALSE; } //pifi->lEmbedId; - //pifi->lItalicAngle; //pifi->lCharBias; //pifi->jWinCharSet; - pifi->jWinPitchAndFamily &= 3; pifi->jWinPitchAndFamily |= GetWinFamily(pOs2->jClassId, pOs2->jSubClassId); pifi->usWinWeight = GETW(&pOs2->usWeightClass); pifi->fsSelection = GETW(&pOs2->fsSelection); @@ -362,9 +360,7 @@ //pifi->ulPanoseCulture; pifi->panose = *(PANOSE*)pOs2->panose; - /* Convert the special characters from unicode to ansi */ - EngUnicodeToMultiByteN(&pifi->chFirstChar, 4, NULL, &pifi->wcFirstChar, 3); - + return TRUE; }

1 0

[tkreuzer] 51626: [PSDK] - add STAMP_DESIGNVECTOR and STAMP_AXESLIST definitions
by tkreuzer＠svn.reactos.org 07 May '11

07 May '11

Author: tkreuzer Date: Sat May 7 19:12:33 2011 New Revision: 51626 URL: http://svn.reactos.org/svn/reactos?rev=51626&view=rev Log: [PSDK] - add STAMP_DESIGNVECTOR and STAMP_AXESLIST definitions Modified: branches/GSoC_2011/GdiFontDriver/include/psdk/wingdi.h Modified: branches/GSoC_2011/GdiFontDriver/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/include… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/include/psdk/wingdi.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/include/psdk/wingdi.h [iso-8859-1] Sat May 7 19:12:33 2011 @@ -2720,6 +2720,8 @@ BYTE SourceConstantAlpha; BYTE AlphaFormat; } BLENDFUNCTION,*PBLENDFUNCTION,*LPBLENDFUNCTION; +#define STAMP_DESIGNVECTOR (0x8000000 + 'd' + ('v' << 8)) +#define STAMP_AXESLIST (0x8000000 + 'a' + ('l' << 8)) #define MM_MAX_NUMAXES 16 typedef struct _DESIGNVECTOR { DWORD dvReserved;

1 0

[tkreuzer] 51625: [GDI FONT DRIVER] - handle DESIGNVECTOR for adobe multiple master fonts - implement FtfdDestroyFont
by tkreuzer＠svn.reactos.org 07 May '11

07 May '11

Author: tkreuzer Date: Sat May 7 16:40:33 2011 New Revision: 51625 URL: http://svn.reactos.org/svn/reactos?rev=51625&view=rev Log: [GDI FONT DRIVER] - handle DESIGNVECTOR for adobe multiple master fonts - implement FtfdDestroyFont Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Sat May 7 16:40:33 2011 @@ -390,6 +390,7 @@ return NULL; } + /* Set basic fields */ pface->pfile = pfile; pface->iFace = iFace; pface->ftface = ftface; @@ -534,6 +535,33 @@ /* Get the file format */ pfile->ulFileFormat = FtfdGetFileFormat(pfile); + /* Check for design vector */ + if (pdv) + { + /* Check if the font format supports it */ + if (pfile->apface[0]->ulFontFormat != FMT_TYPE1) + { + WARN("Design vector is not supported\n"); + goto error; + } + + /* Verify the design vector, just in case ... */ + if (pdv->dvReserved != STAMP_DESIGNVECTOR || + pdv->dvNumAxes > MM_MAX_NUMAXES) + { + WARN("Design vector is invalid\n"); + goto error; + } + + /* Copy design vector */ + pfile->dv = *pdv; + } + else + { + /* Mark as not present */ + pfile->dv.dvReserved = 0; + } + /* Loop all additional faces in this file */ for (i = 1; i < cNumFaces; i++) { @@ -650,7 +678,7 @@ /* Unmap the font file */ EngUnmapFontFileFD(pfile->iFile); - /* Free the memory that was allocated for the font */ + /* Free the memory that was allocated for the file */ EngFreeMem(pfile); return TRUE; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sat May 7 16:40:33 2011 @@ -12,9 +12,10 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/ftadvanc.h> -#include <freetype/ftxf86.h> -#include <freetype/t1tables.h> +#include FT_ADVANCES_H +#include FT_XFREE86_H +#include FT_TYPE1_TABLES_H +#include FT_MULTIPLE_MASTERS_H extern FT_Library gftlibrary; @@ -38,6 +39,9 @@ #define FATAL(...) #endif +// move to appropriate header +#define STAMP_DESIGNVECTOR (0x8000000 + 'd' + ('v' << 8)) + /** Driver specific types *****************************************************/ typedef enum @@ -56,10 +60,10 @@ typedef enum { - FILEFMT_TTF, - FILEFMT_OTF, - FILEFMT_FNT, -} FLE_FORMAT; + FILEFMT_TTF, /* TrueType font file */ + FILEFMT_OTF, /* OpenType font file */ + FILEFMT_FNT, /* Windows .fnt file */ +} FILE_FORMAT; //"Bold Italic Underline Strikeout" #define MAX_STYLESIZE 35 @@ -96,6 +100,7 @@ ULONG cNumFaces; ULONG ulFastCheckSum; ULONG ulFileFormat; + DESIGNVECTOR dv; PFTFD_FACE apface[1]; } FTFD_FILE, *PFTFD_FILE; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Sat May 7 16:40:33 2011 @@ -131,6 +131,21 @@ return NULL; } + } + + /* Check if there is a design vector */ + if (pfile->dv.dvReserved == STAMP_DESIGNVECTOR) + { + /* Set the coordinates */ + fterror = FT_Set_MM_Design_Coordinates(ftface, + pfile->dv.dvNumAxes, + pfile->dv.dvValues); + if (fterror) + { + /* Failure! */ + WARN("Failed to set design vector\n"); + return NULL; + } } // FIXME: quantize to 16.16 fixpoint @@ -464,11 +479,10 @@ switch (iMode) { case QFD_GLYPHANDBITMAP: - TRACE("QFD_GLYPHANDBITMAP\n"); - /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 0)) return FD_ERROR; + /* Render the glyph bitmap */ if (!FtRenderGlyphBitmap(pfont)) return FD_ERROR; if (pgd) FtfdQueryGlyphData(pfo, hg, pgd, pv); @@ -635,7 +649,20 @@ FtfdDestroyFont( FONTOBJ *pfo) { + PFTFD_FONT pfont = pfo->pvProducer; + TRACE("FtfdDestroyFont()\n"); - __debugbreak(); -} - + + /* Nothing to do? */ + if (!pfont) return; + + /* We don't need this anymore */ + pfo->pvProducer = NULL; + + /* Cleanup the freetype face for this font */ + FT_Done_Face(pfont->ftface); + + /* Free the font structure */ + EngFreeMem(pfont); +} + Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] Sat May 7 16:40:33 2011 @@ -6,8 +6,7 @@ - FtfdCompletePDEV: 100% done - FtfdDisablePDEV: 100% done - FtfdEscape: unimplemented, probably unneccessary -- FtfdLoadFontFile: 90% done - - handle DESIGNVECTOR +- FtfdLoadFontFile: 95% done - FtfdQueryFont: 70% done, depends on FtfdInitIfiMetrics - FtfdQueryFontTree: 70% done, depends on FtfdInitGlyphSet and FtfdInitKerningPairs - FtfdUnloadFontFile: 100% done, depends on FtfdDestroyFace @@ -28,7 +27,7 @@ - check possibility of FT_ADVANCE_FLAG_FAST_ONLY - FtfdQueryTrueTypeOutline: unimplemented - FtfdFontManagement: unimplemented, unneccessary -- FtfdDestroyFont: unimplemented, later +- FtfdDestroyFont: 100% implemented internal interface ------------------- Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Sat May 7 16:40:33 2011 @@ -50,7 +50,7 @@ ULONG ulTag, PULONG pulLength) { - POTF_FILE_HEADER pFontHeader; + PTT_FILE_HEADER pFontHeader; PTT_COLLECTION pCollection; ULONG i, ulOffset, ulLength, ulNumTables, ulCheckSum; ASSERT(ulFont > 0); @@ -96,8 +96,8 @@ /* Check if number of tables is ok */ ulNumTables = GETW(&pFontHeader->usNumTables); - ulLength = ulNumTables * sizeof(OTF_TABLE_ENTRY); - if (ulLength + sizeof(OTF_FILE_HEADER) > cjView) + ulLength = ulNumTables * sizeof(TT_TABLE_ENTRY); + if (ulLength + sizeof(TT_FILE_HEADER) > cjView) { WARN("Too many tables (%ld)\n", ulNumTables); return NULL; @@ -311,7 +311,7 @@ { PFTFD_FILE pfile = pface->pfile; PVOID pvView = pfile->pvView; - POTF_OS2_DATA pOs2; + PTT_OS2_DATA pOs2; /* Get the OS/2 table for the face */ // FIXME: get the right table for the face, when multiple faces Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] Sat May 7 16:40:33 2011 @@ -23,15 +23,15 @@ ULONG aulOffsetTable[1]; } TT_COLLECTION, *PTT_COLLECTION; -typedef struct _OTF_TABLE_ENTRY +typedef struct _TT_TABLE_ENTRY { ULONG ulTag; ULONG ulCheckSum; ULONG ulOffset; ULONG ulLength; -} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; +} TT_TABLE_ENTRY, *PTT_TABLE_ENTRY; -typedef struct _OTF_FILE_HEADER +typedef struct _TT_FILE_HEADER { ULONG ulIdentifier; USHORT usNumTables; @@ -39,12 +39,12 @@ USHORT usEntrySelector; USHORT usRangeshift; - OTF_TABLE_ENTRY aTableEntries[1]; + TT_TABLE_ENTRY aTableEntries[1]; -} OTF_FILE_HEADER, *POTF_FILE_HEADER; +} TT_FILE_HEADER, *PTT_FILE_HEADER; #include <pshpack1.h> -typedef struct _OTF_OS2_DATA +typedef struct _TT_OS2_DATA { USHORT version; // 0x0004 SHORT xAvgCharWidth; @@ -91,5 +91,5 @@ USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} OTF_OS2_DATA, *POTF_OS2_DATA; +} TT_OS2_DATA, *PTT_OS2_DATA; #include <poppack.h>

1 0

[hpoussin] 51624: [smss] Display program which failed to run
by hpoussin＠svn.reactos.org 07 May '11

07 May '11

Author: hpoussin Date: Sat May 7 16:31:49 2011 New Revision: 51624 URL: http://svn.reactos.org/svn/reactos?rev=51624&view=rev Log: [smss] Display program which failed to run Modified: trunk/reactos/base/system/smss/initrun.c Modified: trunk/reactos/base/system/smss/initrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initrun.c… ============================================================================== --- trunk/reactos/base/system/smss/initrun.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initrun.c [iso-8859-1] Sat May 7 16:31:49 2011 @@ -85,8 +85,8 @@ NULL, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("SM: %s: running '$S' failed (Status=0x%08lx)\n", - __FUNCTION__, Status); + DPRINT1("SM: %s: running '%S' failed (Status=0x%08lx)\n", + __FUNCTION__, ImagePath, Status); } return(STATUS_SUCCESS); }

1 0

[osiejka] 51623: [REGEDIT] - Polish translation update
by osiejka＠svn.reactos.org 07 May '11

07 May '11

Author: osiejka Date: Sat May 7 16:23:44 2011 New Revision: 51623 URL: http://svn.reactos.org/svn/reactos?rev=51623&view=rev Log: [REGEDIT] - Polish translation update Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Sat May 7 16:23:44 2011 @@ -3,7 +3,7 @@ * * Copyright 2005 Sebastian Gasiorek * - * Update by Caemyr - Olaf Siejka (Dec-Jan, 2007) + * Update by Caemyr - Olaf Siejka (Jan, 2007; May, 2011) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -402,8 +402,8 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Czy dodaæ dane do rejestru?" + IDS_IMPORTED_OK "Dane dopisane do rejestru" END /*****************************************************************/

1 0

[mjmartin] 51622: [USBHUB_NEW] - Some devices implement a default Language, LangId of 0. Some do not. Use LangId 0x0409 (English) until LangId is implemented. - Remove an unused variable.
by mjmartin＠svn.reactos.org 07 May '11

07 May '11

Author: mjmartin Date: Sat May 7 16:10:09 2011 New Revision: 51622 URL: http://svn.reactos.org/svn/reactos?rev=51622&view=rev Log: [USBHUB_NEW] - Some devices implement a default Language, LangId of 0. Some do not. Use LangId 0x0409 (English) until LangId is implemented. - Remove an unused variable. Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sat May 7 16:10:09 2011 @@ -688,21 +688,19 @@ // // Get the index string descriptor length + // FIXME: Implement LangIds // Status = GetUsbDeviceDescriptor(ChildDeviceObject, USB_STRING_DESCRIPTOR_TYPE, Index, - 0, + 0x0409, StringDesc, sizeof(USB_STRING_DESCRIPTOR)); - - // - // If lenght is 4 only then either this is a bad index or the device is not reporting - // - if (StringDesc->bLength == 4) - { - DPRINT1("USBHUB: Device Data Error\n"); - return STATUS_UNSUCCESSFUL; + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status); + ExFreePool(StringDesc); + return Status; } DPRINT1("StringDesc->bLength %d\n", StringDesc->bLength); @@ -724,19 +722,21 @@ DPRINT1("Failed to allocate buffer for string!\n"); return STATUS_INSUFFICIENT_RESOURCES; } + RtlZeroMemory(StringDesc, SizeNeeded); + // // Get the string // Status = GetUsbDeviceDescriptor(ChildDeviceObject, USB_STRING_DESCRIPTOR_TYPE, Index, - 0, + 0x0409, StringDesc, SizeNeeded); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get string from device\n"); + DPRINT1("GetUsbDeviceDescriptor failed with status %x\n", Status); ExFreePool(StringDesc); return Status; } Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Sat May 7 16:10:09 2011 @@ -190,8 +190,6 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - ULONG i; - DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice; DPRINT1("USBHUB: DriverEntry\n");

1 0

[ilardig] 51621: [regedit] - Prompt before importing from the command line. - Inform the user about successful import from the command line and the menu. - Updated Spanish & Italian translations. S...
by ilardig＠svn.reactos.org 07 May '11

07 May '11

Author: ilardig Date: Sat May 7 14:53:32 2011 New Revision: 51621 URL: http://svn.reactos.org/svn/reactos?rev=51621&view=rev Log: [regedit] - Prompt before importing from the command line. - Inform the user about successful import from the command line and the menu. - Updated Spanish & Italian translations. See issue #6230 for more details. Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/resource.h Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,7 +393,7 @@ static BOOL ImportRegistryFile(HWND hWnd) { OPENFILENAME ofn; - TCHAR Caption[128]; + TCHAR Caption[128], szTitle[256], szText[256]; LPCTSTR pszKeyPath; HKEY hRootKey; @@ -414,6 +414,10 @@ fclose(fp); return FALSE; } + LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); + LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); + /* show successful import */ + MessageBox(NULL, szText, szTitle, MB_OK); fclose(fp); } else Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Òúðñåíåòî â ðåãèñòúðà ïðèêëþ÷è." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "Prohledávání registru bylo dokonèeno." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Durchsuchen der Registry beendet." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "ÔÝëïò áíáæÞôçóçò óôç registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -381,6 +381,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -396,6 +396,12 @@ IDS_FINISHEDFIND "Finalizado la busqueda del registro." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Agregar los datos al registro?" + IDS_IMPORTED_OK "La información ha sido agregada al registro" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -396,6 +396,12 @@ IDS_FINISHEDFIND "Recherche dans le registre terminée." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Selesai mencari seluruh registri." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -398,6 +398,12 @@ IDS_FINISHEDFIND "Fine ricerca nel registro." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Aggiungere l'informazione al registro?" + IDS_IMPORTED_OK "L'informazione è stata aggiunta al registro" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "WXgð·×ÄõµÜµ½B" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -378,6 +378,12 @@ IDS_FINISHEDFIND "·¹Áö½ºÆ®¸® °Ë»öÀ» ¿Ï·áÇß½À´Ï´Ù." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Søket i registret er fullført." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -400,6 +400,12 @@ IDS_FINISHEDFIND "Przeszukiwanie rejestru zakoñczone." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Pesquisa do Registro concluída." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -384,6 +384,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "Ïîèñê â ðååñòðå çàâåðøåí." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -378,6 +378,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -391,6 +391,12 @@ IDS_FINISHEDFIND "Slutfört sökningen av registret." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "Finished searching through the registry." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -394,6 +394,12 @@ IDS_FINISHEDFIND "Ïîøóê ó ðåºñòð³ çàâåðøåíèé." END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Sat May 7 14:53:32 2011 @@ -393,6 +393,12 @@ IDS_FINISHEDFIND "×¢²á±íËÑË÷Íê±Ï¡£" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMPORT_PROMPT "Add the data to the registry?" + IDS_IMPORTED_OK "Information added to the registry" +END + /*****************************************************************/ Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Sat May 7 14:53:32 2011 @@ -134,6 +134,7 @@ BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s) { + TCHAR szTitle[256], szText[256]; switch (action) { case ACTION_ADD: @@ -162,6 +163,10 @@ } import_registry_file(fp); get_file_name(&s, filename); + LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); + LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); + /* show successful import */ + MessageBox(NULL, szText, szTitle, MB_OK); } break; } @@ -311,9 +316,18 @@ } if (*s && action == ACTION_UNDEF) - action = ACTION_ADD; - - if (action == ACTION_UNDEF) + { + TCHAR szTitle[256], szText[256]; + LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); + LoadString(hInst, IDS_IMPORT_PROMPT, szText, sizeof(szTitle)); + /* request import confirmation */ + if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + { + action = ACTION_ADD; + } + else return TRUE; + } + if (action == ACTION_UNDEF) return FALSE; return PerformRegAction(action, s); Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Sat May 7 14:53:32 2011 @@ -185,6 +185,8 @@ #define IDS_NEW_VALUE 31127 #define IDS_GOTO_SUGGESTED_KEY 31128 +#define IDS_IMPORT_PROMPT 31129 +#define IDS_IMPORTED_OK 31130 #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001

1 0

[mjmartin] 51620: [USBHUB_NEW] - The lower level driver completes the SCE IRP whenever the change state has been modified for a port. When handling the SCE IRP completion only check for flags in ch...
by mjmartin＠svn.reactos.org 07 May '11

07 May '11

Author: mjmartin Date: Sat May 7 14:49:02 2011 New Revision: 51620 URL: http://svn.reactos.org/svn/reactos?rev=51620&view=rev Log: [USBHUB_NEW] - The lower level driver completes the SCE IRP whenever the change state has been modified for a port. When handling the SCE IRP completion only check for flags in change state. The Change flags must be cleared else the hub driver will get non stop SCE IRP completions. - Allocate IRP from Pool vice calling IoAllocateIrp. Dont free the IRP in the completion routine as the port driver, oddly, frees them. - GetUsbDeviceDescriptor: Remove use of MDL and use only buffer instead to make our new usbehci happy. - When calling the interface routines, correctly use the BusContext returned from the interface instead of the RootHubPdo. This worked on windows as it just happened they were the same. - Implement RootHubInitCallbackFunction, which only job currently is to send the first SCE IRP. - For Start Device for child device objects fake success for now. Will be implemented later. - Implement returning IRP_MN_QUERY_IDs, IRP_MN_QUERY_DEVICE_TEXTs and IRP_MN_QUERY_BUS_INFORMATION. - Add basic handling for IRP_MJ_POWER. - Misc code changes. Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c branches/usb-bringup/drivers/usb/usbhub_new/pdo.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h Modified: branches/usb-bringup/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Sat May 7 14:49:02 2011 @@ -244,16 +244,18 @@ IN PVOID Context) { NTSTATUS Status; - PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT DeviceObject, RootHubDeviceObject; PHUB_DEVICE_EXTENSION HubDeviceExtension; PWORK_ITEM_DATA WorkItemData; PORT_STATUS_CHANGE PortStatus; LONG PortId; + DPRINT1("Entered DeviceStatusChangeThread, Context %x\n", Context); + static LONG failsafe = 0; WorkItemData = (PWORK_ITEM_DATA)Context; DeviceObject = (PDEVICE_OBJECT)WorkItemData->Context; HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; // // Loop all ports // @@ -262,7 +264,7 @@ // // Get Port Status // - Status = GetPortStatusAndChange(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, &PortStatus); + Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get port status for port %d, Status %x\n", PortId, Status); @@ -273,56 +275,105 @@ DPRINT1("Port %d Status %x\n", PortId, PortStatus.Status); DPRINT1("Port %d Change %x\n", PortId, PortStatus.Change); + // // Check for new device connection // - if ((PortStatus.Change == USB_PORT_STATUS_CONNECT) && (PortStatus.Status & USB_PORT_STATUS_CONNECT)) + if (PortStatus.Change & USB_PORT_STATUS_CONNECT) { // - // Clear Connection Status - // - Status = ClearPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, C_PORT_CONNECTION); + // Clear Port Connect + // + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_CONNECTION); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to clear connection change for port %d\n", PortId); } - // No SCE completion done for clearing C_PORT_CONNECT - - // - // Reset Port - // - Status = SetPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, PORT_RESET); + // + // Is this a connect or disconnect? + // + if (!(PortStatus.Status & USB_PORT_STATUS_CONNECT)) + { + DPRINT1("Device disconnected from port %d\n", PortId); + + // + // FIXME: Remove the device, and deallocate memory + // + } + else + { + DPRINT1("Device connected from port %d\n", PortId); + + // No SCE completion done for clearing C_PORT_CONNECT + + // + // Reset Port + // + Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_RESET); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reset port %d\n", PortId); + } + } + } + else if (PortStatus.Change & USB_PORT_STATUS_ENABLE) + { + // + // Clear Enable + // + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_ENABLE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to reset port %d\n", PortId); + DPRINT1("Failed to clear enable change on port %d\n", PortId); } } - else if ((PortStatus.Change == USB_PORT_STATUS_ENABLE) && - (PortStatus.Status & (USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE))) + else if (PortStatus.Change & USB_PORT_STATUS_RESET) { // - // Clear Enable - // - Status = ClearPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, C_PORT_ENABLE); + // Clear Reset + // + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_RESET); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to clear enable change on port %d\n", PortId); - } - } - else if ((PortStatus.Change == USB_PORT_STATUS_RESET) && - (PortStatus.Status & (USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE))) - { - // - // Clear Reset - // - Status = ClearPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, C_PORT_RESET); + DPRINT1("Failed to clear reset change on port %d\n", PortId); + } + + // + // Get Port Status + // + Status = GetPortStatusAndChange(RootHubDeviceObject, PortId, &PortStatus); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to clear reset change on port %d\n", PortId); - } - - // FIXME: Double Check Port Status + DPRINT1("Failed to get port status for port %d, Status %x\n", PortId, Status); + // FIXME: Do we really want to halt further SCE requests? + return; + } + + DPRINT1("Port %d Status %x\n", PortId, PortStatus.Status); + DPRINT1("Port %d Change %x\n", PortId, PortStatus.Change); + + if(PortStatus.Change & USB_PORT_STATUS_RESET) + { + DPRINT1("Port did not clear reset! Possible Hardware problem!\n"); + } + + // + // Make sure its Connected and Enabled + // + if (!(PortStatus.Status & (USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE))) + { + DPRINT1("Usb Device is not connected and enabled!\n"); + // + // Attempt another reset + // + Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_RESET); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reset port %d\n", PortId); + } + continue; + } // // Create the device object only if the port manipulation was started by a device connect @@ -335,14 +386,26 @@ } } + // + // FIXME: Still in testing + // + failsafe++; + if (failsafe > 100) + { + DPRINT1("SCE completed over 100 times but no action has been taken to clear the Change of any ports.\n"); + // + // Return and dont send any more SCE Requests + // + return; + } + ExFreePool(WorkItemData); // // Send another SCE Request // + DPRINT1("Sending another SCE!\n"); QueryStatusChangeEndpoint(DeviceObject); - - } NTSTATUS @@ -359,9 +422,10 @@ HubDeviceExtension = (PHUB_DEVICE_EXTENSION)RealDeviceObject->DeviceExtension; // - // Free the Irp - // - IoFreeIrp(Irp); + // NOTE: USBPORT frees this IRP + // + DPRINT1("Received Irp %x, HubDeviceExtension->PendingSCEIrp %x\n", Irp, HubDeviceExtension->PendingSCEIrp); + //IoFreeIrp(Irp); // // Create and initialize work item data @@ -373,6 +437,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } WorkItemData->Context = RealDeviceObject; + DPRINT1("Initialize work item\n"); ExInitializeWorkItem(&WorkItemData->WorkItem, (PWORKER_THREAD_ROUTINE)DeviceStatusChangeThread, (PVOID)WorkItemData); // @@ -391,15 +456,23 @@ IN PDEVICE_OBJECT DeviceObject) { NTSTATUS Status; + PDEVICE_OBJECT RootHubDeviceObject; PIO_STACK_LOCATION Stack; PHUB_DEVICE_EXTENSION HubDeviceExtension; + PURB PendingSCEUrb; HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; + + // + // Allocate a URB + // + PendingSCEUrb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); // // Initialize URB for Status Change Endpoint request // - UsbBuildInterruptOrBulkTransferRequest(&HubDeviceExtension->PendingSCEUrb, + UsbBuildInterruptOrBulkTransferRequest(PendingSCEUrb, sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), HubDeviceExtension->PipeHandle, HubDeviceExtension->PortStatusChange, @@ -411,13 +484,20 @@ // // Set the device handle to null for roothub // - HubDeviceExtension->PendingSCEUrb.UrbHeader.UsbdDeviceHandle = NULL; + PendingSCEUrb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; // // Allocate an Irp // - HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(HubDeviceExtension->RootHubPhysicalDeviceObject->StackSize, - FALSE); + + HubDeviceExtension->PendingSCEIrp = ExAllocatePoolWithTag(NonPagedPool, + IoSizeOfIrp(RootHubDeviceObject->StackSize), + USB_HUB_TAG); +/* + HubDeviceExtension->PendingSCEIrp = IoAllocateIrp(RootHubDeviceObject->StackSize, + FALSE); +*/ + DPRINT1("Allocated IRP %x\n", HubDeviceExtension->PendingSCEIrp); if (!HubDeviceExtension->PendingSCEIrp) { @@ -428,6 +508,10 @@ // // Initialize the IRP // + IoInitializeIrp(HubDeviceExtension->PendingSCEIrp, + IoSizeOfIrp(RootHubDeviceObject->StackSize), + RootHubDeviceObject->StackSize); + HubDeviceExtension->PendingSCEIrp->IoStatus.Status = STATUS_NOT_SUPPORTED; HubDeviceExtension->PendingSCEIrp->IoStatus.Information = 0; HubDeviceExtension->PendingSCEIrp->Flags = 0; @@ -437,8 +521,8 @@ // Get the Next Stack Location and Initialize it // Stack = IoGetNextIrpStackLocation(HubDeviceExtension->PendingSCEIrp); - Stack->DeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; - Stack->Parameters.Others.Argument1 = &HubDeviceExtension->PendingSCEUrb; + Stack->DeviceObject = DeviceObject; + Stack->Parameters.Others.Argument1 = PendingSCEUrb; Stack->Parameters.Others.Argument2 = NULL; Stack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; Stack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; @@ -456,7 +540,9 @@ // // Send to RootHub // - Status = IoCallDriver(HubDeviceExtension->RootHubPhysicalDeviceObject, HubDeviceExtension->PendingSCEIrp); + DPRINT1("DeviceObject is %x\n", DeviceObject); + DPRINT1("Iocalldriver %x with irp %x\n", RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); + Status = IoCallDriver(RootHubDeviceObject, HubDeviceExtension->PendingSCEIrp); return STATUS_PENDING; } @@ -524,16 +610,17 @@ IN ULONG TransferBufferLength) { NTSTATUS Status; + PDEVICE_OBJECT RootHubDeviceObject; PURB Urb; PHUB_DEVICE_EXTENSION HubDeviceExtension; PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; - PMDL BufferMdl; // // Get the Hubs Device Extension // ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)ChildDeviceObject->DeviceExtension; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) ChildDeviceExtension->ParentDeviceObject->DeviceExtension; + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; // // Allocate a URB @@ -549,29 +636,6 @@ // Zero it // RtlZeroMemory(Urb, sizeof(URB)); - - // - // Create a MDL for buffer - // - BufferMdl = IoAllocateMdl(TransferBuffer, - TransferBufferLength, - FALSE, - FALSE, - NULL); - - // - // Update Physical Pages - // - _SEH2_TRY - { - MmBuildMdlForNonPagedPool(BufferMdl); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT1("MmBuildMdlForNonPagedPool Failed!\n"); - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; // // Create URB for getting device descriptor @@ -581,8 +645,8 @@ DescriptorType, Index, LangId, + TransferBuffer, NULL, - BufferMdl, TransferBufferLength, NULL); @@ -594,15 +658,10 @@ // // Query the Root Hub // - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); - - // - // Free Mdl - // - IoFreeMdl(BufferMdl); return Status; } @@ -636,7 +695,18 @@ 0, StringDesc, sizeof(USB_STRING_DESCRIPTOR)); - SizeNeeded = StringDesc->bLength; + + // + // If lenght is 4 only then either this is a bad index or the device is not reporting + // + if (StringDesc->bLength == 4) + { + DPRINT1("USBHUB: Device Data Error\n"); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("StringDesc->bLength %d\n", StringDesc->bLength); + SizeNeeded = StringDesc->bLength + sizeof(WCHAR); // // Free String @@ -647,14 +717,14 @@ // Recreate with appropriate size // StringDesc = ExAllocatePoolWithTag(NonPagedPool, - SizeNeeded + sizeof(USB_STRING_DESCRIPTOR), + SizeNeeded, USB_HUB_TAG); if (!StringDesc) { DPRINT1("Failed to allocate buffer for string!\n"); return STATUS_INSUFFICIENT_RESOURCES; } - + RtlZeroMemory(StringDesc, SizeNeeded); // // Get the string // @@ -663,7 +733,7 @@ Index, 0, StringDesc, - SizeNeeded + sizeof(USB_STRING_DESCRIPTOR)); + SizeNeeded); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get string from device\n"); @@ -672,11 +742,11 @@ } // - // Allocate Buffer and Save it + // Allocate Buffer to return // *TransferBuffer = ExAllocatePoolWithTag(NonPagedPool, - SizeNeeded, - USB_HUB_TAG); + SizeNeeded, + USB_HUB_TAG); if (!*TransferBuffer) { DPRINT1("Failed to allocate buffer for string!\n"); @@ -689,7 +759,7 @@ // // Copy the string to destination // - RtlCopyMemory(*TransferBuffer, StringDesc->bString, SizeNeeded); + RtlCopyMemory(*TransferBuffer, StringDesc->bString, SizeNeeded - FIELD_OFFSET(USB_STRING_DESCRIPTOR, bLength)); ExFreePool(StringDesc); @@ -707,18 +777,16 @@ PHUB_DEVICE_EXTENSION HubDeviceExtension; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; PUSB_BUS_INTERFACE_HUB_V5 HubInterface; - ULONG ChildDeviceCount; + ULONG ChildDeviceCount, UsbDeviceNumber = 0; WCHAR CharDeviceName[64]; - ULONG UsbDeviceNumber = 0; UNICODE_STRING DeviceName; - USB_DEVICE_DESCRIPTOR DeviceDesc; - USB_CONFIGURATION_DESCRIPTOR ConfigDesc; - ULONG DeviceDescSize, ConfigDescSize; + ULONG ConfigDescSize, DeviceDescSize; + PVOID HubInterfaceBusContext; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) UsbHubDeviceObject->DeviceExtension; HubInterface = &HubDeviceExtension->HubInterface; RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; - + HubInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; // // Find an empty slot in the child device array // @@ -726,6 +794,7 @@ { if (HubDeviceExtension->ChildDeviceObject[ChildDeviceCount] == NULL) { + DPRINT1("Found unused entry at %d\n", ChildDeviceCount); break; } } @@ -735,7 +804,7 @@ // if (ChildDeviceCount == USB_MAXCHILDREN) { - DPRINT1("Too many child devices!\n"); + DPRINT1("USBHUB: Too many child devices!\n"); return STATUS_UNSUCCESSFUL; } @@ -780,7 +849,7 @@ // if (!NT_SUCCESS(Status)) { - DPRINT1("IoCreateDevice failed with status %x\n", Status); + DPRINT1("USBHUB: IoCreateDevice failed with status %x\n", Status); return Status; } @@ -800,45 +869,49 @@ // // Create the UsbDeviceObject // - Status = HubInterface->CreateUsbDevice(RootHubDeviceObject, + Status = HubInterface->CreateUsbDevice(HubInterfaceBusContext, (PVOID)&UsbChildExtension->UsbDeviceHandle, HubDeviceExtension->RootHubHandle, - 0x503, //hack + 0x501, //hack PortId); if (!NT_SUCCESS(Status)) { - DPRINT1("CreateUsbDevice failed with status %x\n", Status); + DPRINT1("USBHUB: CreateUsbDevice failed with status %x\n", Status); goto Cleanup; } // // Initialize UsbDevice // - Status = HubInterface->InitializeUsbDevice(RootHubDeviceObject, UsbChildExtension->UsbDeviceHandle); + Status = HubInterface->InitializeUsbDevice(HubInterfaceBusContext, UsbChildExtension->UsbDeviceHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("InitializeUsbDevice failed with status %x\n", Status); + DPRINT1("USBHUB: InitializeUsbDevice failed with status %x\n", Status); goto Cleanup; } + DPRINT1("Usb Device Handle %x\n", UsbChildExtension->UsbDeviceHandle); + + ConfigDescSize = sizeof(USB_CONFIGURATION_DESCRIPTOR); DeviceDescSize = sizeof(USB_DEVICE_DESCRIPTOR); - ConfigDescSize = sizeof(USB_CONFIGURATION_DESCRIPTOR); // // Get the descriptors // - Status = HubInterface->GetUsbDescriptors(RootHubDeviceObject, + Status = HubInterface->GetUsbDescriptors(HubInterfaceBusContext, UsbChildExtension->UsbDeviceHandle, - (PUCHAR)&DeviceDesc, + (PUCHAR)&UsbChildExtension->DeviceDesc, &DeviceDescSize, - (PUCHAR)&ConfigDesc, + (PUCHAR)&UsbChildExtension->ConfigDesc, &ConfigDescSize); if (!NT_SUCCESS(Status)) { - DPRINT1("GetUsbDescriptors failed with status %x\n", Status); + DPRINT1("USBHUB: GetUsbDescriptors failed with status %x\n", Status); goto Cleanup; } + DumpDeviceDescriptor(&UsbChildExtension->DeviceDesc); + // // Allocate memory for DeviceId // @@ -847,7 +920,7 @@ // // Construct DeviceId from vendor and product values // - swprintf(UsbChildExtension->DeviceId, L"USB\\Vid_%04x&Pid_%04x", DeviceDesc.idVendor, DeviceDesc.idProduct); + swprintf(UsbChildExtension->DeviceId, L"USB\\Vid_%04x&Pid_%04x", UsbChildExtension->DeviceDesc.idVendor, UsbChildExtension->DeviceDesc.idProduct); DPRINT1("Usb Device Id %S\n", UsbChildExtension->DeviceId); @@ -859,26 +932,26 @@ // Get the product string // Status = GetUsbStringDescriptor(NewChildDeviceObject, - DeviceDesc.iProduct, + UsbChildExtension->DeviceDesc.iProduct, 0, (PVOID*)&UsbChildExtension->TextDescription); if (!NT_SUCCESS(Status)) { - DPRINT1("GetUsbStringDescriptor failed with status %x\n", Status); + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); goto Cleanup; } DPRINT1("Usb TextDescription %S\n", UsbChildExtension->TextDescription); - + Status = GetUsbStringDescriptor(NewChildDeviceObject, - DeviceDesc.iSerialNumber, + UsbChildExtension->DeviceDesc.iSerialNumber, 0, (PVOID*)&UsbChildExtension->InstanceId); DPRINT1("Usb InstanceId %S\n", UsbChildExtension->InstanceId); if (!NT_SUCCESS(Status)) { - DPRINT1("GetUsbStringDescriptor failed with status %x\n", Status); + DPRINT1("USBHUB: GetUsbStringDescriptor failed with status %x\n", Status); goto Cleanup; } @@ -891,7 +964,6 @@ IoDeleteDevice(NewChildDeviceObject); return Status; - } NTSTATUS @@ -954,6 +1026,20 @@ return STATUS_SUCCESS; } +VOID +RootHubInitCallbackFunction( + PVOID Context) +{ + PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context; + + DPRINT1("Sending the initial SCE Request %x\n", DeviceObject); + + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); +} + NTSTATUS USBHUB_FdoHandlePnp( IN PDEVICE_OBJECT DeviceObject, @@ -963,6 +1049,8 @@ NTSTATUS Status = STATUS_SUCCESS; ULONG_PTR Information = 0; PHUB_DEVICE_EXTENSION HubDeviceExtension; + PDEVICE_OBJECT RootHubDeviceObject; + PVOID HubInterfaceBusContext , UsbDInterfaceBusContext; HubDeviceExtension = (PHUB_DEVICE_EXTENSION) DeviceObject->DeviceExtension; @@ -973,11 +1061,11 @@ case IRP_MN_START_DEVICE: { PURB Urb; - ULONG Result = 0; PUSB_INTERFACE_DESCRIPTOR Pid; - ULONG PortId; + ULONG Result = 0, PortId; USBD_INTERFACE_LIST_ENTRY InterfaceList[2] = {{NULL, NULL}, {NULL, NULL}}; PURB ConfigUrb = NULL; + ULONG HubStatus; DPRINT1("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); @@ -995,6 +1083,7 @@ &HubDeviceExtension->RootHubPhysicalDeviceObject, &HubDeviceExtension->RootHubFunctionalDeviceObject); + RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject; ASSERT(HubDeviceExtension->RootHubPhysicalDeviceObject); ASSERT(HubDeviceExtension->RootHubFunctionalDeviceObject); DPRINT1("RootPdo %x, RootFdo %x\n", @@ -1004,7 +1093,7 @@ // // Send the StartDevice to RootHub // - Status = ForwardIrpAndWait(HubDeviceExtension->RootHubPhysicalDeviceObject, Irp); + Status = ForwardIrpAndWait(RootHubDeviceObject, Irp); if (!NT_SUCCESS(Status)) { @@ -1015,14 +1104,14 @@ // // Get the current number of hubs // - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_GET_HUB_COUNT, &HubDeviceExtension->NumberOfHubs, NULL); // // Get the Hub Interface // - Status = QueryInterface(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = QueryInterface(RootHubDeviceObject, USB_BUS_INTERFACE_HUB_GUID, sizeof(USB_BUS_INTERFACE_HUB_V5), 5, @@ -1034,10 +1123,12 @@ return STATUS_UNSUCCESSFUL; } + HubInterfaceBusContext = HubDeviceExtension->HubInterface.BusContext; + // // Get the USBDI Interface // - Status = QueryInterface(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = QueryInterface(RootHubDeviceObject, USB_BUS_INTERFACE_USBDI_GUID, sizeof(USB_BUS_INTERFACE_USBDI_V2), 2, @@ -1049,10 +1140,12 @@ return Status; } + UsbDInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext; + // // Get Root Hub Device Handle // - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, &HubDeviceExtension->RootHubHandle, NULL); @@ -1066,7 +1159,7 @@ // // Get Hub Device Information // - Status = HubDeviceExtension->HubInterface.QueryDeviceInformation(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = HubDeviceExtension->HubInterface.QueryDeviceInformation(HubInterfaceBusContext, HubDeviceExtension->RootHubHandle, &HubDeviceExtension->DeviceInformation, sizeof(USB_DEVICE_INFORMATION_0), @@ -1093,9 +1186,9 @@ sizeof(USB_DEVICE_DESCRIPTOR), NULL); - Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); @@ -1120,9 +1213,10 @@ sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), NULL); - Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + DPRINT1("RootHub Handle %x\n", HubDeviceExtension->RootHubHandle); + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); @@ -1136,8 +1230,8 @@ DumpConfigurationDescriptor(&HubDeviceExtension->HubConfigDescriptor); - Status = HubDeviceExtension->HubInterface.GetExtendedHubInformation(HubDeviceExtension->RootHubPhysicalDeviceObject, - HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = HubDeviceExtension->HubInterface.GetExtendedHubInformation(HubInterfaceBusContext, + RootHubDeviceObject, &HubDeviceExtension->UsbExtHubInfo, sizeof(USB_EXTHUB_INFORMATION_0), &Result); @@ -1157,24 +1251,21 @@ sizeof(Urb->UrbControlVendorClassRequest), USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, 0, + USB_REQUEST_GET_DESCRIPTOR, USB_DEVICE_CLASS_RESERVED, - 0, 0, &HubDeviceExtension->HubDescriptor, NULL, sizeof(USB_HUB_DESCRIPTOR), NULL); - Urb->UrbHeader.UsbdDeviceHandle = HubDeviceExtension->RootHubHandle; - - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); - // - // FIXME: This is returning nothing. - // DPRINT1("bDescriptorType %x\n", HubDeviceExtension->HubDescriptor.bDescriptorType); if (!NT_SUCCESS(Status)) @@ -1184,19 +1275,34 @@ return STATUS_UNSUCCESSFUL; } + HubStatus = 0; + UsbBuildGetStatusRequest(Urb, + URB_FUNCTION_GET_STATUS_FROM_DEVICE, + 0, + &HubStatus, + 0, + NULL); + Urb->UrbHeader.UsbdDeviceHandle = NULL;//HubDeviceExtension->RootHubHandle; + + Status = SubmitRequestToRootHub(RootHubDeviceObject, + IOCTL_INTERNAL_USB_SUBMIT_URB, + Urb, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Hub Status!\n"); + ExFreePool(Urb); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("HubStatus %x\n", HubStatus); + // // Allocate memory for PortStatusChange to hold 2 USHORTs for each port on hub // HubDeviceExtension->PortStatusChange = ExAllocatePoolWithTag(NonPagedPool, sizeof(ULONG) * HubDeviceExtension->UsbExtHubInfo.NumberOfPorts, USB_HUB_TAG); - - // - // Initialize the Hub - // - Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubDeviceExtension->RootHubPhysicalDeviceObject, - HubDeviceExtension->RootHubHandle, 1); - DPRINT1("Status %x\n", Status); // // Get the first Configuration Descriptor @@ -1212,7 +1318,7 @@ (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); ASSERT(ConfigUrb != NULL); - Status = SubmitRequestToRootHub(HubDeviceExtension->RootHubPhysicalDeviceObject, + Status = SubmitRequestToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, ConfigUrb, NULL); @@ -1221,22 +1327,54 @@ HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; DPRINT1("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + // + // Initialize the Hub + // + Status = HubDeviceExtension->HubInterface.Initialize20Hub(HubInterfaceBusContext, + HubDeviceExtension->RootHubHandle, 1); + DPRINT1("Status %x\n", Status); + ExFreePool(ConfigUrb); // // Enable power on all ports // + + DPRINT1("Enabling PortPower on all ports!\n"); + for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) { - Status = SetPortFeature(HubDeviceExtension->RootHubPhysicalDeviceObject, PortId, PORT_POWER); + Status = SetPortFeature(RootHubDeviceObject, PortId, PORT_POWER); if (!NT_SUCCESS(Status)) DPRINT1("Failed to power on port %d\n", PortId); - } - - // - // Send the first SCE Request - // - QueryStatusChangeEndpoint(DeviceObject); + + Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_CONNECTION); + if (!NT_SUCCESS(Status)) + DPRINT1("Failed to power on port %d\n", PortId); + } + + DPRINT1("RootHubInitNotification %x\n", HubDeviceExtension->HubInterface.RootHubInitNotification); + // + // + // + if (HubDeviceExtension->HubInterface.RootHubInitNotification) + { + Status = HubDeviceExtension->HubInterface.RootHubInitNotification(HubInterfaceBusContext, + DeviceObject, + (PRH_INIT_CALLBACK)RootHubInitCallbackFunction); + } + else + { + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to set callback\n"); + } ExFreePool(Urb); break; Modified: branches/usb-bringup/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Sat May 7 14:49:02 2011 @@ -4,7 +4,7 @@ * FILE: drivers/usb/usbhub/fdo.c * PURPOSE: Handle PDO * PROGRAMMERS: - * Hervé Poussineau (hpoussin(a)reactos.org) + * HervÃ© Poussineau (hpoussin(a)reactos.org) * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ @@ -72,13 +72,22 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PHUB_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status = STATUS_UNSUCCESSFUL; + PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; + //NTSTATUS Status; DPRINT1("USBHUB_PdoStartDevice %x\n", DeviceObject); - DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // This should be a PDO + // + ASSERT(ChildDeviceExtension->Common.IsFDO == FALSE); + + // + // FIXME: Fow now assume success + // UNIMPLEMENTED - return Status; + return STATUS_SUCCESS; } NTSTATUS @@ -88,9 +97,9 @@ OUT ULONG_PTR* Information) { PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; - ULONG IdType; - PWCHAR SourceString = NULL; - NTSTATUS Status = STATUS_SUCCESS; + ULONG IdType, StringLength = 0; + PWCHAR SourceString = NULL, ReturnString = NULL; + NTSTATUS Status = STATUS_NOT_SUPPORTED; IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -101,26 +110,48 @@ { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); SourceString = ChildDeviceExtension->DeviceId; + Status = STATUS_SUCCESS; break; } case BusQueryHardwareIDs: { + ULONG Index = 0, LastIndex; + PWCHAR Ptr; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); - SourceString = ChildDeviceExtension->HardwareIds; - Status = STATUS_NOT_SUPPORTED; + + StringLength = wcslen(ChildDeviceExtension->DeviceId); + StringLength += wcslen(L"&Rev_XXXX") + 1; + StringLength += wcslen(ChildDeviceExtension->DeviceId) + 1; + StringLength = StringLength * sizeof(WCHAR); + + ReturnString = ExAllocatePool(PagedPool, StringLength); + Ptr = ReturnString; + LastIndex = Index; + Index += swprintf(&Ptr[Index], + L"%s&Rev_%04lx", ChildDeviceExtension->DeviceId, + ChildDeviceExtension->DeviceDesc.bcdDevice) + 1; + Ptr[Index] = UNICODE_NULL; + DPRINT1("%S\n", &Ptr[LastIndex]); + LastIndex = Index; + Index += swprintf(&Ptr[Index], L"%s", ChildDeviceExtension->DeviceId) + 1; + Ptr[Index] = UNICODE_NULL; + DPRINT1("%S\n", &Ptr[LastIndex]); + Status = STATUS_SUCCESS; break; } case BusQueryCompatibleIDs: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); - SourceString = ChildDeviceExtension->CompatibleIds; - Status = STATUS_NOT_SUPPORTED; + //SourceString = ChildDeviceExtension->CompatibleIds; + //return STATUS_NOT_SUPPORTED; break; } case BusQueryInstanceID: { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); SourceString = ChildDeviceExtension->InstanceId; + Status = STATUS_SUCCESS; break; } default: @@ -128,7 +159,17 @@ return STATUS_NOT_SUPPORTED; } - *Information = (ULONG_PTR)SourceString; + if (SourceString) + { + StringLength = (wcslen(SourceString) + 1) * sizeof(WCHAR); + DPRINT1("StringLen %d\n", StringLength); + ReturnString = ExAllocatePool(PagedPool, StringLength); + RtlCopyMemory(ReturnString, SourceString, StringLength); + DPRINT1("%S\n", ReturnString); + } + + *Information = (ULONG_PTR)ReturnString; + return Status; } @@ -140,30 +181,47 @@ { PHUB_CHILDDEVICE_EXTENSION ChildDeviceExtension; DEVICE_TEXT_TYPE DeviceTextType; + PWCHAR SourceString = NULL, ReturnString = NULL; + NTSTATUS Status = STATUS_SUCCESS; LCID LocaleId; + ULONG StrLen; DeviceTextType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.DeviceTextType; LocaleId = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryDeviceText.LocaleId; ChildDeviceExtension = (PHUB_CHILDDEVICE_EXTENSION)DeviceObject->DeviceExtension; + // + // FIXME: LocaleId + // + switch (DeviceTextType) { case DeviceTextDescription: case DeviceTextLocationInformation: { - if (DeviceTextType == DeviceTextDescription) - { - *Information = (ULONG_PTR)ChildDeviceExtension->TextDescription; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); - } - else - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); - return STATUS_SUCCESS; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextDescription\n"); + SourceString = ChildDeviceExtension->TextDescription; + DPRINT1("%S\n", SourceString); + break; } default: + { DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / unknown device text type 0x%lx\n", DeviceTextType); - return STATUS_NOT_SUPPORTED; - } + Status = STATUS_NOT_SUPPORTED; + break; + } + } + + if (SourceString) + { + StrLen = (wcslen(SourceString) + 1) * sizeof(WCHAR); + ReturnString = ExAllocatePool(PagedPool, StrLen); + RtlCopyMemory(ReturnString, SourceString, StrLen); + DPRINT1("%S\n", ReturnString); + *Information = (ULONG_PTR)ReturnString; + } + + return Status; } NTSTATUS @@ -196,13 +254,13 @@ DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; // FIXME: capabilities can change with connected device DeviceCapabilities->LockSupported = TRUE; - DeviceCapabilities->EjectSupported = FALSE; - DeviceCapabilities->Removable = FALSE; + DeviceCapabilities->EjectSupported = TRUE; + DeviceCapabilities->Removable = TRUE; DeviceCapabilities->DockDevice = FALSE; - DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->UniqueID = TRUE; DeviceCapabilities->SilentInstall = TRUE; DeviceCapabilities->RawDeviceOK = FALSE; - DeviceCapabilities->SurpriseRemovalOK = FALSE; + DeviceCapabilities->SurpriseRemovalOK = TRUE; DeviceCapabilities->HardwareDisabled = FALSE; //DeviceCapabilities->NoDisplayInUI = FALSE; DeviceCapabilities->DeviceState[0] = PowerDeviceD0; @@ -237,7 +295,6 @@ case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: { PIO_RESOURCE_REQUIREMENTS_LIST ResourceList; - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); ResourceList = ExAllocatePool(PagedPool, sizeof(IO_RESOURCE_REQUIREMENTS_LIST)); if (!ResourceList) @@ -268,9 +325,30 @@ Status = USBHUB_PdoQueryId(DeviceObject, Irp, &Information); break; } + case IRP_MN_QUERY_BUS_INFORMATION: + { + PPNP_BUS_INFORMATION BusInfo; + BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); + RtlCopyMemory(&BusInfo->BusTypeGuid, + &GUID_BUS_TYPE_USB, + sizeof(BusInfo->BusTypeGuid)); + BusInfo->LegacyBusType = PNPBus; + // FIXME + BusInfo->BusNumber = 0; + Information = (ULONG_PTR)BusInfo; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_REMOVE_DEVICE: + { + // + // FIXME + // + Status = STATUS_SUCCESS; + } default: { - DPRINT1("ERROR PDO IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); + DPRINT1("PDO IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); Information = Irp->IoStatus.Information; Status = Irp->IoStatus.Status; } Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.c [iso-8859-1] Sat May 7 14:49:02 2011 @@ -165,13 +165,24 @@ } NTSTATUS NTAPI -USBHUB_DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +USBHUB_DispatchPnp( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { DPRINT1("USBHUB: DispatchPnp\n"); if (((PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->Common.IsFDO) return USBHUB_FdoHandlePnp(DeviceObject, Irp); else return USBHUB_PdoHandlePnp(DeviceObject, Irp); +} + +NTSTATUS NTAPI +USBHUB_DispatchPower( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; } NTSTATUS NTAPI @@ -183,9 +194,6 @@ DriverObject->DriverExtension->AddDevice = USBHUB_AddDevice; DPRINT1("USBHUB: DriverEntry\n"); - - for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) - DriverObject->MajorFunction[i] = USBHUB_IrpStub; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBHUB_Create; DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBHUB_Close; @@ -193,7 +201,8 @@ DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = USBHUB_DispatchDeviceControl; DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = USBHUB_DispatchInternalDeviceControl; DriverObject->MajorFunction[IRP_MJ_PNP] = USBHUB_DispatchPnp; - - return STATUS_SUCCESS; -} - + DriverObject->MajorFunction[IRP_MJ_POWER] =USBHUB_DispatchPower; + + return STATUS_SUCCESS; +} + Modified: branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Sat May 7 14:49:02 2011 @@ -1,6 +1,8 @@ #pragma once +#include <ntifs.h> #include <ntddk.h> +#include <wdmguid.h> #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h> @@ -59,6 +61,8 @@ PWCHAR HardwareIds; PWCHAR CompatibleIds; PWCHAR TextDescription; + USB_DEVICE_DESCRIPTOR DeviceDesc; + USB_CONFIGURATION_DESCRIPTOR ConfigDesc; UNICODE_STRING SymbolicLinkName; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION;

1 0

[ilardig] 51619: [regedit] - Fix formatting. No code changes.
by ilardig＠svn.reactos.org 07 May '11

07 May '11

Author: ilardig Date: Sat May 7 14:43:49 2011 New Revision: 51619 URL: http://svn.reactos.org/svn/reactos?rev=51619&view=rev Log: [regedit] - Fix formatting. No code changes. Modified: trunk/reactos/base/applications/regedit/resource.h Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Sat May 7 14:43:49 2011 @@ -115,36 +115,36 @@ #define ID_HEXEDIT_SELECT_ALL 32839 #define IDS_LICENSE 32835 #define IDS_ERROR 32836 -#define IDS_BAD_VALUE 32837 -#define IDS_UNSUPPORTED_TYPE 32838 -#define IDS_TOO_BIG_VALUE 32839 -#define ID_EDIT_MODIFY_BIN 32840 -#define IDS_WARNING 32841 -#define IDS_MULTI_SZ_EMPTY_STRING 32842 -#define IDS_BINARY_EMPTY 32843 -#define IDS_DEFAULT_VALUE_NAME 32844 -#define IDS_VALUE_NOT_SET 32845 -#define IDS_UNKNOWN_TYPE 32846 -#define IDS_MY_COMPUTER 32847 -#define IDS_IMPORT_REG_FILE 32848 -#define IDS_EXPORT_REG_FILE 32849 -#define IDS_INVALID_DWORD 32850 -#define IDS_QUERY_DELETE_ONE 32851 -#define IDS_QUERY_DELETE_MORE 32852 -#define IDS_QUERY_DELETE_CONFIRM 32853 -#define IDS_ERR_DELVAL_CAPTION 32854 -#define IDS_ERR_DELETEVALUE 32855 -#define IDS_ERR_RENVAL_CAPTION 32856 -#define IDS_ERR_RENVAL_TOEMPTY 32857 +#define IDS_BAD_VALUE 32837 +#define IDS_UNSUPPORTED_TYPE 32838 +#define IDS_TOO_BIG_VALUE 32839 +#define ID_EDIT_MODIFY_BIN 32840 +#define IDS_WARNING 32841 +#define IDS_MULTI_SZ_EMPTY_STRING 32842 +#define IDS_BINARY_EMPTY 32843 +#define IDS_DEFAULT_VALUE_NAME 32844 +#define IDS_VALUE_NOT_SET 32845 +#define IDS_UNKNOWN_TYPE 32846 +#define IDS_MY_COMPUTER 32847 +#define IDS_IMPORT_REG_FILE 32848 +#define IDS_EXPORT_REG_FILE 32849 +#define IDS_INVALID_DWORD 32850 +#define IDS_QUERY_DELETE_ONE 32851 +#define IDS_QUERY_DELETE_MORE 32852 +#define IDS_QUERY_DELETE_CONFIRM 32853 +#define IDS_ERR_DELVAL_CAPTION 32854 +#define IDS_ERR_DELETEVALUE 32855 +#define IDS_ERR_RENVAL_CAPTION 32856 +#define IDS_ERR_RENVAL_TOEMPTY 32857 #define IDS_BAD_KEY 32858 -#define IDS_LOAD_HIVE 32859 -#define IDS_UNLOAD_HIVE 32860 +#define IDS_LOAD_HIVE 32859 +#define IDS_UNLOAD_HIVE 32860 #define ID_EDIT_NEW_MULTISTRINGVALUE 32861 #define ID_EDIT_NEW_EXPANDABLESTRINGVALUE 32862 #define ID_SWITCH_PANELS 32871 -#define ID_EDIT_PERMISSIONS 32872 +#define ID_EDIT_PERMISSIONS 32872 #define ID_TREE_DELETE 32873 #define ID_TREE_RENAME 32874 #define IDS_QUERY_DELETE_KEY_ONE 32875 @@ -155,30 +155,30 @@ #define ID_TREE_EXPORT 32888 #define ID_TREE_PERMISSIONS 32889 -#define IDS_FLT_REGFILE 31000 -#define IDS_FLT_REGFILES 31001 -#define IDS_FLT_REGFILES_FLT 31002 -#define IDS_FLT_REGEDIT4 31003 -#define IDS_FLT_REGEDIT4_FLT 31004 -#define IDS_FLT_ALLFILES 31005 -#define IDS_FLT_ALLFILES_FLT 31006 - -#define IDS_ACCESS_FULLCONTROL 31101 -#define IDS_ACCESS_READ 31102 -#define IDS_ACCESS_QUERYVALUE 31103 -#define IDS_ACCESS_SETVALUE 31104 -#define IDS_ACCESS_CREATESUBKEY 31105 -#define IDS_ACCESS_ENUMERATESUBKEYS 31106 -#define IDS_ACCESS_NOTIFY 31107 -#define IDS_ACCESS_CREATELINK 31108 -#define IDS_ACCESS_DELETE 31109 -#define IDS_ACCESS_WRITEDAC 31110 -#define IDS_ACCESS_WRITEOWNER 31111 -#define IDS_ACCESS_READCONTROL 31112 - -#define IDS_INHERIT_THISKEYONLY 31121 +#define IDS_FLT_REGFILE 31000 +#define IDS_FLT_REGFILES 31001 +#define IDS_FLT_REGFILES_FLT 31002 +#define IDS_FLT_REGEDIT4 31003 +#define IDS_FLT_REGEDIT4_FLT 31004 +#define IDS_FLT_ALLFILES 31005 +#define IDS_FLT_ALLFILES_FLT 31006 + +#define IDS_ACCESS_FULLCONTROL 31101 +#define IDS_ACCESS_READ 31102 +#define IDS_ACCESS_QUERYVALUE 31103 +#define IDS_ACCESS_SETVALUE 31104 +#define IDS_ACCESS_CREATESUBKEY 31105 +#define IDS_ACCESS_ENUMERATESUBKEYS 31106 +#define IDS_ACCESS_NOTIFY 31107 +#define IDS_ACCESS_CREATELINK 31108 +#define IDS_ACCESS_DELETE 31109 +#define IDS_ACCESS_WRITEDAC 31110 +#define IDS_ACCESS_WRITEOWNER 31111 +#define IDS_ACCESS_READCONTROL 31112 + +#define IDS_INHERIT_THISKEYONLY 31121 #define IDS_INHERIT_THISKEYANDSUBKEYS 31122 -#define IDS_INHERIT_SUBKEYSONLY 31123 +#define IDS_INHERIT_SUBKEYSONLY 31123 #define IDS_EXPAND 31124 #define IDS_COLLAPSE 31125 #define IDS_NEW_KEY 31126 @@ -186,39 +186,39 @@ #define IDS_GOTO_SUGGESTED_KEY 31128 -#define IDD_EDIT_STRING 2000 -#define IDC_VALUE_NAME 2001 -#define IDC_VALUE_DATA 2002 - -#define IDD_EDIT_DWORD 2003 -#define IDC_FORMAT_HEX 2004 -#define IDC_FORMAT_DEC 2005 - -#define IDD_EDIT_MULTI_STRING 2006 -#define IDD_EDIT_BIN_DATA 2007 - -#define IDC_EXPORT_ALL 2008 -#define IDC_EXPORT_BRANCH 2009 -#define IDC_EXPORT_BRANCH_TEXT 2010 - -#define IDD_LOADHIVE 2500 -#define IDC_EDIT_KEY 2501 - -#define IDC_FAVORITENAME 2011 -#define IDC_FAVORITESLIST 2012 -#define IDC_FINDWHAT 2013 -#define IDC_LOOKAT_KEYS 2014 -#define IDC_LOOKAT_VALUES 2015 -#define IDC_LOOKAT_DATA 2016 -#define IDC_MATCHSTRING 2017 -#define IDC_MATCHCASE 2018 - -#define IDS_FINISHEDFIND 2019 - -#define ID_FAVORITES_MIN 2100 -#define ID_FAVORITES_MAX 2999 - -#define ID_ACCEL 3000 - - -#define IDC_STATIC -1 +#define IDD_EDIT_STRING 2000 +#define IDC_VALUE_NAME 2001 +#define IDC_VALUE_DATA 2002 + +#define IDD_EDIT_DWORD 2003 +#define IDC_FORMAT_HEX 2004 +#define IDC_FORMAT_DEC 2005 + +#define IDD_EDIT_MULTI_STRING 2006 +#define IDD_EDIT_BIN_DATA 2007 + +#define IDC_EXPORT_ALL 2008 +#define IDC_EXPORT_BRANCH 2009 +#define IDC_EXPORT_BRANCH_TEXT 2010 + +#define IDD_LOADHIVE 2500 +#define IDC_EDIT_KEY 2501 + +#define IDC_FAVORITENAME 2011 +#define IDC_FAVORITESLIST 2012 +#define IDC_FINDWHAT 2013 +#define IDC_LOOKAT_KEYS 2014 +#define IDC_LOOKAT_VALUES 2015 +#define IDC_LOOKAT_DATA 2016 +#define IDC_MATCHSTRING 2017 +#define IDC_MATCHCASE 2018 + +#define IDS_FINISHEDFIND 2019 + +#define ID_FAVORITES_MIN 2100 +#define ID_FAVORITES_MAX 2999 + +#define ID_ACCEL 3000 + + +#define IDC_STATIC -1

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