Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[janderwald] 25545: - add italian translation by Paolo Devoti, devotip at tiscali dot xit See issue #1949 for more details.

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jan 20 17:12:12 2007 New Revision: 25545 URL: http://svn.reactos.org/svn/reactos?rev=25545&view=rev Log: - add italian translation by Paolo Devoti, devotip at tiscali dot xit See issue #1949 for more details. Added: trunk/reactos/dll/cpl/access/It.rc (with props) Modified: trunk/reactos/dll/cpl/access/access.rc Added: trunk/reactos/dll/cpl/access/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/It.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/access/It.rc (added) +++ trunk/reactos/dll/cpl/access/It.rc Sat Jan 20 17:12:12 2007 @@ -1,0 +1,109 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN + +IDI_CPLACCESS ICON "resources/applet.ico" + + +IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Tastiera" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Tasti bloccabili",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Usa i tasti bloccabili se vuoi usare i tasti Shift, Ctrl o Alt premendo un tasto alla volta.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Usa Tasti bloccabili",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "&Impostazioni",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + GROUPBOX "Filtro",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Usa il filtro se vuoi che siano ignorate le pressioni troppo brevi o doppie dei tastio per rallentare la ripetizione automatica.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usa &Filtro",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "I&mpostazioni",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14 + GROUPBOX "Bistabili",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Se vuoi un segnale acustico quando viene premuto Blocco Maiuscole, Num o Scr.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Use &Bistabili",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + PUSHBUTTON "Im&postazioni",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14 +// CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA +END + + +IDD_PROPPAGESOUND DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Suoni" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Visuale",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Usa questa opzione se vuoi una segnalazione visiva in corrispondenza delle segnalazioni acustiche.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use &Visuale",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "&Impostazioni",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + + GROUPBOX "Titoli",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 + LTEXT "Usa Titoli per informare i programmi che devono mostrare del testo corrispondente a suoni e parlato.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Usa &Titoli",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) +END + + +IDD_PROPPAGEDISPLAY DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Video" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Alto contrasto",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Usa questa opzione se devono essere usati colori e font che migliorano la leggibilità.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "&Usa Alto contrasto",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "&Impostazioni",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 +END + + + +IDD_PROPPAGEMOUSE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Mouse" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Mouse sui tasti",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) + LTEXT "Usa questa opzione se vuoi usare il tastierino numerico al posto del mouse.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) + CHECKBOX "Use &Mouse sui tasti",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14 + PUSHBUTTON "&Impostazioni",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 +END + + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Reset Automatico",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + CHECKBOX "&Disattiva le funzioni di accessibilità se fermo per:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + + //POPUP IDC_RESET_POPUP, GRAYED + //{ + // MENUITEM "5 Minutes", IDC_RESET_5 + // MENUITEM "10 Minutes", IDC_RESET_10 + // MENUITEM "15 Minutes", IDC_RESET_15 + // MENUITEM "20 Minutes", IDC_RESET_20 + // MENUITEM "25 Minutes", IDC_RESET_25 + // MENUITEM "30 Minutes", IDC_RESET_30 + //} + + GROUPBOX "Notifiche",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + CHECKBOX "Avvisa con un messaggio quando si attiva una funzione",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Fai una segnalazione acustica quando una funzione viene attivata o ddisattivata",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + + + GROUPBOX "Dispositivi seriali",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + LTEXT "I dispositivi seriali permettono una modalità alternativa per gestire le funzioni di mouse e tastiera.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Supporta i Dispositivi &Seriali",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) + + PUSHBUTTON "&Impostazioni",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1) + + GROUPBOX "Opzioni di amministrazione",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5) + + CHECKBOX "Applica tutte le impostazioni al desktop di &login ",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2) + CHECKBOX "Applica tutte le impostazioni a quelle predefinite per i nuovi utenti",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) +END + + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Accessibility" + IDS_CPLSYSTEMDESCRIPTION "Customizes accessibility features for your computer." +END + Propchange: trunk/reactos/dll/cpl/access/It.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/access/access.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.rc?r… ============================================================================== --- trunk/reactos/dll/cpl/access/access.rc (original) +++ trunk/reactos/dll/cpl/access/access.rc Sat Jan 20 17:12:12 2007 @@ -17,3 +17,4 @@ #include "Fr.rc" #include "Es.rc" #include "Cz.rc" +#include "It.rc"

17 years, 11 months

