Ros-diffs April 2005

ros-diffs@reactos.org

26 participants
477 discussions

[weiden] 14793: add missing typecast
by weiden＠svn.reactos.com 24 Apr '05

24 Apr '05

add missing typecast Modified: trunk/reactos/tools/raddr2line.c _____ Modified: trunk/reactos/tools/raddr2line.c --- trunk/reactos/tools/raddr2line.c 2005-04-24 14:49:56 UTC (rev 14792) +++ trunk/reactos/tools/raddr2line.c 2005-04-24 20:12:14 UTC (rev 14793) @@ -57,7 +57,7 @@ size_t i; for ( i = 0; i < PEFileHeader->NumberOfSections; i++ ) { - if ( 0 == strcmp ( PESectionHeaders[i].Name, ".rossym" ) ) + if ( 0 == strcmp ( (char*)PESectionHeaders[i].Name, ".rossym" ) ) return &PESectionHeaders[i]; } return NULL;

1 0

[ekohl] 14792: Implement the time format page for the regional settings control panel.
by ekohl＠svn.reactos.com 24 Apr '05

24 Apr '05

Implement the time format page for the regional settings control panel. Modified: trunk/reactos/lib/cpl/intl/de.rc Modified: trunk/reactos/lib/cpl/intl/en.rc Modified: trunk/reactos/lib/cpl/intl/resource.h Modified: trunk/reactos/lib/cpl/intl/time.c _____ Modified: trunk/reactos/lib/cpl/intl/de.rc --- trunk/reactos/lib/cpl/intl/de.rc 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/de.rc 2005-04-24 14:49:56 UTC (rev 14792) @@ -34,7 +34,25 @@ CAPTION "Uhrzeit" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 4",-1,73,74,90,8 + GROUPBOX "Darstellung", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Beispiel:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Zeitformat:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&Trennzeichen:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol f³r &Vormittag:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Symbol f³r &Nachmittag:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + LTEXT "Zeitformat\n\n" + "h = Stunde m = Minute s = Sekunde t = Vor-/Nachmittag\n\n" + "h = 12 Stunden\n" + "H = 24 Stunden\n\n" + "hh, mm, ss = f³hrende Null\n" + "h, m, s = keine f³hrende Null", + -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END _____ Modified: trunk/reactos/lib/cpl/intl/en.rc --- trunk/reactos/lib/cpl/intl/en.rc 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/en.rc 2005-04-24 14:49:56 UTC (rev 14792) @@ -34,7 +34,25 @@ CAPTION "Time" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Property Page 4",-1,73,74,90,8 + GROUPBOX "Appearance sample", -1, 7, 7, 228, 33, WS_CHILD | WS_VISIBLE + LTEXT "Time sample:", -1, 13, 21, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Time format:", -1, 13, 52, 54, 10, WS_CHILD |WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEFORMAT, 68, 50, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Time &separator:", -1, 13, 70, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMESEPARATOR, 68, 68, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "A&M symbol:", -1, 13, 88, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEAMSYMBOL, 68, 86, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "&PM symbol:", -1, 13, 106, 54, 10, WS_VISIBLE | WS_GROUP + COMBOBOX IDC_TIMEPMSYMBOL, 68, 104, 84, 100, CBS_DROPDOWN | WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "", -1, 7, 132, 228, 88, WS_VISIBLE + LTEXT "Time format notation\n\n" + "h = hour m = minute s = second t = am or pm\n\n" + "h = 12 hour\n" + "H = 24 hour\n\n" + "hh, mm, ss = leading zero\n" + "h, m, s = no leading zero", + -1, 13, 141, 214, 74, WS_CHILD |WS_VISIBLE | WS_GROUP END @@ -52,7 +70,7 @@ CAPTION "Input Locale" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Primary language", -1, 8, 11, 228, 74 + GROUPBOX "Primary language", -1, 8, 11, 228, 74 ICON IDC_FLAGS, IDC_ICON1, 12, 26, 21, 20, SS_ICON LTEXT "Select the primary language and region you want to use:", -1, 38, 25, 193, 22 COMBOBOX IDC_LANGUAGELIST, 39, 49, 191, 83, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP _____ Modified: trunk/reactos/lib/cpl/intl/resource.h --- trunk/reactos/lib/cpl/intl/resource.h 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/resource.h 2005-04-24 14:49:56 UTC (rev 14792) @@ -3,16 +3,23 @@ #define IDC_CPLICON 1 -#define IDC_FLAGS 2 -#define IDC_ICON1 3 +#define IDC_FLAGS 2 +#define IDC_ICON1 3 #define IDD_GENERALPAGE 100 #define IDD_NUMBERSPAGE 101 #define IDD_CURRENCYPAGE 102 + #define IDD_TIMEPAGE 103 +#define IDC_TIMESAMPLE 107 +#define IDC_TIMEFORMAT 108 +#define IDC_TIMESEPARATOR 109 +#define IDC_TIMEAMSYMBOL 110 +#define IDC_TIMEPMSYMBOL 111 + #define IDD_DATEPAGE 104 #define IDD_LOCALEPAGE 105 -#define IDC_LANGUAGELIST 106 +#define IDC_LANGUAGELIST 106 #define IDS_CPLNAME 1000 #define IDS_CPLDESCRIPTION 1001 _____ Modified: trunk/reactos/lib/cpl/intl/time.c --- trunk/reactos/lib/cpl/intl/time.c 2005-04-24 10:37:17 UTC (rev 14791) +++ trunk/reactos/lib/cpl/intl/time.c 2005-04-24 14:49:56 UTC (rev 14792) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS International Control Panel * FILE: lib/cpl/intl/time.c * PURPOSE: Time property page @@ -31,19 +30,187 @@ #include "intl.h" #include "resource.h" +/* + * TODO: + * - Enumerate available time formats (use EnumTimeformatsW) + */ +static VOID +UpdateTimeSample(HWND hWnd) +{ + WCHAR InBuffer[80]; + WCHAR OutBuffer[80]; + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, InBuffer, 80); + + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, NULL, InBuffer, OutBuffer, 80); + + SendMessageW(hWnd, WM_SETTEXT, 0, (LPARAM)OutBuffer); +} + + /* Property page dialog callback */ INT_PTR CALLBACK TimePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { switch(uMsg) { case WM_INITDIALOG: + { + WCHAR Buffer[80]; + int nLen; + + /* Update the time format sample */ + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + + /* Get the time format (max. 80 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_LIMITTEXT, 80, 0); + + /* FIXME: add available time formats to the list */ + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_SETCURSEL, + 0, /* index */ + 0); + + /* Get the time separator (max. 4 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_LIMITTEXT, 4, 0); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_SETCURSEL, + 0, /* index */ + 0); + + /* Get the AM symbol (max. 9 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_LIMITTEXT, 9, 0); + nLen = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + if (nLen != 0) + { + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)L""); + } + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_SETCURSEL, + 0, /* index */ + 0); + + /* Get the PM symbol (max. 9 characters) */ + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_LIMITTEXT, 9, 0); + nLen = GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer, 80); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)Buffer); + if (nLen != 0) + { + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_ADDSTRING, + 0, + (LPARAM)L""); + } + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_SETCURSEL, + 0, /* index */ + 0); + } break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_TIMEFORMAT: + case IDC_TIMESEPARATOR: + case IDC_TIMEAMSYMBOL: + case IDC_TIMEPMSYMBOL: + if (HIWORD(wParam) == CBN_SELCHANGE || + HIWORD(wParam) == CBN_EDITCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + if (lpnm->code == PSN_APPLY) + { + WCHAR Buffer[80]; + int nIndex; + + /* Set time format */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_GETCURSEL, 0, 0); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEFORMAT), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIMEFORMAT, Buffer); + + /* Set time separator */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_GETCURSEL, 0, 0); + SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STIME, Buffer); + + /* Set the AM symbol */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_GETCURSEL, 0, 0); + if (nIndex != CB_ERR) + { + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S1159, Buffer); + } + else + { + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S1159, L""); + } + + /* Set the PM symbol */ + nIndex = SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_GETCURSEL, 0, 0); + if (nIndex != CB_ERR) + { + SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), + CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)Buffer); + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S2359, Buffer); + } + else + { + SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_S2359, L""); + } + + /* Update the time format sample */ + UpdateTimeSample(GetDlgItem(hwndDlg, IDC_TIMESAMPLE)); + } + } + break; } + return FALSE; }

