Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[cwittich] 40618: fix 7 setupapi misc winetests
by cwittich＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cwittich Date: Tue Apr 21 02:59:31 2009 New Revision: 40618 URL: http://svn.reactos.org/svn/reactos?rev=40618&view=rev Log: fix 7 setupapi misc winetests Modified: trunk/reactos/dll/win32/setupapi/install.c Modified: trunk/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/install… ============================================================================== --- trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/install.c [iso-8859-1] Tue Apr 21 02:59:31 2009 @@ -2228,8 +2228,8 @@ MyFree(SourceInfFileNameW); MyFree(OEMSourceMediaLocationW); MyFree(DestinationInfFileNameW); - TRACE("Returning %d\n", ret); + if (ret) SetLastError(ERROR_SUCCESS); return ret; } @@ -2518,5 +2518,6 @@ } TRACE("Returning %d\n", ret); + if (ret) SetLastError(ERROR_SUCCESS); return ret; }

1 0

[cwittich] 40617: add linebreaks
by cwittich＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cwittich Date: Tue Apr 21 02:50:49 2009 New Revision: 40617 URL: http://svn.reactos.org/svn/reactos?rev=40617&view=rev Log: add linebreaks Modified: trunk/rostests/winetests/setupapi/devclass.c Modified: trunk/rostests/winetests/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/setupapi/devcla… ============================================================================== --- trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] (original) +++ trunk/rostests/winetests/setupapi/devclass.c [iso-8859-1] Tue Apr 21 02:50:49 2009 @@ -68,9 +68,9 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiBuildClassInfoList( 0, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); if ( !guid_list ) @@ -78,12 +78,12 @@ SetLastError( 0xdeadbeef ); ok( SetupDiBuildClassInfoList( 0, guid_list, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); SetLastError( 0xdeadbeef ); ok( SetupDiBuildClassInfoList( 0, guid_list, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); if ( size > 0 ) { @@ -101,28 +101,28 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, NULL ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( NULL, NULL, 0, &required_size ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( "", NULL, 0, &required_size ), - "Error reported %lx", GetLastError() ); - ok( required_size == 0, "Expected 0, got %lu", required_size ); + "Error reported %lx\n", GetLastError() ); + ok( required_size == 0, "Expected 0, got %lu\n", required_size ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassGuidsFromNameA( test_class_name, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); SetLastError( 0xdeadbeef ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu", required_size ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); guid_list = HeapAlloc( GetProcessHeap(), 0, ( required_size + 1 ) * sizeof( GUID ) ); if ( !guid_list ) @@ -130,16 +130,16 @@ SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); SetLastError( 0xdeadbeef ); ok( SetupDiClassGuidsFromNameA( test_class_name, guid_list, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( IsEqualIID( &guid_list[0], &test_class_guid ), - "Expected %s, got %s", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); + "Expected %s, got %s\n", debugstr_guid( &test_class_guid ), debugstr_guid( &guid_list[0] ) ); HeapFree( GetProcessHeap(), 0, guid_list ); } @@ -151,23 +151,23 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, NULL ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( NULL, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiClassNameFromGuidA( &test_class_guid, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu", required_size ); - ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu", MAX_CLASS_NAME_LEN, required_size ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); + ok( required_size < MAX_CLASS_NAME_LEN, "Expected < %u, got %lu\n", MAX_CLASS_NAME_LEN, required_size ); class_name = HeapAlloc( GetProcessHeap(), 0, required_size ); if ( !class_name ) @@ -175,16 +175,16 @@ SetLastError( 0xdeadbeef ); ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( !strcmp( class_name, test_class_name ), - "Expected %s, got %s", test_class_name, class_name ); + "Expected %s, got %s\n", test_class_name, class_name ); SetLastError( 0xdeadbeef ); ok( SetupDiClassNameFromGuidA( &test_class_guid, class_name, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); ok( !strcmp( class_name, test_class_name ), - "Expected %s, got %s", test_class_name, class_name ); + "Expected %s, got %s\n", test_class_name, class_name ); HeapFree( GetProcessHeap(), 0, class_name ); } @@ -196,23 +196,23 @@ SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, NULL ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( NULL, NULL, 0, &required_size ), - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); ok( !SetupDiGetClassDescriptionA( &test_class_guid, NULL, 0, &required_size ), - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "Expected error %lx, got %lx", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); - ok( required_size > 0, "Expected > 0, got %lu", required_size ); - ok( required_size < LINE_LEN, "Expected < %u, got %lu", LINE_LEN, required_size ); + "Expected error %lx, got %lx\n", ERROR_INSUFFICIENT_BUFFER, GetLastError() ); + ok( required_size > 0, "Expected > 0, got %lu\n", required_size ); + ok( required_size < LINE_LEN, "Expected < %u, got %lu\n", LINE_LEN, required_size ); class_desc = HeapAlloc( GetProcessHeap(), 0, required_size ); if ( !class_desc ) @@ -220,12 +220,12 @@ SetLastError( 0xdeadbeef ); ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); SetLastError( 0xdeadbeef ); ok( SetupDiGetClassDescriptionA( &test_class_guid, class_desc, required_size + 1, &size ), - "Error reported %lx", GetLastError() ); - ok( size == required_size, "Expected size %lu, got %lu", required_size, size ); + "Error reported %lx\n", GetLastError() ); + ok( size == required_size, "Expected size %lu, got %lu\n", required_size, size ); HeapFree( GetProcessHeap(), 0, class_desc ); } @@ -237,47 +237,47 @@ SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, NULL, NULL, 0 ); ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_ALLCLASSES ); ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, NULL, NULL, DIGCF_DEVICEINTERFACE ); ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, - "Expected error %lx, got %lx", ERROR_INVALID_PARAMETER, GetLastError() ); + "Fail expected\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, + "Expected error %lx, got %lx\n", ERROR_INVALID_PARAMETER, GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( &test_class_guid, NULL, NULL, 0 ); ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, "(invalid enumerator)", NULL, DIGCF_ALLCLASSES ); ok( device_info == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_DATA, - "Expected error %lx, got %lx", ERROR_INVALID_DATA, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INVALID_DATA, GetLastError() ); SetLastError( 0xdeadbeef ); device_info = SetupDiGetClassDevs( NULL, "Root", NULL, DIGCF_ALLCLASSES ); ok( device_info != INVALID_HANDLE_VALUE, - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); SetLastError( 0xdeadbeef ); ok( SetupDiDestroyDeviceInfoList( device_info ), - "Error reported %lx", GetLastError() ); + "Error reported %lx\n", GetLastError() ); } static void test_SetupDiOpenClassRegKeyExA(void) @@ -288,51 +288,51 @@ SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, 0, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx", ERROR_INVALID_FLAGS, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER | DIOCR_INTERFACE, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_FLAGS, - "Expected error %lx, got %lx", ERROR_INVALID_FLAGS, GetLastError() ); + "Expected error %lx, got %lx\n", ERROR_INVALID_FLAGS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INSTALLER, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, 0, DIOCR_INTERFACE, NULL, NULL ); ok( hkey == INVALID_HANDLE_VALUE, - "Fail expected" ); + "Fail expected\n" ); ok( GetLastError() == ERROR_INVALID_CLASS, - "Expected error %x, got %lx", ERROR_INVALID_CLASS, GetLastError() ); + "Expected error %x, got %lx\n", ERROR_INVALID_CLASS, GetLastError() ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( NULL, KEY_QUERY_VALUE, DIOCR_INTERFACE, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); SetLastError( 0xdeadbeef ); hkey = SetupDiOpenClassRegKeyExA( &test_class_guid, KEY_QUERY_VALUE, DIOCR_INSTALLER, NULL, NULL ); - ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx", GetLastError() ); + ok( hkey != INVALID_HANDLE_VALUE, "Got error %lx\n", GetLastError() ); err = RegCloseKey( hkey ); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); err = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "System\\CurrentControlSet\\Control\\Class", 0, KEY_SET_VALUE, &hkey); - ok( err == ERROR_SUCCESS, "Got error %lx", err ); + ok( err == ERROR_SUCCESS, "Got error %lx\n", err ); } START_TEST(devclass)

1 0

