ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
January 2005
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
28 participants
703 discussions
Start a n
N
ew thread
[chorns] 12674: Add error reporting assistant.
by chorns@svn.reactos.com
Add error reporting assistant. Modified: trunk/reactos/Makefile Modified: trunk/reactos/bootdata/packages/reactos.dff Added: trunk/reactos/subsys/system/reporterror/ Added: trunk/reactos/subsys/system/reporterror/En.rc Added: trunk/reactos/subsys/system/reporterror/Makefile Added: trunk/reactos/subsys/system/reporterror/manifest.xml Added: trunk/reactos/subsys/system/reporterror/reporterror.c Added: trunk/reactos/subsys/system/reporterror/reporterror.h Added: trunk/reactos/subsys/system/reporterror/reporterror.rc Added: trunk/reactos/subsys/system/reporterror/resources/ Added: trunk/reactos/subsys/system/reporterror/resources/header.bmp Added: trunk/reactos/subsys/system/reporterror/resources/watermark.bmp _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/Makefile 2005-01-01 01:11:54 UTC (rev 12674) @@ -1,4 +1,3 @@ -# $Id$ # # Global makefile # @@ -101,8 +100,8 @@ # System applications # autochk cmd format services setup usetup welcome winlogon msiexec SYS_APPS = autochk calc cmd explorer expand format regedt32 regsvr32 \ - services setup taskmgr userinit usetup welcome vmwinst winlogon \ - regedit winefile notepad reactos + reporterror services setup taskmgr userinit usetup welcome vmwinst \ + winlogon regedit winefile notepad reactos # System services # rpcss eventlog _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-01-01 01:11:54 UTC (rev 12674) @@ -148,6 +148,7 @@ subsys\system\regedit\regedit.exe 4 subsys\system\regedt32\regedt32.exe 1 subsys\system\regsvr32\regsvr32.exe 1 +subsys\system\reporterror\reporterror.exe 1 subsys\system\services\services.exe 1 subsys\system\setup\setup.exe 1 subsys\system\taskmgr\taskmgr.exe 1 Property changes on: trunk/reactos/subsys/system/reporterror ___________________________________________________________________ Name: svn:ignore + *.coff *.map *.exe *.sym *.a _____ Added: trunk/reactos/subsys/system/reporterror/En.rc --- trunk/reactos/subsys/system/reporterror/En.rc 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/En.rc 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,53 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "The system recovered from an error.", -1, 115, 15, 160, 24 + LTEXT "Would you like to report the error to the ReactOS project?", -1, 115, 35, 160, 17 +END + +IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReacOS project or 'Cancel' to not send any information.",-1,10,0,225,40 + LTEXT "Your e-mail address (optional):",-1,10,40,120,20 + EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12 + LTEXT "Description of problem (optional):",-1,10,55,120,20 + EDITTEXT IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,10,65,250,55,ES_WANTRETURN|ES_MULT ILINE|ES_LEFT|WS_BORDER|WS_TABSTOP|WS_VSCROLL +END + +IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_SUBMISSION_STATUS,25,58,225,8 + CONTROL "", IDC_SUBMITTING_IN_PROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Error reporting assistant" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Your error report was successfully sent to the ReactOS project.",-1,25,5,225,20 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "Report error to the ReactOS project" + IDS_FAILED_TO_CONTACT_SERVER "The system was unable to contact the error reporting server.\nPlease make sure that your system is connected to the internet." + IDS_FAILED_TO_DELIVER_ERROR_REPORT "The system was unable to deliver the error report." +END + +STRINGTABLE +BEGIN + IDS_CONTACTING_SERVER "Contacting error reporting server..." + IDS_FAILED_TO_INITIALIZE_WINSOCK "Failed to initialize winsock (windows error code %d)" + IDS_FAILED_TO_LOCATE_SERVER "Failed to contact error reporting server" +END _____ Added: trunk/reactos/subsys/system/reporterror/Makefile --- trunk/reactos/subsys/system/reporterror/Makefile 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/Makefile 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,20 @@ +PATH_TO_TOP = ../../.. + +TARGET_TYPE = program + +TARGET_APPTYPE = windows + +TARGET_NAME = reporterror + +TARGET_INSTALLDIR = system32 + +TARGET_CFLAGS = -D__USE_W32API -DUNICODE -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 + +TARGET_SDKLIBS = advapi32.a comctl32.a comdlg32.a shell32.a ws2_32.a + +TARGET_OBJECTS = \ + $(TARGET_NAME).o + +include $(PATH_TO_TOP)/rules.mak + +include $(TOOLS_PATH)/helper.mk _____ Added: trunk/reactos/subsys/system/reporterror/manifest.xml --- trunk/reactos/subsys/system/reporterror/manifest.xml 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/manifest.xml 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="ReactOS.ErrorReport" + type="win32" + /> + <description>ReactOS Error Reporting Assistant</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> _____ Added: trunk/reactos/subsys/system/reporterror/reporterror.c --- trunk/reactos/subsys/system/reporterror/reporterror.c 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/reporterror.c 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,613 @@ +/* + * ReactOS Error Reporting Assistant + * Copyright (C) 2004-2005 Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * Copyright (C) 2003-2004 Peter Willis <psyphreak(a)phreaker.net> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Error Reporting Assistant + * FILE: subsys/system/reporterror/reporterror.c + * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) + */ +#include <windows.h> +#include <commctrl.h> +#include <stdio.h> +#include <string.h> +#include "reporterror.h" + +static LPSTR ErrorReportingServerName = "
errors.reactos.com
"; +static HINSTANCE hAppInstance; +static HANDLE hSubmissionThread = NULL; +static HWND hSubmissionNotifyWnd = NULL; +static LONG AbortSubmission = 0; +static LPERROR_REPORT ErrorReport = NULL; + +#define WM_ABORT_SUBMISSION (WM_USER + 2) +#define WM_CONTACTING_SERVER (WM_USER + 3) +#define WM_SUBMISSION_COMPLETE (WM_USER + 4) + +#define MAX_REQUEST_BUFFER_SIZE 20480 + +LPSTR +UrlEncode(LPSTR in, LPSTR out) +{ + CHAR buffer[4]; + UCHAR iu; + INT i; + + for (i = 0; i < strlen(in); i++) + { + iu = (UCHAR)in[i]; + memset(buffer, '\0', sizeof(buffer)); + if ((iu < 33 || iu > 126)) + sprintf(buffer, "%%%02x", iu); + else + sprintf(buffer, "%c", iu); + strcat(out, buffer); + } + return out; +} + +LPERROR_REPORT +FillErrorReport(HWND hwndDlg) +{ + INT size; + LPERROR_REPORT errorReport = malloc(sizeof(ERROR_REPORT)); + + size = 300; + errorReport->YourEmail = malloc(size); + GetDlgItemTextA(hwndDlg, + IDE_SUBMIT_REPORT_YOUR_EMAIL, + errorReport->YourEmail, + size); + + size = 10240; + errorReport->ProblemDescription = malloc(size); + GetDlgItemTextA(hwndDlg, + IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION, + errorReport->ProblemDescription, + size); + + return errorReport; +} + +ReleaseErrorReport(LPERROR_REPORT errorReport) +{ + if (errorReport->YourEmail) + free(errorReport->YourEmail); + if (errorReport->ProblemDescription) + free(errorReport->ProblemDescription); + free(errorReport); +} + +BOOL +ProcessMessage(VOID) +{ + MSG msg; + if (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + return TRUE; + } + return FALSE; +} + +VOID +ProcessMessages(VOID) +{ + while (ProcessMessage()); +} + +VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT | Flags; + psp->hInstance = hAppInstance; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} + +INT_PTR CALLBACK +PageFirstPageProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + break; + } + case PSN_WIZNEXT: + { + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SUBMIT_REPORT); + return TRUE; + } + } + break; + } + } + return FALSE; +} + +INT_PTR CALLBACK +PageSubmitReportProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + break; + } + case PSN_WIZNEXT: + { + ErrorReport = FillErrorReport(hwndDlg); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SUBMITTING_REPORT); + break; + } + } + break; + } + } + return FALSE; +} + +VOID +TerminateSubmission(BOOL Wait) +{ + if (hSubmissionThread != NULL) + { + if (Wait) + { + InterlockedExchange((LONG*)&AbortSubmission, 2); + WaitForSingleObject(hSubmissionThread, INFINITE); + } + else + InterlockedExchange((LONG*)&AbortSubmission, 1); + } +} + +INT +ConnectToServer(LPSTR host, + SOCKET *clientSocket, + LPWSTR errorMessage) +{ + struct sockaddr_in sin; + struct hostent *hp; + struct servent *sp; + INT error; + SOCKET s; + + *clientSocket = 0; + + hp = gethostbyname(host); + if (hp == NULL) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); + return error; + } + + s = socket(hp->h_addrtype, SOCK_STREAM, 0); + if (s < 0) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not create socket (windows error code %d)", error); + return error; + } + + memset(&sin, 0, sizeof(sin)); + sin.sin_family = hp->h_addrtype; + if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not resolve DNS for %S (windows error code %d)", host, error); + closesocket(s); + return error; + } + + memcpy((char *)&sin.sin_addr, hp->h_addr, hp->h_length); + sp = getservbyname("www", "tcp"); + if (sp == NULL) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not get service (windows error code %d)", error); + closesocket(s); + return error; + } + + sin.sin_port = sp->s_port; + + if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) + { + error = WSAGetLastError(); + wsprintf(errorMessage, L"Could not connect to server (windows error code %d)", error); + closesocket(s); + return error; + } + + *clientSocket = s; + return NO_ERROR; +} + +VOID +CreateHTTPPostRequest(LPSTR requestBuffer, + LPSTR hostname, + LPERROR_REPORT errorReport) +{ + LPSTR parameterBuffer; + LPSTR urlencodeBuffer; + + parameterBuffer = malloc(MAX_REQUEST_BUFFER_SIZE); + memset(parameterBuffer, '\0', MAX_REQUEST_BUFFER_SIZE); + + strcat(parameterBuffer, "errorReport="); + strcat(parameterBuffer, "<ErrorReportResponse>"); + strcat(parameterBuffer, "<YourEmail>"); + strcat(parameterBuffer, errorReport->YourEmail); + strcat(parameterBuffer, "</YourEmail>"); + strcat(parameterBuffer, "<ProblemDescription>"); + strcat(parameterBuffer, errorReport->ProblemDescription); + strcat(parameterBuffer, "</ProblemDescription>"); + strcat(parameterBuffer, "</ErrorReportResponse>"); + strcat(parameterBuffer, "\r\n"); + + urlencodeBuffer = malloc(MAX_REQUEST_BUFFER_SIZE); + memset(urlencodeBuffer, '\0', MAX_REQUEST_BUFFER_SIZE); + + UrlEncode(parameterBuffer, urlencodeBuffer); + sprintf(requestBuffer, "POST /Report.asmx/SubmitErrorReport HTTP/1.1\r\n" + "Host: %s\r\n" + "Content-Type: application/x-www-form-urlencoded\r\n" + "Content-Length: %d\r\n" + "\r\n" + "%s", + hostname, + strlen(urlencodeBuffer), + urlencodeBuffer); + + free(urlencodeBuffer); + free(parameterBuffer); +} + +#define CONTENT_LENGTH "Content-Length:" + +BOOL +WasErrorReportDelivered(LPSTR httpResponse) +{ + + return strstr(httpResponse, "</ErrorReportResponse>") != NULL; +} + +BOOL +ReceiveResponse(SOCKET socket, LPSTR responseBuffer, PULONG responseBufferSize) +{ + PCHAR pch = (PCHAR)responseBuffer; + ULONG length = 0; + INT contentLength = 0; + fd_set fdset[1]; + struct timeval timeout; + CHAR buf[4000]; + + FD_ZERO(&fdset); + FD_SET(socket, &fdset); + timeout.tv_sec = 5; + timeout.tv_usec = 0; + while (select(1, fdset, NULL, NULL, &timeout) > 0) + { + if (recv(socket, pch, 1, 0) == 1) + { + pch++; + length++; + if (WasErrorReportDelivered(responseBuffer)) + { + *responseBufferSize = length; + return TRUE; + } + } + else + break; + } + *responseBufferSize = 0; + return FALSE; +} + +BOOL +SubmitErrorReport(SOCKET socket, LPERROR_REPORT errorReport) +{ + BOOL wasErrorReportDelivered; + LPSTR requestBuffer; + LPSTR responseBuffer; + ULONG requestBufferSize = MAX_REQUEST_BUFFER_SIZE; + + requestBuffer = malloc(requestBufferSize); + memset(requestBuffer, '\0', requestBufferSize); + CreateHTTPPostRequest(requestBuffer, ErrorReportingServerName, errorReport); + send(socket, requestBuffer, strlen(requestBuffer), 0); + responseBuffer = malloc(requestBufferSize); + wasErrorReportDelivered = ReceiveResponse(socket, responseBuffer, IN OUT &requestBufferSize); + free(responseBuffer); + free(requestBuffer); + return wasErrorReportDelivered; +} + +VOID +DisconnectFromServer(SOCKET socket) +{ + closesocket(socket); +} + +DWORD STDCALL +SubmissionThread(LPVOID lpParameter) +{ + WCHAR errorMessage[1024]; + SOCKET socket; + HANDLE hThread; + INT error; + INT i; + + if (AbortSubmission != 0) + goto done; + + PostMessage(hSubmissionNotifyWnd, WM_CONTACTING_SERVER, IDS_CONTACTING_SERVER, 0); + + error = ConnectToServer(ErrorReportingServerName, &socket, errorMessage); + if (error != NO_ERROR) + { + MessageBox(NULL, errorMessage, NULL, MB_ICONWARNING); + + PostMessage(hSubmissionNotifyWnd, WM_ABORT_SUBMISSION, IDS_FAILED_TO_LOCATE_SERVER, 0); + goto cleanup; + } + + if (!SubmitErrorReport(socket, ErrorReport)) + { + PostMessage(hSubmissionNotifyWnd, WM_ABORT_SUBMISSION, IDS_FAILED_TO_DELIVER_ERROR_REPORT, 0); + goto cleanup; + } + + DisconnectFromServer(socket); +done: + switch (AbortSubmission) + { + case 0: + SendMessage(hSubmissionNotifyWnd, WM_SUBMISSION_COMPLETE, 0, 0); + break; + case 1: + SendMessage(hSubmissionNotifyWnd, WM_ABORT_SUBMISSION, 0, 0); + break; + } + +cleanup: + hThread = (HANDLE)InterlockedExchange((LONG*)&hSubmissionThread, 0); + if (hThread != NULL) + CloseHandle(hThread); + ReleaseErrorReport(ErrorReport); + ErrorReport = NULL; + return 0; +} + +BOOL +StartSubmissionThread(HWND hWndNotify) +{ + if (hSubmissionThread == NULL) + { + DWORD ThreadId; + hSubmissionNotifyWnd = hWndNotify; + AbortSubmission = 0; + hSubmissionThread = CreateThread(NULL, + 0, + SubmissionThread, + NULL, + CREATE_SUSPENDED, + &ThreadId); + if (hSubmissionThread == NULL) + return FALSE; + + ResumeThread(hSubmissionThread); + return TRUE; + } + + return FALSE; +} + +INT_PTR CALLBACK +PageSubmittingReportProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + SetDlgItemText(hwndDlg, IDC_SUBMISSION_STATUS, NULL); + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, TRUE, 50); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK); + StartSubmissionThread(hwndDlg); + break; + } + case PSN_RESET: + { + TerminateSubmission(TRUE); + break; + } + case PSN_WIZBACK: + if (hSubmissionThread != NULL) + { + PropSheet_SetWizButtons(GetParent(hwndDlg), 0); + TerminateSubmission(FALSE); + SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); + return -1; + } + else + { + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, FALSE, 0); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_SUBMIT_REPORT); + } + break; + } + break; + } + case WM_CONTACTING_SERVER: + { + WCHAR Msg[1024]; + LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); + SetDlgItemText(hwndDlg, IDC_SUBMISSION_STATUS, Msg); + break; + } + case WM_SUBMISSION_COMPLETE: + { + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, FALSE, 0); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SUBMITTED_REPORT); + break; + } + case WM_ABORT_SUBMISSION: + { + /* Go back in case we aborted the submission thread */ + SendDlgItemMessage(hwndDlg, IDC_SUBMITTING_IN_PROGRESS, PBM_SETMARQUEE, FALSE, 0); + PropSheet_SetCurSelByID(GetParent(hwndDlg), IDD_SUBMIT_REPORT); + if (wParam != 0) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, wParam, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + } + break; + } + } + return FALSE; +} + +INT_PTR CALLBACK +PageSubmittedReportProc( + HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch(uMsg) + { + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + switch (pnmh->code) + { + case PSN_SETACTIVE: + { + EnableWindow(GetDlgItem(GetParent(hwndDlg), IDCANCEL), FALSE); + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); + break; + } + } + break; + } + } + return FALSE; +} + +static LONG +CreateWizard(VOID) +{ + PROPSHEETPAGE psp[8]; + PROPSHEETHEADER psh; + WCHAR Caption[1024]; + + LoadString(hAppInstance, IDS_WIZARD_NAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); + psh.dwSize = sizeof(PROPSHEETHEADER); + psh.dwFlags = PSH_PROPSHEETPAGE | PSH_WIZARD97 | PSH_WATERMARK | PSH_HEADER; + psh.hwndParent = NULL; + psh.hInstance = hAppInstance; + psh.hIcon = 0; + psh.pszCaption = Caption; + psh.nPages = 4; + psh.nStartPage = 0; + psh.ppsp = psp; + psh.pszbmWatermark = MAKEINTRESOURCE(IDB_WATERMARK); + psh.pszbmHeader = MAKEINTRESOURCE(IDB_HEADER); + + InitPropSheetPage(&psp[0], IDD_FIRSTPAGE, PSP_HIDEHEADER, PageFirstPageProc); + InitPropSheetPage(&psp[1], IDD_SUBMIT_REPORT, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageSubmitReportProc); + InitPropSheetPage(&psp[2], IDD_SUBMITTING_REPORT, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageSubmittingReportProc); + InitPropSheetPage(&psp[3], IDD_SUBMITTED_REPORT, PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE, PageSubmittedReportProc); + + return (LONG)(PropertySheet(&psh) != -1); +} + +int WINAPI +WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpszCmdLine, + int nCmdShow) +{ + WORD wVersionRequested; + WSADATA wsaData; + INT error; + INT version; + WCHAR *lc; + + hAppInstance = hInstance; + + wVersionRequested = MAKEWORD(1, 1); + error = WSAStartup(wVersionRequested, &wsaData); + if (error != NO_ERROR) + { + WCHAR format[1024]; + WCHAR message[1024]; + LoadString(hAppInstance, IDS_FAILED_TO_INITIALIZE_WINSOCK, format, sizeof(format) / sizeof(WCHAR)); + wsprintf(message, format, error); + MessageBox(NULL, message, NULL, MB_ICONWARNING); + return; + } + + CreateWizard(); + + WSACleanup(); + + return 0; +} _____ Added: trunk/reactos/subsys/system/reporterror/reporterror.h --- trunk/reactos/subsys/system/reporterror/reporterror.h 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/reporterror.h 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,50 @@ +#ifndef __REPORTERROR_H +#define __REPORTERROR_H + +#ifndef PSCB_BUTTONPRESSED +#define PSCB_BUTTONPRESSED (3) +#endif + +#ifndef PBS_MARQUEE +#define PBS_MARQUEE (8) +#endif + +/* metrics */ +#define PROPSHEETWIDTH 250 +#define PROPSHEETHEIGHT 120 +#define PROPSHEETPADDING 6 +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) +#define ICONSIZE 16 + +/* Resource IDs */ + +#define IDS_WIZARD_NAME 100 +#define IDS_FAILED_TO_CONTACT_SERVER 101 + +#define IDS_CONTACTING_SERVER 201 +#define IDS_FAILED_TO_INITIALIZE_WINSOCK 202 +#define IDS_FAILED_TO_LOCATE_SERVER 203 +#define IDS_FAILED_TO_DELIVER_ERROR_REPORT 204 + +#define IDD_FIRSTPAGE 100 +#define IDD_SUBMIT_REPORT 101 +#define IDD_SUBMITTING_REPORT 102 +#define IDD_SUBMITTED_REPORT 103 + +#define IDC_SUBMISSION_STATUS 200 +#define IDC_SUBMITTING_IN_PROGRESS 201 + +#define IDE_SUBMIT_REPORT_YOUR_EMAIL 300 +#define IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION 301 + +#define IDB_WATERMARK 100 +#define IDB_HEADER 101 + +typedef struct _ERROR_REPORT +{ + LPSTR YourEmail; + LPSTR ProblemDescription; +} ERROR_REPORT, *LPERROR_REPORT; + +#endif /* __REPORTERROR_H */ _____ Added: trunk/reactos/subsys/system/reporterror/reporterror.rc --- trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-01-01 01:03:31 UTC (rev 12673) +++ trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-01-01 01:11:54 UTC (rev 12674) @@ -0,0 +1,17 @@ +#include <defines.h> +#include "reporterror.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Error Reporting Assistant\0" +#define REACTOS_STR_INTERNAL_NAME "reporterror\0" +#define REACTOS_STR_ORIGINAL_FILENAME "reporterror.exe\0" +#include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +1 24 DISCARDABLE "manifest.xml" + +/* Bitmaps */ +IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_HEADER BITMAP "resources/header.bmp" + +#include "En.rc" _____ Added: trunk/reactos/subsys/system/reporterror/resources/header.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/reporterror/resources/header.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/subsys/system/reporterror/resources/watermark.bmp (Binary files differ) Property changes on: trunk/reactos/subsys/system/reporterror/resources/watermark.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream
19 years, 11 months
1
0
0
0
[ion] 12673: Modified NtDelayExecution Prototype/Function to use LARGE_INTEGER and not TIME, and renamed EX_MAXIMUM_WAIT_OBJECTS to MAXIMUM_WAIT_OBJECTS, which is the correct define to use (the ex define was an unnecessary duplicate)
by ion@svn.reactos.com
Modified NtDelayExecution Prototype/Function to use LARGE_INTEGER and not TIME, and renamed EX_MAXIMUM_WAIT_OBJECTS to MAXIMUM_WAIT_OBJECTS, which is the correct define to use (the ex define was an unnecessary duplicate) Modified: trunk/reactos/include/ntos/ntdef.h Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/rtl/rangelist.c _____ Modified: trunk/reactos/include/ntos/ntdef.h --- trunk/reactos/include/ntos/ntdef.h 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/include/ntos/ntdef.h 2005-01-01 01:03:31 UTC (rev 12673) @@ -11,7 +11,9 @@ #ifndef __INCLUDE_NTDEF_H #define __INCLUDE_NTDEF_H -#define EX_MAXIMUM_WAIT_OBJECTS (64) +#ifndef _USE_W32API +#define MAXIMUM_WAIT_OBJECTS (64) +#endif #if defined(_MSC_VER) && (_MSC_VER >= 1300) && defined(__cplusplus) # define TYPE_ALIGNMENT(t) __alignof(t) _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/include/ntos/zw.h 2005-01-01 01:03:31 UTC (rev 12673) @@ -1,4 +1,4 @@ -/* $Id: zw.h,v 1.40 2004/12/30 08:05:10 hyperion Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -5241,7 +5241,7 @@ STDCALL NtDelayExecution( IN ULONG Alertable, - IN TIME *Interval + IN LARGE_INTEGER *Interval ); /* _____ Modified: trunk/reactos/ntoskrnl/ke/timer.c --- trunk/reactos/ntoskrnl/ke/timer.c 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/ntoskrnl/ke/timer.c 2005-01-01 01:03:31 UTC (rev 12673) @@ -1,4 +1,4 @@ -/* $Id: timer.c,v 1.93 2004/12/24 17:06:58 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -138,7 +138,7 @@ NTSTATUS STDCALL NtDelayExecution(IN ULONG Alertable, - IN TIME* Interval) + IN LARGE_INTEGER* Interval) { NTSTATUS Status; LARGE_INTEGER Timeout; _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-01-01 01:03:31 UTC (rev 12673) @@ -492,7 +492,7 @@ DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) " "PsGetCurrentThread() %x\n", Count, Object, PsGetCurrentThread()); - ASSERT(0 < Count && Count <= EX_MAXIMUM_WAIT_OBJECTS); + ASSERT(0 < Count && Count <= MAXIMUM_WAIT_OBJECTS); CurrentThread = KeGetCurrentThread(); @@ -510,7 +510,7 @@ } else { - if (Count > EX_MAXIMUM_WAIT_OBJECTS) + if (Count > MAXIMUM_WAIT_OBJECTS) { DPRINT("(%s:%d) Too many objects!\n", __FILE__, __LINE__); return (STATUS_UNSUCCESSFUL); @@ -762,8 +762,8 @@ IN BOOLEAN Alertable, IN PLARGE_INTEGER UnsafeTime) { - KWAIT_BLOCK WaitBlockArray[EX_MAXIMUM_WAIT_OBJECTS]; - PVOID ObjectPtrArray[EX_MAXIMUM_WAIT_OBJECTS]; + KWAIT_BLOCK WaitBlockArray[MAXIMUM_WAIT_OBJECTS]; + PVOID ObjectPtrArray[MAXIMUM_WAIT_OBJECTS]; NTSTATUS Status; ULONG i, j; KPROCESSOR_MODE WaitMode; @@ -772,7 +772,7 @@ DPRINT("NtWaitForMultipleObjects(Count %lu Object[] %x, Alertable %d, " "Time %x)\n", Count,Object,Alertable,Time); - if (Count > EX_MAXIMUM_WAIT_OBJECTS) + if (Count > MAXIMUM_WAIT_OBJECTS) return STATUS_UNSUCCESSFUL; if (0 == Count) return STATUS_INVALID_PARAMETER; _____ Modified: trunk/reactos/ntoskrnl/rtl/rangelist.c --- trunk/reactos/ntoskrnl/rtl/rangelist.c 2005-01-01 00:42:18 UTC (rev 12672) +++ trunk/reactos/ntoskrnl/rtl/rangelist.c 2005-01-01 01:03:31 UTC (rev 12673) @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: rangelist.c,v 1.3 2004/10/22 16:30:58 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries
19 years, 11 months
1
0
0
0
[chorns] 12672: Move freeldr to reactos\boot\freeldr.
by chorns@svn.reactos.com
Move freeldr to reactos\boot\freeldr. Deleted: trunk/freeldr/ Modified: trunk/reactos/Makefile Added: trunk/reactos/boot/ Added: trunk/reactos/boot/freeldr/ Modified: trunk/reactos/boot/freeldr/Makefile Deleted: trunk/reactos/boot/freeldr/bootsect/.cvsignore Modified: trunk/reactos/boot/freeldr/bootsect/Makefile Deleted: trunk/reactos/boot/freeldr/fdebug/.cvsignore Modified: trunk/reactos/boot/freeldr/fdebug/Makefile Deleted: trunk/reactos/boot/freeldr/freeldr/.cvsignore Modified: trunk/reactos/boot/freeldr/freeldr/Makefile Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c Modified: trunk/reactos/boot/freeldr/freeldr/include/cmdline.h Modified: trunk/reactos/boot/freeldr/freeldr/include/inffile.h Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c Modified: trunk/reactos/boot/freeldr/freeldr/machine.c Modified: trunk/reactos/boot/freeldr/install/Makefile Modified: trunk/reactos/boot/freeldr/rules.mak Deleted: trunk/reactos/boot/freeldr/tools/.cvsignore Modified: trunk/reactos/boot/freeldr/tools/Makefile Deleted: trunk/reactos/boot/freeldr/tools/hosttype.c Deleted: trunk/reactos/boot/freeldr/tools/rcopy.c Deleted: trunk/reactos/boot/freeldr/tools/rdel.c Deleted: trunk/reactos/boot/freeldr/tools/rmkdir.c Deleted: trunk/reactos/boot/freeldr/tools/rrmdir.c _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2004-12-31 21:31:39 UTC (rev 12671) +++ trunk/reactos/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.277 2004/12/30 18:31:43 ion Exp $ +# $Id$ # # Global makefile # @@ -23,6 +23,9 @@ IMPLIB = implib endif +# Boot loaders +BOOT_LOADERS = freeldr + # Required to run the system COMPONENTS = ntoskrnl @@ -124,9 +127,8 @@ # Regression tests REGTESTS = regtests -all: bootstrap $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) $(DLLS) $(SUBSYS) \ - $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) \ - $(APPS) $(EXT_MODULES) +all: bootstrap $(BOOT_LOADERS) $(COMPONENTS) $(REGTESTS) $(HALS) $(BUS) $(LIB_FSLIB) \ + $(DLLS) $(SUBSYS) $(KERNEL_DRIVERS) $(SYS_APPS) $(SYS_SVC) $(APPS) $(EXT_MODULES) bootstrap: dk implib iface_native iface_additional @@ -136,21 +138,21 @@ $(SUBSYS:%=%_depends) $(SYS_SVC:%=%_depends) \ $(EXT_MODULES:%=%_depends) $(POSIX_LIBS:%=%_depends) -implib: hallib $(LIB_STATIC) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) $(BUS:%=%_implib) \ - $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) msvcrt_implib $(DLLS:%=%_implib) \ - $(KERNEL_DRIVERS:%=%_implib) $(SUBSYS:%=%_implib) \ - $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) $(EXT_MODULES:%=%_implib) \ - $(REGTESTS:%=%_implib) +implib: hallib $(LIB_STATIC) $(COMPONENTS:%=%_implib) $(HALS:%=%_implib) \ + $(BUS:%=%_implib) $(LIB_STATIC:%=%_implib) $(LIB_FSLIB:%=%_implib) \ + msvcrt_implib $(DLLS:%=%_implib) $(KERNEL_DRIVERS:%=%_implib) \ + $(SUBSYS:%=%_implib) $(SYS_APPS:%=%_implib) $(SYS_SVC:%=%_implib) \ + $(EXT_MODULES:%=%_implib) $(REGTESTS:%=%_implib) -test: $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \ +test: $(BOOT_LOADERS:%=%_test) $(COMPONENTS:%=%_test) $(HALS:%=%_test) $(BUS:%=%_test) \ $(LIB_STATIC:%=%_test) $(LIB_FSLIB:%=%_test) msvcrt_test $(DLLS:%=%_test) \ $(KERNEL_DRIVERS:%=%_test) $(SUBSYS:%=%_test) \ $(SYS_SVC:%=%_test) $(EXT_MODULES:%=%_test) clean: tools dk_clean iface_native_clean iface_additional_clean hallib_clean \ - $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) \ - $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) msvcrt_clean \ - $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \ + $(BOOT_LOADERS:%=%_clean) $(HALS:%=%_clean) $(COMPONENTS:%=%_clean) \ + $(BUS:%=%_clean) $(LIB_STATIC:%=%_clean) $(LIB_FSLIB:%=%_clean) \ + msvcrt_clean $(DLLS:%=%_clean) $(KERNEL_DRIVERS:%=%_clean) \ $(SUBSYS:%=%_clean) $(SYS_APPS:%=%_clean) $(SYS_SVC:%=%_clean) \ $(NET_APPS:%=%_clean) $(APPS:%=%_clean) $(EXT_MODULES:%=%_clean) \ $(REGTESTS:%=%_clean) clean_after tools_clean @@ -159,19 +161,15 @@ $(HALFVERBOSEECHO) [RM] /include/roscfg.h $(RM) $(PATH_TO_TOP)/include/roscfg.h -fastinstall: tools install_dirs install_before \ - $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \ - $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) msvcrt_install $(DLLS:%=%_install) \ - $(KERNEL_DRIVERS:%=%_install) $(SUBSYS:%=%_install) \ - $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \ +fastinstall: tools install_dirs install_before $(COMPONENTS:%=%_install) $(HALS:%=%_install) \ + $(BUS:%=%_install) $(LIB_STATIC:%=%_install) $(LIB_FSLIB:%=%_install) \ + msvcrt_install $(DLLS:%=%_install) $(KERNEL_DRIVERS:%=%_install) \ + $(SUBSYS:%=%_install) $(SYS_APPS:%=%_install) $(SYS_SVC:%=%_install) \ $(APPS:%=%_install) $(EXT_MODULES:%=%_install) $(REGTESTS:%=%_install) install: fastinstall registry -FREELDR_DIR = ../freeldr +FREELDR_DIR = boot/freeldr -freeldr: - $(MAKE) -C $(FREELDR_DIR) - bootcd_directory_layout: $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR) $(RMKDIR) $(BOOTCD_DIR) @@ -183,26 +181,11 @@ $(RMKDIR) $(BOOTCD_DIR)/reactos $(HALFVERBOSEECHO) [RMKDIR] $(BOOTCD_DIR)/reactos/system32 $(RMKDIR) $(BOOTCD_DIR)/reactos/system32 - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/isoboot.bin to ${BOOTCD_DIR}/../isoboot.bin - $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/dosmbr.bin to ${BOOTCD_DIR}/loader/dosmbr.bin - $(CP) ${FREELDR_DIR}/bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/ext2.bin to ${BOOTCD_DIR}/loader/ext2.bin - $(CP) ${FREELDR_DIR}/bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/fat.bin to ${BOOTCD_DIR}/loader/fat.bin - $(CP) ${FREELDR_DIR}/bootsect/fat.bin ${BOOTCD_DIR}/loader/fat.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/fat32.bin to ${BOOTCD_DIR}/loader/fat32.bin - $(CP) ${FREELDR_DIR}/bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/bootsect/isoboot.bin to ${BOOTCD_DIR}/loader/isoboot.bin - $(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys to ${BOOTCD_DIR}/loader/freeldr.sys - $(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys - $(HALFVERBOSEECHO) [COPY] ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys to ${BOOTCD_DIR}/loader/setupldr.sys - $(CP) ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys -bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \ - $(LIB_STATIC:%=%_bootcd) $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \ - $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd) +bootcd_bootstrap_files: $(BOOT_LOADERS:%=%_bootcd) $(COMPONENTS:%=%_bootcd) \ + $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) $(LIB_STATIC:%=%_bootcd) \ + $(LIB_FSLIB:%=%_bootcd) msvcrt_bootcd $(DLLS:%=%_bootcd) \ + $(KERNEL_DRIVERS:%=%_bootcd) $(SUBSYS:%=%_bootcd) $(SYS_APPS:%=%_bootcd) bootcd_install_before: $(HALFVERBOSEECHO) [RLINE] bootdata/autorun.inf to $(BOOTCD_DIR)/autorun.inf @@ -288,10 +271,28 @@ registry: tools $(MKHIVE) bootdata $(INSTALL_DIR)/system32/config bootdata/hiveinst.inf -.PHONY: all bootstrap depends implib test clean clean_before install freeldr bootcd_directory_layout \ +.PHONY: all bootstrap depends implib test clean clean_before install bootcd_directory_layout \ bootcd_bootstrap_files bootcd_install_before bootcd_basic bootcd_makecd ubootcd_unattend bootcd +# +# Boot Loaders +# +$(BOOT_LOADERS): %: + $(MAKE) -C boot/$* + +$(BOOT_LOADERS:%=%_test): %_test: + $(MAKE) -C boot/$* test + +$(BOOT_LOADERS:%=%_clean): %_clean: + $(MAKE) -C boot/$* clean + +$(BOOT_LOADERS:%=%_bootcd): %_bootcd: + $(MAKE) -C boot/$* bootcd + +.PHONY: $(BOOT_LOADERS) $(BOOT_LOADERS:%=%_test) $(BOOT_LOADERS:%=%_clean) \ + $(BOOT_LOADERS:%=%_bootcd) + $(COMPONENTS): dk # _____ Copied: trunk/reactos/boot/freeldr (from rev 12648, trunk/freeldr) _____ Modified: trunk/reactos/boot/freeldr/Makefile --- trunk/freeldr/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -17,10 +17,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# Windows is default host environment -ifeq ($(HOST),) -HOST = mingw32-windows -endif +PATH_TO_TOP = ../.. include rules.mak @@ -31,10 +28,8 @@ $(MAKE) -C install $(MAKE) -C fdebug -freeldr: - $(MAKE) -C freeldr -.PHONY : freeldr - +test: + clean: $(MAKE) -C bootsect clean $(MAKE) -C freeldr clean @@ -42,4 +37,14 @@ $(MAKE) -C fdebug clean $(MAKE) -C tools clean +bootcd: + $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin + $(CP) bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin + $(CP) bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin + $(CP) bootsect/fat.bin ${BOOTCD_DIR}/loader/fat.bin + $(CP) bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin + $(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin + $(CP) freeldr/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys + $(CP) freeldr/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys + .PHONY : clean _____ Deleted: trunk/reactos/boot/freeldr/bootsect/.cvsignore --- trunk/freeldr/bootsect/.cvsignore 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/bootsect/.cvsignore 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,3 +0,0 @@ -*.exe -*.bin -*.h _____ Modified: trunk/reactos/boot/freeldr/bootsect/Makefile --- trunk/freeldr/bootsect/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/bootsect/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -17,15 +17,19 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -BOOTCD_DIR = ../../bootcd +PATH_TO_TOP = ../../.. +include ../rules.mak + +BOOTCD_DIR = $(PATH_TO_TOP)/../bootcd + .PHONY : clean bootcd all: $(BIN2C) dosmbr.bin fat.bin fat32.bin isoboot.bin ext2.bin $(BIN2C) : - @$(MAKE) --no-print-directory -C $(TOOLSDIR) + @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) dosmbr.bin : dosmbr.asm @echo ===================================================== Assembling dosmbr Property changes on: trunk/reactos/boot/freeldr/fdebug ___________________________________________________________________ Name: svn:ignore - *.res + *.res *.exe _____ Deleted: trunk/reactos/boot/freeldr/fdebug/.cvsignore --- trunk/freeldr/fdebug/.cvsignore 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/fdebug/.cvsignore 2005-01-01 00:42:18 UTC (rev 12672) @@ -1 +0,0 @@ -*.res _____ Modified: trunk/reactos/boot/freeldr/fdebug/Makefile --- trunk/freeldr/fdebug/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/fdebug/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -16,8 +16,11 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # - +PATH_TO_TOP = ../../.. + +include ../rules.mak + FLAGS = -Wall OBJS = rs232.o fdebug.o fdebug.res @@ -32,7 +35,7 @@ fdebug.res: fdebug.rc resource.h @echo ===================================================== Compiling $* - $(WINDRES) -o fdebug.res fdebug.rc -O coff + $(RC) -o fdebug.res fdebug.rc -O coff fdebug.o: fdebug.c rs232.h @echo ===================================================== Compiling $* Property changes on: trunk/reactos/boot/freeldr/freeldr ___________________________________________________________________ Name: svn:ignore - obj + *.d *.map *.exe *.sys _____ Deleted: trunk/reactos/boot/freeldr/freeldr/.cvsignore --- trunk/freeldr/freeldr/.cvsignore 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/.cvsignore 2005-01-01 00:42:18 UTC (rev 12672) @@ -1 +0,0 @@ -obj _____ Modified: trunk/reactos/boot/freeldr/freeldr/Makefile --- trunk/freeldr/freeldr/Makefile 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/Makefile 2005-01-01 00:42:18 UTC (rev 12672) @@ -17,89 +17,46 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -############################################# -# CHANGE THESE FOR YOUR OUTPUT -# -TARGET = i386 +PATH_TO_TOP = ../../.. + +include ../rules.mak + +TARGET = i386 ifeq ($(DEBUG),) # Debugging information on (bigger binary) -#DEBUG = yes +#DEBUG = yes # Debugging information off (smaller binary) -DEBUG = no +DEBUG = no endif -OBJDIR = obj -OUTPUT_DIR = $(OBJDIR)/$(TARGET) +SRCDIR = . -BOOTCD_DIR = ../../bootcd +BOOTCD_DIR = $(PATH_TO_TOP)/bootcd -############################################# -# COMPILER AND LINKER PROGRAMS -# -TOOLSDIR = $(SRCDIR)/../tools +TOOLSDIR = $(SRCDIR)/../tools -RM = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rdel -CP = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rcopy -MKDIR = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rmkdir -RMDIR = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)rrmdir -OBJCOPY = objcopy -NM = nm -OBJDUMP = objdump -DEPTOOL = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)deptool -HOSTTOOL = $(subst /,$(SEP),$(TOOLSDIR))$(SEP)hosttype -TOOLS = $(DEPTOOL) $(HOSTTOOL) +DEPTOOL = $(subst /,$(SEP),$(FREELDR_TOOLS_PATH))$(SEP)deptool +TOOLS = $(DEPTOOL) -HOSTTYPE = $(shell $(HOSTTOOL)) +preall : all -#---------------------------------------------------------------------- ------------------------------- -# TEST IF WE ARE IN THE TARGET DIRECTORY -# IF NOT WE WILL CHANGE TO THE TARGET DIRECTORY AND RUN MAKE FROM THERE -#---------------------------------------------------------------------- ------------------------------- -#ifeq (,$(filter $(CURDIR)/$(OUTPUT_DIR),$(notdir $(CURDIR)))) -ifneq ($(CURDIR), $(SRCDIR)/$(OUTPUT_DIR)) - -SRCDIR = $(CURDIR) - -.SUFFIXES: - -############################################# -# VARIABLE TO CHANGE TO TARGET DIRECTORY AND INVOKE MAKE FROM THERE -# -MAKETARGET = $(MAKE) --no-print-directory -C $(OUTPUT_DIR) \ - -f ../../Makefile SRCDIR=$(CURDIR) $(MAKECMDGOALS) - -.PHONY: CHANGE_TO_TARGET -CHANGE_TO_TARGET setupldr : BUILD_TOOLS $(OBJDIR) $(OBJDIR)/$(TARGET) - @echo Calculating source file dependencies... - +@$(MAKETARGET) - .PHONY: BUILD_TOOLS BUILD_TOOLS: - @$(MAKE) --no-print-directory -C $(TOOLSDIR) + @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) -$(OBJDIR): - @echo Creating directory: $(OBJDIR) - @$(MKDIR) $(OBJDIR) - -$(OBJDIR)/$(TARGET): $(OBJDIR) - @echo Creating directory: $(OBJDIR)/$(TARGET) - @$(MKDIR) $(OBJDIR)/$(TARGET) - - -Makefile : ; - -% :: CHANGE_TO_TARGET - ############################################# .PHONY : clean clean: - @$(MAKE) --no-print-directory -C $(TOOLSDIR) - @echo Cleaning directory $(OBJDIR)/$(TARGET) - @-$(RM) $(OBJDIR)/$(TARGET)/* - @echo Removing directory $(OBJDIR)/$(TARGET) - @-$(RMDIR) $(OBJDIR)/$(TARGET) - @-$(RMDIR) $(OBJDIR) + @-$(RM) $(ALL_OBJS) + @-$(RM) $(ALL_OBJS:.o=.d) + @-$(RM) freeldr.exe + @-$(RM) freeldr.sys + @-$(RM) freeldr.map + @-$(RM) setupldr.exe + @-$(RM) setupldr.sys + @-$(RM) setupldr.map + @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) @echo Clean ALL done. ############################################# @@ -117,31 +74,19 @@ $(MKDIR) $(BOOTCD_DIR)/disk/loader .PHONY : boot_loader -boot_loader : $(OBJDIR)/$(TARGET)/freeldr.sys - $(CP) $(OBJDIR)/$(TARGET)/freeldr.sys $(BOOTCD_DIR)/disk/loader/freeldr.sys +boot_loader : freeldr.sys + $(CP) freeldr.sys $(BOOTCD_DIR)/disk/loader/freeldr.sys $(CP) ../freeldr.ini $(BOOTCD_DIR)/disk/loader/freeldr.ini .PHONY : setup_loader -setup_loader : $(OBJDIR)/$(TARGET)/setupldr.sys - $(CP) $(OBJDIR)/$(TARGET)/setupldr.sys $(BOOTCD_DIR)/disk/loader/setupldr.sys +setup_loader : setupldr.sys + $(CP) setupldr.sys $(BOOTCD_DIR)/disk/loader/setupldr.sys -############################################# -#---------------------------------------------------------------------- ------------------------------- -# END MAGIC TARGET DIRECTORY CHANGE STUFF -#---------------------------------------------------------------------- ------------------------------- -else - -############################################# -# COMPILER COMMAND LINE OPTIONS -# COMPILER_OPTIONS = -Wall -Werror -nostdlib -nostdinc -ffreestanding -fno-builtin -fno-inline \ -fno-zero-initialized-in-bss -O1 -MD # FreeLoader does not use any of the standard libraries, includes, or built-in functions -############################################# -# COMPILER DEFINES -# ifeq ($(DEBUG),yes) COMPILER_DEBUG_DEFINES = -DDEBUG else @@ -150,132 +95,110 @@ COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) -############################################# -# INCLUDE DIRECTORY OPTIONS -# COMPILER_INCLUDES = -I$(SRCDIR)/include -############################################# -# COMPILER FLAGS -# -CFLAGS = $(COMPILER_OPTIONS) \ - $(COMPILER_DEFINES) \ - $(COMPILER_INCLUDES) +CFLAGS = $(COMPILER_OPTIONS) \ + $(COMPILER_DEFINES) \ + $(COMPILER_INCLUDES) -############################################# -# LINKER COMMAND LINE OPTIONS -# -#LINKER_OPTIONS = -N -Ttext=0x8000 --oformat=binary -s LINKER_OPTIONS = -N -Ttext=0x8000 -############################################# -# LINKER FLAGS -# LFLAGS = $(LINKER_OPTIONS) -############################################# -# NASM FLAGS -# -ifeq ($(HOSTTYPE), dos) - NASMFLAGS = -f coff +ifeq ($(HOST),mingw32-linux) + NASMFLAGS = -f win32 else - ifeq ($(HOSTTYPE), win32) - NASMFLAGS = -f win32 - else - NASMFLAGS = -f elf - endif + NASMFLAGS = -f elf endif -############################################# -# LIST ALL THE OBJECT FILE GROUPS -# # fathelp.o must come first in the link line because it contains bootsector helper code # arch.o must come second in the link line because it contains the startup code -ARCH_OBJS = fathelp.o \ - arch.o \ - i386idt.o \ - i386trap.o \ - i386cpu.o \ - i386pnp.o \ - boot.o \ - linux.o \ - mb.o \ - i386rtl.o \ - i386vid.o \ - drvmap.o \ - int386.o \ - i386disk.o \ - portio.o \ - hardware.o \ - hwacpi.o \ - hwapm.o \ - hwcpu.o \ - hwpci.o \ - archmach.o \ - machpc.o \ - machxbox.o \ - pccons.o \ - pcdisk.o \ - pcmem.o \ - pcrtc.o \ - pcvideo.o \ - xboxcons.o \ - xboxdisk.o \ - xboxfont.o \ - xboxhw.o \ - xboxmem.o \ - xboxrtc.o \ - xboxvideo.o \ - _alloca.o # For Mingw32 builds +ARCH_I386_OBJS = fathelp.o \ + arch.o \ + i386idt.o \ + i386trap.o \ + i386cpu.o \ + i386pnp.o \ + boot.o \ + linux.o \ + mb.o \ + i386rtl.o \ + i386vid.o \ + drvmap.o \ + int386.o \ + i386disk.o \ + portio.o \ + hardware.o \ + hwacpi.o \ + hwapm.o \ + hwcpu.o \ + hwpci.o \ + archmach.o \ + machpc.o \ + machxbox.o \ + pccons.o \ + pcdisk.o \ + pcmem.o \ + pcrtc.o \ + pcvideo.o \ + xboxcons.o \ + xboxdisk.o \ + xboxfont.o \ + xboxhw.o \ + xboxmem.o \ + xboxrtc.o \ + xboxvideo.o \ + _alloca.o # For Mingw32 builds +ARCH_OBJS = $(addprefix i386/,$(ARCH_I386_OBJS)) -RTL_OBJS = print.o \ - stdlib.o \ - string.o \ - list.o \ - memcmp.o \ - memcpy.o \ - memmove.o \ - memset.o +RTL_OBJS = print.o \ + stdlib.o \ + string.o \ + list.o \ + memcmp.o \ + memcpy.o \ + memmove.o \ + memset.o -FS_OBJS = fs.o \ - fat.o \ - iso.o \ - ext2.o \ - ntfs.o \ - fsrec.o +FS_OBJS = fs.o \ + fat.o \ + iso.o \ + ext2.o \ + ntfs.o \ + fsrec.o -UI_OBJS = tui.o \ - tuimenu.o \ - ui.o \ - gui.o +UI_OBJS = tui.o \ + tuimenu.o \ + ui.o \ + gui.o -REACTOS_OBJS= arcname.o \ - binhive.o \ - registry.o +REACTOS_OBJS = arcname.o \ + binhive.o \ + registry.o COMM_OBJS = rs232.o -DISK_OBJS = disk.o \ - partition.o +DISK_OBJS = disk.o \ + partition.o -MM_OBJS = mm.o \ - meminit.o +MM_OBJS = mm.o \ + meminit.o -CACHE_OBJS = cache.o \ - blocklist.o +CACHE_OBJS = cache.o \ + blocklist.o -INIFILE_OBJS= inifile.o \ - ini_init.o \ - parse.o +INIFILE_OBJS = inifile.o \ + ini_init.o \ + parse.o -INFFILE_OBJS= inffile.o +INFFILE_OBJS = inffile.o -VIDEO_OBJS = video.o \ - fade.o \ - palette.o \ - pixel.o \ - bank.o +VIDEO_OBJS = video.o \ + fade.o \ + palette.o \ + pixel.o \ + bank.o # libgcc2.o contains code (__udivdi3, __umoddi3) necessary to do # 64-bit division on the i386 (and other 32-bit) architectures @@ -283,87 +206,61 @@ MATH_OBJS = libgcc2.o BASE_OBJS = freeldr.o \ - debug.o \ - multiboot.o \ - version.o \ - cmdline.o \ - machine.o + debug.o \ + multiboot.o \ + version.o \ + cmdline.o \ + machine.o -FREELDR_OBJS= bootmgr.o \ - drivemap.o \ - miscboot.o \ - options.o \ - linuxboot.o \ - oslist.o \ - custom.o +FREELDR_OBJS = bootmgr.o \ + drivemap.o \ + miscboot.o \ + options.o \ + linuxboot.o \ + oslist.o \ + custom.o -ROSLDR_OBJS = reactos.o +ROSLDR_OBJS = reactos.o -SETUPLDR_OBJS= setupldr.o +SETUPLDR_OBJS = setupldr.o -COMMON_OBJS = $(ARCH_OBJS) \ - $(RTL_OBJS) \ - $(FS_OBJS) \ - $(UI_OBJS) \ - $(REACTOS_OBJS) \ - $(COMM_OBJS) \ - $(DISK_OBJS) \ - $(MM_OBJS) \ - $(CACHE_OBJS) \ - $(VIDEO_OBJS) \ - $(MATH_OBJS) \ - $(BASE_OBJS) +COMMON_OBJS = $(addprefix arch/,$(ARCH_OBJS)) \ + $(addprefix rtl/,$(RTL_OBJS)) \ + $(addprefix fs/,$(FS_OBJS)) \ + $(addprefix ui/,$(UI_OBJS)) \ + $(addprefix reactos/,$(REACTOS_OBJS)) \ + $(addprefix comm/,$(COMM_OBJS)) \ + $(addprefix disk/,$(DISK_OBJS)) \ + $(addprefix mm/,$(MM_OBJS)) \ + $(addprefix cache/,$(CACHE_OBJS)) \ + $(addprefix video/,$(VIDEO_OBJS)) \ + $(addprefix math/,$(MATH_OBJS)) \ + $(BASE_OBJS) -SPECIAL_OBJS = $(INIFILE_OBJS) \ - $(INFFILE_OBJS) \ - $(FREELDR_OBJS) \ - $(ROSLDR_OBJS) \ - $(SETUPLDR_OBJS) - +SPECIAL_OBJS = $(addprefix inifile/,$(INIFILE_OBJS)) \ + $(addprefix inffile/,$(INFFILE_OBJS)) \ + $(FREELDR_OBJS) \ + $(addprefix reactos/,$(ROSLDR_OBJS)) \ + $(addprefix reactos/,$(SETUPLDR_OBJS)) -F_OBJS = $(COMMON_OBJS) \ - $(INIFILE_OBJS) \ - $(ROSLDR_OBJS) \ - $(FREELDR_OBJS) +F_OBJS = $(COMMON_OBJS) \ + $(addprefix inifile/,$(INIFILE_OBJS)) \ + $(addprefix reactos/,$(ROSLDR_OBJS)) \ + $(FREELDR_OBJS) -S_OBJS = $(COMMON_OBJS) \ - $(INIFILE_OBJS) \ - $(INFFILE_OBJS) \ - $(SETUPLDR_OBJS) +S_OBJS = $(COMMON_OBJS) \ + $(addprefix inifile/,$(INIFILE_OBJS)) \ + $(addprefix inffile/,$(INFFILE_OBJS)) \ + $(addprefix reactos/,$(SETUPLDR_OBJS)) -############################################# -# ALL THE OBJECTS -# -ALL_OBJS = $(COMMON_OBJS) \ - $(SPECIAL_OBJS) +ALL_OBJS = $(COMMON_OBJS) \ + $(SPECIAL_OBJS) -############################################# -# SET THE VPATH SO MAKE CAN FIND THE SOURCE FILES -# -VPATH = $(SRCDIR)/ \ - $(SRCDIR)/arch/$(TARGET) \ - $(SRCDIR)/rtl \ - $(SRCDIR)/fs \ - $(SRCDIR)/ui \ - $(SRCDIR)/reactos \ - $(SRCDIR)/comm \ - $(SRCDIR)/disk \ - $(SRCDIR)/mm \ - $(SRCDIR)/cache \ - $(SRCDIR)/inifile \ - $(SRCDIR)/inffile \ - $(SRCDIR)/video \ - $(SRCDIR)/math \ - $(SRCDIR)/include - -############################################# - all : freeldr.sys setupldr.sys @echo Make ALL done. -############################################# freeldr.sys : $(ALL_OBJS) @echo ===================================================== LINKING $@ @@ -375,7 +272,6 @@ endif @$(OBJCOPY) -O binary freeldr.exe freeldr.sys -############################################# setupldr.sys : $(ALL_OBJS) @echo ===================================================== LINKING $@ @@ -387,7 +283,6 @@ endif @$(OBJCOPY) -O binary setupldr.exe setupldr.sys -############################################# %.o :: %.c @echo ===================================================== Compiling $* @@ -402,12 +297,3 @@ %.o :: %.asm @echo ===================================================== Assembling $* @$(NASM_CMD) $(NASMFLAGS) -o $@ $< - -############################################# - -# Include the automagically generated dependencies --include $(ALL_OBJS:%.o=%.d) - -############################################# - -endif Property changes on: trunk/reactos/boot/freeldr/freeldr/arch/i386 ___________________________________________________________________ Name: svn:ignore + *.d _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/freeldr/freeldr/arch/i386/archmach.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: archmach.c,v 1.2 2004/11/09 23:36:19 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c --- trunk/freeldr/freeldr/arch/i386/machpc.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machpc.c,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h --- trunk/freeldr/freeldr/arch/i386/machpc.h 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.h 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machpc.h,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/freeldr/freeldr/arch/i386/machxbox.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machxbox.c,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h --- trunk/freeldr/freeldr/arch/i386/machxbox.h 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.h 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: machxbox.h,v 1.7 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c --- trunk/freeldr/freeldr/arch/i386/pccons.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pccons.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pccons.c,v 1.3 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c --- trunk/freeldr/freeldr/arch/i386/pcmem.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pcmem.c,v 1.2 2004/11/10 23:45:37 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c --- trunk/freeldr/freeldr/arch/i386/pcrtc.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pcrtc.c,v 1.1 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c --- trunk/freeldr/freeldr/arch/i386/pcvideo.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: pcvideo.c,v 1.3 2004/12/13 15:07:33 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c --- trunk/freeldr/freeldr/arch/i386/portio.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/portio.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: portio.c,v 1.1 2003/01/19 01:03:58 bpalmer Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c --- trunk/freeldr/freeldr/arch/i386/xboxcons.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxcons.c,v 1.1 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c --- trunk/freeldr/freeldr/arch/i386/xboxdisk.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxdisk.c,v 1.3 2004/11/12 17:17:07 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c --- trunk/freeldr/freeldr/arch/i386/xboxfont.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxfont.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxfont.c,v 1.2 2004/11/10 23:45:37 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c --- trunk/freeldr/freeldr/arch/i386/xboxhw.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxhw.c,v 1.1 2004/11/28 22:42:40 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c --- trunk/freeldr/freeldr/arch/i386/xboxmem.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxmem.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxmem.c,v 1.3 2004/11/10 23:45:37 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c --- trunk/freeldr/freeldr/arch/i386/xboxrtc.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxrtc.c,v 1.1 2004/11/14 22:04:38 gvg Exp $ +/* $Id$ * * FreeLoader * _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c --- trunk/freeldr/freeldr/arch/i386/xboxvideo.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: xboxvideo.c,v 1.5 2004/11/28 21:54:11 gvg Exp $ +/* $Id$ * * FreeLoader * Property changes on: trunk/reactos/boot/freeldr/freeldr/cache ___________________________________________________________________ Name: svn:ignore + *.d _____ Modified: trunk/reactos/boot/freeldr/freeldr/cmdline.c --- trunk/freeldr/freeldr/cmdline.c 2004-12-31 16:52:45 UTC (rev 12648) +++ trunk/reactos/boot/freeldr/freeldr/cmdline.c 2005-01-01 00:42:18 UTC (rev 12672) @@ -1,4 +1,4 @@ -/* $Id: cmdline.c,v 1.1 2004/11/01 20:49:32 gvg Exp $ +/* $Id$ * * FreeLoader * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> Property changes on: trunk/reactos/boot/freeldr/freeldr/comm ___________________________________________________________________ Name: svn:ignore + *.d Property changes on: trunk/reactos/boot/freeldr/freeldr/disk ___________________________________________________________________ Name: svn:ignore + *.d Property changes on: trunk/reactos/boot/freeldr/freeldr/fs [truncated at 1000 lines; 652 more skipped]
19 years, 11 months
1
0
0
0
← Newer
1
...
68
69
70
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200