1 0

[mbosma] 14791: PackageManager: HTML Log
by mbosma＠svn.reactos.com 24 Apr '05

24 Apr '05

PackageManager: HTML Log Modified: trunk/rosapps/packmgr/lib/download.cpp Modified: trunk/rosapps/packmgr/lib/log.cpp Modified: trunk/rosapps/packmgr/lib/log.h _____ Modified: trunk/rosapps/packmgr/lib/download.cpp --- trunk/rosapps/packmgr/lib/download.cpp 2005-04-23 20:02:39 UTC (rev 14790) +++ trunk/rosapps/packmgr/lib/download.cpp 2005-04-24 10:37:17 UTC (rev 14791) @@ -27,7 +27,7 @@ // Download a file -char* PML_Download (pTree tree, const char* url, const char* server = "tree", const char* filename = NULL) +char* PML_Download (pTree tree, const char* url, const char* server = "tree", const char* filename = "packmgr.xml") { UINT i; static char downl [MAX_PATH]; // the full url @@ -43,6 +43,10 @@ else if(!strstr(filename, "\\")) GetTempPathA (200, path); + + else + strcpy(path, ""); + // create the local file name if(filename) @@ -51,7 +55,7 @@ DeleteFileA (path); } else - GetTempFileNameA (path, "pml", 0, path); + GetTempFileNameA (path, "pml", 1, path); // get the url if (!server) @@ -76,12 +80,11 @@ // is this a file link ? if (strstr(downl, "file://") || strstr(downl, "File://")) - {/* - if(downl[strlen(downl)] == '\') - downl[strlen(downl)] = '\0'; - */ + { if(!filename) + { return &downl[7]; + } else { @@ -90,6 +93,7 @@ } } + // download the file if(URLDownloadToFileA (NULL, downl, path, 0, NULL) != S_OK) { @@ -116,7 +120,7 @@ // download the file if(strstr(url, "file://")) - filename = PML_Download(tree, url, NULL); + filename = PML_Download(tree, url, NULL, NULL); else filename = PML_Download(tree, url); @@ -132,8 +136,7 @@ FILE* file = fopen(filename, "r"); if(!file) { - MessageBoxA(0,filename,0,0); - Log("! ERROR: Could not open the xml file \""); + Log("! ERROR: Could not open the xml file "); LogAdd(filename); return ERR_GENERIC; } _____ Modified: trunk/rosapps/packmgr/lib/log.cpp --- trunk/rosapps/packmgr/lib/log.cpp 2005-04-23 20:02:39 UTC (rev 14790) +++ trunk/rosapps/packmgr/lib/log.cpp 2005-04-24 10:37:17 UTC (rev 14791) @@ -28,10 +28,14 @@ char version[50]; char versionos[50]; - if (!LogCreated) { + if (!LogCreated) + { file = fopen(LOGFILE, "w"); LogCreated = true; + //HTML Header + fputs("<html><head><title>Logfile</title></head><body>", file); + // date and time time_t now; now = time(NULL); @@ -49,32 +53,43 @@ KERNEL_VERSION_MINOR, KERNEL_VERSION_PATCH_LEVEL); - fputs("# ReactOS Package Manager - Log File\n#\n# WARNING: This is still pre-alpha software.\n# Date: ", file); + fputs("<h2>ReactOS Package Manager - Log File</h2><br>\n", file); + fputs("WARNING: This is still pre-alpha software.<br>\n", file); + + fputs("Date: ", file); fputs(GTime, file); - fputs("\n#\n#", file); - fputs(version, file); - fputs("\n#", file); - fputs(versionos, file); - fputs("\n#\n", file); + fputs("<br>\n", file); + + fputs(version, file); + fputs("<br>\n", file); + fputs(versionos, file); + fputs("<br>\n", file); } + else file = fopen(LOGFILE, "a"); - if (file == NULL) { - + if (file == NULL) + { if (LogCreated) LogCreated = false; - return; + return Log(message); } + else { // Save log entry (+ add time) - fputs("\n", file); + fputs("<br>\n", file); + time_t now; now = time(NULL); strftime(GTime,sizeof GTime,"%I:%M:%S %p ",localtime(&now)); + + fputs("<b>", file); fputs(GTime, file); + fputs("</b>", file); + fputs(message, file); fclose(file); } _____ Modified: trunk/rosapps/packmgr/lib/log.h --- trunk/rosapps/packmgr/lib/log.h 2005-04-23 20:02:39 UTC (rev 14790) +++ trunk/rosapps/packmgr/lib/log.h 2005-04-24 10:37:17 UTC (rev 14791) @@ -13,7 +13,7 @@ #include <stdio.h> #include <string.h> -#define LOGFILE "packmgr.log" +#define LOGFILE "logfile.html" extern bool LogCreated;