[dreimer] 40616: Finish the changes to make if possible to keep the settings on a update.
by dreimer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dreimer Date: Tue Apr 21 01:51:39 2009 New Revision: 40616 URL: http://svn.reactos.org/svn/reactos?rev=40616&view=rev Log: Finish the changes to make if possible to keep the settings on a update. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Apr 21 01:51:39 2009 @@ -276,6 +276,7 @@ ;; ;; Add our start menu shortcuts. ;; + IfFileExists "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" +10 0 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY @@ -296,6 +297,7 @@ ;; ;; Add our desktop shortcuts. ;; + IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +4 0 SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE @@ -308,6 +310,7 @@ ;; ;; Add our quick launch shortcuts. ;; + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +4 0 SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE @@ -335,17 +338,25 @@ Abort IfFileExists "$PROFILE\RosBE\." 0 +2 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ - IDYES +2 + "Do you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ + IDNO +1 RMDir /r /REBOOTOK "$PROFILE\RosBE" - Abort IfFileExists "$APPDATA\RosBE\." 0 +2 MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ - IDYES +2 + "Do you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ + IDNO +1 RMDir /r /REBOOTOK "$APPDATA\RosBE" - - Abort + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ + IDNO +8 + IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" + IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" + IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 + Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" FunctionEnd Section Uninstall @@ -400,14 +411,6 @@ Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" ;; ;; Clean up the registry.

1 0

[dreimer] 40615: Ask on uninstall if you wanna keep the configuration settings. Request by Physicus.
by dreimer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dreimer Date: Tue Apr 21 01:21:44 2009 New Revision: 40615 URL: http://svn.reactos.org/svn/reactos?rev=40615&view=rev Log: Ask on uninstall if you wanna keep the configuration settings. Request by Physicus. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Tue Apr 21 01:21:44 2009 @@ -1,5 +1,5 @@ !define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.4" +!define PRODUCT_VERSION "1.4.2" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.4.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.4.2.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2009 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.4.0.0" +VIProductVersion "1.4.2.0" CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -330,8 +330,21 @@ Function un.onInit MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ - "Are you sure you want to completely remove ReactOS Build Environment and all of its components?" \ - IDYES +2 + "Are you sure you want to remove ReactOS Build Environment and all of its components?" \ + IDYES +2 + Abort + IfFileExists "$PROFILE\RosBE\." 0 +2 + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Are you sure you want to remove the ReactOS Build Environment configuration file from the Profile Path?" \ + IDYES +2 + RMDir /r /REBOOTOK "$PROFILE\RosBE" + Abort + IfFileExists "$APPDATA\RosBE\." 0 +2 + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ + "Are you sure you want to remove the ReactOS Build Environment configuration file from the Application Data Path?" \ + IDYES +2 + RMDir /r /REBOOTOK "$APPDATA\RosBE" + Abort FunctionEnd @@ -345,10 +358,6 @@ RMDir /r /REBOOTOK "$INSTDIR\i386" RMDir /r /REBOOTOK "$INSTDIR\Tools" RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP" - IfFileExists "$PROFILE\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$PROFILE\RosBE" - IfFileExists "$APPDATA\RosBE\." 0 +2 - RMDir /r /REBOOTOK "$APPDATA\RosBE" Delete /REBOOTOK "$INSTDIR\Build.cmd" Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\chdefdir.cmd"

1 0

[cgutman] 40614: - Implement NdisMRegisterUnloadHandler, NdisMRegisterDevice, and NdisMDeregisterDevice
by cgutman＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cgutman Date: Tue Apr 21 00:59:40 2009 New Revision: 40614 URL: http://svn.reactos.org/svn/reactos?rev=40614&view=rev Log: - Implement NdisMRegisterUnloadHandler, NdisMRegisterDevice, and NdisMDeregisterDevice Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Tue Apr 21 00:59:40 2009 @@ -33,6 +33,12 @@ #else } NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK; #endif + +/* There must be some defined struct to do this... */ +typedef struct _NDIS_M_DEVICE_BLOCK { + PDEVICE_OBJECT DeviceObject; + PNDIS_STRING SymbolicName; +} NDIS_M_DEVICE_BLOCK, *PNDIS_M_DEVICE_BLOCK; /* resources allocated on behalf on the miniport */ #define MINIPORT_RESOURCE_TYPE_MEMORY 0 Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Tue Apr 21 00:59:40 2009 @@ -231,26 +231,6 @@ */ NDIS_STATUS EXPORT -NdisMDeregisterDevice( - IN NDIS_HANDLE NdisDeviceHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT NdisMPromoteMiniport( IN NDIS_HANDLE MiniportAdapterHandle) /* @@ -263,50 +243,6 @@ UNIMPLEMENTED return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMRegisterDevice( - IN NDIS_HANDLE NdisWrapperHandle, - IN PNDIS_STRING DeviceName, - IN PNDIS_STRING SymbolicName, - IN PDRIVER_DISPATCH MajorFunctions[], - OUT PDEVICE_OBJECT *pDeviceObject, - OUT NDIS_HANDLE *NdisDeviceHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisMRegisterUnloadHandler( - IN NDIS_HANDLE NdisWrapperHandle, - IN PDRIVER_UNLOAD UnloadHandler) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Apr 21 00:59:40 2009 @@ -2664,5 +2664,124 @@ *AllocatedResourcesTranslated = Adapter->NdisMiniportBlock.AllocatedResourcesTranslated; } +/* + * @implemented + */ +VOID +EXPORT +NdisMRegisterUnloadHandler( + IN NDIS_HANDLE NdisWrapperHandle, + IN PDRIVER_UNLOAD UnloadHandler) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PNDIS_M_DRIVER_BLOCK DriverBlock = NdisWrapperHandle; + + NDIS_DbgPrint(MAX_TRACE, ("Miniport registered unload handler\n")); + + DriverBlock->DriverObject->DriverUnload = UnloadHandler; +} + +/* + * @implemented + */ +NDIS_STATUS +EXPORT +NdisMRegisterDevice( + IN NDIS_HANDLE NdisWrapperHandle, + IN PNDIS_STRING DeviceName, + IN PNDIS_STRING SymbolicName, + IN PDRIVER_DISPATCH MajorFunctions[], + OUT PDEVICE_OBJECT *pDeviceObject, + OUT NDIS_HANDLE *NdisDeviceHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PNDIS_M_DRIVER_BLOCK DriverBlock = NdisWrapperHandle; + PNDIS_M_DEVICE_BLOCK DeviceBlock; + PDEVICE_OBJECT DeviceObject; + NDIS_STATUS Status; + UINT i; + + NDIS_DbgPrint(MAX_TRACE, ("Called\n")); + + Status = IoCreateDevice(DriverBlock->DriverObject, + 0, /* This space is reserved for us. Should we use it? */ + DeviceName, + FILE_DEVICE_NETWORK, + 0, + FALSE, + &DeviceObject); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = IoCreateSymbolicLink(SymbolicName, DeviceName); + + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(DeviceObject); + return Status; + } + + DeviceBlock = ExAllocatePool(NonPagedPool, sizeof(NDIS_M_DEVICE_BLOCK)); + + if (!DeviceBlock) + { + IoDeleteDevice(DeviceObject); + IoDeleteSymbolicLink(SymbolicName); + return NDIS_STATUS_RESOURCES; + } + + for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) + DriverBlock->DriverObject->MajorFunction[i] = MajorFunctions[i]; + + DriverBlock->DriverObject->MajorFunction[IRP_MJ_PNP] = NdisIDispatchPnp; + DriverBlock->DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = NdisIShutdown; + + DeviceBlock->DeviceObject = DeviceObject; + DeviceBlock->SymbolicName = SymbolicName; + + *pDeviceObject = DeviceObject; + *NdisDeviceHandle = DeviceBlock; + + return NDIS_STATUS_SUCCESS; +} + +/* + * @implemented + */ +NDIS_STATUS +EXPORT +NdisMDeregisterDevice( + IN NDIS_HANDLE NdisDeviceHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PNDIS_M_DEVICE_BLOCK DeviceBlock = NdisDeviceHandle; + + IoDeleteDevice(DeviceBlock->DeviceObject); + + IoDeleteSymbolicLink(DeviceBlock->SymbolicName); + + ExFreePool(DeviceBlock); + + return NDIS_STATUS_SUCCESS; +} + /* EOF */

1 0

[dgoette] 390: update subsystem integration of paste to roscms4
by dgoette＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dgoette Date: Tue Apr 21 00:26:40 2009 New Revision: 390 URL: http://svn.reactos.org/svn/reactos?rev=390&view=rev Log: update subsystem integration of paste to roscms4 Modified: branches/danny-web/www/www.reactos.org/paste/inc/account.php Modified: branches/danny-web/www/www.reactos.org/paste/inc/account.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/paste/inc/account.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/paste/inc/account.php [iso-8859-1] Tue Apr 21 00:26:40 2009 @@ -19,19 +19,16 @@ */ define("ROOT_PATH", "../"); - require_once(ROOT_PATH . "roscms/logon/subsys_login.php"); - $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . "http://localhost/reactos.org/"); + define("ROSCMS_PATH", ROOT_PATH.'roscms/'); + + require_once(ROSCMS_PATH . "lib/RosCMS_Autoloader.class.php"); + $RSDB_intern_user_id = Subsystem::in(Login::OPTIONAL, "/" . "http://localhost/reactos.org/"); include("connect.db.php"); if($RSDB_intern_user_id != 0) { - $query_roscms_user = mysql_query("SELECT * - FROM roscms.users - WHERE user_id = '".mysql_escape_string($RSDB_intern_user_id)."' LIMIT 1;") ; - $result_roscms_user = mysql_fetch_array($query_roscms_user); - // Name - $RSDB_USER_name = $result_roscms_user['user_name']; + $RSDB_USER_name = Subsystem::getUserName($RSDB_intern_user_id); } else {

1 0

[dgoette] 389: update subsystem integration to roscms4, set url for this server
by dgoette＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: dgoette Date: Tue Apr 21 00:25:29 2009 New Revision: 389 URL: http://svn.reactos.org/svn/reactos?rev=389&view=rev Log: update subsystem integration to roscms4, set url for this server Modified: branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php branches/danny-web/www/www.reactos.org/support/inc/utils.php branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php branches/danny-web/www/www.reactos.org/support/rsdb_setting.php branches/danny-web/www/www.reactos.org/support/search.js branches/danny-web/www/www.reactos.org/support/style.css Modified: branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/inc/comp/data/group_list.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -117,8 +117,8 @@ <comp><?php echo $result_page['grpentr_comp']; ?></comp> <devnet><?php echo $result_page['grpentr_devnet']; ?></devnet> </dbentry> -<? +<?php } } ?> -</root> +</root> Modified: branches/danny-web/www/www.reactos.org/support/inc/utils.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/inc/utils.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/inc/utils.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -19,6 +19,6 @@ */ //require_once("/web/reactos.org/htdocs/roscms/inc/utils.php"); -require_once("../roscms/inc/utils.php"); +require_once("../shared/subsys_layout.php"); ?> Modified: branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/rsdb_human_readable_url.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -29,9 +29,9 @@ $RSDB_URI_mode = ""; - $RSDB_intern_SET_path = "http://localhost/reactos.org/support/"; - $RSDB_intern_SET_path_ex = "http://localhost/reactos.org/support/index.php/"; - $RSDB_intern_dirs = "reactos.org/support/"; + $RSDB_intern_SET_path = "http://79.99.5.181/support/"; + $RSDB_intern_SET_path_ex = "http://79.99.5.181/support/index.php/"; + $RSDB_intern_dirs = "79.99.5.181/support/"; $RSDB_URI_tree = $_SERVER['REQUEST_URI']; Modified: branches/danny-web/www/www.reactos.org/support/rsdb_setting.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/rsdb_setting.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/rsdb_setting.php [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -39,8 +39,8 @@ // ************** // Config: (please sync this with the database) - $RSDB_intern_version = "RSDB 0.1 - http://www.reactos.org/"; // RSDB version info - $RSDB_intern_path_server = "http://www.reactos.org/"; // complete server path + $RSDB_intern_version = "RSDB 0.1 - http://79.99.5.181/"; // RSDB version info + $RSDB_intern_path_server = "http://79.99.5.181/"; // complete server path $RSDB_intern_path = "support/"; // the dirs after http://www.reactos.org // script file fix (for Safari browser) @@ -54,21 +54,17 @@ $RSDB_intern_items_per_page = 25; @define("ROOT_PATH", "../"); - require_once(ROOT_PATH . "roscms/logon/subsys_login.php"); + @define ("ROSCMS_PATH", ROOT_PATH.'roscms/'); + require_once(ROSCMS_PATH . "lib/RosCMS_Autoloader.class.php"); // User ID - $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path); + $RSDB_intern_user_id = Subsystem::in(Login::OPTIONAL, "/" . $RSDB_intern_path); require_once('inc/user_settings.php'); if($RSDB_intern_user_id != 0) { - $query_roscms_user = mysql_query("SELECT * - FROM roscms.users - WHERE `user_id` = '".mysql_escape_string($RSDB_intern_user_id)."' LIMIT 1;") ; - $result_roscms_user = mysql_fetch_array($query_roscms_user); - // Name - $RSDB_USER_name = $result_roscms_user['user_name']; + $RSDB_USER_name = Subsystem::getUserName($RSDB_intern_user_id); // RSDB user settings Modified: branches/danny-web/www/www.reactos.org/support/search.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/search.js [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/search.js [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -13,8 +13,8 @@ var tResults = ""; //var twebsite = "http://localhost/reactos.org/support/index.php"; //var twebsite2 = "http://localhost/reactos.org/"; - var twebsite = "http://www.reactos.org/support/index.php"; - var twebsite2 = "http://www.reactos.org/"; + var twebsite = "http://79.99.5.181/support/index.php"; + var twebsite2 = "http://79.99.5.181/"; function writeItemList_style_header() { @@ -350,4 +350,4 @@ } ---> +--> Modified: branches/danny-web/www/www.reactos.org/support/style.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/s… ============================================================================== --- branches/danny-web/www/www.reactos.org/support/style.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/support/style.css [iso-8859-1] Tue Apr 21 00:25:29 2009 @@ -3,7 +3,7 @@ font-size: 12px; margin: 0 0 1em 0; padding: 0; /* Only affects Opera */ - background: #FFFFFF url('http://localhost/reactos.org/images/topbar.jpg') repeat-x scroll top left; + background: #FFFFFF url('/roscms/images/topbar.jpg') repeat-x scroll top left; } hr { @@ -100,7 +100,7 @@ /* set by the generator */ a.extern { - background: url('http://localhost/reactos.org/wiki/stylesheets/monobook/external.png') no-repeat center right; + background: url('/wiki/stylesheets/monobook/external.png') no-repeat center right; padding-right: 14px; } @@ -111,12 +111,12 @@ } #content li { - list-style-image: url('http://localhost/reactos.org/images/bullet.png') + list-style-image: url('/roscms/images/bullet.png') } #top { margin: 0; - background: url('http://localhost/reactos.org/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; + background: url('/support/images/logo_rsdb.jpg') no-repeat scroll 35px 0; padding: 103px 0 26px 0; color: #FFFFFF; text-align: right;

1 0

[cfinck] 388: Integrate People Map into RosCMS 4
by cfinck＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: cfinck Date: Tue Apr 21 00:22:12 2009 New Revision: 388 URL: http://svn.reactos.org/svn/reactos?rev=388&view=rev Log: Integrate People Map into RosCMS 4 Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php branches/danny-web/www/www.reactos.org/peoplemap/index.php Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/ajax-deletelocation.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -25,7 +25,7 @@ } // Get the user ID from the session key - $stmt = $dbh->prepare("SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = :usersessionid LIMIT 1"); + $stmt = $dbh->prepare("SELECT user_id FROM $DB_ROSCMS.roscms_accounts_sessions WHERE id = :usersessionid LIMIT 1"); $stmt->bindParam(":usersessionid", $_COOKIE["roscmsusrkey"]); $stmt->execute() or die("<error>Query failed #1</error>"); $userid = (int)$stmt->fetchColumn(); Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/ajax-getuser.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -28,27 +28,27 @@ } // Build the query - $query = "SELECT u.user_id, u.user_name, u.user_fullname, l.latitude, l.longitude " . - "FROM $DB_ROSCMS.users u " . - "JOIN $DB_PEOPLEMAP.user_locations l ON u.user_id = l.roscms_user_id "; + $query = "SELECT u.id, u.name, u.fullname, l.latitude, l.longitude " . + "FROM $DB_ROSCMS.roscms_accounts u " . + "JOIN $DB_PEOPLEMAP.user_locations l ON u.id = l.roscms_user_id "; switch($_GET["subject"]) { case "username": - $query .= "WHERE u.user_name LIKE :query"; + $query .= "WHERE u.name LIKE :query"; break; case "fullname": - $query .= "WHERE u.user_fullname LIKE :query"; + $query .= "WHERE u.fullname LIKE :query"; break; case "group": - $query .= "JOIN $DB_ROSCMS.usergroup_members g ON u.user_id = g.usergroupmember_userid " . - "WHERE g.usergroupmember_usergroupid = :query"; + $query .= "JOIN $DB_ROSCMS.roscms_rel_groups_accounts g ON u.id = g.user_id " . + "WHERE g.group_id = :query"; break; case "userid": - $query .= "WHERE u.user_id = :query"; + $query .= "WHERE u.id = :query"; $_GET["query"] = (int)$_GET["query"]; break; @@ -56,7 +56,7 @@ die("<error>Invalid subject!</error>"); } - $query .= " ORDER BY u.user_name ASC"; + $query .= " ORDER BY u.name ASC"; switch($_GET["subject"]) { Modified: branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/ajax-setlocation.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -25,7 +25,7 @@ } // Get the user ID from the session key - $stmt = $dbh->prepare("SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = :usersessionid LIMIT 1"); + $stmt = $dbh->prepare("SELECT user_id FROM $DB_ROSCMS.roscms_accounts_sessions WHERE id = :usersessionid LIMIT 1"); $stmt->bindParam(":usersessionid", $_COOKIE["roscmsusrkey"]); $stmt->execute() or die("<error>Query failed #1</error>"); $userid = (int)$stmt->fetchColumn(); @@ -44,7 +44,7 @@ $stmt->execute() or die("<error>Query failed #2</error>"); // We succeeded, return all information about our account - $stmt = $dbh->prepare("SELECT user_name, user_fullname FROM $DB_ROSCMS.users WHERE user_id = :userid LIMIT 1"); + $stmt = $dbh->prepare("SELECT name AS user_name, fullname AS user_fullname FROM $DB_ROSCMS.roscms_accounts WHERE id = :userid LIMIT 1"); $stmt->bindParam(":userid", $userid); $stmt->execute() or die("<error>Query failed #3</error>"); $row = $stmt->fetch(PDO::FETCH_NUM); Modified: branches/danny-web/www/www.reactos.org/peoplemap/index.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/p… ============================================================================== --- branches/danny-web/www/www.reactos.org/peoplemap/index.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/peoplemap/index.php [iso-8859-1] Tue Apr 21 00:22:12 2009 @@ -85,10 +85,10 @@ catch(PDOException $e) { // Give no exact error message here, so no server internals are exposed - die("<error>Could not establish the DB connection</error>"); - } - - $stmt = $dbh->query("SELECT COUNT(*) FROM $DB_ROSCMS.users") or die("Query failed #1"); + die("Could not establish the DB connection"); + } + + $stmt = $dbh->query("SELECT COUNT(*) FROM $DB_ROSCMS.roscms_accounts") or die("Query failed #1"); $user_count = (int)$stmt->fetchColumn(); $stmt = $dbh->query("SELECT COUNT(*) FROM $DB_PEOPLEMAP.user_locations") or die("Query failed #2"); @@ -142,7 +142,7 @@ $iconcode = '<script type="text/javascript">'; $iconcode .= 'IconTable = new Object();'; - $stmt = $dbh->query("SELECT usrgroup_name_id, usrgroup_name FROM $DB_ROSCMS.usergroups WHERE usrgroup_visible = 1") or die("Query failed #3"); + $stmt = $dbh->query("SELECT id, name FROM $DB_ROSCMS.roscms_groups WHERE visible = 1") or die("Query failed #3"); while($row = $stmt->fetch(PDO::FETCH_NUM)) { @@ -234,7 +234,7 @@ if($_COOKIE["roscmsusrkey"]) { - $stmt = $dbh->prepare("SELECT usersession_user_id FROM $DB_ROSCMS.user_sessions WHERE usersession_id = :usersessionid LIMIT 1"); + $stmt = $dbh->prepare("SELECT user_id FROM $DB_ROSCMS.roscms_accounts_sessions WHERE id = :usersessionid LIMIT 1"); $stmt->bindParam(":usersessionid", $_COOKIE["roscmsusrkey"]); $stmt->execute() or die("Query failed #4"); $userid = (int)$stmt->fetchColumn();

1 0

