Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[pschweitzer] 31409: - Various fixes for French translations (control, sysdm, syssetup, usetup)
by pschweitzer＠svn.reactos.org 23 Dec '07

23 Dec '07

Author: pschweitzer Date: Sun Dec 23 03:01:41 2007 New Revision: 31409 URL: http://svn.reactos.org/svn/reactos?rev=31409&view=rev Log: - Various fixes for French translations (control, sysdm, syssetup, usetup) Modified: trunk/reactos/base/applications/control/lang/fr-FR.rc trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/base/applications/control/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/control/lang/fr-FR.rc Sun Dec 23 03:01:41 2007 @@ -28,9 +28,9 @@ STRINGTABLE BEGIN - IDS_WINDOW_TITLE "Panneau de contrôle" - IDS_ABOUT "Panneau de contrôle simple (non basé sur Shell-namespace)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rSous licence GPL" - IDS_ABOUT_TITLE "À propos du panneau de contrôle" + IDS_WINDOW_TITLE "Panneau de configuration" + IDS_ABOUT "Panneau de configuration simple (non basé sur Shell-namespace)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rSous licence GPL" + IDS_ABOUT_TITLE "À propos du panneau de configuration" IDS_NO_ITEMS "Aucun élément dans la ListView" IDS_NAME "Nom" IDS_COMMENT "Commentaire" Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h Sun Dec 23 03:01:41 2007 @@ -776,7 +776,7 @@ { 6, 9, - "Choisissez un repertoire ou vous voulez que ReactOS soit installe:", + "Choisissez un repertoire ou vous voulez que ReactOS soit installe :", TEXT_NORMAL }, { Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Sun Dec 23 03:01:41 2007 @@ -54,7 +54,7 @@ BEGIN LTEXT "Les privilèges administrateur sont requis pour la plupart de ces paramètres.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "Performance", IDC_STATIC, 6, 18, 244, 50 - LTEXT "Les options de performance contrôlent comment les applications utilisent la mémoire, ce qui affecte la vitesse de l'ordinateur.", IDC_STATIC, 16, 29, 210, 25 + LTEXT "Les options de performance contrôlent comment les applications utilisent la mémoire, ce qui affecte la vitesse de l'ordinateur.", IDC_STATIC, 16, 29, 210, 25 PUSHBUTTON "Réglages", IDC_PERFOR, 194, 48, 50, 14 GROUPBOX "Profils Utilisateurs", IDC_STATIC, 6,75,244,48 @@ -66,7 +66,7 @@ PUSHBUTTON "Réglages", IDC_STAREC, 194, 162, 50, 14 PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 70, 192, 94, 15 - PUSHBUTTON "Rapport d'e&rreurs", IDC_ERRORREPORT, 170, 192, 80, 14 + PUSHBUTTON "Rapport d'e&rreurs", IDC_ERRORREPORT, 170, 192, 80, 15 END @@ -162,7 +162,7 @@ GROUPBOX "Écrire les informations de débogage", IDC_STATIC, 12, 167, 227, 76 COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST - LTEXT "Ficher Cliché :", IDC_STATIC, 17, 202, 150, 8 + LTEXT "Fichier Cliché :", IDC_STATIC, 17, 202, 150, 8 EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 AUTOCHECKBOX "&Écraser tout fichier existant", IDC_STRRECOVERWRITE, 17, 228, 125, 10 Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Sun Dec 23 03:01:41 2007 @@ -30,7 +30,7 @@ LTEXT "Cet assistant installe ReactOS sur votre ordinateur. Il a "\ "besoin de certaines informations sur vous et votre ordinateur "\ "pour configurer ReactOS correctement.", IDC_STATIC, 115, 50, 189, 100 - LTEXT "Appuyez sur Suivant pour continuer l'assistant.", IDC_STATIC, 115, 160, 189, 31 + LTEXT "Appuyez sur Suivant pour continuer l'installation.", IDC_STATIC, 115, 160, 189, 31 END @@ -40,7 +40,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Les développeurs de ReactOS voudraient présenter les projets Open Source suivants, "\ - "(ou seulement des composants) qui ont été utilisés pour créer ReactOS:", + "(ou seulement des composants) qui ont été utilisés pour créer ReactOS :", IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL @@ -233,10 +233,10 @@ IDS_REACTOS_SETUP "Installation de ReactOS" IDS_UNKNOWN_ERROR "Erreur inconnue" IDS_REGISTERING_COMPONENTS "Enregistrement des composants..." - IDS_LOADLIBRARY_FAILED "Échec de LoadLibrary: " - IDS_GETPROCADDR_FAILED "Échec de GetProcAddr: " - IDS_REGSVR_FAILED "Échec de DllRegisterServer: " - IDS_DLLINSTALL_FAILED "Échec de DllInstall: " + IDS_LOADLIBRARY_FAILED "Échec de LoadLibrary : " + IDS_GETPROCADDR_FAILED "Échec de GetProcAddr : " + IDS_REGSVR_FAILED "Échec de DllRegisterServer : " + IDS_DLLINSTALL_FAILED "Échec de DllInstall : " IDS_TIMEOUT "Délai dépassé lors de l'enregistrement" IDS_REASON_UNKNOWN "" END