[greatlrd] 25544: sorry ia32 should be own folder

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jan 20 16:39:01 2007 New Revision: 25544 URL: http://svn.reactos.org/svn/reactos?rev=25544&view=rev Log: sorry ia32 should be own folder Added: trunk/rosapps/devutils/cputointel/From/IA32/ trunk/rosapps/devutils/cputointel/From/IA32/IA32.h (with props) trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.c (with props) trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.h (with props) trunk/rosapps/devutils/cputointel/From/IA32/IA32opcode.c (with props) Removed: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c Added: trunk/rosapps/devutils/cputointel/From/IA32/IA32.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/I… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/IA32/IA32.h (added) +++ trunk/rosapps/devutils/cputointel/From/IA32/IA32.h Sat Jan 20 16:39:01 2007 @@ -1,0 +1,17 @@ + +#include "../../misc.h" + +CPU_INT IA32Brain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp); + +/* here we put the prototype for the opcode api that brain need we show a example for it */ +CPU_INT IA32_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); + + +/* Export comment thing see m68k for example + * in dummy we do not show it, for it is diffent for each cpu + */ Propchange: trunk/rosapps/devutils/cputointel/From/IA32/IA32.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/I… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.c (added) +++ trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.c Sat Jan 20 16:39:01 2007 @@ -1,0 +1,107 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "IA32Brain.h" +#include "IA32.h" +#include "../../any_op.h" +#include "../../misc.h" + + + + +/* + * DummyBrain is example how you create you own cpu brain to translate from + * cpu to intel assembler, I have not add DummyBrain to the loader it is not + * need it in our example. When you write you own brain, it must be setup in + * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not + * need the brain you have writen so you do not need setup it there then. + * + * input param: + * cpu_buffer : the memory buffer with loaded program we whant translate + * cpu_pos : the positions in the cpu_buffer + * cpu_size : the alloced memory size of the cpu_buffer + * BaseAddress : the virtual memory address we setup to use. + * cpuarch : the sub arch for the brain, example if it exists more one + * cpu with same desgin but few other opcode or extend opcode + * outfp : the output file pointer + * + * mode : if we should run disambler of this binary or + * translate it, Disambler will not calc the + * the row name right so we simple give each + row a name. In translations mode we run a + * analys so we getting better optimzing and + * only row name there we need. + * value for mode are : + * 0 = disambler mode + * 1 = translate mode intel + * + * return value + * 0 : Ok + * 1 : unimplemt + * 2 : Unkonwn Opcode + * 3 : unimplement cpu + * 4 : unknown machine + */ + +CPU_INT IA32Brain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp) +{ + CPU_UNINT cpu_oldpos; + CPU_INT cpuint; + CPU_INT retcode = 0; + CPU_INT retsize; + + /* now we start the process */ + while (cpu_pos<cpu_size) + { + cpu_oldpos = cpu_pos; + + /* use the GetData32Be or GetData32Le + to read from the memory the + Le is for small endian and the + Be is for big endian + the 32 is how many bits we should read + */ + cpuint = GetData32Be(&cpu_buffer[cpu_pos]); + + /* Add */ + if ((cpuint - (cpuint & GetMaskByte(cpuIA32Init_Add))) == ConvertBitToByte(cpuIA32Init_Add)) + { + retsize = IA32_Add( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Found all Opcode and breakout and return no error found */ + if (cpu_pos >=cpu_size) + { + break; + } + + /* Check if we have found a cpu opcode */ + if (cpu_oldpos == cpu_pos) + { + if (retcode == 0) + { + /* no unimplement error where found so we return a msg for unknown opcode */ + printf("Unkonwn Opcode found at 0x%8x opcode 0x%2x\n",cpu_oldpos+BaseAddress,(unsigned int)cpu_buffer[cpu_oldpos]); + retcode = 2; + } + } + + /* Erorro Found ? */ + if (retcode!=0) + { + /* Erorro Found break and return the error code */ + break; + } + } + return retcode; +} Propchange: trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/I… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.h (added) +++ trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.h Sat Jan 20 16:39:01 2007 @@ -1,0 +1,13 @@ + + +#include "../../misc.h" + + +/* example how setup a opcode, this opcode is 16bit long (taken from M68K) + * 0 and 1 mean normal bit, 2 mean mask bit the bit that are determent diffent + * thing in the opcode, example which reg so on, it can be etither 0 or 1 in + * the opcode. but a opcode have also normal bit that is always been set to + * same. thuse bit are always 0 or 1 + */ +CPU_BYTE cpuIA32Init_Add[16] = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2}; + Propchange: trunk/rosapps/devutils/cputointel/From/IA32/IA32Brain.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/From/IA32/IA32opcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/I… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/IA32/IA32opcode.c (added) +++ trunk/rosapps/devutils/cputointel/From/IA32/IA32opcode.c Sat Jan 20 16:39:01 2007 @@ -1,0 +1,50 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "IA32.h" +#include "../../misc.h" + + +/* cpuDummyInit_Add + * Input param : + * out : The file pointer that we write to (the output file to intel asm) + * cpu_buffer : The memory buffer we have our binary code that we whant convert + * cpu_pos : Current positions in the cpu_buffer + * cpu_size : The memory size of the cpu_buffer + * BaseAddress : The base address you whant the binay file should run from + * cpuarch : if it exists diffent cpu from a manufactor like pentium, + * pentinum-mmx so on, use this flag to specify which type + * of cpu you whant or do not use it if it does not exists + * other or any sub model. + * + * mode : if we should run disambler of this binary or + * translate it, Disambler will not calc the + * the row name right so we simple give each + row a name. In translations mode we run a + * analys so we getting better optimzing and + * only row name there we need. + * value for mode are : + * 0 = disambler mode + * 1 = translate mode intel + * + * Return value : + * value -1 : unimplement + * value 0 : wrong opcode or not vaild opcode + * value +1 and higher : who many byte we should add to cpu_pos + */ + +CPU_INT IA32_Add( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) + +{ + /* + * ConvertBitToByte() is perfect to use to get the bit being in use from a bit array + * GetMaskByte() is perfect if u whant known which bit have been mask out + * see M68kopcode.c and how it use the ConvertBitToByte() + */ + + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Add unimplement\n"); + return -1; +} Propchange: trunk/rosapps/devutils/cputointel/From/IA32/IA32opcode.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h (original) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h (removed) @@ -1,17 +1,0 @@ - -#include "../../misc.h" - -CPU_INT IA32Brain( CPU_BYTE *cpu_buffer, - CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, - CPU_UNINT BaseAddress, - CPU_UNINT cpuarch, - FILE *outfp); - -/* here we put the prototype for the opcode api that brain need we show a example for it */ -CPU_INT IA32_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); - - -/* Export comment thing see m68k for example - * in dummy we do not show it, for it is diffent for each cpu - */ Removed: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c (original) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c (removed) @@ -1,107 +1,0 @@ - -#include <stdio.h> -#include <stdlib.h> -#include "IA32Brain.h" -#include "IA32.h" -#include "../../any_op.h" -#include "../../misc.h" - - - - -/* - * DummyBrain is example how you create you own cpu brain to translate from - * cpu to intel assembler, I have not add DummyBrain to the loader it is not - * need it in our example. When you write you own brain, it must be setup in - * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not - * need the brain you have writen so you do not need setup it there then. - * - * input param: - * cpu_buffer : the memory buffer with loaded program we whant translate - * cpu_pos : the positions in the cpu_buffer - * cpu_size : the alloced memory size of the cpu_buffer - * BaseAddress : the virtual memory address we setup to use. - * cpuarch : the sub arch for the brain, example if it exists more one - * cpu with same desgin but few other opcode or extend opcode - * outfp : the output file pointer - * - * mode : if we should run disambler of this binary or - * translate it, Disambler will not calc the - * the row name right so we simple give each - row a name. In translations mode we run a - * analys so we getting better optimzing and - * only row name there we need. - * value for mode are : - * 0 = disambler mode - * 1 = translate mode intel - * - * return value - * 0 : Ok - * 1 : unimplemt - * 2 : Unkonwn Opcode - * 3 : unimplement cpu - * 4 : unknown machine - */ - -CPU_INT IA32Brain( CPU_BYTE *cpu_buffer, - CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, - CPU_UNINT BaseAddress, - CPU_UNINT cpuarch, - FILE *outfp) -{ - CPU_UNINT cpu_oldpos; - CPU_INT cpuint; - CPU_INT retcode = 0; - CPU_INT retsize; - - /* now we start the process */ - while (cpu_pos<cpu_size) - { - cpu_oldpos = cpu_pos; - - /* use the GetData32Be or GetData32Le - to read from the memory the - Le is for small endian and the - Be is for big endian - the 32 is how many bits we should read - */ - cpuint = GetData32Be(&cpu_buffer[cpu_pos]); - - /* Add */ - if ((cpuint - (cpuint & GetMaskByte(cpuIA32Init_Add))) == ConvertBitToByte(cpuIA32Init_Add)) - { - retsize = IA32_Add( outfp, cpu_buffer, cpu_pos, cpu_size, - BaseAddress, cpuarch); - if (retsize<0) - retcode = 1; - else - cpu_pos += retsize; - } - - /* Found all Opcode and breakout and return no error found */ - if (cpu_pos >=cpu_size) - { - break; - } - - /* Check if we have found a cpu opcode */ - if (cpu_oldpos == cpu_pos) - { - if (retcode == 0) - { - /* no unimplement error where found so we return a msg for unknown opcode */ - printf("Unkonwn Opcode found at 0x%8x opcode 0x%2x\n",cpu_oldpos+BaseAddress,(unsigned int)cpu_buffer[cpu_oldpos]); - retcode = 2; - } - } - - /* Erorro Found ? */ - if (retcode!=0) - { - /* Erorro Found break and return the error code */ - break; - } - } - return retcode; -} Removed: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h (original) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h (removed) @@ -1,13 +1,0 @@ - - -#include "../../misc.h" - - -/* example how setup a opcode, this opcode is 16bit long (taken from M68K) - * 0 and 1 mean normal bit, 2 mean mask bit the bit that are determent diffent - * thing in the opcode, example which reg so on, it can be etither 0 or 1 in - * the opcode. but a opcode have also normal bit that is always been set to - * same. thuse bit are always 0 or 1 - */ -CPU_BYTE cpuIA32Init_Add[16] = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2}; - Removed: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c (removed) @@ -1,50 +1,0 @@ - -#include <stdio.h> -#include <stdlib.h> -#include "IA32.h" -#include "../../misc.h" - - -/* cpuDummyInit_Add - * Input param : - * out : The file pointer that we write to (the output file to intel asm) - * cpu_buffer : The memory buffer we have our binary code that we whant convert - * cpu_pos : Current positions in the cpu_buffer - * cpu_size : The memory size of the cpu_buffer - * BaseAddress : The base address you whant the binay file should run from - * cpuarch : if it exists diffent cpu from a manufactor like pentium, - * pentinum-mmx so on, use this flag to specify which type - * of cpu you whant or do not use it if it does not exists - * other or any sub model. - * - * mode : if we should run disambler of this binary or - * translate it, Disambler will not calc the - * the row name right so we simple give each - row a name. In translations mode we run a - * analys so we getting better optimzing and - * only row name there we need. - * value for mode are : - * 0 = disambler mode - * 1 = translate mode intel - * - * Return value : - * value -1 : unimplement - * value 0 : wrong opcode or not vaild opcode - * value +1 and higher : who many byte we should add to cpu_pos - */ - -CPU_INT IA32_Add( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) - -{ - /* - * ConvertBitToByte() is perfect to use to get the bit being in use from a bit array - * GetMaskByte() is perfect if u whant known which bit have been mask out - * see M68kopcode.c and how it use the ConvertBitToByte() - */ - - fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); - - printf(";Add unimplement\n"); - return -1; -}

