Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[fireball] 31399: - Add a status table for ntdll, which corresponds to Windows 2003 SP1 build. ntstatus.mc is done by Dmitry Philippov, with some additional editing by me. Now we have a real autogenerated ntstatus.h (the one in include/ddk still remains for now). - Include autogenerated resources in ntdll.dll.
by fireball＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: fireball Date: Sat Dec 22 19:56:29 2007 New Revision: 31399 URL: http://svn.reactos.org/svn/reactos?rev=31399&view=rev Log: - Add a status table for ntdll, which corresponds to Windows 2003 SP1 build. ntstatus.mc is done by Dmitry Philippov, with some additional editing by me. Now we have a real autogenerated ntstatus.h (the one in include/ddk still remains for now). - Include autogenerated resources in ntdll.dll. Added: trunk/reactos/dll/ntdll/def/ntstatus.mc (with props) Modified: trunk/reactos/Makefile trunk/reactos/dll/ntdll/def/ntdll.rc trunk/reactos/dll/ntdll/ntdll.rbuild [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=31399&r1=3139… Modified: trunk/reactos/dll/ntdll/def/ntdll.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.rc?rev… Added: trunk/reactos/dll/ntdll/def/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntstatus.mc?… Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev…

1 0

[dreimer] 31398: Add a Check if SCUT is installed or not. If not, remove the Macro
by dreimer＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: dreimer Date: Sat Dec 22 19:35:18 2007 New Revision: 31398 URL: http://svn.reactos.org/svn/reactos?rev=31398&view=rev Log: Add a Check if SCUT is installed or not. If not, remove the Macro Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Dec 22 19:35:18 2007 @@ -40,4 +40,6 @@ doskey /macrofile="%_ROSBE_BASEDIR%\MinGW.mac" +if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) + :EOC

1 0

[cfinck] 31397: Update the plain text version of the Readme file as well.
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sat Dec 22 18:22:53 2007 New Revision: 31397 URL: http://svn.reactos.org/svn/reactos?rev=31397&view=rev Log: Update the plain text version of the Readme file as well. Modified: trunk/tools/RosBE/RosBE-Unix/README Modified: trunk/tools/RosBE/RosBE-Unix/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README?rev=… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/README (original) +++ trunk/tools/RosBE/RosBE-Unix/README Sat Dec 22 18:22:53 2007 @@ -1,5 +1,5 @@ ReactOS Build Environment - Version 0.3.6 for Unix-based operating systems + Version 1.1 for Unix-based operating systems by Colin Finck (mail(a)colinfinck.de) Introduction @@ -79,22 +79,26 @@ This version of RosBE for Unix-based operating systems uses the following components: - * Binutils 20070422 (CVS version) - patched with "winres_64bit.diff" - (http://sourceware.org/bugzilla/attachment.cgi?id=1733&action=view) + * GNU Binutils v2.18.50-20071015 (snapshot) + patched with: + - binutils-2.18.50.10-15-2007-snapshot-hpoussin.patch + (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/binutils-2.18.…) - * GCC 4.1.3-prerelease (SVN version, r124026) - patched with "gcc-virtual-stdcall.patch" - (http://www.apiviewer.de/downloads/gcc-virtual-stdcall.patch) + * GCC, The GNU Compiler Collection v4.1.3-20071015 (snapshot) + patched with: + - GCC-v4.1-r129382-prerelease-w3seek.patch + (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) + - GCC-v4.1-r129382-virtual-stdcall-bug27067.patch + (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293…) + - GCC-v4.1-r129490-CreateFileMapping-Vista-bug30335.patch + (http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1294…) + NOTE: This GCC version only supports C and C++ - * Make 20070422 (CVS version) - patched with "make-strcmpi-strcasecmp.patch" - (http://savannah.gnu.org/file/make-strcmpi-strcasecmp.patch?file_id=12544) - - * Mingw-runtime 3.12 - * Nasm 0.98.39 - * w32api 3.9 + * Make 20071219 (CVS version) + * MinGW-Runtime 3.13 + * NASM, The Netwide assembler v2.00 + * W32api 3.10 Tested Operating Systems @@ -112,7 +116,7 @@ Websites --------- -MingW - Minimalist GNU for Windows +MinGW - Minimalist GNU for Windows http://www.mingw.org Binutils, the Binary Tools Collection @@ -130,7 +134,19 @@ Credits -------- - Credits go to blight, dralnix and EmuandCo, who created the original ReactOS -Build Environment for Windows. My Unix version uses many ideas of it. - Special thanks also to ROSFan, who created the nice ReactOS Build -Environment Logo. +Colin Finck (mail(a)colinfinck.de) + +Thanks go also to the members of the RosBE-Windows team, namely: +Daniel Reimer (reimer.daniel(a)freenet.de) +Peter Ward (dralnix(a)gmail.com) +Pierre Schweitzer (heis_spiter(a)hotmail.com) + + Special thanks to ROSFan, who created the nice ReactOS Build Environment +Logo. + Special thanks also goes out to all those who provide so much help by +testing out new versions, you know who you are. Without them the RosBE +would not be what it is. + Credits go to Gregor Anich who created the original ReactOS Build +Environment v0.2-3.4.4. + +Inspired by Dazzle from TinyKRNL (http://tinykrnl.org/).