1 0

[mpiulachs] 31408: Add support for mc files and remove hardcoded WMC instructions from Makefile . Thanks to Amine and Colin for helping to test it
by mpiulachs＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: mpiulachs Date: Sun Dec 23 02:41:57 2007 New Revision: 31408 URL: http://svn.reactos.org/svn/reactos?rev=31408&view=rev Log: Add support for mc files and remove hardcoded WMC instructions from Makefile . Thanks to Amine and Colin for helping to test it Added: trunk/reactos/dll/win32/kernel32/errcodes.mc - copied unchanged from r31400, trunk/reactos/dll/win32/kernel32/kernel32.mc trunk/reactos/ntoskrnl/bugcodes.mc Removed: trunk/reactos/dll/win32/kernel32/kernel32.mc trunk/reactos/ntoskrnl/ntoskrnl.mc Modified: trunk/reactos/Makefile trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/ntoskrnl/ntkrnlmp.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/compilationunit.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=31408&r1=3140… Removed: trunk/reactos/dll/win32/kernel32/kernel32.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Added: trunk/reactos/ntoskrnl/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/bugcodes.mc?rev=3… Modified: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbuild?r… Removed: trunk/reactos/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=3… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun…

1 0

[tkreuzer] 31407: set svn:eol-style = native
by tkreuzer＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: tkreuzer Date: Sun Dec 23 01:29:48 2007 New Revision: 31407 URL: http://svn.reactos.org/svn/reactos?rev=31407&view=rev Log: set svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.mc (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de…

1 0

[tkreuzer] 31406: commit my first translated error messages for kernel32, unused atm, but we can translate it now. There are enough left for everyone ; -)
by tkreuzer＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: tkreuzer Date: Sun Dec 23 01:27:58 2007 New Revision: 31406 URL: http://svn.reactos.org/svn/reactos?rev=31406&view=rev Log: commit my first translated error messages for kernel32, unused atm, but we can translate it now. There are enough left for everyone ;-) Added: trunk/reactos/dll/win32/kernel32/lang/ trunk/reactos/dll/win32/kernel32/lang/de-DE.mc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/win32/kernel32/lang/de-DE.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/lang/de…

1 0

[cfinck] 31405: Oops, forgot to delete them in my previous commit
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sun Dec 23 00:29:14 2007 New Revision: 31405 URL: http://svn.reactos.org/svn/reactos?rev=31405&view=rev Log: Oops, forgot to delete them in my previous commit Removed: trunk/tools/VM-Templates/

1 0