17 years, 11 months

[greatlrd] 25543: start add mr op code causeome new bug for ppc

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jan 20 16:33:42 2007 New Revision: 25543 URL: http://svn.reactos.org/svn/reactos?rev=25543&view=rev Log: start add mr op code causeome new bug for ppc Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPC.h trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPC.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPC.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPC.h Sat Jan 20 16:33:42 2007 @@ -12,6 +12,7 @@ /* here we put the prototype for the opcode api that brain need we show a example for it */ CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); CPU_INT PPC_Li( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT PPC_mr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); CPU_INT PPC_Stw( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); CPU_INT PPC_Stwu( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c Sat Jan 20 16:33:42 2007 @@ -80,6 +80,17 @@ cpu_pos += retsize; } + /* mr */ + if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_mr))) == ConvertBitToByte32(cpuPPCInit_mr)) + { + retsize = PPC_mr( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* stw */ if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_stw))) == ConvertBitToByte32(cpuPPCInit_stw)) { @@ -90,7 +101,6 @@ else cpu_pos += retsize; } - retcode = 0; /* stwu */ if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_stwu))) == ConvertBitToByte32(cpuPPCInit_stwu)) Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h Sat Jan 20 16:33:42 2007 @@ -14,6 +14,7 @@ CPU_BYTE cpuPPCInit_Li[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,1,1,1,0,2,2}; CPU_BYTE cpuPPCInit_stw[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,0,2,2}; CPU_BYTE cpuPPCInit_stwu[32] = {2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,0,0,1,0,1,2,2}; +CPU_BYTE cpuPPCInit_mr[32] = {0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,2,2,2,2,2,2,2,2,0,1,1,1,1,1,2,2}; /* mask */ /* * no mask we implement function getting the reg right Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Sat Jan 20 16:33:42 2007 @@ -95,6 +95,31 @@ } +CPU_INT PPC_mr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + CPU_UNINT opcode; + + opcode = GetData32Le(&cpu_buffer[cpu_pos]); + + BaseAddress +=cpu_pos; + + /* own translatons langues */ + if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ + { + return -1; + } + pMyBrainAnalys->op = OP_ANY_mov; + pMyBrainAnalys->type= 2 + 8 + 16; /* 8 dst reg, 2 src reg */ + pMyBrainAnalys->src_size = 32; + pMyBrainAnalys->src = PPC_GetBitArraySrcReg(opcode); + pMyBrainAnalys->dst = PPC_GetBitArrayBto31xx(opcode); + pMyBrainAnalys->memAdr=BaseAddress; + + return 4; +} + + CPU_INT PPC_Stw( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) {

17 years, 11 months