1 0

[cfinck] 31396: Add links to the used patches to the RosBE-Windows Readme file as it's done for the RosBE-Unix file now.
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sat Dec 22 18:06:16 2007 New Revision: 31396 URL: http://svn.reactos.org/svn/reactos?rev=31396&view=rev Log: Add links to the used patches to the RosBE-Windows Readme file as it's done for the RosBE-Unix file now. Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[cfinck] 31395: - Add a "scut.sh" script for executing scut and changing the current directory appropriately - Add a "basedir.sh" script for the "basedir" command. Previously, bash only read the $_ROSSOURCEDIR variable one time, when the prompt was started, and then never again. - Add both scripts as aliases to the "RosBE-rc" file. - Clarify with a better prompt, why I recommend to run the installation script as the "root" user. - Update the Readme file.
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sat Dec 22 18:02:15 2007 New Revision: 31395 URL: http://svn.reactos.org/svn/reactos?rev=31395&view=rev Log: - Add a "scut.sh" script for executing scut and changing the current directory appropriately - Add a "basedir.sh" script for the "basedir" command. Previously, bash only read the $_ROSSOURCEDIR variable one time, when the prompt was started, and then never again. - Add both scripts as aliases to the "RosBE-rc" file. - Clarify with a better prompt, why I recommend to run the installation script as the "root" user. - Update the Readme file. Added: trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh (with props) trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh (with props) Modified: trunk/tools/RosBE/RosBE-Unix/README.odt trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc Modified: trunk/tools/RosBE/RosBE-Unix/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README.odt?… ============================================================================== Binary files - no diff available. 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 18:02:15 2007 @@ -102,7 +102,9 @@ if [ ! "`whoami`" = "root" ]; then boldmsg "User is not \"root\"" - echo "It is recommended to run this script as the \"root\" user. Otherwise you probably cannot create the necessary directories." + echo "The default installation path for the Build Environment is \"$DEFAULT_INSTALL_DIR\"." + echo "Therefore it is recommended to run this script as the \"root\" user. Otherwise you probably cannot create the necessary directories." + echo "An alternative is to specify another installation directory at the installation process." echo "Do you really want to continue? (yes/no)" read -p "[no] " answer Modified: trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/RosBE-rc Sat Dec 22 18:02:15 2007 @@ -2,11 +2,12 @@ PATH="$_ROSSCRIPTDIR/bin:$PATH" # Set aliases -alias basedir="cd $_ROSSOURCEDIR" +alias basedir="source $_ROSSCRIPTDIR/basedir.sh" alias clean="$_ROSSCRIPTDIR/clean.sh" alias help="$_ROSSCRIPTDIR/help.sh" alias make="$_ROSSCRIPTDIR/build.sh" alias makex="$_ROSSCRIPTDIR/build-multi.sh" +alias scut="source $_ROSSCRIPTDIR/scut.sh" alias version="$_ROSSCRIPTDIR/version.sh" # Display the available commands Added: trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/bas… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh Sat Dec 22 18:02:15 2007 @@ -1,0 +1,10 @@ +#!/bin/bash +# +# Script for changing the current directory to $_ROSSOURCEDIR +# Part of RosBE for Unix-based Operating Systems +# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +# An alias just to "cd $_ROSSOURCEDIR" won't work as bash only expands when executing the shell and then never again +cd "$_ROSSOURCEDIR" Propchange: trunk/tools/RosBE/RosBE-Unix/scripts/basedir.sh ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh (added) +++ trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh Sat Dec 22 18:02:15 2007 @@ -1,0 +1,25 @@ +#!/bin/bash +# +# Script for launching scut and changing the current directory appropriately +# Part of RosBE for Unix-based Operating Systems +# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# +# Released under GNU GPL v2 or any later version. + +case "$1" in +add|rem|edit|def|list|/?|-h|--help) + # It's an scut parameter, which can just be passed to the program + "$_ROSSCRIPTDIR/bin/scut" $* + ;; + +*) + # It's probably the name of a shortcut + _ROSSOURCEDIR=`"$_ROSSCRIPTDIR/bin/scut" $*` + + if [ "$_ROSSOURCEDIR" != "Default" ] && [ -d "$_ROSSOURCEDIR" ]; then + export _ROSSOURCEDIR + basedir + fi + + ;; +esac Propchange: trunk/tools/RosBE/RosBE-Unix/scripts/scut.sh ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 31394: Tag the RosBE-Unix 0.3.6 release
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sat Dec 22 16:28:39 2007 New Revision: 31394 URL: http://svn.reactos.org/svn/reactos?rev=31394&view=rev Log: Tag the RosBE-Unix 0.3.6 release Added: tags/RosBE-Unix-0.3.6/ - copied from r27006, trunk/