[cfinck] 31404: - Create a new directory "Release Engineering" and move the "VM-Templates" directory into it. - Add a document "Packaging ReactOS Releases.odt" describing how each ReactOS release package is created. This file also supersedes the "SVN-Readme.txt" files in the "QEMU" and "VMware" subdirectories, so I removed them.
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sun Dec 23 00:18:19 2007 New Revision: 31404 URL: http://svn.reactos.org/svn/reactos?rev=31404&view=rev Log: - Create a new directory "Release Engineering" and move the "VM-Templates" directory into it. - Add a document "Packaging ReactOS Releases.odt" describing how each ReactOS release package is created. This file also supersedes the "SVN-Readme.txt" files in the "QEMU" and "VMware" subdirectories, so I removed them. Added: trunk/tools/Release Engineering/ trunk/tools/Release Engineering/Packaging ReactOS Releases.odt (with props) trunk/tools/Release Engineering/VM-Templates/ - copied from r31370, trunk/tools/VM-Templates/ Removed: trunk/tools/Release Engineering/VM-Templates/QEMU/SVN-Readme.txt trunk/tools/Release Engineering/VM-Templates/VMware/SVN-Readme.txt Added: trunk/tools/Release Engineering/Packaging ReactOS Releases.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/Release%20Engineering/Packag… ============================================================================== Binary file - no diff available. Propchange: trunk/tools/Release Engineering/Packaging ReactOS Releases.odt ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Removed: trunk/tools/Release Engineering/VM-Templates/QEMU/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/QEMU/SVN-Readme… ============================================================================== --- trunk/tools/Release Engineering/VM-Templates/QEMU/SVN-Readme.txt (original) +++ trunk/tools/Release Engineering/VM-Templates/QEMU/SVN-Readme.txt (removed) @@ -1,18 +1,0 @@ -Packaging the QEMU Preinstallation ------------------------------------ - -Replace [VERSION] with the version of ReactOS you want to package, e.g. 0.3.1. - -- Copy the files in this directory into a directory called - "ReactOS-[VERSION]-QEMU". -- Put the QEMU program files in the "files" subdirectory, including its subdirectories. -- Use the following command to create the virtual hard disk: - - qemu-img create -f vmdk ReactOS.vmdk 2G - -- Copy the "ReactOS.iso" file into the "files" subdirectory and run "install.bat" to - install it. -- Remove the "ReactOS.iso", "install.bat" and this "SVN-Readme.txt" file -- Create a ZIP file "ReactOS-[VERSION]-REL-qemu.zip" containing this - directory. - Do not forget to activate the option to store the relative path names. Removed: trunk/tools/Release Engineering/VM-Templates/VMware/SVN-Readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/VM-Templates/VMware/SVN-Read… ============================================================================== --- trunk/tools/Release Engineering/VM-Templates/VMware/SVN-Readme.txt (original) +++ trunk/tools/Release Engineering/VM-Templates/VMware/SVN-Readme.txt (removed) @@ -1,20 +1,0 @@ -Packaging the VMware Preinstallation -------------------------------------- - -Replace [VERSION] with the version of ReactOS you want to package, e.g. 0.3.1. - -- Copy the files in this directory into a directory called - "ReactOS-[VERSION]-VMware". -- Copy the "ReactOS.iso" file into this directory. -- Open the "ReactOS-Installation.vmx" file in your VMware product, click on - "Edit virtual machine settings" and on "Add". -- Add a new hard disk called "ReactOS.vmdk" with 2 GB size and in a growable - format (deselect "Allocate all disk space now"). -- Remove the created "Hard Disk 2" entry as we already have a "Hard Disk" - entry, which now uses the created file. -- Start the virtual machine and install ReactOS on it. -- Remove all files in this directory except "ReactOS.vmx", "ReactOS.vmdk" and - "Readme.txt" -- Create a ZIP file "ReactOS-[VERSION]-REL-vmware.zip" containing the - "ReactOS-[VERSION]-VMware" directory. - Do not forget to activate the option to store the relative path names.

1 0

[greatlrd] 31403: DO not use magic number for debug version of d3d9d detections use DX_D3D9_DEBUG instead. the value are documented in ms dxsdk but ms have not set any name of it.
by greatlrd＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: greatlrd Date: Sat Dec 22 23:57:02 2007 New Revision: 31403 URL: http://svn.reactos.org/svn/reactos?rev=31403&view=rev Log: DO not use magic number for debug version of d3d9d detections use DX_D3D9_DEBUG instead. the value are documented in ms dxsdk but ms have not set any name of it. Modified: trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9_private.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv…

1 0