1 0

[ion] 14790: Don't use hack for trap frames anymore, read TempEsp and TempSegSs for kernel-mode traps during debugging.
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Don't use hack for trap frames anymore, read TempEsp and TempSegSs for kernel-mode traps during debugging. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-23 19:23:00 UTC (rev 14789) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h 2005-04-23 20:02:39 UTC (rev 14790) @@ -27,8 +27,8 @@ #define KTRAP_FRAME_DEBUGEIP (0x4) #define KTRAP_FRAME_DEBUGARGMARK (0x8) #define KTRAP_FRAME_DEBUGPOINTER (0xC) -#define KTRAP_FRAME_TEMPCS (0x10) -#define KTRAP_FRAME_TEMPEIP (0x14) +#define KTRAP_FRAME_TEMPSS (0x10) +#define KTRAP_FRAME_TEMPESP (0x14) #define KTRAP_FRAME_DR0 (0x18) #define KTRAP_FRAME_DR1 (0x1C) #define KTRAP_FRAME_DR2 (0x20) @@ -117,8 +117,8 @@ PVOID DebugEip; PVOID DebugArgMark; PVOID DebugPointer; - PVOID TempCs; - PVOID TempEip; + PVOID TempSegSs; + PVOID TempEsp; ULONG Dr0; ULONG Dr1; ULONG Dr2; _____ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-04-23 19:23:00 UTC (rev 14789) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c 2005-04-23 20:02:39 UTC (rev 14790) @@ -374,6 +374,19 @@ if (Argv[0][0] == 'r') /* regs */ { + ULONG Esp; + USHORT Ss; + + if (!(Tf->Cs & 1)) + { + Esp = (ULONG)Tf->TempEsp; + Ss = (USHORT)((ULONG)Tf->TempSegSs & 0xFFFF); + } + else + { + Esp = Tf->Esp; + Ss = Tf->Ss; + } KdbpPrint("CS:EIP 0x%04x:0x%08x\n" "SS:ESP 0x%04x:0x%08x\n" " EAX 0x%08x EBX 0x%08x\n" @@ -381,7 +394,7 @@ " ESI 0x%08x EDI 0x%08x\n" " EBP 0x%08x\n", Tf->Cs & 0xFFFF, Tf->Eip, - Tf->Ss, Tf->Esp, + Ss, Esp, Tf->Eax, Tf->Ebx, Tf->Ecx, Tf->Edx, Tf->Esi, Tf->Edi, _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 19:23:00 UTC (rev 14789) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 20:02:39 UTC (rev 14790) @@ -76,29 +76,6 @@ popl %edi popl %esi popl %ebx - -#ifdef KDBG - /* - * Cleanup the stack which was used to setup a trapframe with SS:ESP when called - * from kmode. - */ - movw 0xC(%esp), %bp /* Get CS from trapframe */ - cmpw $KERNEL_CS, %bp - jne 0f - - /* Copy EBP, CS:EIP and EFLAGS from the trapframe back onto the top of our stack. */ - movl 0x00(%esp), %ebp /* EBP */ - movl %ebp, 0x24(%esp) - movl 0x08(%esp), %ebp /* EIP */ - movl %ebp, 0x2C(%esp) - movl 0x0C(%esp), %ebp /* CS */ - movl %ebp, 0x30(%esp) - movl 0x10(%esp), %ebp /* EFLAGS */ - movl %ebp, 0x34(%esp) - - addl $0x24, %esp -0: -#endif /* DBG */ popl %ebp addl $0x4, %esp /* Ignore error code */ @@ -106,28 +83,7 @@ .globl _KiTrapProlog _KiTrapProlog: -#ifdef KDBG - /* - * If we were called from kmode we start setting up a new trapframe (with SS:ESP at the end) - */ - movw 0x14(%esp), %bx /* Get old CS */ - cmpw $KERNEL_CS, %bx - - jne 0f - leal 0x1C(%esp), %ebp - pushl %ss /* Old SS */ - pushl %ebp /* Old ESP */ - pushl 0x20(%esp) /* Old EFLAGS */ - pushl 0x20(%esp) /* Old CS */ - pushl 0x20(%esp) /* Old EIP */ - pushl 0x20(%esp) /* ErrorCode */ - pushl 0x20(%esp) /* Ebp */ - pushl 0x20(%esp) /* Ebx */ - pushl 0x20(%esp) /* Esi */ -0: -#endif /* DBG */ - pushl %edi pushl %fs @@ -191,8 +147,9 @@ pushl %eax /* Dr1 */ movl %dr0, %eax pushl %eax /* Dr0 */ - pushl $0 /* XXX: TempESP */ - pushl $0 /* XXX: TempCS */ + leal 0x64(%esp), %eax + pushl %eax /* XXX: TempESP */ + pushl %ss /* XXX: TempSS */ pushl $0 /* XXX: DebugPointer */ pushl $0 /* XXX: DebugArgMark */ movl 0x60(%esp), %ebx

1 0

[ion] 14789: Use fake frame in KDBG mode, not DBG
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Use fake frame in KDBG mode, not DBG Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 18:41:02 UTC (rev 14788) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-04-23 19:23:00 UTC (rev 14789) @@ -77,7 +77,7 @@ popl %esi popl %ebx -#ifdef DBG +#ifdef KDBG /* * Cleanup the stack which was used to setup a trapframe with SS:ESP when called * from kmode. @@ -106,7 +106,7 @@ .globl _KiTrapProlog _KiTrapProlog: -#ifdef DBG +#ifdef KDBG /* * If we were called from kmode we start setting up a new trapframe (with SS:ESP at the end) */

1 0