[greatlrd] 25542: forgot thuse file

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jan 20 16:32:26 2007 New Revision: 25542 URL: http://svn.reactos.org/svn/reactos?rev=25542&view=rev Log: forgot thuse file Added: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c Added: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h (added) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32.h Sat Jan 20 16:32:26 2007 @@ -1,0 +1,17 @@ + +#include "../../misc.h" + +CPU_INT IA32Brain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp); + +/* here we put the prototype for the opcode api that brain need we show a example for it */ +CPU_INT IA32_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); + + +/* Export comment thing see m68k for example + * in dummy we do not show it, for it is diffent for each cpu + */ Added: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c (added) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.c Sat Jan 20 16:32:26 2007 @@ -1,0 +1,107 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "IA32Brain.h" +#include "IA32.h" +#include "../../any_op.h" +#include "../../misc.h" + + + + +/* + * DummyBrain is example how you create you own cpu brain to translate from + * cpu to intel assembler, I have not add DummyBrain to the loader it is not + * need it in our example. When you write you own brain, it must be setup in + * misc.c function LoadPFileImage and PEFileStart, PEFileStart maybe does not + * need the brain you have writen so you do not need setup it there then. + * + * input param: + * cpu_buffer : the memory buffer with loaded program we whant translate + * cpu_pos : the positions in the cpu_buffer + * cpu_size : the alloced memory size of the cpu_buffer + * BaseAddress : the virtual memory address we setup to use. + * cpuarch : the sub arch for the brain, example if it exists more one + * cpu with same desgin but few other opcode or extend opcode + * outfp : the output file pointer + * + * mode : if we should run disambler of this binary or + * translate it, Disambler will not calc the + * the row name right so we simple give each + row a name. In translations mode we run a + * analys so we getting better optimzing and + * only row name there we need. + * value for mode are : + * 0 = disambler mode + * 1 = translate mode intel + * + * return value + * 0 : Ok + * 1 : unimplemt + * 2 : Unkonwn Opcode + * 3 : unimplement cpu + * 4 : unknown machine + */ + +CPU_INT IA32Brain( CPU_BYTE *cpu_buffer, + CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, + CPU_UNINT BaseAddress, + CPU_UNINT cpuarch, + FILE *outfp) +{ + CPU_UNINT cpu_oldpos; + CPU_INT cpuint; + CPU_INT retcode = 0; + CPU_INT retsize; + + /* now we start the process */ + while (cpu_pos<cpu_size) + { + cpu_oldpos = cpu_pos; + + /* use the GetData32Be or GetData32Le + to read from the memory the + Le is for small endian and the + Be is for big endian + the 32 is how many bits we should read + */ + cpuint = GetData32Be(&cpu_buffer[cpu_pos]); + + /* Add */ + if ((cpuint - (cpuint & GetMaskByte(cpuIA32Init_Add))) == ConvertBitToByte(cpuIA32Init_Add)) + { + retsize = IA32_Add( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Found all Opcode and breakout and return no error found */ + if (cpu_pos >=cpu_size) + { + break; + } + + /* Check if we have found a cpu opcode */ + if (cpu_oldpos == cpu_pos) + { + if (retcode == 0) + { + /* no unimplement error where found so we return a msg for unknown opcode */ + printf("Unkonwn Opcode found at 0x%8x opcode 0x%2x\n",cpu_oldpos+BaseAddress,(unsigned int)cpu_buffer[cpu_oldpos]); + retcode = 2; + } + } + + /* Erorro Found ? */ + if (retcode!=0) + { + /* Erorro Found break and return the error code */ + break; + } + } + return retcode; +} Added: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h (added) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32Brain.h Sat Jan 20 16:32:26 2007 @@ -1,0 +1,13 @@ + + +#include "../../misc.h" + + +/* example how setup a opcode, this opcode is 16bit long (taken from M68K) + * 0 and 1 mean normal bit, 2 mean mask bit the bit that are determent diffent + * thing in the opcode, example which reg so on, it can be etither 0 or 1 in + * the opcode. but a opcode have also normal bit that is always been set to + * same. thuse bit are always 0 or 1 + */ +CPU_BYTE cpuIA32Init_Add[16] = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2}; + Added: trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/d… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c (added) +++ trunk/rosapps/devutils/cputointel/From/dummycpu/IA32opcode.c Sat Jan 20 16:32:26 2007 @@ -1,0 +1,50 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "IA32.h" +#include "../../misc.h" + + +/* cpuDummyInit_Add + * Input param : + * out : The file pointer that we write to (the output file to intel asm) + * cpu_buffer : The memory buffer we have our binary code that we whant convert + * cpu_pos : Current positions in the cpu_buffer + * cpu_size : The memory size of the cpu_buffer + * BaseAddress : The base address you whant the binay file should run from + * cpuarch : if it exists diffent cpu from a manufactor like pentium, + * pentinum-mmx so on, use this flag to specify which type + * of cpu you whant or do not use it if it does not exists + * other or any sub model. + * + * mode : if we should run disambler of this binary or + * translate it, Disambler will not calc the + * the row name right so we simple give each + row a name. In translations mode we run a + * analys so we getting better optimzing and + * only row name there we need. + * value for mode are : + * 0 = disambler mode + * 1 = translate mode intel + * + * Return value : + * value -1 : unimplement + * value 0 : wrong opcode or not vaild opcode + * value +1 and higher : who many byte we should add to cpu_pos + */ + +CPU_INT IA32_Add( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) + +{ + /* + * ConvertBitToByte() is perfect to use to get the bit being in use from a bit array + * GetMaskByte() is perfect if u whant known which bit have been mask out + * see M68kopcode.c and how it use the ConvertBitToByte() + */ + + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Add unimplement\n"); + return -1; +}

17 years, 11 months