[greatlrd] 31402: Fixing smaller bugs in ddraw.dll GetCaps 1. GetCaps should not call get avail memory for hel 2. add ddcaps size check 3. add Enter/leave CriticalSection GetDeviceIdentifier 1. add Enter/leave CriticalSection
by greatlrd＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: greatlrd Date: Sat Dec 22 23:33:11 2007 New Revision: 31402 URL: http://svn.reactos.org/svn/reactos?rev=31402&view=rev Log: Fixing smaller bugs in ddraw.dll GetCaps 1. GetCaps should not call get avail memory for hel 2. add ddcaps size check 3. add Enter/leave CriticalSection GetDeviceIdentifier 1. add Enter/leave CriticalSection Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetCaps.c Sat Dec 22 23:33:11 2007 @@ -32,9 +32,39 @@ DX_WINDBG_trace(); - _SEH_TRY + EnterCriticalSection( &ddcs ); + + _SEH_TRY { if ((!pDriverCaps) && (!pHELCaps)) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + /* + * DDCAPS_DX6 and DDCAPS_DX7 have same size so + * we do not need check both only one of them + */ + if ( (pDriverCaps) && + (pDriverCaps->dwSize != sizeof(DDCAPS_DX1) ) && + (pDriverCaps->dwSize != sizeof(DDCAPS_DX3) ) && + (pDriverCaps->dwSize != sizeof(DDCAPS_DX5) ) && + (pDriverCaps->dwSize != sizeof(DDCAPS_DX7 )) ) + { + retVal = DDERR_INVALIDPARAMS; + _SEH_LEAVE; + } + + /* + * DDCAPS_DX6 and DDCAPS_DX7 have same size so + * we do not need check both only one of them + */ + if ( (pHELCaps) && + (pHELCaps->dwSize != sizeof(DDCAPS_DX1) ) && + (pHELCaps->dwSize != sizeof(DDCAPS_DX3) ) && + (pHELCaps->dwSize != sizeof(DDCAPS_DX5) ) && + (pHELCaps->dwSize != sizeof(DDCAPS_DX7 )) ) { retVal = DDERR_INVALIDPARAMS; _SEH_LEAVE; @@ -153,13 +183,10 @@ if (pHELCaps) { /* Setup software caps */ - DDSCAPS2 ddscaps = { 0 }; LPDDCORECAPS CoreCaps = (LPDDCORECAPS)&This->lpLcl->lpGbl->ddHELCaps; DWORD dwTotal = 0; DWORD dwFree = 0; - - Main_DirectDraw_GetAvailableVidMem4(This, &ddscaps, &dwTotal, &dwFree); switch (pHELCaps->dwSize) { @@ -259,7 +286,6 @@ break; } } - } _SEH_HANDLE @@ -268,6 +294,7 @@ } _SEH_END; - return retVal; + LeaveCriticalSection( &ddcs ); + return retVal; } Modified: trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/Ge… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/GetDeviceIdentifier.c Sat Dec 22 23:33:11 2007 @@ -74,6 +74,8 @@ long *lpdata; DX_WINDBG_trace(); + + EnterCriticalSection( &ddcs ); _SEH_TRY { @@ -184,5 +186,6 @@ } _SEH_END; + LeaveCriticalSection( &ddcs ); return retVal; }

1 0

[cfinck] 31401: - Add "make" to the list of updated tools in RosBE-Unix 1.1. - NASM 2.0 has problems, when it's compiled in a dedicated build directory, so extract the source into one directory and build NASM in the same one. - Use a better method for expanding variables in pathes. - Also expand variables in pathes in "createshortcut.sh". - Add "scut" to the list printed by the "help" command.
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sat Dec 22 21:31:04 2007 New Revision: 31401 URL: http://svn.reactos.org/svn/reactos?rev=31401&view=rev Log: - Add "make" to the list of updated tools in RosBE-Unix 1.1. - NASM 2.0 has problems, when it's compiled in a dedicated build directory, so extract the source into one directory and build NASM in the same one. - Use a better method for expanding variables in pathes. - Also expand variables in pathes in "createshortcut.sh". - Add "scut" to the list printed by the "help" command. Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh trunk/tools/RosBE/RosBE-Unix/scripts/help.sh Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Build… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh Sat Dec 22 21:31:04 2007 @@ -186,6 +186,9 @@ if [ "$installdir" = "" ]; then installdir=$DEFAULT_INSTALL_DIR fi + + # Make sure we have the absolute path to the installation directory + installdir=`eval echo $installdir` # Check if the installation directory already exists if [ -f "$installdir" ]; then @@ -254,10 +257,6 @@ fi done -# Make sure we have the absolute path to the installation directory -cd "$installdir" -installdir="$PWD" - # Ready to start boldmsg "Ready to start" @@ -302,6 +301,7 @@ process_w32api=true process_binutils=true process_gcc=true + process_make=true process_nasm=true process_scut=true ;; @@ -469,16 +469,14 @@ # nasm if $process_nasm; then rm -rf "nasm" - rm -rf "nasm-build" echo -n "Extracting nasm... " tar -xjf "nasm.tar.bz2" >& "$SCRIPTDIR/tar.log" checkrun "tar" echo -n "Configuring nasm... " - mkdir "nasm-build" - cd "nasm-build" - ../nasm/configure --prefix="$installdir" --target=mingw32 >& "$SCRIPTDIR/configure.log" + cd "nasm" + ./configure --prefix="$installdir" --target=mingw32 >& "$SCRIPTDIR/configure.log" checkrun "configure" echo -n "Building nasm... " @@ -491,7 +489,6 @@ echo -n "Cleaning up nasm... " cd "$SOURCEDIR" - rm -rf "nasm-build" rm -rf "nasm" checkrun fi Modified: trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/cre… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/createshortcut.sh Sat Dec 22 21:31:04 2007 @@ -37,6 +37,9 @@ sourcedir="" while [ "$sourcedir" = "" ]; do read -p "Directory: " sourcedir + + # Make sure we have the absolute path to the source directory + sourcedir=`eval echo $sourcedir` if ! [ -d "$sourcedir" ]; then echo "The entered path is no directory. Please enter the right path to the ReactOS sources." Modified: trunk/tools/RosBE/RosBE-Unix/scripts/help.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/help.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/help.sh Sat Dec 22 21:31:04 2007 @@ -14,9 +14,12 @@ echo " makex [OPTIONS] - Same as 'make' but automatically determines the" echo " number of CPUs in the system and uses -j with" echo " the appropriate number." +echo " basedir - Switch back to the ReactOS source directory." echo " clean - Fully clean the ReactOS source directory." echo " help - Display the available commands." +echo " scut [OPTIONS] - List, add, edit, remove, switch and default to" +echo " shortcutted ReactOS source directories." echo " version - Show information about the tool versions." -echo " basedir - Switch back to the ReactOS source directory." + echo

1 0

[fireball] 31400: Dmitry Philippov - Implement hard error message handler. Now whenever a hard error occurs (like an exception in the win32 application, or missing DLL import), a user will be presented with a nice message box saying about the problem.
by fireball＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: fireball Date: Sat Dec 22 20:18:32 2007 New Revision: 31400 URL: http://svn.reactos.org/svn/reactos?rev=31400&view=rev Log: Dmitry Philippov - Implement hard error message handler. Now whenever a hard error occurs (like an exception in the win32 application, or missing DLL import), a user will be presented with a nice message box saying about the problem. Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c trunk/reactos/subsystems/win32/csrss/include/csrplugin.h trunk/reactos/subsystems/win32/csrss/init.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c Sat Dec 22 20:18:32 2007 @@ -106,7 +106,9 @@ } } -BOOL FASTCALL CallHardError(void); +BOOL +CallHardError(IN PCSRSS_PROCESS_DATA ProcessData, + IN PHARDERROR_MSG HardErrorMessage); static VOID @@ -117,7 +119,7 @@ DPRINT1("CSR: received hard error %lx\n", Message->Status); /* Call the hard error handler in win32csr */ - CallHardError(); + (VOID)CallHardError(ProcessData, Message); } NTSTATUS STDCALL Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h Sat Dec 22 20:18:32 2007 @@ -43,7 +43,8 @@ typedef BOOL (STDCALL *CSRPLUGIN_INIT_COMPLETE_PROC)(void); -typedef BOOL (STDCALL *CSRPLUGIN_HARDERROR_PROC)(void); +typedef BOOL (STDCALL *CSRPLUGIN_HARDERROR_PROC)(IN PCSRSS_PROCESS_DATA ProcessData, + IN PHARDERROR_MSG HardErrorMessage); typedef BOOL (STDCALL *CSRPLUGIN_INITIALIZE_PROC)(PCSRSS_API_DEFINITION *ApiDefinitions, PCSRSS_OBJECT_DEFINITION *ObjectDefinitions, Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Sat Dec 22 20:18:32 2007 @@ -122,8 +122,8 @@ } BOOL -FASTCALL -CallHardError(void) +CallHardError(IN PCSRSS_PROCESS_DATA ProcessData, + IN PHARDERROR_MSG HardErrorMessage) { BOOL Ok; unsigned i; @@ -135,7 +135,7 @@ { for (i = 0; i < HardErrorProcCount && Ok; i++) { - Ok = (*(HardErrorProcs[i]))(); + Ok = (*(HardErrorProcs[i]))(ProcessData, HardErrorMessage); } } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Sat Dec 22 20:18:32 2007 @@ -1,9 +1,9 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: subsys/csrss/win32csr/dllmain.c * PURPOSE: Initialization + * PROGRAMMERS: Dmitry Philippov (shedon(a)mail.ru) */ /* INCLUDES ******************************************************************/ @@ -172,9 +172,376 @@ } static BOOL STDCALL -Win32CsrHardError(void) -{ - MessageBox(0, "Hard Error", "TODO", 0); +Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData, + IN PHARDERROR_MSG HardErrorMessage) +{ + UINT responce = MB_OK; + NTSTATUS Status; + HANDLE hProcess; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG nParam = 0; + PRTL_MESSAGE_RESOURCE_ENTRY MessageResource; + ULONG ParameterList[MAXIMUM_HARDERROR_PARAMETERS]; + LPSTR CaptionText, MessageBody; + LPWSTR szxCaptionText, szxMessageBody; + DWORD SizeOfAllUnicodeStrings = 0; + PROCESS_BASIC_INFORMATION ClientBasicInfo; + UNICODE_STRING ClientFileNameU; + UNICODE_STRING TempStringU; + UNICODE_STRING ParameterStringU; + ANSI_STRING ParamStringA; + ULONG UnicodeStringParameterMask = HardErrorMessage->UnicodeStringParameterMask; + int MessageBoxResponse; + + HardErrorMessage->Response = ResponseNotHandled; + + DPRINT1("NumberOfParameters = %d\n", HardErrorMessage->NumberOfParameters); + DPRINT1("Status = %lx\n", HardErrorMessage->Status); + + // open client process + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&hProcess, PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, &ObjectAttributes, &HardErrorMessage->h.ClientId); + if( !NT_SUCCESS(Status) ) { + DPRINT1("NtOpenProcess failed with code: %lx\n", Status); + return FALSE; + } + + // let's get a name of the client process to display it in the caption of a message box + + ClientFileNameU.MaximumLength = 0; + ClientFileNameU.Length = 0; + ClientFileNameU.Buffer = NULL; + Status = NtQueryInformationProcess(hProcess, + ProcessBasicInformation, + &ClientBasicInfo, + sizeof(ClientBasicInfo), + NULL); + if( NT_SUCCESS(Status) ) { + PLIST_ENTRY ModuleListHead; + PLIST_ENTRY Entry; + PLDR_DATA_TABLE_ENTRY Module; + PPEB_LDR_DATA Ldr; + PPEB Peb = ClientBasicInfo.PebBaseAddress; + + if( Peb ) + { + Status = NtReadVirtualMemory(hProcess, &Peb->Ldr, &Ldr, sizeof(Ldr), NULL); + if( NT_SUCCESS(Status) ) { + ModuleListHead = &Ldr->InLoadOrderModuleList; + Status = NtReadVirtualMemory( + hProcess, + &ModuleListHead->Flink, + &Entry, + sizeof(Entry), + NULL + ); + + if( NT_SUCCESS(Status) ) + { + if (Entry != ModuleListHead) + { + LDR_DATA_TABLE_ENTRY ModuleData; + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); + + Status = NtReadVirtualMemory(hProcess, Module, &ModuleData, sizeof(ModuleData), NULL); + if( NT_SUCCESS(Status) ) { + PVOID ClientDllBase; + + Status = NtReadVirtualMemory( + hProcess, + &Peb->ImageBaseAddress, + &ClientDllBase, + sizeof(ClientDllBase), + NULL + ); + if( NT_SUCCESS(Status) && (ClientDllBase == ModuleData.DllBase) ) { + + ClientFileNameU.MaximumLength = ModuleData.BaseDllName.MaximumLength; + ClientFileNameU.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, ClientFileNameU.MaximumLength); + Status = NtReadVirtualMemory( + hProcess, + ModuleData.BaseDllName.Buffer, + ClientFileNameU.Buffer, + ClientFileNameU.MaximumLength, + NULL + ); + if( NT_SUCCESS(Status) ) { + ClientFileNameU.Length = wcslen(ClientFileNameU.Buffer)*sizeof(wchar_t); + } + else { + RtlFreeHeap (RtlGetProcessHeap(), 0, ClientFileNameU.Buffer); + ClientFileNameU.Buffer = NULL; + } + + DPRINT("ClientFileNameU=\'%wZ\'\n", &ClientFileNameU); + } + } + } + } + } + } + } + + // read all unicode strings from client space + for(nParam = 0; nParam < HardErrorMessage->NumberOfParameters; nParam++, UnicodeStringParameterMask >>= 1) + { + if( UnicodeStringParameterMask & 0x01 ) { + Status = NtReadVirtualMemory(hProcess, + (PVOID)HardErrorMessage->Parameters[nParam], + (PVOID)&TempStringU, + sizeof(TempStringU), + NULL); + + if( NT_SUCCESS(Status) ) { + ParameterStringU.Buffer = (PWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, TempStringU.MaximumLength); + if( !ParameterStringU.Buffer ) { + DPRINT1("Cannot allocate memory %d\n", TempStringU.MaximumLength); + NtClose(hProcess); + if( ClientFileNameU.Buffer ) { + RtlFreeHeap (RtlGetProcessHeap(), 0, ClientFileNameU.Buffer); + } + return FALSE; + } + + Status = NtReadVirtualMemory(hProcess, + (PVOID)TempStringU.Buffer, + (PVOID)ParameterStringU.Buffer, + TempStringU.MaximumLength, + NULL); + if( !NT_SUCCESS(Status) ) { + DPRINT1("NtReadVirtualMemory failed with code: %lx\n", Status); + RtlFreeHeap (RtlGetProcessHeap(), 0, ParameterStringU.Buffer); + if( ClientFileNameU.Buffer ) { + RtlFreeHeap (RtlGetProcessHeap(), 0, ClientFileNameU.Buffer); + } + NtClose(hProcess); + return FALSE; + } + ParameterStringU.Length = TempStringU.Length; + ParameterStringU.MaximumLength = TempStringU.MaximumLength; + DPRINT("ParameterStringU=\'%wZ\'\n", &ParameterStringU); + RtlUnicodeStringToAnsiString(&ParamStringA, &ParameterStringU, TRUE); + ParameterList[nParam] = (ULONG)ParamStringA.Buffer; + SizeOfAllUnicodeStrings += ParamStringA.MaximumLength; + } + } + else { + // it's not a unicode string + ParameterList[nParam] = HardErrorMessage->Parameters[nParam]; + } + } + + NtClose(hProcess); + + // get text string of the error code + Status = RtlFindMessage( + (PVOID)GetModuleHandle(TEXT("ntdll")), + (ULONG)RT_MESSAGETABLE, + LANG_NEUTRAL, + HardErrorMessage->Status, + &MessageResource ); + if( !NT_SUCCESS(Status) ) { + // WE HAVE TO DISPLAY HERE: "Unknown hard error" + if( ClientFileNameU.Buffer ) { + szxCaptionText = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, ClientFileNameU.MaximumLength+64); + wsprintfW(szxCaptionText, L"%s - %hs", ClientFileNameU.Buffer, "Application Error"); + } else { + szxCaptionText = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, 64); + wsprintfW(szxCaptionText, L"System - Application Error"); + } + MessageBody = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, 38); + wsprintfA(MessageBody, "Unknown hard error"); + } + else { + LPSTR NtStatusString; + UNICODE_STRING MessageU; + ANSI_STRING MessageA; + + RtlInitUnicodeString(&MessageU, (PWSTR)MessageResource->Text); + RtlUnicodeStringToAnsiString(&MessageA, &MessageU, TRUE); + + USHORT CaptionSize = 0; + // check whether a caption exists + if( *MessageA.Buffer == '{' ) { + // get size of the caption + for( CaptionSize = 0; (CaptionSize < MessageA.Length) && ('}' != MessageA.Buffer[CaptionSize]); CaptionSize++); + + CaptionText = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CaptionSize); + RtlCopyMemory(CaptionText, MessageA.Buffer+1, CaptionSize-1); + CaptionSize += 3; // "}\r\n" - 3 + + szxCaptionText = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(wchar_t)*CaptionSize+ClientFileNameU.MaximumLength+128); + if( ClientFileNameU.Buffer ) { + wsprintfW(szxCaptionText, L"%s - %hs", ClientFileNameU.Buffer, CaptionText); + } else { + wsprintfW(szxCaptionText, L"System - %hs", CaptionText); + } + RtlFreeHeap (RtlGetProcessHeap(), 0, CaptionText); + } + else { + if( ClientFileNameU.Buffer ) { + szxCaptionText = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, ClientFileNameU.MaximumLength); + wsprintfW(szxCaptionText, L"%s", ClientFileNameU.Buffer); + } else { + szxCaptionText = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, 14); // 14 - "System\0\0" + wsprintfW(szxCaptionText, L"System"); + } + } + if( STATUS_UNHANDLED_EXCEPTION == HardErrorMessage->Status ) + { + PRTL_MESSAGE_RESOURCE_ENTRY MsgResException; + MessageBody = NULL; + Status = RtlFindMessage( + (PVOID)GetModuleHandle(TEXT("ntdll")), + (ULONG)RT_MESSAGETABLE, + LANG_NEUTRAL, + ParameterList[0], + &MsgResException); + + if( NT_SUCCESS(Status) ) + { + UNICODE_STRING ExcMessageU; + ANSI_STRING ExcMessageA; + + RtlInitUnicodeString(&ExcMessageU, (PWSTR)MsgResException->Text); + + RtlUnicodeStringToAnsiString(&ExcMessageA, &ExcMessageU, TRUE); + + MessageBody = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MsgResException->Length+SizeOfAllUnicodeStrings+1024); // 1024 is a magic number I think it should be enough + if( STATUS_ACCESS_VIOLATION == ParameterList[0] ) { + LPSTR pOperationType; + if( ParameterList[2] ) pOperationType = "written"; + else pOperationType = "read"; + wsprintfA(MessageBody, ExcMessageA.Buffer, ParameterList[1], ParameterList[3], pOperationType); + } + else if( STATUS_IN_PAGE_ERROR == ParameterList[0] ) { + wsprintfA(MessageBody, ExcMessageA.Buffer, ParameterList[1], ParameterList[3], ParameterList[2]); + } + } + if( !MessageBody ) { + NtStatusString = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MessageResource->Length-CaptionSize); + RtlCopyMemory(NtStatusString, MessageA.Buffer+CaptionSize, (MessageResource->Length-CaptionSize)-1); + + MessageBody = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MessageResource->Length+SizeOfAllUnicodeStrings+1024); // 1024 is a magic number I think it should be enough + + wsprintfA(MessageBody, NtStatusString, + L"Unknown software exception", + ParameterList[0], + ParameterList[1]); + + RtlFreeHeap (RtlGetProcessHeap(), 0, NtStatusString); + } + } + else + { + NtStatusString = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MessageResource->Length-CaptionSize); + RtlCopyMemory(NtStatusString, MessageA.Buffer+CaptionSize, (MessageResource->Length-CaptionSize)-1); + + MessageBody = (LPSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, MessageResource->Length+SizeOfAllUnicodeStrings+1024); // 1024 is a magic number I think it should be enough + + wsprintfA(MessageBody, NtStatusString, + ParameterList[0], + ParameterList[1], + ParameterList[2], + ParameterList[3]); + + RtlFreeHeap (RtlGetProcessHeap(), 0, NtStatusString); + } + RtlFreeAnsiString(&MessageA); + } + if( ClientFileNameU.Buffer ) { + RtlFreeHeap (RtlGetProcessHeap(), 0, ClientFileNameU.Buffer); + } + + szxMessageBody = (LPWSTR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(wchar_t)*(strlen(MessageBody)+1)); + wsprintfW(szxMessageBody, L"%hs", MessageBody); + RtlFreeHeap (RtlGetProcessHeap(), 0, MessageBody); + + switch ( HardErrorMessage->ValidResponseOptions ) + { + case OptionAbortRetryIgnore: + responce = MB_ABORTRETRYIGNORE; + break; + + case OptionOk: + responce = MB_OK; + break; + + case OptionOkCancel: + responce = MB_OKCANCEL; + break; + + case OptionRetryCancel: + responce = MB_RETRYCANCEL; + break; + + case OptionYesNo: + responce = MB_YESNO; + break; + + case OptionYesNoCancel: + responce = MB_YESNOCANCEL; + break; + + case OptionShutdownSystem: + // XZ?? + break; + + default: + DPRINT1("Wrong option: ValidResponseOptions = %d\n", HardErrorMessage->ValidResponseOptions); + ASSERT(FALSE); + break; + } + + // FIXME: We should not use MessageBox !!!! + MessageBoxResponse = MessageBoxW(0, szxMessageBody, szxCaptionText, responce|MB_ICONERROR|MB_SYSTEMMODAL|MB_SETFOREGROUND); + + RtlFreeHeap (RtlGetProcessHeap(), 0, szxMessageBody); + RtlFreeHeap (RtlGetProcessHeap(), 0, szxCaptionText); + + switch( MessageBoxResponse ) + { + case IDOK: + HardErrorMessage->Response = ResponseOk; + break; + + case IDCANCEL: + HardErrorMessage->Response = ResponseCancel; + break; + + case IDYES: + HardErrorMessage->Response = ResponseYes; + break; + + case IDNO: + HardErrorMessage->Response = ResponseNo; + break; + + case IDABORT: + HardErrorMessage->Response = ResponseAbort; + break; + + case IDIGNORE: + HardErrorMessage->Response = ResponseIgnore; + break; + + case IDRETRY: + HardErrorMessage->Response = ResponseRetry; + break; + + case 10://IDTRYAGAIN: + HardErrorMessage->Response = ResponseTryAgain; + break; + + case 11://IDCONTINUE: + HardErrorMessage->Response = ResponseContinue; + break; + + default: + ASSERT(FALSE); + break; + } + return TRUE; }

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007