[hpoussin] 40613: Implement agnostic architecture for file system access, according to Advanced RISC Computing Specification Version 1.2 Some shortcuts still exist, and will need to be addressed later Use this new API in the NTLDR-style loader
by hpoussin＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: hpoussin Date: Tue Apr 21 00:04:23 2009 New Revision: 40613 URL: http://svn.reactos.org/svn/reactos?rev=40613&view=rev Log: Implement agnostic architecture for file system access, according to Advanced RISC Computing Specification Version 1.2 Some shortcuts still exist, and will need to be addressed later Use this new API in the NTLDR-style loader Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/include/fs.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -395,6 +395,99 @@ MmHeapFree(PartialResourceList); } +typedef struct tagDISKCONTEXT +{ + ULONG DriveNumber; + ULONG SectorSize; + ULONGLONG SectorOffset; + ULONGLONG SectorNumber; +} DISKCONTEXT; + +static LONG DiskClose(ULONG FileId) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + MmHeapFree(Context); + return ESUCCESS; +} + +static LONG DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + return EINVAL; +} + +static LONG DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + DISKCONTEXT* Context; + ULONG DriveNumber, DrivePartition, SectorSize; + ULONGLONG SectorOffset = 0; + PARTITION_TABLE_ENTRY PartitionTableEntry; + CHAR FileName[1]; + + if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) + return EINVAL; + SectorSize = (DrivePartition == 0xff ? 2048 : 512); + if (DrivePartition != 0xff && DrivePartition != 0) + { + if (!MachDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) + return EINVAL; + SectorOffset = PartitionTableEntry.SectorCountBeforePartition; + } + + Context = MmHeapAlloc(sizeof(DISKCONTEXT)); + if (!Context) + return ENOMEM; + Context->DriveNumber = DriveNumber; + Context->SectorSize = SectorSize; + Context->SectorOffset = SectorOffset; + Context->SectorNumber = 0; + FsSetDeviceSpecific(*FileId, Context); + + return ESUCCESS; +} + +static LONG DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + BOOLEAN ret; + + *Count = 0; + if (N & (Context->SectorSize - 1)) + return EINVAL; + + ret = MachDiskReadLogicalSectors( + Context->DriveNumber, + Context->SectorNumber + Context->SectorOffset, + N / Context->SectorSize, + Buffer); + if (!ret) + return EIO; + + *Count = N; + return ESUCCESS; +} + +static LONG DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); + + if (SeekMode != SeekAbsolute) + return EINVAL; + if (Position->LowPart & (Context->SectorSize - 1)) + return EINVAL; + + /* FIXME: take HighPart into account */ + Context->SectorNumber = Position->LowPart / Context->SectorSize; + return ESUCCESS; +} + +static const DEVVTBL DiskVtbl = { + DiskClose, + DiskGetFileInformation, + DiskOpen, + DiskRead, + DiskSeek, +}; static VOID SetHarddiskIdentifier(PCONFIGURATION_COMPONENT_DATA DiskKey, @@ -407,6 +500,7 @@ ULONG Signature; CHAR Identifier[20]; CHAR ArcName[256]; + PARTITION_TABLE_ENTRY PartitionTableEntry; /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) @@ -438,6 +532,21 @@ reactos_arc_disk_info[reactos_disk_count].ArcName = reactos_arc_strings[reactos_disk_count]; reactos_disk_count++; + + sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(0)", DriveNumber - 0x80); + FsRegisterDevice(ArcName, &DiskVtbl); + + /* Add partitions */ + i = 0; + while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) + { + if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) + { + sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(%lu)", DriveNumber - 0x80, i); + FsRegisterDevice(ArcName, &DiskVtbl); + } + i++; + } /* Convert checksum and signature to identifier string */ Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; @@ -776,6 +885,9 @@ SetHarddiskConfigurationData(DiskKey, 0x80 + i); SetHarddiskIdentifier(DiskKey, 0x80 + i); } + + /* Also add one cdrom drive */ + FsRegisterDevice("multi(0)disk(0)cdrom(224)", &DiskVtbl); } static VOID Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -26,6 +26,8 @@ MachInit(CmdLine); + FsInit(); + DebugInit(); DPRINTM(DPRINT_WARNING, "BootMain() called.\n"); Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -319,3 +319,279 @@ DPRINTM(DPRINT_FILESYSTEM, "FatGetFirstNameFromPath() Path = %s FirstName = %s\n", Path, Buffer); } + +LONG CompatFsClose(ULONG FileId) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + + FsCloseFile(FileHandle); + return ESUCCESS; +} + +LONG CompatFsGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + + memset(Information, 0, sizeof(FILEINFORMATION)); + Information->EndingAddress.LowPart = FsGetFileSize(FileHandle); + Information->CurrentAddress.LowPart = FsGetFilePointer(FileHandle); + return ESUCCESS; +} + +LONG CompatFsOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + PFILE FileHandle; + static BOOLEAN bVolumeOpened = FALSE; + + if (!bVolumeOpened) + { + bVolumeOpened = FsOpenBootVolume(); + if (!bVolumeOpened) + return EIO; + } + + FileHandle = FsOpenFile(Path); + if (!FileHandle) + return EIO; + FsSetDeviceSpecific(*FileId, FileHandle); + return ESUCCESS; +} + +LONG CompatFsRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + BOOLEAN ret; + + ret = FsReadFile(FileHandle, N, Count, Buffer); + return (ret ? ESUCCESS : EFAULT); +} + +LONG CompatFsSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + PFILE FileHandle = FsGetDeviceSpecific(FileId); + + if (SeekMode != SeekAbsolute) + return EINVAL; + + FsSetFilePointer(FileHandle, Position->LowPart); + return ESUCCESS; +} + +const DEVVTBL CompatFsFuncTable = { + CompatFsClose, + CompatFsGetFileInformation, + CompatFsOpen, + CompatFsRead, + CompatFsSeek, +}; + +#define MAX_FDS 20 +typedef struct tagFILEDATA +{ + ULONG DeviceId; + ULONG ReferenceCount; + const DEVVTBL* FuncTable; + const DEVVTBL* FileFuncTable; + VOID* Specific; +} FILEDATA; + +typedef struct tagDEVICE +{ + LIST_ENTRY ListEntry; + const DEVVTBL* FuncTable; + CHAR* Prefix; + ULONG DeviceId; + ULONG ReferenceCount; +} DEVICE; + +static FILEDATA FileData[MAX_FDS]; +static LIST_ENTRY DeviceListHead; + +LONG ArcClose(ULONG FileId) +{ + LONG ret; + + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + + ret = FileData[FileId].FuncTable->Close(FileId); + + if (ret == ESUCCESS) + { + FileData[FileId].FuncTable = NULL; + FileData[FileId].Specific = NULL; + } + return ret; +} + +LONG ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + return FileData[FileId].FuncTable->GetFileInformation(FileId, Information); +} + +LONG ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) +{ + ULONG i, ret; + PLIST_ENTRY pEntry; + DEVICE* pDevice; + CHAR* DeviceName; + CHAR* FileName; + CHAR* p; + CHAR* q; + ULONG dwCount, dwLength; + OPENMODE DeviceOpenMode; + ULONG DeviceId; + + *FileId = MAX_FDS; + + /* Search last ')', which delimits device and path */ + FileName = strrchr(Path, ')'); + if (!FileName) + return EINVAL; + FileName++; + + /* Count number of "()", which needs to be replaced by "(0)" */ + dwCount = 0; + for (p = Path; p != FileName; p++) + if (*p == '(' && *(p + 1) == ')') + dwCount++; + + /* Duplicate device name, and replace "()" by "(0)" (if required) */ + dwLength = FileName - Path + dwCount; + if (dwCount != 0) + { + DeviceName = MmHeapAlloc(FileName - Path + dwCount); + if (!DeviceName) + return ENOMEM; + for (p = Path, q = DeviceName; p != FileName; p++) + { + *q++ = *p; + if (*p == '(' && *(p + 1) == ')') + *q++ = '0'; + } + } + else + DeviceName = Path; + + /* Search for the device */ + pEntry = DeviceListHead.Flink; + if (OpenMode == OpenReadOnly || OpenMode == OpenWriteOnly) + DeviceOpenMode = OpenMode; + else + DeviceOpenMode = OpenReadWrite; + while (pEntry != &DeviceListHead) + { + pDevice = CONTAINING_RECORD(pEntry, DEVICE, ListEntry); + if (strncmp(pDevice->Prefix, DeviceName, dwLength) == 0) + { + /* OK, device found. It is already opened? */ + if (pDevice->ReferenceCount == 0) + { + /* Search some room for the device */ + for (DeviceId = 0; DeviceId < MAX_FDS; DeviceId++) + if (!FileData[DeviceId].FuncTable) + break; + if (DeviceId == MAX_FDS) + return EMFILE; + /* Try to open the device */ + FileData[DeviceId].FuncTable = pDevice->FuncTable; + ret = pDevice->FuncTable->Open(pDevice->Prefix, DeviceOpenMode, &DeviceId); + if (ret != ESUCCESS) + { + FileData[DeviceId].FuncTable = NULL; + return ret; + } + + /* Try to detect the file system */ + /* FIXME: we link there to old infrastructure... */ + FileData[DeviceId].FileFuncTable = &CompatFsFuncTable; + + pDevice->DeviceId = DeviceId; + } + else + { + DeviceId = pDevice->DeviceId; + } + pDevice->ReferenceCount++; + break; + } + pEntry = pEntry->Flink; + } + if (pEntry == &DeviceListHead) + return ENODEV; + + /* At this point, device is found and opened. Its file id is stored + * in DeviceId, and FileData[DeviceId].FileFuncTable contains what + * needs to be called to open the file */ + + /* Search some room for the device */ + for (i = 0; i < MAX_FDS; i++) + if (!FileData[i].FuncTable) + break; + if (i == MAX_FDS) + return EMFILE; + + /* Open the file */ + FileData[i].FuncTable = FileData[DeviceId].FileFuncTable; + *FileId = i; + ret = FileData[i].FuncTable->Open(FileName, OpenMode, FileId); + if (ret != ESUCCESS) + { + FileData[i].FuncTable = NULL; + *FileId = MAX_FDS; + } + return ret; +} + +LONG ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + return FileData[FileId].FuncTable->Read(FileId, Buffer, N, Count); +} + +LONG ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return EBADF; + return FileData[FileId].FuncTable->Seek(FileId, Position, SeekMode); +} + +VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable) +{ + DEVICE* pNewEntry; + ULONG dwLength; + + dwLength = strlen(Prefix) + 1; + pNewEntry = MmHeapAlloc(sizeof(DEVICE) + dwLength); + if (!pNewEntry) + return; + pNewEntry->FuncTable = FuncTable; + pNewEntry->ReferenceCount = 0; + pNewEntry->Prefix = (CHAR*)(pNewEntry + 1); + memcpy(pNewEntry->Prefix, Prefix, dwLength); + + InsertHeadList(&DeviceListHead, &pNewEntry->ListEntry); +} + +VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return; + FileData[FileId].Specific = Specific; +} + +VOID* FsGetDeviceSpecific(ULONG FileId) +{ + if (FileId >= MAX_FDS || !FileData[FileId].FuncTable) + return NULL; + return FileData[FileId].Specific; +} + +VOID FsInit(VOID) +{ + memset(FileData, 0, sizeof(FileData)); + InitializeListHead(&DeviceListHead); +} Modified: trunk/reactos/boot/freeldr/freeldr/include/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/fs.h [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -20,6 +20,14 @@ #ifndef __FS_H #define __FS_H +typedef struct tagDEVVTBL +{ + ARC_CLOSE Close; + ARC_GET_FILE_INFORMATION GetFileInformation; + ARC_OPEN Open; + ARC_READ Read; + ARC_SEEK Seek; +} DEVVTBL; //#define EOF -1 @@ -32,6 +40,17 @@ #define FILE VOID #define PFILE FILE * + +VOID FsRegisterDevice(CHAR* Prefix, const DEVVTBL* FuncTable); +VOID FsSetDeviceSpecific(ULONG FileId, VOID* Specific); +VOID* FsGetDeviceSpecific(ULONG FileId); +VOID FsInit(VOID); + +LONG ArcClose(ULONG FileId); +LONG ArcGetFileInformation(ULONG FileId, FILEINFORMATION* Information); +LONG ArcOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId); +LONG ArcRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); +LONG ArcSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); VOID FileSystemError(PCSTR ErrorString); BOOLEAN FsOpenBootVolume(); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -26,6 +26,10 @@ #ifndef __MEMORY_H #include "mm.h" +#endif + +#ifndef __FS_H +#include "fs.h" #endif typedef enum tagVIDEODISPLAYMODE Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -255,14 +255,15 @@ TYPE_OF_MEMORY MemoryType, OUT PVOID *ImageBasePA) { - PFILE FileHandle; + ULONG FileId; PVOID PhysicalBase; PVOID VirtualBase = NULL; UCHAR HeadersBuffer[SECTOR_SIZE * 2]; PIMAGE_NT_HEADERS NtHeaders; PIMAGE_SECTION_HEADER SectionHeader; ULONG VirtualSize, SizeOfRawData, NumberOfSections; - BOOLEAN Status; + LONG Status; + LARGE_INTEGER Position; ULONG i, BytesRead; CHAR ProgressString[256]; @@ -272,22 +273,19 @@ UiDrawProgressBarCenter(1, 100, ProgressString); /* Open the image file */ - FileHandle = FsOpenFile(FileName); - - if (FileHandle == NULL) - { - //Print(L"Can not open the file %s\n",FileName); + Status = ArcOpen(FileName, OpenReadOnly, &FileId); + if (Status != ESUCCESS) + { UiMessageBox("Can not open the file"); return FALSE; } /* Load the first 2 sectors of the image so we can read the PE header */ - Status = FsReadFile(FileHandle, SECTOR_SIZE * 2, NULL, HeadersBuffer); - if (!Status) - { - //Print(L"Error reading from file %s\n", FileName); + Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); + if (Status != ESUCCESS) + { UiMessageBox("Error reading from file"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -298,7 +296,7 @@ { //Print(L"Error - no NT header found in %s\n", FileName); UiMessageBox("Error - no NT header found"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -307,7 +305,7 @@ { //Print(L"Not an executable image %s\n", FileName); UiMessageBox("Not an executable image"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -329,7 +327,7 @@ { //Print(L"Failed to alloc pages for image %s\n", FileName); UiMessageBox("Failed to alloc pages for image"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } } @@ -340,15 +338,22 @@ DPRINTM(DPRINT_PELOADER, "Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); /* Set to 0 position and fully load the file image */ - FsSetFilePointer(FileHandle, 0); - - Status = FsReadFile(FileHandle, NtHeaders->OptionalHeader.SizeOfHeaders, NULL, PhysicalBase); - - if (!Status) + Position.HighPart = Position.LowPart = 0; + Status = ArcSeek(FileId, &Position, SeekAbsolute); + if (Status != ESUCCESS) + { + UiMessageBox("Error seeking to start of file"); + ArcClose(FileId); + return FALSE; + } + + Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); + + if (Status != ESUCCESS) { //Print(L"Error reading headers %s\n", FileName); UiMessageBox("Error reading headers"); - FsCloseFile(FileHandle); + ArcClose(FileId); return FALSE; } @@ -388,14 +393,15 @@ if (SizeOfRawData != 0) { /* Seek to the correct position */ - FsSetFilePointer(FileHandle, SectionHeader->PointerToRawData); + Position.LowPart = SectionHeader->PointerToRawData; + Status = ArcSeek(FileId, &Position, SeekAbsolute); DPRINTM(DPRINT_PELOADER, "SH->VA: 0x%X\n", SectionHeader->VirtualAddress); /* Read this section from the file, size = SizeOfRawData */ - Status = FsReadFile(FileHandle, SizeOfRawData, &BytesRead, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress); - - if (!Status && (BytesRead == 0)) + Status = ArcRead(FileId, (PUCHAR)PhysicalBase + SectionHeader->VirtualAddress, SizeOfRawData, &BytesRead); + + if (Status != ESUCCESS) { DPRINTM(DPRINT_PELOADER, "WinLdrLoadImage(): Error reading section from file!\n"); break; @@ -413,10 +419,10 @@ } /* We are done with the file - close it */ - FsCloseFile(FileHandle); + ArcClose(FileId); /* If loading failed - return right now */ - if (!Status) + if (Status != ESUCCESS) return FALSE; @@ -425,7 +431,7 @@ { DPRINTM(DPRINT_PELOADER, "Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); - Status = (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, + return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, "FreeLdr", TRUE, @@ -433,7 +439,7 @@ FALSE); } - return Status; + return TRUE; } /* PRIVATE FUNCTIONS *******************************************************/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -161,7 +161,6 @@ LPCSTR BootOptions; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; - ULONG BootDevice; ULONG i, ErrorLine; HINF InfHandle; INFCONTEXT InfContext; @@ -188,10 +187,11 @@ NULL }; - /* Get boot device number */ - MachDiskGetBootDevice(&BootDevice); + /* Try to open system drive */ + FsOpenBootVolume(); /* Open 'txtsetup.sif' from any of source paths */ + MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) { SourcePath = SourcePaths[i]; @@ -200,14 +200,13 @@ printf("Failed to open 'txtsetup.sif'\n"); return; } - sprintf(FileName,"%s\\txtsetup.sif", SourcePath); + sprintf(FileName, "%s\\txtsetup.sif", SourcePath); if (InfOpenFile (&InfHandle, FileName, &ErrorLine)) + { + sprintf(BootPath, "%s%s\\", SystemPath, SourcePath); break; - } - - /* If we didn't find it anywhere, then just use root */ - if (!*SourcePath) - SourcePath = "\\"; + } + } /* Load options */ if (!InfFindFirstLine(InfHandle, @@ -225,9 +224,6 @@ return; } - /* Save source path */ - strcpy(BootPath, SourcePath); - SetupUiInitialize(); UiDrawStatusText(""); UiDrawStatusText("Detecting Hardware..."); @@ -235,18 +231,8 @@ /* Let user know we started loading */ UiDrawStatusText("Loading..."); - /* Try to open system drive */ - FsOpenBootVolume(); - - /* Append a backslash to the bootpath if needed */ - if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') - { - strcat(BootPath, "\\"); - } - /* Construct the system path */ - MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - strcat(SystemPath, SourcePath); + sprintf(SystemPath, "%s\\", SourcePath); DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s', SystemPath: '%s'\n", BootPath, SystemPath); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -374,10 +374,12 @@ PVOID WinLdrLoadModule(PCSTR ModuleName, ULONG *Size, TYPE_OF_MEMORY MemoryType) { - PFILE FileHandle; + ULONG FileId; PVOID PhysicalBase; + FILEINFORMATION FileInfo; ULONG FileSize; - BOOLEAN Status; + ULONG Status; + ULONG BytesRead; //CHAR ProgressString[256]; @@ -389,38 +391,40 @@ *Size = 0; /* Open the image file */ - FileHandle = FsOpenFile(ModuleName); - - if (FileHandle == NULL) + Status = ArcOpen((PCHAR)ModuleName, OpenReadOnly, &FileId); + if (Status != ESUCCESS) { /* In case of errors, we just return, without complaining to the user */ return NULL; } /* Get this file's size */ - FileSize = FsGetFileSize(FileHandle); + Status = ArcGetFileInformation(FileId, &FileInfo); + if (Status != ESUCCESS) + { + ArcClose(FileId); + return NULL; + } + FileSize = FileInfo.EndingAddress.LowPart; *Size = FileSize; /* Allocate memory */ PhysicalBase = MmAllocateMemoryWithType(FileSize, MemoryType); if (PhysicalBase == NULL) { - FsCloseFile(FileHandle); + ArcClose(FileId); return NULL; } /* Load whole file */ - Status = FsReadFile(FileHandle, FileSize, NULL, PhysicalBase); - if (!Status) - { - FsCloseFile(FileHandle); + Status = ArcRead(FileId, PhysicalBase, FileSize, &BytesRead); + ArcClose(FileId); + if (Status != ESUCCESS) + { return NULL; } DPRINTM(DPRINT_WINDOWS, "Loaded %s at 0x%x with size 0x%x\n", ModuleName, PhysicalBase, FileSize); - - /* We are done with the file - close it */ - FsCloseFile(FileHandle); return PhysicalBase; } @@ -437,7 +441,6 @@ PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; ULONG SectionId; - ULONG BootDevice; PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlockVA; KERNEL_ENTRY_POINT KiSystemStartup; PLDR_DATA_TABLE_ENTRY KernelDTE, HalDTE, KdComDTE = NULL; @@ -476,25 +479,19 @@ strcpy(BootOptions, ""); } - /* Normalize system path */ - if (!MachDiskNormalizeSystemPath(SystemPath, sizeof(SystemPath))) - { - UiMessageBox("Invalid system path"); - return; + /* Special case for LiveCD */ + if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD"))) + { + strcpy(BootPath, SystemPath + strlen("LiveCD")); + MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); + strcat(SystemPath, BootPath); } /* Let user know we started loading */ UiDrawStatusText("Loading..."); - /* Try to open system drive */ - BootDevice = 0xffffffff; - if (!FsOpenSystemVolume(SystemPath, BootPath, &BootDevice)) - { - UiMessageBox("Failed to open boot drive."); - return; - } - /* append a backslash */ + strcpy(BootPath, SystemPath); if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') strcat(BootPath, "\\"); Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Tue Apr 21 00:04:23 2009 @@ -42,34 +42,37 @@ IN LPCSTR DirectoryPath, IN LPCSTR HiveName) { - PFILE FileHandle; + ULONG FileId; CHAR FullHiveName[256]; - BOOLEAN Status; + LONG Status; + FILEINFORMATION FileInfo; ULONG HiveFileSize; ULONG_PTR HiveDataPhysical; PVOID HiveDataVirtual; + ULONG BytesRead; /* Concatenate path and filename to get the full name */ strcpy(FullHiveName, DirectoryPath); strcat(FullHiveName, HiveName); //Print(L"Loading %s...\n", FullHiveName); - FileHandle = FsOpenFile(FullHiveName); - - if (FileHandle == NULL) + Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); + + if (Status != ESUCCESS) { UiMessageBox("Opening hive file failed!"); return FALSE; } /* Get the file length */ - HiveFileSize = FsGetFileSize(FileHandle); - - if (HiveFileSize == 0) - { - FsCloseFile(FileHandle); + Status = ArcGetFileInformation(FileId, &FileInfo); + + if (Status != ESUCCESS) + { + ArcClose(FileId); UiMessageBox("Hive file has 0 size!"); return FALSE; } + HiveFileSize = FileInfo.EndingAddress.LowPart; /* Round up the size to page boundary and alloc memory */ HiveDataPhysical = (ULONG_PTR)MmAllocateMemoryWithType( @@ -78,7 +81,7 @@ if (HiveDataPhysical == 0) { - FsCloseFile(FileHandle); + ArcClose(FileId); UiMessageBox("Unable to alloc memory for a hive!"); return FALSE; } @@ -91,9 +94,9 @@ LoaderBlock->RegistryBase = HiveDataVirtual; /* Finally read from file to the memory */ - Status = FsReadFile(FileHandle, HiveFileSize, NULL, (PVOID)HiveDataPhysical); - FsCloseFile(FileHandle); - if (!Status) + Status = ArcRead(FileId, (PVOID)HiveDataPhysical, HiveFileSize, &BytesRead); + ArcClose(FileId); + if (Status != ESUCCESS) { UiMessageBox("Unable to read from hive file!"); return FALSE; @@ -272,14 +275,16 @@ IN LPCSTR LanguageFileName) { CHAR FileName[255]; - PFILE AnsiFileHandle; - PFILE OemFileHandle; - PFILE LanguageFileHandle; + ULONG AnsiFileId; + ULONG OemFileId; + ULONG LanguageFileId; ULONG AnsiFileSize, OemFileSize, LanguageFileSize; ULONG TotalSize; ULONG_PTR NlsDataBase; PVOID NlsVirtual; - BOOLEAN Status, AnsiEqualsOem = FALSE; + BOOLEAN AnsiEqualsOem = FALSE; + FILEINFORMATION FileInfo; + ULONG BytesRead, Status; /* There may be a case, when OEM and ANSI page coincide */ if (!strcmp(AnsiFileName, OemFileName)) @@ -289,14 +294,17 @@ //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); - AnsiFileHandle = FsOpenFile(FileName); - - if (AnsiFileHandle == NULL) - goto Failure; - - AnsiFileSize = FsGetFileSize(AnsiFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcGetFileInformation(AnsiFileId, &FileInfo); + if (Status != ESUCCESS) + goto Failure; + AnsiFileSize = FileInfo.EndingAddress.LowPart; DPRINTM(DPRINT_WINDOWS, "AnsiFileSize: %d\n", AnsiFileSize); - FsCloseFile(AnsiFileHandle); + ArcClose(AnsiFileId); /* Open OEM file and store its length */ if (AnsiEqualsOem) @@ -308,13 +316,16 @@ //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, OemFileName); - OemFileHandle = FsOpenFile(FileName); - - if (OemFileHandle == NULL) + Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + + if (Status != ESUCCESS) goto Failure; - OemFileSize = FsGetFileSize(OemFileHandle); - FsCloseFile(OemFileHandle); + Status = ArcGetFileInformation(OemFileId, &FileInfo); + if (Status != ESUCCESS) + goto Failure; + OemFileSize = FileInfo.EndingAddress.LowPart; + ArcClose(OemFileId); } DPRINTM(DPRINT_WINDOWS, "OemFileSize: %d\n", OemFileSize); @@ -322,13 +333,16 @@ //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, LanguageFileName); - LanguageFileHandle = FsOpenFile(FileName); - - if (LanguageFileHandle == NULL) - goto Failure; - - LanguageFileSize = FsGetFileSize(LanguageFileHandle); - FsCloseFile(LanguageFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcGetFileInformation(LanguageFileId, &FileInfo); + if (Status != ESUCCESS) + goto Failure; + LanguageFileSize = FileInfo.EndingAddress.LowPart; + ArcClose(LanguageFileId); DPRINTM(DPRINT_WINDOWS, "LanguageFileSize: %d\n", LanguageFileSize); /* Sum up all three length, having in mind that every one of them @@ -361,50 +375,50 @@ /* Now actually read the data into memory, starting with Ansi file */ strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); - AnsiFileHandle = FsOpenFile(FileName); - - if (AnsiFileHandle == NULL) - goto Failure; - - Status = FsReadFile(AnsiFileHandle, AnsiFileSize, NULL, VaToPa(LoaderBlock->NlsData->AnsiCodePageData)); - - if (!Status) - goto Failure; - - FsCloseFile(AnsiFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcRead(AnsiFileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); + + if (Status != ESUCCESS) + goto Failure; + + ArcClose(AnsiFileId); /* OEM now, if it doesn't equal Ansi of course */ if (!AnsiEqualsOem) { strcpy(FileName, DirectoryPath); strcat(FileName, OemFileName); - OemFileHandle = FsOpenFile(FileName); - - if (OemFileHandle == NULL) + Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); + + if (Status != ESUCCESS) goto Failure; - Status = FsReadFile(OemFileHandle, OemFileSize, NULL, VaToPa(LoaderBlock->NlsData->OemCodePageData)); - - if (!Status) + Status = ArcRead(OemFileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); + + if (Status != ESUCCESS) goto Failure; - FsCloseFile(OemFileHandle); + ArcClose(OemFileId); } /* finally the language file */ strcpy(FileName, DirectoryPath); strcat(FileName, LanguageFileName); - LanguageFileHandle = FsOpenFile(FileName); - - if (LanguageFileHandle == NULL) - goto Failure; - - Status = FsReadFile(LanguageFileHandle, LanguageFileSize, NULL, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData)); - - if (!Status) - goto Failure; - - FsCloseFile(LanguageFileHandle); + Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); + + if (Status != ESUCCESS) + goto Failure; + + Status = ArcRead(LanguageFileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); + + if (Status != ESUCCESS) + goto Failure; + + ArcClose(LanguageFileId); // // THIS IS HAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACK

1 0

[mkupfer] 40612: - changelog template generator for wiki changelog page - creates a complete changelog for the given xml file and try to put all entries in the best fitting section - the section file needs update to represent the whole wiki page structure - entries which don't fit (due to different paths) to a section are collected in "uncategorized" section
by mkupfer＠svn.reactos.org 20 Apr '09

20 Apr '09

Author: mkupfer Date: Mon Apr 20 23:41:48 2009 New Revision: 40612 URL: http://svn.reactos.org/svn/reactos?rev=40612&view=rev Log: - changelog template generator for wiki changelog page - creates a complete changelog for the given xml file and try to put all entries in the best fitting section - the section file needs update to represent the whole wiki page structure - entries which don't fit (due to different paths) to a section are collected in "uncategorized" section Added: trunk/tools/changelog/ trunk/tools/changelog/autocl.py (with props) trunk/tools/changelog/sections (with props) Added: trunk/tools/changelog/autocl.py URL: http://svn.reactos.org/svn/reactos/trunk/tools/changelog/autocl.py?rev=4061… ============================================================================== --- trunk/tools/changelog/autocl.py (added) +++ trunk/tools/changelog/autocl.py [iso-8859-1] Mon Apr 20 23:41:48 2009 @@ -1,0 +1,172 @@ +#!/usr/bin/python + +# Creates basic changelog wiki page from svn log +# - argument is the generated xml log file with log entries +# created by 'svn log -v --xml -r revision1:revision2 repository' +# - needs internet access for retrieving the author names from wiki +# (http://www.reactos.org/wiki/index.php?title=Developer_Roles&action=edit) +# - needs a section file 'sections' +# this file contains all generated wiki-sections and the according paths +# to assign the log messages correctly +# +# (c) Matthias Kupfer 2009 + +import xml.sax # for the parser +import sys # for system functions +import string # for string operations +import re # for regular expressions +import time # for sorting +import urllib # for downloading the developer wiki page + +class XMLLogParser: + class XMLLogHandler(xml.sax.handler.ContentHandler): + __logentries = [] # log entries list + __logentry = {} + def startElement(self, name, attrs): + "Process all start tags." + self.__data = '' + attr = {} # temporary dictionary of attributes + for i in attrs.items(): # iterate over all attributes + tmp = i[1] # save attribute value + if tmp: # if value exists + tmp = tmp.encode('utf-8') # encode as utf-8 + attr[i[0].encode('utf-8')] = tmp # encode attribute name too + if name == 'logentry': + # save the log entry revision number (currently unused) + self.__logentry["revision"] = attr.get("revision") + elif name == 'paths': + # collect files and paths + self.__logentry["paths"] = [] # reset path + elif name == 'path': + # save file or path attributes + self.__pathattr = (attr.get("action"), + attr.get("copyfrom-path"), + attrs.get("copyfrom-rev")) # copy path attributes + def endElement(self, name): + "Process all end tags." + if name == 'logentry': + # append the created log entry and clear the temporary one + self.__logentries.append(self.__logentry) + self.__logentry = {} # clear current log entry + elif name == 'author': + # save the author name in the current log entry + self.__logentry["author"] = self.__data # copy author + elif name == 'date': + # extract timestamp and save it in the current log entry + m = re.match(r"(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):" \ + "(\d{2})\.(\d{6})Z", self.__data) # regular expression for time + self.__logentry["time"] = time.mktime((int(m.group(1)), + int(m.group(2)), int(m.group(3)), int(m.group(4)), + int(m.group(5)), int(m.group(6)), -1, -1, -1)) + \ + (float("0."+m.group(7))) # build time entry + elif name == 'path': + # append a file or path entry to current log entry + self.__logentry["paths"].append((self.__data, self.__pathattr)) + elif name == 'msg': + # save message in current log entry + self.__logentry["msg"] = self.__data + def characters(self, ch): + "Save character data." + self.__data += ch.encode('utf-8') + def get_entry_list(self): + "Sort created list by revision in ascending order." + self.__logentries.sort(lambda x,y : cmp(y["revision"], x["revision"])) + return self.__logentries + __Handler = XMLLogHandler() # instance of content handler + get_entry_list = __Handler.get_entry_list + def __init__(self, file = None): + "Create a XML parser, set content handler and load the file." + self.parser = xml.sax.make_parser() # create a xml parser + self.parser.setContentHandler(self.__Handler) # set content handler + if file: + self.load(file) + def load(self, file): + "Parse a file." + self.parser.parse(file) # parse file + +def get_common_part(paths): + "returns the longest common path part of all file entries" + index = 0 # length + mypaths = [] # list of all paths + for i in paths: # extract all path from list + mypaths.append(i[0][0:string.rfind(i[0],'/')]) + if len(mypaths) == 1: # if only one path + return mypaths[0] # the return the whole path + else: + cmp = mypaths[0] # set first path for comparison + while index < len(cmp): + isequal = True + for i in mypaths[1:]: # for all remaining paths + if index >= len(i) or i[index] != cmp[index]: + isequal = False + break + if isequal == True: # if equal then next character + index += 1 + else: # else finish + break; + return cmp[0:index] + +def find_section(i,sections): + "find the best fitting (longest path) section" + section = "" # no section found + path = "" # no path + for k in sections.keys(): # iterate over all section paths + if i.startswith(k) and len(k) > len(path): # if i starts with path and + #is longer then the previous path then update path and section + section = sections[k] + path = k + return section # return wiki section name + +if __name__ == '__main__': + if len(sys.argv) != 2: + print "This script generates a template for the wiki changelog" + print + print "Syntax: %s <svn-log-xml-file>" % sys.argv[0] + print "log file should be created with:" + print "svn log -v --xml [-r revision1:revision2] repository > svn-log-xml-file" + exit(1) + sec_order = [] # list for the sections (to preserve) order + authors = {} # dictionary for commit name -> real names + sections = {} # dictionary for path -> sections + messages = {} # dictionary for section -> log messages + author = urllib.urlopen("http://www.reactos.org/wiki/index.php?title=Developer_Roles&action=edit").readlines() + for i in author: + m = re.match("^.*\[\[(.*)\]\].*\|\|[^|]*\|\|\s([^ ]*)\s\|\|.*$",i) + if m: + authors[m.group(2)] = m.group(1) # fill author dictionary + section = open('sections').readlines() # read sections + for i in section: + m = re.match("^(/.*?) (.*)$",i) + if m: + sections[m.group(1)] = m.group(2) # fill section dictionary + sec_order.append(m.group(2)) # and section list + log = XMLLogParser(sys.argv[1]) # read log entries + for i in log.get_entry_list(): + lns = [] + lines = string.split(i['msg'],'\n'); + for k in lines: + m = re.match(r"^\s*[-*]*\s*(.*)\s*$",k) + if m: + l = string.strip(m.group(1)) + if len(l) > 0: + lns.append(l) + msg = string.join(lns) + author = authors[i['author']] + if not i.has_key('paths'): + print "Error: no path information found" + print "Did you really use the option '-v' in 'svn log'?" + print "Can't create template without path information" + exit(1) + path = get_common_part(i['paths']) + this_section = find_section(path,sections) + if messages.has_key(this_section): + messages[this_section].append((msg,author)) + else: + messages[this_section] = [(msg,author)] + for i in sec_order: + print i + if messages.has_key(i): + for k in messages[i]: + print '*',k[0],'([['+k[1]+']])' + +# vim: set ts=4 sw=4: Propchange: trunk/tools/changelog/autocl.py ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/tools/changelog/autocl.py ------------------------------------------------------------------------------ svn:executable = * Added: trunk/tools/changelog/sections URL: http://svn.reactos.org/svn/reactos/trunk/tools/changelog/sections?rev=40612… ============================================================================== --- trunk/tools/changelog/sections (added) +++ trunk/tools/changelog/sections [iso-8859-1] Mon Apr 20 23:41:48 2009 @@ -1,0 +1,42 @@ +This file contains the sections for the wiki page +every line that doens't start with '/' is ignored +the line consist of 2 parts: path wiki-header + +This file is fairly incomplete, please add path information step by step! + +/trunk/reactos/boot/freeldr == Bootloader (FreeLoader) == +/trunk/reactos/ntoskrnl == Kernel and Executive (NTOSKRNL) == +/trunk/reactos/ntoskrnl/cc === CC === +/trunk/reactos/ntoskrnl/cm === CM === +/trunk/reactos/ntoskrnl/dbgk === DBGK === +/trunk/reactos/ntoskrnl/ex === EX === +/trunk/reactos/ntoskrnl/io === IO === +/trunk/reactos/ntoskrnl/kd === KD === +/trunk/reactos/ntoskrnl/mm === MM === +/trunk/reactos/dll/cpl == CPL == +/trunk/reactos/subsystems == Subsystems == +/trunk/reactos/drivers == Kernel Mode Drivers == +/trunk/reactos/drivers/bus/acpi === ACPI === +/trunk/reactos/drivers/network/afd === AFD === +/trunk/reactos/drivers/bus/filesystems/cdfs === CDFS === +/trunk/reactos/drivers/bus/filesystems/ext2 === EXT2 === +/trunk/reactos/drivers/bus/filesystems/fastfat === FASTFAT === +/trunk/reactos/drivers/bus/filesystems/fs_rec === FS_REC === +/trunk/reactos/drivers/bus/filesystems/npfs === NPFS === +/trunk/reactos/drivers/bus/usb === USB === +/trunk/reactos/dll/ntdll == NT System Library (NTDLL) == +/trunk/reactos/dll/keyboard === Keyboard Layouts === +/trunk/reactos/base/setup == Setup == +/trunk/reactos/base/setup/usetup === USETUP === +/trunk/reactos/subsystems == Win32™ Personality == +/trunk/reactos/subsystems/win32/csrss === User mode subsystem (CSRSS) === +/trunk/reactos/subsystems/win32/win32k === Kernel-mode subsystem Server (Win32K) === +/trunk/reactos/dll/cpl == Control panel applets == +/trunk/reactos/dll/cpl/appwiz === APPWIZ === +/trunk/reactos/dll/cpl/desk === DESKTOP === +/trunk/reactos/dll/cpl/intl === INTL === +/trunk/reactos/dll/cpl/sysdm === SYSDM === +/trunk/reactos/dll/cpl/timedate === TIMEDATE === +/trunk/reactos/base/applications == Win32™ Applications == +/trunk/reactos/base/dll/win32 == Win32™ Libraries == +/trunk/reactos == uncategorized == Propchange: trunk/tools/changelog/sections ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
48
Older →

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 April 2009