[greatlrd] 25541: forgot this file

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Jan 20 16:30:04 2007 New Revision: 25541 URL: http://svn.reactos.org/svn/reactos?rev=25541&view=rev Log: forgot this file Added: trunk/rosapps/devutils/cputointel/ConvertToPPCProcess.c (with props) Added: trunk/rosapps/devutils/cputointel/ConvertToPPCProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToPPCProcess.c (added) +++ trunk/rosapps/devutils/cputointel/ConvertToPPCProcess.c Sat Jan 20 16:30:04 2007 @@ -1,0 +1,180 @@ + +#include <windows.h> +#include <winnt.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "misc.h" +#include "any_op.h" + +static void standardreg(CPU_INT *RegTableCount, CPU_UNINT reg, + CPU_INT setup_ebp, FILE *outfp) +{ + CPU_INT t, found = 0; + for (t=0;t<31;t++) + { + if (reg == RegTableCount[t]) + { + fprintf(outfp,"r%d",t); + found++; + break; + } + } + + if (found == 0) + { + fprintf(outfp,"r%d",reg); + } +} + +CPU_INT ConvertToPPCProcess( FILE *outfp, + PMYBrainAnalys pMystart, + PMYBrainAnalys pMyend, CPU_INT regbits, + CPU_INT HowManyRegInUse, + CPU_INT *RegTableCount) +{ + + CPU_INT stack = 0; + //CPU_UNINT tmp; + CPU_INT setup_ebp = 0 ; /* 0 = no, 1 = yes */ + CPU_INT t=0; + + if (HowManyRegInUse > 31) + { + setup_ebp =1; /* we will use ebx as ebp */ + stack = HowManyRegInUse * regbits; + } + + if (RegTableCount[1]!=0) + t++; + if (RegTableCount[3]!=0) + t++; + if (RegTableCount[4]!=0) + t++; + if (RegTableCount[8]!=0) + t++; + if (RegTableCount[9]!=0) + t++; + if (RegTableCount[10]!=0) + t++; + if (RegTableCount[11]!=0) + t++; + if (RegTableCount[31]!=0) + t++; + + if (HowManyRegInUse != t) + { + /* fixme optimze the table or active the frame pointer */ + setup_ebp =1; /* we will use ebx as ebp */ + stack = HowManyRegInUse * regbits; + } + + +/* fixme gas compatible + fprintf(outfp,"BITS 32\n"); + fprintf(outfp,"GLOBAL _main\n"); + fprintf(outfp,"SECTION .text\n\n"); + fprintf(outfp,"; compile with nasm filename.asm -f win32, ld filename.obj -o filename.exe\n\n"); + fprintf(outfp,"_main:\n"); +*/ + + /* setup a frame pointer */ + if (setup_ebp == 1) + { + /* fixme ppc frame pointer */ + // fprintf(outfp,"\n; Setup frame pointer \n"); + } + + fprintf(outfp,"; Start the program \n"); + while (pMystart!=NULL) + { + /* fixme the line lookup from anaylysing process */ + + /* mov not full implement */ + if (pMystart->op == OP_ANY_mov) + { + printf("waring OP_ANY_mov are not full implement\n"); + + if ((pMystart->type & 8)== 8) + { + /* dst are register */ + // FIXME frame pointer setup + // tmp = stack - (pMystart->dst*regbits); + + if ((pMystart->type & 2)== 2) + { + fprintf(outfp,"mr "); + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp,","); + standardreg( RegTableCount, + pMystart->src, + setup_ebp, outfp); + fprintf(outfp,"\n"); + } + + if ((pMystart->type & 16)== 16) + { + /* source are imm */ + if (setup_ebp == 1) + fprintf(outfp,"not supporet\n"); + else + { + fprintf(outfp,"li "); + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp," , %llu\n",pMystart->src); + } + } + } /* end pMyBrainAnalys->type & 8 */ + + if ((pMystart->type & 64)== 64) + { + if ((pMystart->type & 2)== 2) + { + /* dest [eax - 0x20], source reg */ + if ((pMystart->type & 128)== 128) + { + fprintf(outfp,"stwu "); + } + else + { + fprintf(outfp,"stw "); + } + + standardreg( RegTableCount, + pMystart->src, + setup_ebp, outfp); + fprintf(outfp,", %d(",pMystart->dst_extra); + + standardreg( RegTableCount, + pMystart->dst, + setup_ebp, outfp); + fprintf(outfp,")\n"); + } + } /* end pMyBrainAnalys->type & 64 */ + } + + /* return */ + if (pMystart->op == OP_ANY_ret) + { + if (pMyBrainAnalys->ptr_next == NULL) + { + if (setup_ebp == 1) + { + // FIXME end our own frame pointer + fprintf(outfp,"\n; clean up after the frame \n"); + } + } + fprintf(outfp,"blr\n"); + } + if (pMystart == pMyend) + pMystart=NULL; + else + pMystart = (PMYBrainAnalys) pMystart->ptr_next; + } + return 0; +} Propchange: trunk/rosapps/devutils/cputointel/ConvertToPPCProcess.c ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 11 months

[hpoussin] 25540: Fix some warnings

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Jan 20 16:29:04 2007 New Revision: 25540 URL: http://svn.reactos.org/svn/reactos?rev=25540&view=rev Log: Fix some warnings Modified: trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/system/winlogon/screensaver.c trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/stubs.c trunk/reactos/dll/win32/msgina/tui.c trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/drivers/base/green/createclose.c trunk/reactos/drivers/base/green/green.h trunk/reactos/lib/string/wtoi.c trunk/reactos/subsystems/win32/csrss/init.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sat Jan 20 16:29:04 2007 @@ -636,14 +636,14 @@ InsertTailList(&PartList->BiosDiskListHead, &BiosDiskEntry->ListEntry); - DPRINT("DiskNumber: %d\n", BiosDiskEntry->DiskNumber); - DPRINT("Signature: %08x\n", BiosDiskEntry->Signature); - DPRINT("Checksum: %08x\n", BiosDiskEntry->Checksum); - DPRINT("BytesPerSector: %d\n", BiosDiskEntry->DiskGeometry.BytesPerSector); - DPRINT("NumberOfCylinders: %d\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); - DPRINT("NumberOfHeads: %d\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); + DPRINT("DiskNumber: %lu\n", BiosDiskEntry->DiskNumber); + DPRINT("Signature: %08lx\n", BiosDiskEntry->Signature); + DPRINT("Checksum: %08lx\n", BiosDiskEntry->Checksum); + DPRINT("BytesPerSector: %lu\n", BiosDiskEntry->DiskGeometry.BytesPerSector); + DPRINT("NumberOfCylinders: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfCylinders); + DPRINT("NumberOfHeads: %lu\n", BiosDiskEntry->DiskGeometry.NumberOfHeads); DPRINT("DriveSelect: %02x\n", BiosDiskEntry->Int13DiskData.DriveSelect); - DPRINT("MaxCylinders: %d\n", BiosDiskEntry->Int13DiskData.MaxCylinders); + DPRINT("MaxCylinders: %lu\n", BiosDiskEntry->Int13DiskData.MaxCylinders); DPRINT("SectorsPerTrack: %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack); DPRINT("MaxHeads: %d\n", BiosDiskEntry->Int13DiskData.MaxHeads); DPRINT("NumberDrives: %d\n", BiosDiskEntry->Int13DiskData.NumberDrives); Modified: trunk/reactos/base/system/winlogon/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/scree… ============================================================================== --- trunk/reactos/base/system/winlogon/screensaver.c (original) +++ trunk/reactos/base/system/winlogon/screensaver.c Sat Jan 20 16:29:04 2007 @@ -275,9 +275,9 @@ if (bufferSize == 0) goto cleanup; - szApplicationName[bufferSize] = 0; /* Terminate the string */ - - if (wcslen(szApplicationName) == 0) + szApplicationName[bufferSize] = 0; /* Terminate the string */ + + if (wcslen(szApplicationName) == 0) goto cleanup; wsprintfW(szCommandLine, L"%s /s", szApplicationName); Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c (original) +++ trunk/reactos/dll/win32/msgina/gui.c Sat Jan 20 16:29:04 2007 @@ -35,6 +35,8 @@ IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(wParam); + switch (uMsg) { case WM_INITDIALOG: @@ -75,7 +77,7 @@ DialogBoxParam( hDllInstance, MAKEINTRESOURCE(IDD_STATUSWINDOW_DLG), - 0, + GetDesktopWindow(), StatusMessageWindowProc, (LPARAM)lpParam); SetThreadDesktop(OldDesk); @@ -113,7 +115,7 @@ msg->pMessage = pMessage; msg->hDesktop = hDesktop; - msg->StartupEvent = CreateEvent( + msg->StartupEvent = CreateEventW( NULL, TRUE, FALSE, @@ -161,6 +163,21 @@ return TRUE; } +static INT_PTR CALLBACK +EmptyWindowProc( + IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + UNREFERENCED_PARAMETER(hwndDlg); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); + + return FALSE; +} + static VOID GUIDisplaySASNotice( IN OUT PGINA_CONTEXT pgContext) @@ -173,8 +190,8 @@ result = DialogBoxParam( pgContext->hDllInstance, MAKEINTRESOURCE(IDD_NOTICE_DLG), - NULL, - NULL, + GetDesktopWindow(), + EmptyWindowProc, (LPARAM)NULL); if (result == -1) { @@ -215,6 +232,8 @@ IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + switch (uMsg) { case WM_COMMAND: @@ -274,7 +293,7 @@ pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(IDD_LOGGEDON_DLG), - NULL, + GetDesktopWindow(), LoggedOnWindowProc, (LPARAM)pgContext); if (result >= WLX_SAS_ACTION_LOGON && @@ -315,7 +334,7 @@ if (pgContext->hBitmap) { hdc = BeginPaint(hwndDlg, &ps); - DrawState(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); + DrawStateW(hdc, NULL, NULL, (LPARAM)pgContext->hBitmap, (WPARAM)0, 0, 0, 0, 0, DST_BITMAP); EndPaint(hwndDlg, &ps); } return TRUE; @@ -376,7 +395,7 @@ pgContext->hWlx, pgContext->hDllInstance, MAKEINTRESOURCEW(IDD_LOGGEDOUT_DLG), - NULL, + GetDesktopWindow(), LoggedOutWindowProc, (LPARAM)pgContext); if (result >= WLX_SAS_ACTION_LOGON && @@ -395,6 +414,8 @@ IN OUT PGINA_CONTEXT pgContext) { TRACE("GUILockedSAS()\n"); + + UNREFERENCED_PARAMETER(pgContext); UNIMPLEMENTED; return WLX_SAS_ACTION_UNLOCK_WKSTA; Modified: trunk/reactos/dll/win32/msgina/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msgina/stubs.c (original) +++ trunk/reactos/dll/win32/msgina/stubs.c Sat Jan 20 16:29:04 2007 @@ -23,6 +23,10 @@ DWORD Unknown, BOOL bHideLogoff) { + UNREFERENCED_PARAMETER(hParent); + UNREFERENCED_PARAMETER(Unknown); + UNREFERENCED_PARAMETER(bHideLogoff); + /* Return values: * 0x00: Cancelled/Help * 0x01: Log off user @@ -43,8 +47,9 @@ WlxDisplayLockedNotice( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; - return; } @@ -55,6 +60,8 @@ WlxIsLockOk( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; return TRUE; } @@ -67,6 +74,8 @@ WlxIsLogoffOk( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; return TRUE; } @@ -79,8 +88,9 @@ WlxLogoff( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; - return; } @@ -92,8 +102,10 @@ PVOID pWlxContext, DWORD ShutdownType) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(ShutdownType); + UNIMPLEMENTED; - return; } @@ -105,6 +117,9 @@ PVOID pWlxContext, BOOL *pSecure) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pSecure); + //HKLM\Software\Policies\Microsoft\Windows\Control Panel\Desktop : ScreenSaverIsSecure UNIMPLEMENTED; return TRUE; @@ -121,6 +136,11 @@ PWSTR pMessage, DWORD dwBufferSize) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pdwOptions); + UNREFERENCED_PARAMETER(pMessage); + UNREFERENCED_PARAMETER(dwBufferSize); + UNIMPLEMENTED; return FALSE; } @@ -134,6 +154,9 @@ PVOID pWlxContext, PWLX_MPR_NOTIFY_INFO pNprNotifyInfo) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pNprNotifyInfo); + UNIMPLEMENTED; return FALSE; } @@ -146,8 +169,9 @@ WlxDisconnectNotify( PVOID pWlxContext) { + UNREFERENCED_PARAMETER(pWlxContext); + UNIMPLEMENTED; - return; } @@ -159,6 +183,9 @@ PVOID pWlxContext, PVOID pCredInfo) { + UNREFERENCED_PARAMETER(pWlxContext); + UNREFERENCED_PARAMETER(pCredInfo); + UNIMPLEMENTED; return FALSE; } Modified: trunk/reactos/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/tui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/tui.c (original) +++ trunk/reactos/dll/win32/msgina/tui.c Sat Jan 20 16:29:04 2007 @@ -32,6 +32,11 @@ TRACE("TUIDisplayStatusMessage(%ws)\n", pMessage); + UNREFERENCED_PARAMETER(pgContext); + UNREFERENCED_PARAMETER(hDesktop); + UNREFERENCED_PARAMETER(dwOptions); + UNREFERENCED_PARAMETER(pTitle); + return WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), @@ -51,6 +56,8 @@ TUIRemoveStatusMessage( IN PGINA_CONTEXT pgContext) { + UNREFERENCED_PARAMETER(pgContext); + /* Nothing to do */ return TRUE; } @@ -64,7 +71,7 @@ static LPCWSTR newLine = L"\n"; DWORD count; - if (!LoadStringW(hDllInstance, uIdResourceText, Prompt, 256)) + if (0 == LoadStringW(hDllInstance, uIdResourceText, Prompt, 256)) return FALSE; if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), @@ -92,6 +99,8 @@ { TRACE("TUIDisplaySASNotice()\n"); + UNREFERENCED_PARAMETER(pgContext); + DisplayResourceText(IDS_LOGGEDOUTSAS, TRUE); DisplayResourceText(IDS_PRESSCTRLALTDELETE, TRUE); } @@ -103,6 +112,8 @@ { TRACE("TUILoggedOnSAS()\n"); + UNREFERENCED_PARAMETER(pgContext); + if (dwSasType != WLX_SAS_TYPE_CTRL_ALT_DEL) { /* Nothing to do for WLX_SAS_TYPE_TIMEOUT */ @@ -115,7 +126,6 @@ static BOOL ReadString( - IN PGINA_CONTEXT pgContext, IN UINT uIdResourcePrompt, IN OUT PWSTR Buffer, IN DWORD BufferLength, @@ -164,6 +174,7 @@ } Buffer[i++] = readChar; /* FIXME: buffer overflow if the user writes too many chars! */ + UNREFERENCED_PARAMETER(BufferLength); /* FIXME: handle backspace */ } Buffer[i] = UNICODE_NULL; @@ -193,9 +204,9 @@ TRACE("TUILoggedOutSAS()\n"); /* Ask the user for credentials */ - if (!ReadString(pgContext, IDS_ASKFORUSER, UserName, 256, TRUE)) - return WLX_SAS_ACTION_NONE; - if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE)) + if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE)) + return WLX_SAS_ACTION_NONE; + if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) return WLX_SAS_ACTION_NONE; if (DoLoginTasks(pgContext, UserName, NULL, Password)) @@ -213,13 +224,15 @@ TRACE("TUILockedSAS()\n"); + UNREFERENCED_PARAMETER(pgContext); + if (!DisplayResourceText(IDS_LOGGEDOUTSAS, TRUE)) return WLX_SAS_ACTION_UNLOCK_WKSTA; /* Ask the user for credentials */ - if (!ReadString(pgContext, IDS_ASKFORUSER, UserName, 256, TRUE)) - return WLX_SAS_ACTION_NONE; - if (!ReadString(pgContext, IDS_ASKFORPASSWORD, Password, 256, FALSE)) + if (!ReadString(IDS_ASKFORUSER, UserName, 256, TRUE)) + return WLX_SAS_ACTION_NONE; + if (!ReadString(IDS_ASKFORPASSWORD, Password, 256, FALSE)) return WLX_SAS_ACTION_NONE; FIXME("FIXME: Check user/password\n"); Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Sat Jan 20 16:29:04 2007 @@ -62,7 +62,7 @@ /* Check flags */ if (InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)) { - DPRINT("Unknown flags: 0x%08lx\n", InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)); + TRACE("Unknown flags: 0x%08lx\n", InstallFlags & ~(INSTALLFLAG_FORCE | INSTALLFLAG_READONLY | INSTALLFLAG_NONINTERACTIVE)); SetLastError(ERROR_INVALID_FLAGS); goto cleanup; } Modified: trunk/reactos/drivers/base/green/createclose.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/green/createc… ============================================================================== --- trunk/reactos/drivers/base/green/createclose.c (original) +++ trunk/reactos/drivers/base/green/createclose.c Sat Jan 20 16:29:04 2007 @@ -11,7 +11,7 @@ #define NDEBUG #include <debug.h> -NTSTATUS NTAPI +NTSTATUS GreenCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -24,7 +24,7 @@ return STATUS_SUCCESS; } -NTSTATUS NTAPI +NTSTATUS GreenClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/base/green/green.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/green/green.h… ============================================================================== --- trunk/reactos/drivers/base/green/green.h (original) +++ trunk/reactos/drivers/base/green/green.h Sat Jan 20 16:29:04 2007 @@ -110,12 +110,12 @@ /************************************ createclose.c */ -NTSTATUS NTAPI +NTSTATUS GreenCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS NTAPI +NTSTATUS GreenClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); Modified: trunk/reactos/lib/string/wtoi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/string/wtoi.c?rev=2554… ============================================================================== --- trunk/reactos/lib/string/wtoi.c (original) +++ trunk/reactos/lib/string/wtoi.c Sat Jan 20 16:29:04 2007 @@ -1,5 +1,6 @@ #include <string.h> #include <stdlib.h> +#include <ctype.h> /* * @implemented Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/ini… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c (original) +++ trunk/reactos/subsystems/win32/csrss/init.c Sat Jan 20 16:29:04 2007 @@ -168,7 +168,7 @@ NULL); Status = NtOpenDirectoryObject(&CsrObjectDirectory, - 0xF000F, /* ea:??? */ + DIRECTORY_ALL_ACCESS, &Attributes); return Status; }

17 years, 11 months

[janderwald] 25539: msvc compilation fix & identify

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Jan 20 16:25:28 2007 New Revision: 25539 URL: http://svn.reactos.org/svn/reactos?rev=25539&view=rev Log: msvc compilation fix & identify Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c Sat Jan 20 16:25:28 2007 @@ -33,17 +33,18 @@ WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam); TCHAR *szSystemDrive; TCHAR szDefaultOS[MAX_PATH]; TCHAR szDefaultOSName[MAX_PATH]; TCHAR szTimeout[10]; int iTimeout; - switch(uMsg) - { - case WM_INITDIALOG: - { + UNREFERENCED_PARAMETER(lParam); + + switch(uMsg) + { + case WM_INITDIALOG: + { /* get Path to freeldr.ini or boot.ini */ szSystemDrive = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); if (szSystemDrive != NULL) @@ -76,11 +77,11 @@ if (iTimeout != 0) SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - break; + } + break; - case WM_COMMAND: - { + case WM_COMMAND: + { switch(LOWORD(wParam)) { case IDC_STRRECEDIT: @@ -113,8 +114,8 @@ SetTimeout(hwndDlg, 0); } } - } - break; + } + break; } return FALSE; }

17 years, 11 months

[fireball] 25538: Unmap accessible, but completely unneeded by kernel memory too

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 20 01:23:58 2007 New Revision: 25538 URL: http://svn.reactos.org/svn/reactos?rev=25538&view=rev Log: Unmap accessible, but completely unneeded by kernel memory too Modified: branches/winldr/windows/wlmemory.c Modified: branches/winldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=2… ============================================================================== --- branches/winldr/windows/wlmemory.c (original) +++ branches/winldr/windows/wlmemory.c Sat Jan 20 01:23:58 2007 @@ -273,24 +273,32 @@ for (i=0; i<MadCount; i++) { + ULONG StartPage, EndPage, Page; + + StartPage = Mad[i].BasePage; + EndPage = Mad[i].BasePage + Mad[i].PageCount; + if (Mad[i].MemoryType == LoaderFirmwarePermanent || - Mad[i].MemoryType == LoaderSpecialMemory) - { - ULONG StartPage, EndPage, Page; - - StartPage = Mad[i].BasePage; - EndPage = Mad[i].BasePage + Mad[i].PageCount; + Mad[i].MemoryType == LoaderSpecialMemory || + Mad[i].MemoryType == LoaderFree || + (Mad[i].MemoryType == LoaderFirmwareTemporary && EndPage <= LOADER_HIGH_ZONE) || + Mad[i].MemoryType == LoaderOsloaderStack || + Mad[i].MemoryType == LoaderLoadedProgram) + { // // But, the first megabyte of memory always stays! // And, to tell the truth, we don't care about what's higher // than LOADER_HIGH_ZONE - if (StartPage < 0x100) - StartPage = 0x100; - - if (EndPage > LOADER_HIGH_ZONE) - EndPage = LOADER_HIGH_ZONE; - + if (Mad[i].MemoryType == LoaderFirmwarePermanent || + Mad[i].MemoryType == LoaderSpecialMemory) + { + if (StartPage < 0x100) + StartPage = 0x100; + + if (EndPage > LOADER_HIGH_ZONE) + EndPage = LOADER_HIGH_ZONE; + } for (Page = StartPage; Page < EndPage; Page++) { @@ -301,9 +309,12 @@ { KernelPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); - KernelPT[Page & 0x3ff].PageFrameNumber = 0; - KernelPT[Page & 0x3ff].Valid = 0; - KernelPT[Page & 0x3ff].Write = 0; + if (KernelPT) + { + KernelPT[Page & 0x3ff].PageFrameNumber = 0; + KernelPT[Page & 0x3ff].Valid = 0; + KernelPT[Page & 0x3ff].Write = 0; + } } } }

17 years, 11 months

[fireball] 25537: - Add MempDisablePages() which unmaps non-accessible memory areas from KSEG0 page table.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Jan 20 00:37:25 2007 New Revision: 25537 URL: http://svn.reactos.org/svn/reactos?rev=25537&view=rev Log: - Add MempDisablePages() which unmaps non-accessible memory areas from KSEG0 page table. Modified: branches/winldr/windows/wlmemory.c Modified: branches/winldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=2… ============================================================================== --- branches/winldr/windows/wlmemory.c (original) +++ branches/winldr/windows/wlmemory.c Sat Jan 20 00:37:25 2007 @@ -262,6 +262,56 @@ } VOID +MempDisablePages() +{ + int i; + + // + // We need to delete kernel mapping from memory areas which are + // marked as Special or Permanent memory (thus non-accessible) + // + + for (i=0; i<MadCount; i++) + { + if (Mad[i].MemoryType == LoaderFirmwarePermanent || + Mad[i].MemoryType == LoaderSpecialMemory) + { + ULONG StartPage, EndPage, Page; + + StartPage = Mad[i].BasePage; + EndPage = Mad[i].BasePage + Mad[i].PageCount; + + // + // But, the first megabyte of memory always stays! + // And, to tell the truth, we don't care about what's higher + // than LOADER_HIGH_ZONE + if (StartPage < 0x100) + StartPage = 0x100; + + if (EndPage > LOADER_HIGH_ZONE) + EndPage = LOADER_HIGH_ZONE; + + + for (Page = StartPage; Page < EndPage; Page++) + { + PHARDWARE_PTE KernelPT; + ULONG Entry = (Page >> 10) + (KSEG0_BASE >> 22); + + if (PDE[Entry].Valid) + { + KernelPT = (PHARDWARE_PTE)(PDE[Entry].PageFrameNumber << MM_PAGE_SHIFT); + + KernelPT[Page & 0x3ff].PageFrameNumber = 0; + KernelPT[Page & 0x3ff].Valid = 0; + KernelPT[Page & 0x3ff].Write = 0; + } + } + } + } +} + + +VOID MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, ULONG BasePage, ULONG PageCount, @@ -423,6 +473,30 @@ } } + // TEMP, DEBUG! + // adding special reserved memory zones for vmware workstation +#if 0 + { + Mad[MadCount].BasePage = 0xfec00; + Mad[MadCount].PageCount = 0x10; + Mad[MadCount].MemoryType = LoaderSpecialMemory; + WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); + MadCount++; + + Mad[MadCount].BasePage = 0xfee00; + Mad[MadCount].PageCount = 0x1; + Mad[MadCount].MemoryType = LoaderSpecialMemory; + WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); + MadCount++; + + Mad[MadCount].BasePage = 0xfffe0; + Mad[MadCount].PageCount = 0x20; + Mad[MadCount].MemoryType = LoaderSpecialMemory; + WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); + MadCount++; + } +#endif + DbgPrint((DPRINT_WINDOWS, "MadCount: %d\n", MadCount)); WinLdrpDumpMemoryDescriptors(LoaderBlock); //FIXME: Delete! @@ -453,6 +527,9 @@ //DbgPrint((DPRINT_WINDOWS, "VideoMemoryBase: 0x%X\n", VideoMemoryBase)); Tss = (PKTSS)(KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); + + // Unmap what is not needed from kernel page table + MempDisablePages(); // Fill the memory descriptor list and //PrepareMemoryDescriptorList(); @@ -655,7 +732,7 @@ // // TSS Selector (0x28) // - pGdt[5].LimitLow = 0x78-1; // 60 dwords + pGdt[5].LimitLow = 0x78-1; //FIXME: Check this pGdt[5].BaseLow = (USHORT)(Tss & 0xffff); pGdt[5].HighWord.Bytes.BaseMid = (UCHAR)((Tss >> 16) & 0xff); pGdt[5].HighWord.Bytes.Flags1 = 0x89;

17 years, 11 months

[weiden] 25536: Enable shell extensions to add pages to the control panel. The "Remote" page in XP however disappears when being clicked on. Is someone interested in taking a look at it?

by weiden＠svn.reactos.org

Author: weiden Date: Fri Jan 19 21:34:50 2007 New Revision: 25536 URL: http://svn.reactos.org/svn/reactos?rev=25536&view=rev Log: Enable shell extensions to add pages to the control panel. The "Remote" page in XP however disappears when being clicked on. Is someone interested in taking a look at it? Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c Modified: trunk/reactos/dll/cpl/sysdm/sysdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.c (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.c Fri Jan 19 21:34:50 2007 @@ -102,6 +102,7 @@ HPROPSHEETPAGE hpsp[MAX_SYSTEM_PAGES]; PROPSHEETHEADER psh; HMODULE hNetIdDll; + HPSXA hpsxa; LONG Ret; static INITCOMMONCONTROLSEX icc = {sizeof(INITCOMMONCONTROLSEX), ICC_LINK_CLASS}; @@ -125,7 +126,19 @@ InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); + /* Load additional pages provided by shell extensions */ + hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages); + if (hpsxa != NULL) + { + SHAddFromPropSheetExtArray(hpsxa, PropSheetAddPage, (LPARAM)&psh); + } + Ret = (LONG)(PropertySheet(&psh) != -1); + + if (hpsxa != NULL) + { + SHDestroyPropSheetExtArray(hpsxa); + } if (hNetIdDll != NULL) FreeLibrary(hNetIdDll);

17 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007