[chorns] 14788: ROS_BUILDNOSTRIP environment variable to control building of non-symbol-stripped executable output files
by chorns＠svn.reactos.com 23 Apr '05

23 Apr '05

ROS_BUILDNOSTRIP environment variable to control building of non-symbol-stripped executable output files Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/Makefile --- branches/xmlbuildsystem/reactos/Makefile 2005-04-23 18:17:11 UTC (rev 14787) +++ branches/xmlbuildsystem/reactos/Makefile 2005-04-23 18:41:02 UTC (rev 14788) @@ -39,6 +39,14 @@ # without source code) or no (to not build any map files). The variable # defaults to no. # +# ROS_BUILDNOSTRIP +# This variable controls if non-symbol-stripped versions are to be built +# of executable output files. Non-symbol-stripped executable output files +# have .nostrip added to the filename just before the extension. The value +# can be either yes (to build non-symbol-stripped versions of executable +# output files) or no (to not build non-symbol-stripped versions of +# executable output files). The variable defaults to no. +# # ROS_RBUILDFLAGS # Pass parameters to rbuild. _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-23 18:17:11 UTC (rev 14787) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-23 18:41:02 UTC (rev 14788) @@ -1147,6 +1147,32 @@ } void +MingwModuleHandler::GenerateBuildNonSymbolStrippedCode () +{ + fprintf ( fMakefile, + "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" ); + + string filename = module.GetPath (); + string outputFilename = PassThruCacheDirectory ( + filename, + backend->outputDirectory ); + string nostripFilename = PassThruCacheDirectory ( + GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ), + backend->outputDirectory ); + CLEAN_FILE ( nostripFilename ); + + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s 1>$(NUL)\n", + outputFilename.c_str (), + nostripFilename.c_str () ); + + fprintf ( fMakefile, + "endif\n" ); +} + +void MergeStringVector ( const vector<string>& input, vector<string>& output ) { @@ -1289,6 +1315,8 @@ GenerateBuildMapCode (); + GenerateBuildNonSymbolStrippedCode (); + fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); fprintf ( fMakefile, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-23 18:17:11 UTC (rev 14787) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-04-23 18:41:02 UTC (rev 14788) @@ -169,6 +169,7 @@ std::string GetDefinitionFilename () const; static std::string RemoveVariables ( std::string path); void GenerateBuildMapCode (); + void GenerateBuildNonSymbolStrippedCode (); public: const Module& module; string_list clean_files;

1 0

[ion] 14787: forgot to delete this one too
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

forgot to delete this one too Deleted: trunk/reactos/lib/ntdll/rtl/i386/float.c _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/float.c --- trunk/reactos/lib/ntdll/rtl/i386/float.c 2005-04-23 18:16:59 UTC (rev 14786) +++ trunk/reactos/lib/ntdll/rtl/i386/float.c 2005-04-23 18:17:11 UTC (rev 14787) @@ -1,12 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Floating point initializer - * FILE: lib/ntdll/rtl/i386/float.c - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -int _fltused = 0x9875; - -/* EOF */

1 0

[chorns] 14786: Use correct case
by chorns＠svn.reactos.com 23 Apr '05

23 Apr '05

Use correct case Modified: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc --- branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc 2005-04-23 18:15:39 UTC (rev 14785) +++ branches/xmlbuildsystem/reactos/subsys/system/reporterror/reporterror.rc 2005-04-23 18:16:59 UTC (rev 14786) @@ -16,4 +16,4 @@ #include "En.rc" #include "De.rc" -#include "Dk.rc" +#include "dk.rc"

1 0

[ion] 14785: Share compiler-generated asm exports between ntdll and ntoskrnl (stuff like aullshr, alldiv, etc
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Share compiler-generated asm exports between ntdll and ntoskrnl (stuff like aullshr, alldiv, etc Modified: trunk/reactos/lib/ntdll/makefile Modified: trunk/reactos/lib/ntdll/rtl/apc.c Deleted: trunk/reactos/lib/ntdll/rtl/i386/alldiv.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allmul.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allrem.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshl.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshr.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullrem.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullshr.s Deleted: trunk/reactos/lib/ntdll/rtl/i386/exception.c Modified: trunk/reactos/lib/ntdll/rtl/i386/ftol.c Added: trunk/reactos/lib/rtl/i386/alldiv.s Added: trunk/reactos/lib/rtl/i386/allmul.s Added: trunk/reactos/lib/rtl/i386/allrem.s Added: trunk/reactos/lib/rtl/i386/allshl.s Added: trunk/reactos/lib/rtl/i386/allshr.s Added: trunk/reactos/lib/rtl/i386/aulldiv.s Added: trunk/reactos/lib/rtl/i386/aullrem.s Added: trunk/reactos/lib/rtl/i386/aullshr.s Modified: trunk/reactos/lib/rtl/makefile Modified: trunk/reactos/ntoskrnl/Makefile.i386 Deleted: trunk/reactos/ntoskrnl/ke/i386/i386-mcount.S Deleted: trunk/reactos/ntoskrnl/rtl/i386/alldiv.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allmul.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allrem.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allshl.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/allshr.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/aulldiv.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/aullrem.s Deleted: trunk/reactos/ntoskrnl/rtl/i386/aullshr.s _____ Modified: trunk/reactos/lib/ntdll/makefile --- trunk/reactos/lib/ntdll/makefile 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/makefile 2005-04-23 18:15:39 UTC (rev 14785) @@ -51,15 +51,6 @@ ldr/utils.o RTL_I386_OBJECTS = \ - rtl/i386/alldiv.o \ - rtl/i386/allmul.o \ - rtl/i386/allrem.o \ - rtl/i386/allshl.o \ - rtl/i386/allshr.o \ - rtl/i386/aulldiv.o \ - rtl/i386/aullrem.o \ - rtl/i386/aullshr.o \ - rtl/i386/float.o \ rtl/i386/ftol.o RTL_OBJECTS = \ _____ Modified: trunk/reactos/lib/ntdll/rtl/apc.c --- trunk/reactos/lib/ntdll/rtl/apc.c 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/apc.c 2005-04-23 18:15:39 UTC (rev 14785) @@ -28,6 +28,7 @@ #include <ddk/ntddk.h> #include <string.h> +#include <debug.h> /* FUNCTIONS ***************************************************************/ @@ -41,12 +42,14 @@ /* * Call the APC */ + //DPRINT1("ITS ME\n"); ApcRoutine(ApcContext, Iosb, Reserved); /* * Switch back to the interrupted context */ + //DPRINT1("switch back\n"); NtContinue(Context, 1); } _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/alldiv.s --- trunk/reactos/lib/ntdll/rtl/i386/alldiv.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/alldiv.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,50 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/alldiv.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __alldiv(long long Dividend, long long Divisor); - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __alldiv -__alldiv: - call ___divdi3 - ret $0x10 - -/* -__alldiv: - pushl %ebp - movl %esp, %ebp - pushl %eax - pushl %eax - movl 20(%ebp), %eax - pushl %eax - movl 16(%ebp), %eax - pushl %eax - movl 12(%ebp), %eax - pushl %eax - movl 8(%ebp), %eax - pushl %eax - call ___divdi3 - addl $16, %esp - movl %ebp, %esp - popl %ebp - ret -*/ - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allmul.s --- trunk/reactos/lib/ntdll/rtl/i386/allmul.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allmul.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,54 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/allmul.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __allmul(long long Multiplier, long long Multiplicand); - * - * Parameters: - * [ESP+04h] - long long Multiplier - * [ESP+0Ch] - long long Multiplicand - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long product (Multiplier*Multiplicand) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __allmul -__allmul: - pushl %ebp - movl %esp, %ebp - pushl %edi - pushl %esi - pushl %ebx - subl $12, %esp - movl 16(%ebp), %ebx - movl 8(%ebp), %eax - mull %ebx - movl 20(%ebp), %ecx - movl %eax, -24(%ebp) - movl 8(%ebp), %eax - movl %edx, %esi - imull %ecx, %eax - addl %eax, %esi - movl 12(%ebp), %eax - imull %eax, %ebx - leal (%ebx,%esi), %eax - movl %eax, -20(%ebp) - movl -24(%ebp), %eax - movl -20(%ebp), %edx - addl $12, %esp - popl %ebx - popl %esi - popl %edi - popl %ebp - ret $0x10 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allrem.s --- trunk/reactos/lib/ntdll/rtl/i386/allrem.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allrem.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,31 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/math.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - * NOTES: This file is shared with ntoskrnl/rtl/i386/math.s. - * Please keep the files synchronized! - */ - -/* - * long long - * __allrem(long long Dividend, long long Divisor); - * - * Parameters: - * [ESP+04h] - long long Dividend - * [ESP+0Ch] - long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - long long remainder (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __allrem -__allrem: - call ___moddi3 - ret $16 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshl.s --- trunk/reactos/lib/ntdll/rtl/i386/allshl.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allshl.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,33 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/allshl.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __allshl(long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - signed long long value to be shifted left - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -.globl __allshl -__allshl: - shldl %cl, %eax, %edx - sall %cl, %eax - andl $32, %ecx - je L1 - movl %eax, %edx - xorl %eax, %eax -L1: - ret - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/allshr.s --- trunk/reactos/lib/ntdll/rtl/i386/allshr.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/allshr.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,33 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/allshr.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * long long - * __allshr(long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - signed long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -.globl __allshr -__allshr: - shrdl %cl, %edx, %eax - sarl %cl, %edx - andl $32, %ecx - je L1 - movl %edx, %eax - sarl $31, %edx -L1: - ret - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s --- trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/aulldiv.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,29 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/aulldiv.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * unsigned long long - * __aulldiv(unsigned long long Dividend, unsigned long long Divisor); - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long quotient (Dividend/Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __aulldiv -__aulldiv: - call ___udivdi3 - ret $16 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullrem.s --- trunk/reactos/lib/ntdll/rtl/i386/aullrem.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/aullrem.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,29 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/aullrem.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * unsigned long long - * __aullrem(unsigned long long Dividend, unsigned long long Divisor); - * - * Parameters: - * [ESP+04h] - unsigned long long Dividend - * [ESP+0Ch] - unsigned long long Divisor - * Registers: - * Unknown - * Returns: - * EDX:EAX - unsigned long long remainder (Dividend%Divisor) - * Notes: - * Routine removes the arguments from the stack. - */ -.globl __aullrem -__aullrem: - call ___umoddi3 - ret $16 - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/aullshr.s --- trunk/reactos/lib/ntdll/rtl/i386/aullshr.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/aullshr.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,32 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Math support for IA-32 - * FILE: lib/ntdll/rtl/i386/aullshr.s - * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * unsigned long long - * __aullshr(unsigned long long Value, unsigned char Shift); - * - * Parameters: - * EDX:EAX - unsigned long long value to be shifted right - * CL - number of bits to shift by - * Registers: - * Destroys CL - * Returns: - * EDX:EAX - shifted value - */ -.globl __aullshr -__aullshr: - shrdl %cl, %edx, %eax - shrl %cl, %edx - andl $32, %ecx - je L1 - movl %edx, %eax -L1: - ret - -/* EOF */ _____ Deleted: trunk/reactos/lib/ntdll/rtl/i386/exception.c --- trunk/reactos/lib/ntdll/rtl/i386/exception.c 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/exception.c 2005-04-23 18:15:39 UTC (rev 14785) @@ -1,446 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: User-mode exception support for IA-32 - * FILE: lib/ntdll/rtl/i386/exception.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ddk/ntddk.h> -#include <windows.h> -#include <string.h> - -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -/* Implemented in except.s */ - -VOID -RtlpCaptureContext(PCONTEXT pContext); - -/* Macros that will help streamline the SEH implementations for - kernel mode and user mode */ - -#define SehpGetStackLimits(StackBase, StackLimit) \ -{ \ - (*(StackBase)) = NtCurrentTeb()->Tib->StackBase; \ - (*(StackLimit)) = NtCurrentTeb()->Tib->StackLimit; \ -} - -#define SehpGetExceptionList() \ - (PEXCEPTION_REGISTRATION)(NtCurrentTeb()->Tib.ExceptionList) - -#define SehpSetExceptionList(NewExceptionList) \ - NtCurrentTeb()->Tib.ExceptionList = (PVOID)(NewExceptionList) - -#define SehpCaptureContext(Context) \ -{ \ - RtlpCaptureContext(Context); \ -} - -#define SehpContinue(Context, TestAlert) \ - NtContinue(Context, TestAlert) - -/*** Code below this line is shared with ntoskrnl/rtl/i386/exception.c - please keep in sync ***/ - -VOID STDCALL -AsmDebug(ULONG Value) -{ - DbgPrint("Value 0x%.08x\n", Value); -} - - -/* Declare a few prototypes for the functions in except.s */ - -EXCEPTION_DISPOSITION -RtlpExecuteHandlerForException( - PEXCEPTION_RECORD ExceptionRecord, - PEXCEPTION_REGISTRATION RegistrationFrame, - PCONTEXT Context, - PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); - -EXCEPTION_DISPOSITION -RtlpExecuteHandlerForUnwind( - PEXCEPTION_RECORD ExceptionRecord, - PEXCEPTION_REGISTRATION RegistrationFrame, - PCONTEXT Context, - PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); - - -#ifndef NDEBUG - -VOID RtlpDumpExceptionRegistrations(VOID) -{ - PEXCEPTION_REGISTRATION Current; - - DbgPrint("Dumping exception registrations:\n"); - - Current = SehpGetExceptionList(); - - if ((ULONG_PTR)Current != -1) - { - while ((ULONG_PTR)Current != -1) - { - DbgPrint(" (0x%08X) HANDLER (0x%08X)\n", Current, Current->handler); - Current = Current->prev; - } - DbgPrint(" End-Of-List\n"); - } else { - DbgPrint(" No exception registrations exists.\n"); - } -} - -#endif /* NDEBUG */ - -ULONG -RtlpDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context) -{ - PEXCEPTION_REGISTRATION RegistrationFrame; - DWORD DispatcherContext; - DWORD ReturnValue; - - DPRINT("RtlpDispatchException()\n"); - -#ifndef NDEBUG - RtlpDumpExceptionRegistrations(); -#endif /* NDEBUG */ - - RegistrationFrame = SehpGetExceptionList(); - - DPRINT("RegistrationFrame is 0x%X\n", RegistrationFrame); - - while ((ULONG_PTR)RegistrationFrame != -1) - { - EXCEPTION_RECORD ExceptionRecord2; - DWORD Temp = 0; - //PVOID RegistrationFrameEnd = (PVOID)RegistrationFrame + 8; - - // Make sure the registration frame is located within the stack - - DPRINT("Error checking\n"); -#if 0 - if (Teb->Tib.StackBase > RegistrationFrameEnd) - { - DPRINT("Teb->Tib.StackBase (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n", - Teb->Tib.StackBase, RegistrationFrameEnd); - ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; - return ExceptionContinueExecution; - } - // FIXME: Stack top, correct? - if (Teb->Tib.StackLimit < RegistrationFrameEnd) - { - DPRINT("Teb->Tib.StackLimit (0x%.08x) > RegistrationFrameEnd (0x%.08x)\n", - Teb->Tib.StackLimit, RegistrationFrameEnd); - ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; - return ExceptionContinueExecution; - } - - // Make sure stack is DWORD aligned - if ((ULONG_PTR)RegistrationFrame & 3) - { - DPRINT("RegistrationFrameEnd (0x%.08x) is not DWORD aligned.\n", - RegistrationFrameEnd); - ExceptionRecord->ExceptionFlags |= EXCEPTION_STACK_INVALID; - return ExceptionContinueExecution; - } -#endif - -#if 0 - /* FIXME: */ - if (someFlag) - RtlpLogLastExceptionDisposition( hLog, retValue ); -#endif - - DPRINT("Calling handler at 0x%X\n", RegistrationFrame->handler); - DPRINT("ExceptionRecord 0x%X\n", ExceptionRecord); - DPRINT("RegistrationFrame 0x%X\n", RegistrationFrame); - DPRINT("Context 0x%X\n", Context); - DPRINT("&DispatcherContext 0x%X\n", &DispatcherContext); - - ReturnValue = RtlpExecuteHandlerForException( - ExceptionRecord, - RegistrationFrame, - Context, - &DispatcherContext, - RegistrationFrame->handler); -#ifdef DEBUG - DPRINT("Exception handler said 0x%X\n", ReturnValue); - DPRINT("RegistrationFrame == 0x%.08x\n", RegistrationFrame); - { - PULONG sp = (PULONG)((PVOID)RegistrationFrame - 0x08); - DPRINT("StandardESP == 0x%.08x\n", sp[0]); - DPRINT("Exception Pointers == 0x%.08x\n", sp[1]); - DPRINT("PrevFrame == 0x%.08x\n", sp[2]); - DPRINT("Handler == 0x%.08x\n", sp[3]); - DPRINT("ScopeTable == 0x%.08x\n", sp[4]); - DPRINT("TryLevel == 0x%.08x\n", sp[5]); - DPRINT("EBP == 0x%.08x\n", sp[6]); - } -#endif - if (RegistrationFrame == NULL) - { - ExceptionRecord->ExceptionFlags &= ~EXCEPTION_NESTED_CALL; // Turn off flag - } - - if (ReturnValue == ExceptionContinueExecution) - { - DPRINT("ReturnValue == ExceptionContinueExecution\n"); - if (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) - { - DPRINT("(ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE) == TRUE\n"); - - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.ExceptionCode = STATUS_NONCONTINUABLE_EXCEPTION; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.NumberParameters = 0; - RtlRaiseException(&ExceptionRecord2); - } - else - { - /* Copy the (possibly changed) context back to the trap frame and return */ - SehpContinue(Context, FALSE); - return ExceptionContinueExecution; - } - } - else if (ReturnValue == ExceptionContinueSearch) - { - DPRINT("ReturnValue == ExceptionContinueSearch\n"); - - /* Nothing to do here */ - } - else if (ReturnValue == ExceptionNestedException) - { - DPRINT("ReturnValue == ExceptionNestedException\n"); - - ExceptionRecord->ExceptionFlags |= EXCEPTION_EXIT_UNWIND; - if (DispatcherContext > Temp) - { - Temp = DispatcherContext; - } - } - else /* if (ReturnValue == ExceptionCollidedUnwind) */ - { - DPRINT("ReturnValue == ExceptionCollidedUnwind or unknown\n"); - - ExceptionRecord2.ExceptionRecord = ExceptionRecord; - ExceptionRecord2.ExceptionCode = STATUS_INVALID_DISPOSITION; - ExceptionRecord2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - ExceptionRecord2.NumberParameters = 0; - RtlRaiseException(&ExceptionRecord2); - } - - RegistrationFrame = RegistrationFrame->prev; // Go to previous frame - } - - /* No exception handler will handle this exception */ - - DPRINT("RtlpDispatchException(): Return ExceptionContinueExecution\n"); - - return ExceptionContinueExecution; -} - -/* - * @implemented - */ -VOID STDCALL -RtlRaiseStatus(NTSTATUS Status) -{ - EXCEPTION_RECORD ExceptionRecord; - - DPRINT("RtlRaiseStatus(Status 0x%.08x)\n", Status); - - ExceptionRecord.ExceptionCode = Status; - ExceptionRecord.ExceptionRecord = NULL; - ExceptionRecord.NumberParameters = 0; - ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - RtlRaiseException (& ExceptionRecord); -} - -/* - * @implemented - */ -VOID STDCALL -RtlUnwind(PEXCEPTION_REGISTRATION RegistrationFrame, - PVOID ReturnAddress, - PEXCEPTION_RECORD ExceptionRecord, - DWORD EaxValue) -{ - PEXCEPTION_REGISTRATION ERHead; - PEXCEPTION_RECORD pExceptRec; - EXCEPTION_RECORD TempER; - CONTEXT Context; - - DPRINT("RtlUnwind(). RegistrationFrame 0x%X\n", RegistrationFrame); - -#ifndef NDEBUG - RtlpDumpExceptionRegistrations(); -#endif /* NDEBUG */ - - ERHead = SehpGetExceptionList(); - - DPRINT("ERHead is 0x%X\n", ERHead); - - if (ExceptionRecord == NULL) // The normal case - { - DPRINT("ExceptionRecord == NULL (normal)\n"); - - pExceptRec = &TempER; - pExceptRec->ExceptionFlags = 0; - pExceptRec->ExceptionCode = STATUS_UNWIND; - pExceptRec->ExceptionRecord = NULL; - pExceptRec->ExceptionAddress = ReturnAddress; - pExceptRec->ExceptionInformation[0] = 0; - } - else - { - pExceptRec = ExceptionRecord; - } - - if (RegistrationFrame) - pExceptRec->ExceptionFlags |= EXCEPTION_UNWINDING; - else - pExceptRec->ExceptionFlags |= (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND); - -#ifndef NDEBUG - DPRINT("ExceptionFlags == 0x%x:\n", pExceptRec->ExceptionFlags); - if (pExceptRec->ExceptionFlags & EXCEPTION_UNWINDING) - { - DPRINT(" * EXCEPTION_UNWINDING (0x%x)\n", EXCEPTION_UNWINDING); - } - if (pExceptRec->ExceptionFlags & EXCEPTION_EXIT_UNWIND) - { - DPRINT(" * EXCEPTION_EXIT_UNWIND (0x%x)\n", EXCEPTION_EXIT_UNWIND); - } -#endif /* NDEBUG */ - - Context.ContextFlags = - (CONTEXT_i386 | CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS); - - SehpCaptureContext(&Context); - - DPRINT("Context.Eip = 0x%.08x\n", Context.Eip); - DPRINT("Context.Ebp = 0x%.08x\n", Context.Ebp); - DPRINT("Context.Esp = 0x%.08x\n", Context.Esp); - - Context.Esp += 0x10; - Context.Eax = EaxValue; - - // Begin traversing the list of EXCEPTION_REGISTRATION - while ((ULONG_PTR)ERHead != -1) - { - EXCEPTION_RECORD er2; - - DPRINT("ERHead 0x%X\n", ERHead); - - if (ERHead == RegistrationFrame) - { - DPRINT("Continueing execution\n"); - SehpContinue(&Context, FALSE); - return; - } - else - { - // If there's an exception frame, but it's lower on the stack - // than the head of the exception list, something's wrong! - if (RegistrationFrame && (RegistrationFrame <= ERHead)) - { - DPRINT("The exception frame is bad\n"); - - // Generate an exception to bail out - er2.ExceptionRecord = pExceptRec; - er2.NumberParameters = 0; - er2.ExceptionCode = STATUS_INVALID_UNWIND_TARGET; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&er2); - } - } - -#if 0 - Stack = ERHead + sizeof(EXCEPTION_REGISTRATION); - if ( (Teb->Tib.StackBase <= (PVOID)ERHead ) // Make sure that ERHead - && (Teb->Tib.->StackLimit >= (PVOID)Stack ) // is in range, and a multiple - && (0 == ((ULONG_PTR)ERHead & 3)) ) // of 4 (i.e., sane) - { -#else - if (1) { -#endif - PEXCEPTION_REGISTRATION NewERHead; - PEXCEPTION_REGISTRATION pCurrExceptReg; - EXCEPTION_DISPOSITION ReturnValue; - - DPRINT("Executing handler at 0x%X for unwind\n", ERHead->handler); - - ReturnValue = RtlpExecuteHandlerForUnwind( - pExceptRec, - ERHead, - &Context, - &NewERHead, - ERHead->handler); - - DPRINT("Handler at 0x%X returned 0x%X\n", ERHead->handler, ReturnValue); - - if (ReturnValue != ExceptionContinueSearch) - { - if (ReturnValue != ExceptionCollidedUnwind) - { - DPRINT("Bad return value\n"); - - er2.ExceptionRecord = pExceptRec; - er2.NumberParameters = 0; - er2.ExceptionCode = STATUS_INVALID_DISPOSITION; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&er2); - } - else - { - ERHead = NewERHead; - } - } - - pCurrExceptReg = ERHead; - ERHead = ERHead->prev; - - DPRINT("New ERHead is 0x%X\n", ERHead); - - DPRINT("Setting exception registration at 0x%X as current\n", - RegistrationFrame->prev); - - // Unlink the exception handler - SehpSetExceptionList(RegistrationFrame->prev); - } - else // The stack looks goofy! Raise an exception to bail out - { - DPRINT("Bad stack\n"); - - er2.ExceptionRecord = pExceptRec; - er2.NumberParameters = 0; - er2.ExceptionCode = STATUS_BAD_STACK; - er2.ExceptionFlags = EXCEPTION_NONCONTINUABLE; - - RtlRaiseException(&er2); - } - } - - // If we get here, we reached the end of the EXCEPTION_REGISTRATION list. - // This shouldn't happen normally. - - DPRINT("Ran out of exception registrations. RegistrationFrame is (0x%X)\n", - RegistrationFrame); - - if ((ULONG_PTR)RegistrationFrame == -1) - SehpContinue(&Context, FALSE); - else - NtRaiseException(pExceptRec, &Context, 0); -} - -/* EOF */ _____ Modified: trunk/reactos/lib/ntdll/rtl/i386/ftol.c --- trunk/reactos/lib/ntdll/rtl/i386/ftol.c 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/ntdll/rtl/i386/ftol.c 2005-04-23 18:15:39 UTC (rev 14785) @@ -8,6 +8,7 @@ * REVISION HISTORY: 2003/04/24 Created */ +int _fltused = 0x9875; /* * This routine is called by MSVC-generated code to convert from floating point * to integer representation. The floating point number to be converted is _____ Added: trunk/reactos/lib/rtl/i386/alldiv.s --- trunk/reactos/lib/rtl/i386/alldiv.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/alldiv.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,50 @@ +/* $Id: alldiv.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Math support for IA-32 + * FILE: ntoskrnl/rtl/i386/alldiv.s + * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + */ + +/* + * long long + * __alldiv(long long Dividend, long long Divisor); + * + * Parameters: + * [ESP+04h] - long long Dividend + * [ESP+0Ch] - long long Divisor + * Registers: + * Unknown + * Returns: + * EDX:EAX - long long quotient (Dividend/Divisor) + * Notes: + * Routine removes the arguments from the stack. + */ +.globl __alldiv +__alldiv: + call ___divdi3 + ret $0x10 + +/* +__alldiv: + pushl %ebp + movl %esp, %ebp + pushl %eax + pushl %eax + movl 20(%ebp), %eax + pushl %eax + movl 16(%ebp), %eax + pushl %eax + movl 12(%ebp), %eax + pushl %eax + movl 8(%ebp), %eax + pushl %eax + call ___divdi3 + addl $16, %esp + movl %ebp, %esp + popl %ebp + ret +*/ + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/i386/allmul.s --- trunk/reactos/lib/rtl/i386/allmul.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/allmul.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,54 @@ +/* $Id: allmul.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Math support for IA-32 + * FILE: ntoskrnl/rtl/i386/allmul.s + * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + */ + +/* + * long long + * __allmul(long long Multiplier, long long Multiplicand); + * + * Parameters: + * [ESP+04h] - long long Multiplier + * [ESP+0Ch] - long long Multiplicand + * Registers: + * Unknown + * Returns: + * EDX:EAX - long long product (Multiplier*Multiplicand) + * Notes: + * Routine removes the arguments from the stack. + */ +.globl __allmul +__allmul: + pushl %ebp + movl %esp, %ebp + pushl %edi + pushl %esi + pushl %ebx + subl $12, %esp + movl 16(%ebp), %ebx + movl 8(%ebp), %eax + mull %ebx + movl 20(%ebp), %ecx + movl %eax, -24(%ebp) + movl 8(%ebp), %eax + movl %edx, %esi + imull %ecx, %eax + addl %eax, %esi + movl 12(%ebp), %eax + imull %eax, %ebx + leal (%ebx,%esi), %eax + movl %eax, -20(%ebp) + movl -24(%ebp), %eax + movl -20(%ebp), %edx + addl $12, %esp + popl %ebx + popl %esi + popl %edi + popl %ebp + ret $0x10 + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/i386/allrem.s --- trunk/reactos/lib/rtl/i386/allrem.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/allrem.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,31 @@ +/* $Id: allrem.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Math support for IA-32 + * FILE: ntoskrnl/rtl/i386/math.s + * PROGRAMER: Eric Kohl (ekohl(a)rz-online.de) + * NOTES: This file is shared with ntoskrnl/rtl/i386/math.s. + * Please keep the files synchronized! + */ + +/* + * long long + * __allrem(long long Dividend, long long Divisor); + * + * Parameters: + * [ESP+04h] - long long Dividend + * [ESP+0Ch] - long long Divisor + * Registers: + * Unknown + * Returns: + * EDX:EAX - long long remainder (Dividend/Divisor) + * Notes: + * Routine removes the arguments from the stack. + */ +.globl __allrem +__allrem: + call ___moddi3 + ret $16 + +/* EOF */ _____ Added: trunk/reactos/lib/rtl/i386/allshl.s --- trunk/reactos/lib/rtl/i386/allshl.s 2005-04-23 18:00:59 UTC (rev 14784) +++ trunk/reactos/lib/rtl/i386/allshl.s 2005-04-23 18:15:39 UTC (rev 14785) @@ -0,0 +1,33 @@ +/* $Id: allshl.s 12852 2005-01-06 13:58:04Z mf $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel [truncated at 1000 lines; 608 more skipped]

1 0

[ion] 14784: Remove MDA support
by ion＠svn.reactos.com 23 Apr '05

23 Apr '05

Remove MDA support Modified: trunk/reactos/ntoskrnl/kd/kdebug.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdebug.c --- trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-23 17:56:10 UTC (rev 14783) +++ trunk/reactos/ntoskrnl/kd/kdebug.c 2005-04-23 18:00:59 UTC (rev 14784) @@ -152,11 +152,6 @@ p2 += 4; KdDebugState |= KD_DEBUG_FILELOG; } - else if (!_strnicmp(p2, "MDA", 3) && BootPhase > 0) - { - p2 += 3; - KdDebugState |= KD_DEBUG_MDA; - } } } else if (!_strnicmp(p2, "KDSERIAL", 8) && BootPhase > 0) @@ -243,9 +238,6 @@ if (KdDebugState & KD_DEBUG_FILELOG && BootPhase > 0) DebugLogInit(); - - if (KdDebugState & KD_DEBUG_MDA && BootPhase > 0) - KdInitializeMda(); } @@ -353,9 +345,6 @@ if (KdDebugState & KD_DEBUG_FILELOG) DebugLogWrite(pch); - if (KdDebugState & KD_DEBUG_MDA) - KdPrintMda(pch); - return((ULONG)String->Length); }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
48
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2005