1 0

[cfinck] 31393: - Add a macro file for the MinGW prompt as well - Add SCUT to the macro file, it's also handy at the MinGW prompt :-) - Remove EmuandCo's "Added a Security Prompt to clean.cmd..." entry from the changelog, the prompt has already been removed
by cfinck＠svn.reactos.org 22 Dec '07

22 Dec '07

Author: cfinck Date: Sat Dec 22 16:13:02 2007 New Revision: 31393 URL: http://svn.reactos.org/svn/reactos?rev=31393&view=rev Log: - Add a macro file for the MinGW prompt as well - Add SCUT to the macro file, it's also handy at the MinGW prompt :-) - Remove EmuandCo's "Added a Security Prompt to clean.cmd..." entry from the changelog, the prompt has already been removed Added: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Sat Dec 22 16:13:02 2007 @@ -4,7 +4,7 @@ - Removed an used var. (Pierre Schweitzer) - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output AND Logs in one process. (Daniel Reimer) -- Added a Security Prompt to clean.cmd to not accidentally delete all Built stuff. (Daniel Reimer) +- Add a macro file for the MinGW prompt and add SCUT to this macro file (Colin Finck) *** December 8th, 2007 - RosBE 1.1 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Dec 22 16:13:02 2007 @@ -38,8 +38,6 @@ :: for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i -doskey CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* -doskey MAKE = "%_ROSBE_MINGWMAKE%" $* -doskey MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $* +doskey /macrofile="%_ROSBE_BASEDIR%\MinGW.mac" :EOC Added: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac Sat Dec 22 16:13:02 2007 @@ -1,0 +1,4 @@ +CHDEFGCC = "%_ROSBE_BASEDIR%\chdefgcc.cmd" $* +MAKE = "%_ROSBE_MINGWMAKE%" $* +MAKEX = "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% $* +SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $* Propchange: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.mac ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs