Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[cwittich] 35881: -hackfix 2nd and 3rd stage (setting boot dev to cdrom) -test all three stages -return the status (fail|success) in ProcessDebugData
by cwittich＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cwittich Date: Tue Sep 2 16:30:18 2008 New Revision: 35881 URL: http://svn.reactos.org/svn/reactos?rev=35881&view=rev Log: -hackfix 2nd and 3rd stage (setting boot dev to cdrom) -test all three stages -return the status (fail|success) in ProcessDebugData Modified: trunk/tools/sysreg2/console.c trunk/tools/sysreg2/sysreg.h trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/console.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35881&… ============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Tue Sep 2 16:30:18 2008 @@ -2,19 +2,20 @@ #include <termios.h> #include <poll.h> -void ProcessDebugData(const char* tty, int timeout, int stage ) +bool ProcessDebugData(const char* tty, int timeout, int stage ) { int ttyfd, i; struct termios ttyattr, rawattr; + bool Ret = true; if ((ttyfd = open(tty, O_NOCTTY | O_RDWR)) < 0) { printf("error opening tty\n"); - return; + return false; } if (tcgetattr(STDIN_FILENO, &ttyattr) < 0) - return; + return false; rawattr = ttyattr; rawattr.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP @@ -25,7 +26,7 @@ rawattr.c_cflag |= CS8; if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &rawattr) < 0) - return; + return false; while (1) { @@ -46,6 +47,7 @@ { /* timeout */ printf("timeout\n"); + Ret = false; goto cleanup; } @@ -59,10 +61,13 @@ int got, sent = 0; got = read(fds[i].fd, buf, sizeof(buf)); - if (got < 0) + if (got < 0) { goto cleanup; + } if (!got || got == 1 && buf[0] == '\33') + { goto cleanup; + } if (fds[i].fd != STDIN_FILENO) { @@ -72,6 +77,7 @@ if ((done = safewrite(STDOUT_FILENO, buf + sent, got -sent)) <= 0) { + Ret = false; goto cleanup; } sent += done; @@ -86,7 +92,6 @@ cleanup: tcsetattr(STDIN_FILENO, TCSAFLUSH, &ttyattr); close(ttyfd); - - + return Ret; } Modified: trunk/tools/sysreg2/sysreg.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.h?rev=35881&r… ============================================================================== --- trunk/tools/sysreg2/sysreg.h [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.h [iso-8859-1] Tue Sep 2 16:30:18 2008 @@ -33,4 +33,4 @@ bool LoadSettings(const char* XmlConfig); /* console.c */ -void ProcessDebugData(const char* tty, int timeout, int stage); +bool ProcessDebugData(const char* tty, int timeout, int stage); Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=35881&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Tue Sep 2 16:30:18 2008 @@ -56,7 +56,7 @@ return false; numids = virConnectListDomains(vConn, &ids[0], maxids); - if (numids > -1) + if (numids > -1) { int i; for(i=0; i<numids; i++) @@ -139,17 +139,18 @@ { virConnectPtr vConn; virDomainPtr vDom; - virDomainInfo info; + virDomainInfo info; int Stage; - int Stages = 1; /* 1 for testing, should be set to 3 later */ + int Stages = 3; char qemu_img_cmdline[300]; FILE* file; - char config[255]; - - if (argc == 2) - strcpy(config, argv[1]); - else - strcpy(config, "sysreg.xml"); + char config[255]; + int Ret = EXIT_SUCCESS; + + if (argc == 2) + strcpy(config, argv[1]); + else + strcpy(config, "sysreg.xml"); if (!LoadSettings(config)) { @@ -189,20 +190,31 @@ { if (vDom) { + if (Stage > 0) + printf("\n\n\n\n\n"); + printf("Running stage %d...\n", Stage + 1); printf("Domain %s started.\n", virDomainGetName(vDom)); - ProcessDebugData(GetConsole(vDom), - AppSettings.Timeout, Stage); - - virDomainGetInfo(vDom, &info); - if (info.state != VIR_DOMAIN_SHUTOFF) + if (!ProcessDebugData(GetConsole(vDom), + AppSettings.Timeout, Stage)) + { + Ret = EXIT_FAILURE; + } + virDomainGetInfo(vDom, &info); + if (info.state != VIR_DOMAIN_SHUTOFF) virDomainDestroy(vDom); virDomainUndefine(vDom); virDomainFree(vDom); + if (Ret == EXIT_FAILURE) + break; } - } + } } virConnectClose(vConn); - return EXIT_SUCCESS; -} - + if (Ret == EXIT_SUCCESS) + printf("Test succeeded!\n"); + else + printf("Test failed!\n"); + return Ret; +} +

1 0

[dreimer] 35880: Bug 3637: Norwegian rosapps translation from Lars Martin Hambro
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Tue Sep 2 16:00:30 2008 New Revision: 35880 URL: http://svn.reactos.org/svn/reactos?rev=35880&view=rev Log: Bug 3637: Norwegian rosapps translation from Lars Martin Hambro Added: trunk/rosapps/applications/devutils/zoomin/lang/ trunk/rosapps/applications/devutils/zoomin/lang/en-US.rc (with props) trunk/rosapps/applications/devutils/zoomin/lang/no-NO.rc (with props) trunk/rosapps/applications/fontview/lang/no-NO.rc (with props) trunk/rosapps/applications/fraginator/lang/ trunk/rosapps/applications/fraginator/lang/en-US.rc (with props) trunk/rosapps/applications/fraginator/lang/no-NO.rc (with props) trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc (with props) trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc (with props) trunk/rosapps/applications/screensavers/blankscr/lang/no-NO.rc (with props) trunk/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc (with props) trunk/rosapps/applications/screensavers/matrix/lang/no-NO.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc (with props) trunk/rosapps/applications/screensavers/starfield/lang/no-NO.rc (with props) trunk/rosapps/applications/sysutils/ctm/lang/no-NO.rc (with props) trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc (with props) Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc trunk/rosapps/applications/fontview/fontview.rc trunk/rosapps/applications/fraginator/Fraginator.rc trunk/rosapps/applications/imagesoft/lang/no-NO.rc trunk/rosapps/applications/packmgr/gui/packmgr.rc trunk/rosapps/applications/packmgr/lib/package.rc trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc trunk/rosapps/applications/screensavers/starfield/starfield.rc trunk/rosapps/applications/sysutils/ctm/ctm.rc trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc Added: trunk/rosapps/applications/devutils/zoomin/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/lang/en-US.rc (added) +++ trunk/rosapps/applications/devutils/zoomin/lang/en-US.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,85 @@ +/* $Id: zoomin.rc 31932 2008-01-21 21:29:59Z dreimer $ */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ZOOMIN ICON DISCARDABLE "zoomin.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_ZOOMIN_MENU MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit\tAlt-F4", ID_EDIT_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY, GRAYED + MENUITEM "&Refresh\tF5", ID_EDIT_REFRESH + END + POPUP "&Options" + BEGIN + MENUITEM "&Refresh Rate...", ID_OPTIONS_REFRESH_RATE, GRAYED + END + POPUP "&Help" + BEGIN + MENUITEM "&About ...", ID_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "System" +BEGIN + ICON IDI_ZOOMIN,IDI_ZOOMIN,14,9,16,16 + LTEXT "ReactOS zoomin Version 1.0",IDC_STATIC,49,10,119,8, + SS_NOPREFIX + LTEXT "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "ReactOS Zoomin" +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ZOOMIN ACCELERATORS DISCARDABLE +BEGIN + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT +END Propchange: trunk/rosapps/applications/devutils/zoomin/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/devutils/zoomin/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/lang/no-NO.rc (added) +++ trunk/rosapps/applications/devutils/zoomin/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,85 @@ +/* $Id: zoomin.rc 31932 2008-01-21 21:29:59Z dreimer $ */ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ZOOMIN ICON DISCARDABLE "zoomin.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_ZOOMIN_MENU MENU DISCARDABLE +BEGIN + POPUP "&Fil" + BEGIN + MENUITEM "A&vslutt\tAlt-F4", ID_EDIT_EXIT + END + POPUP "&Rediger" + BEGIN + MENUITEM "&Kopier\tCtrl+C", ID_EDIT_COPY, GRAYED + MENUITEM "&Oppdater\tF5", ID_EDIT_REFRESH + END + POPUP "&Valg" + BEGIN + MENUITEM "&Oppdatering hastighet...", ID_OPTIONS_REFRESH_RATE, GRAYED + END + POPUP "&Hjelp" + BEGIN + MENUITEM "&Om ...", ID_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Om" +FONT 8, "System" +BEGIN + ICON IDI_ZOOMIN,IDI_ZOOMIN,14,9,16,16 + LTEXT "ReactOS zoomin versjon 1.0",IDC_STATIC,49,10,119,8, + SS_NOPREFIX + LTEXT "Enerett (C) 2002 ReactOS gruppen",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "ReactOS Zoomin" +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ZOOMIN ACCELERATORS DISCARDABLE +BEGIN + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT +END Propchange: trunk/rosapps/applications/devutils/zoomin/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -8,84 +8,5 @@ #define REACTOS_STR_ORIGINAL_FILENAME "zoomin.exe\0" #include <reactos/version.rc> - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ZOOMIN ICON DISCARDABLE "zoomin.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - - -///////////////////////////////////////////////////////////////////////////// -// -// Menu -// - -IDR_ZOOMIN_MENU MENU DISCARDABLE -BEGIN - POPUP "&File" - BEGIN - MENUITEM "E&xit\tAlt-F4", ID_EDIT_EXIT - END - POPUP "&Edit" - BEGIN - MENUITEM "&Copy\tCtrl+C", ID_EDIT_COPY, GRAYED - MENUITEM "&Refresh\tF5", ID_EDIT_REFRESH - END - POPUP "&Options" - BEGIN - MENUITEM "&Refresh Rate...", ID_OPTIONS_REFRESH_RATE, GRAYED - END - POPUP "&Help" - BEGIN - MENUITEM "&About ...", ID_HELP_ABOUT - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "About" -FONT 8, "System" -BEGIN - ICON IDI_ZOOMIN,IDI_ZOOMIN,14,9,16,16 - LTEXT "ReactOS zoomin Version 1.0",IDC_STATIC,49,10,119,8, - SS_NOPREFIX - LTEXT "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8 - DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP -END - - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE DISCARDABLE -BEGIN - IDS_APP_TITLE "ReactOS Zoomin" -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Accelerator -// - -IDR_ZOOMIN ACCELERATORS DISCARDABLE -BEGIN - VK_F5, ID_REFRESH, VIRTKEY, NOINVERT -END +#include "lang/en-US.rc" +#include "lang/no-NO.rc" Modified: trunk/rosapps/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fontview/font… ============================================================================== --- trunk/rosapps/applications/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fontview/fontview.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -23,3 +23,4 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/no-NO.rc" Added: trunk/rosapps/applications/fontview/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fontview/lang… ============================================================================== --- trunk/rosapps/applications/fontview/lang/no-NO.rc (added) +++ trunk/rosapps/applications/fontview/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,16 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUIT, "Avslutt" + IDS_PRINT, "Skriv" + IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" + IDS_ERROR, "Feil" + IDS_ERROR_NOMEM, "Det er ikke nok minne for å fullføre oppgaven." + IDS_ERROR_NOFONT, "Filen %1 er ikke et gyldig skriftfil." + IDS_ERROR_NOCLASS, "Kunne ikke initialise vindu klassen." + IDS_ERROR_BADCMD, "Ingen skriftfil er gitt.\nSyntaks:\n fontview.exe <font file>" +END + + + Propchange: trunk/rosapps/applications/fontview/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/fraginator/Fraginator.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/Fr… ============================================================================== --- trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/fraginator/Fraginator.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -12,230 +12,6 @@ ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_MAIN DIALOGEX 0, 0, 346, 103 -STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | - WS_CAPTION | WS_SYSMENU -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Start",IDC_STARTSTOP,294,7,45,15 - PUSHBUTTON "Help",ID_MAIN_HELP,294,28,45,15 - PUSHBUTTON "Exit",IDC_QUIT,294,49,45,15 - CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | - WS_BORDER,7,7,63,58 - LTEXT "Choose a drive:",-1,78,40,50,8 - LTEXT "Choose an action:",-1,135,40,58,8 - CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | - 0x1,7,71,299,10 - CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | - SS_SUNKEN | WS_GROUP,7,86,332,10 - LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 - LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT - LTEXT "Process Priority:",-1,223,40,51,8 -END - -IDD_REPORT DIALOGEX 0, 0, 391, 169 -STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Report" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Bytes",IDC_BYTES,7,148,50,14 - DEFPUSHBUTTON "Kilobytes",IDC_KILOBYTES,61,148,50,14 - DEFPUSHBUTTON "Megabytes",IDC_MEGABYTES,115,148,50,14 - DEFPUSHBUTTON "Gigabytes",IDC_GIGABYTES,169,148,50,14 - DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 - RTEXT "Volume",-1,7,7,24,8 - LTEXT "Capacity",-1,7,51,28,8 - RTEXT "(Drive Letter)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN - RTEXT "(Disk Size, Bytes)",IDC_DISKSIZEBYTES,63,51,117,10, - SS_SUNKEN - RTEXT "(Disk Size, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, - 10,SS_SUNKEN - LTEXT "Total clusters",-1,7,73,43,8 - RTEXT "(Cluster size)",IDC_DISKCLUSTERSIZE,63,84,117,10, - SS_SUNKEN - LTEXT "Cluster size",-1,7,84,36,8 - RTEXT "(Files count)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN - RTEXT "(Files size, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, - SS_SUNKEN - LTEXT "# of files",-1,194,18,28,8 - LTEXT "Total size",-1,194,29,31,8 - LTEXT "Size on disk",-1,194,40,39,8 - RTEXT "(Total size, bytes)",IDC_FILESSIZEONDISK,267,40,117,10, - SS_SUNKEN - RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, - SS_SUNKEN - LTEXT "Wasted slack",-1,194,51,44,8 - RTEXT "(Disk Free, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, - SS_SUNKEN - LTEXT "Free space",-1,7,62,36,8 - RTEXT "(Files fragmented, count)",IDC_FILESFRAGGED,267,62,117, - 10,SS_SUNKEN - LTEXT "Fragmented files",-1,194,62,52,8 - RTEXT "(Dirs count)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN - LTEXT "# of directories",-1,194,7,48,8 - RTEXT "File System",-1,7,40,36,8 - RTEXT "(File System Name)",IDC_FILESYSTEM,63,40,117,10, - SS_SUNKEN - RTEXT "Volume Label",-1,7,18,44,8 - RTEXT "(Volume Name)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN - RTEXT "Serial",-1,7,29,18,8 - RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, - SS_SUNKEN - RTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,267,73,117, - 10,SS_SUNKEN - LTEXT "Average fragments per file",-1,194,73,60,20 - LTEXT "XX.X% of the files on this drive are fragmented. It is recommended that you perform a SSSSSSS defragmentation.", - IDC_RECOMMEND,7,106,377,38,SS_SUNKEN - LTEXT "Recommendations:",-1,7,96,62,8 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_MAIN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 339 - TOPMARGIN, 7 - BOTTOMMARGIN, 96 - END - - IDD_REPORT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 384 - TOPMARGIN, 7 - BOTTOMMARGIN, 162 - END -END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""windows.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,0 - PRODUCTVERSION 1,3,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", " " - VALUE "FileDescription", "Fraginator" - VALUE "FileVersion", "1.03" - VALUE "InternalName", "Fraginator" - VALUE "LegalCopyright", "Copyright © 2000-2002 Rick Brewster" - VALUE "OriginalFilename", "Fraginator.exe" - VALUE "ProductName", "Fraginator" - VALUE "ProductVersion", "1.03" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_LOGO BITMAP "Fraginator Motif Icon.bmp" - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON ICON "icon1.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// RT_MANIFEST -// - -1 RT_MANIFEST "default1.bin" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +#include "lang/en-US.rc" +#include "lang/no-NO.rc" Added: trunk/rosapps/applications/fraginator/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/en-US.rc (added) +++ trunk/rosapps/applications/fraginator/lang/en-US.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,230 @@ +// Microsoft Visual C++ generated resource script. +// + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_MAIN DIALOGEX 0, 0, 346, 103 +STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Start",IDC_STARTSTOP,294,7,45,15 + PUSHBUTTON "Help",ID_MAIN_HELP,294,28,45,15 + PUSHBUTTON "Exit",IDC_QUIT,294,49,45,15 + CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | + WS_BORDER,7,7,63,58 + LTEXT "Choose a drive:",-1,78,40,50,8 + LTEXT "Choose an action:",-1,135,40,58,8 + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | + 0x1,7,71,299,10 + CONTROL "Static",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | + SS_SUNKEN | WS_GROUP,7,86,332,10 + LTEXT "I am a monkey, hear me eeK",IDC_WISECRACKS,78,15,91,8 + LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT + LTEXT "Process Priority:",-1,223,40,51,8 +END + +IDD_REPORT DIALOGEX 0, 0, 391, 169 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "Report" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bytes",IDC_BYTES,7,148,50,14 + DEFPUSHBUTTON "Kilobytes",IDC_KILOBYTES,61,148,50,14 + DEFPUSHBUTTON "Megabytes",IDC_MEGABYTES,115,148,50,14 + DEFPUSHBUTTON "Gigabytes",IDC_GIGABYTES,169,148,50,14 + DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 + RTEXT "Volume",-1,7,7,24,8 + LTEXT "Capacity",-1,7,51,28,8 + RTEXT "(Drive Letter)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN + RTEXT "(Disk Size, Bytes)",IDC_DISKSIZEBYTES,63,51,117,10, + SS_SUNKEN + RTEXT "(Disk Size, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + 10,SS_SUNKEN + LTEXT "Total clusters",-1,7,73,43,8 + RTEXT "(Cluster size)",IDC_DISKCLUSTERSIZE,63,84,117,10, + SS_SUNKEN + LTEXT "Cluster size",-1,7,84,36,8 + RTEXT "(Files count)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN + RTEXT "(Files size, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, + SS_SUNKEN + LTEXT "# of files",-1,194,18,28,8 + LTEXT "Total size",-1,194,29,31,8 + LTEXT "Size on disk",-1,194,40,39,8 + RTEXT "(Total size, bytes)",IDC_FILESSIZEONDISK,267,40,117,10, + SS_SUNKEN + RTEXT "(Files slack bytes)",IDC_FILESSLACKBYTES,267,51,117,10, + SS_SUNKEN + LTEXT "Wasted slack",-1,194,51,44,8 + RTEXT "(Disk Free, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + SS_SUNKEN + LTEXT "Free space",-1,7,62,36,8 + RTEXT "(Files fragmented, count)",IDC_FILESFRAGGED,267,62,117, + 10,SS_SUNKEN + LTEXT "Fragmented files",-1,194,62,52,8 + RTEXT "(Dirs count)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN + LTEXT "# of directories",-1,194,7,48,8 + RTEXT "File System",-1,7,40,36,8 + RTEXT "(File System Name)",IDC_FILESYSTEM,63,40,117,10, + SS_SUNKEN + RTEXT "Volume Label",-1,7,18,44,8 + RTEXT "(Volume Name)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN + RTEXT "Serial",-1,7,29,18,8 + RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, + SS_SUNKEN + RTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,267,73,117, + 10,SS_SUNKEN + LTEXT "Average fragments per file",-1,194,73,60,20 + LTEXT "XX.X% of the files on this drive are fragmented. It is recommended that you perform a SSSSSSS defragmentation.", + IDC_RECOMMEND,7,106,377,38,SS_SUNKEN + LTEXT "Recommendations:",-1,7,96,62,8 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_MAIN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 339 + TOPMARGIN, 7 + BOTTOMMARGIN, 96 + END + + IDD_REPORT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 384 + TOPMARGIN, 7 + BOTTOMMARGIN, 162 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""windows.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", " " + VALUE "FileDescription", "Fraginator" + VALUE "FileVersion", "1.03" + VALUE "InternalName", "Fraginator" + VALUE "LegalCopyright", "Copyright © 2000-2002 Rick Brewster" + VALUE "OriginalFilename", "Fraginator.exe" + VALUE "ProductName", "Fraginator" + VALUE "ProductVersion", "1.03" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_LOGO BITMAP "Fraginator Motif Icon.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// RT_MANIFEST +// + +1 RT_MANIFEST "default1.bin" +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/fraginator/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/fraginator/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fraginator/la… ============================================================================== --- trunk/rosapps/applications/fraginator/lang/no-NO.rc (added) +++ trunk/rosapps/applications/fraginator/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,230 @@ +// Microsoft Visual C++ generated resource script. +// + +///////////////////////////////////////////////////////////////////////////// +// Norwegian (N.O.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_MAIN DIALOGEX 0, 0, 346, 103 +STYLE DS_SHELLFONT | DS_CENTERMOUSE | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + COMBOBOX IDC_DRIVES_LIST,78,52,29,111,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_METHODS_LIST,135,52,77,79,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRIORITY_LIST,223,52,59,91,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Start",IDC_STARTSTOP,294,7,45,15 + PUSHBUTTON "Hjelp",ID_MAIN_HELP,294,28,45,15 + PUSHBUTTON "Avslutt",IDC_QUIT,294,49,45,15 + CONTROL 110,-1,"Static",SS_BITMAP | SS_SUNKEN | + WS_BORDER,7,7,63,58 + LTEXT "Velg en stasjon:",-1,78,40,50,8 + LTEXT "Velg en handling:",-1,135,40,58,8 + CONTROL "Prosess1",IDC_PROGRESS,"msctls_progress32",WS_BORDER | + 0x1,7,71,299,10 + CONTROL "Statisk",IDC_STATUS,"Statisk",SS_LEFTNOWORDWRAP | + SS_SUNKEN | WS_GROUP,7,86,332,10 + LTEXT "Jeg er en ape, hør meg eeK",IDC_WISECRACKS,78,15,91,8 + LTEXT "100.00%",IDC_PERCENT,311,71,28,8,0,WS_EX_RIGHT + LTEXT "Prosess proritet:",-1,223,40,51,8 +END + +IDD_REPORT DIALOGEX 0, 0, 391, 169 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION +CAPTION "Rapport" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bytes",IDC_BYTES,7,148,50,14 + DEFPUSHBUTTON "KB",IDC_KILOBYTES,61,148,50,14 + DEFPUSHBUTTON "MB",IDC_MEGABYTES,115,148,50,14 + DEFPUSHBUTTON "GB",IDC_GIGABYTES,169,148,50,14 + DEFPUSHBUTTON "OK",IDC_REPORTOK,334,148,50,14 + RTEXT "Stasjon",-1,7,7,24,8 + LTEXT "Kapasitet",-1,7,51,28,8 + RTEXT "(Stasjon bokstav)",IDC_DRIVELETTER,63,7,117,10,SS_SUNKEN + RTEXT "(Disk størrelse, Byte)",IDC_DISKSIZEBYTES,63,51,117,10, + SS_SUNKEN + RTEXT "(Disk størrelse, Clusters)",IDC_DISKSIZECLUSTERS,63,73,117, + 10,SS_SUNKEN + LTEXT "Total clusters",-1,7,73,43,8 + RTEXT "(Cluster størrelse)",IDC_DISKCLUSTERSIZE,63,84,117,10, + SS_SUNKEN + LTEXT "Cluster størrelse",-1,7,84,36,8 + RTEXT "(Files count)",IDC_FILESCOUNT,267,18,117,10,SS_SUNKEN + RTEXT "(Fil størrelse, bytes)",IDC_FILESSIZEBYTES,267,29,117,10, + SS_SUNKEN + LTEXT "# filer",-1,194,18,28,8 + LTEXT "Total størrelse",-1,194,29,31,8 + LTEXT "diskstørrelse",-1,194,40,39,8 + RTEXT "(Total størrelse, byte)",IDC_FILESSIZEONDISK,267,40,117,10, + SS_SUNKEN + RTEXT "(Fil slack byte)",IDC_FILESSLACKBYTES,267,51,117,10, + SS_SUNKEN + LTEXT "Wasted slack",-1,194,51,44,8 + RTEXT "(Ledig plass, Bytes)",IDC_DISKFREEBYTES,63,62,117,10, + SS_SUNKEN + LTEXT "Ledig plass",-1,7,62,36,8 + RTEXT "(Filer fragmentert, count)",IDC_FILESFRAGGED,267,62,117, + 10,SS_SUNKEN + LTEXT "Fragmenterte filer",-1,194,62,52,8 + RTEXT "(Dirs count)",IDC_DIRSCOUNT,267,7,117,10,SS_SUNKEN + LTEXT "# of directories",-1,194,7,48,8 + RTEXT "Filsystem",-1,7,40,36,8 + RTEXT "(Filsystem navn)",IDC_FILESYSTEM,63,40,117,10, + SS_SUNKEN + RTEXT "Volume Label",-1,7,18,44,8 + RTEXT "(Stasjon navn)",IDC_VOLUMELABEL,63,18,117,10,SS_SUNKEN + RTEXT "Serial",-1,7,29,18,8 + RTEXT "(Volume Serial)",IDC_VOLUMESERIAL,63,29,117,10, + SS_SUNKEN + RTEXT "(Average Frags Per File)",IDC_AVERAGEFRAGS,267,73,117, + 10,SS_SUNKEN + LTEXT "Average fragments per file",-1,194,73,60,20 + LTEXT "XX.X% of the files on this drive are fragmented. It is recommended that you perform a SSSSSSS defragmentation.", + IDC_RECOMMEND,7,106,377,38,SS_SUNKEN + LTEXT "Recommendations:",-1,7,96,62,8 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_MAIN, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 339 + TOPMARGIN, 7 + BOTTOMMARGIN, 96 + END + + IDD_REPORT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 384 + TOPMARGIN, 7 + BOTTOMMARGIN, 162 + END +END +#endif // APSTUDIO_INVOKED + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""windows.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,3,0,0 + PRODUCTVERSION 1,3,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Bedriftnavn", " " + VALUE "Filbeskrivelse", "Fraginator" + VALUE "Filversjon", "1.03" + VALUE "Internasjonaltnavn", "Fraginator" + VALUE "LegalCopyright", "enerett © 2000-2002 Rick Brewster" + VALUE "Originalfilnavn", "Fraginator.exe" + VALUE "Produktnavn", "Fraginator" + VALUE "ProduktVersjon", "1.03" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_LOGO BITMAP "Fraginator Motif Icon.bmp" + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON "icon1.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// RT_MANIFEST +// + +1 RT_MANIFEST "default1.bin" +#endif // Norwegian (N.O.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/rosapps/applications/fraginator/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/imagesoft/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… ============================================================================== --- trunk/rosapps/applications/imagesoft/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -45,17 +45,27 @@ MENUITEM "&Historie", ID_HISTORY, CHECKED MENUITEM "&Statuslinje", ID_STATUSBAR, CHECKED END - POPUP "&Bilde" - BEGIN - MENUITEM "&Crop...", -1, GRAYED - MENUITEM "&Endre størrelse ...", -1, GRAYED - MENUITEM "R&oter ...", -1, GRAYED - MENUITEM "&Flip...", -1, GRAYED - MENUITEM "&Strekk...", -1, GRAYED - MENUITEM "S&kew...", -1, GRAYED - MENUITEM "&Inverter Farger", -1, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Attributter...", -1, GRAYED + POPUP "&Still" + BEGIN + MENUITEM "Lysstyrke...", ID_BRIGHTNESS + MENUITEM "Kontrast...", ID_CONTRAST + MENUITEM "Fargetone/metning...", -1, GRAYED + POPUP "Farger" + BEGIN + MENUITEM "Svart og hvit" ID_BLACKANDWHITE + MENUITEM "Inverter farger" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "Uskarphet", ID_BLUR + MENUITEM "Sharpen", ID_SHARPEN + MENUITEM "Jevne kantlinje", -1, GRAYED + MENUITEM "Legg til skygger", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Bilde størrelse...", -1, GRAYED + MENUITEM "Flip", -1, GRAYED + MENUITEM "Speil", -1, GRAYED + MENUITEM "Rotere", -1, GRAYED + END POPUP "&Farger" BEGIN @@ -87,21 +97,21 @@ END IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 -CAPTION "Brightness" +CAPTION "Lysstyrke" FONT 8,"MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN - LTEXT "Color form:", IDC_STATIC, 135, 5, 36, 9 + LTEXT "Farge form:", IDC_STATIC, 135, 5, 36, 9 GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 CONTROL "Full (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 - CONTROL "Red", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 - CONTROL "Green", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 - CONTROL "Blue", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + CONTROL "Rød", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Grønn", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Blå", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 - PUSHBUTTON "Cancel", IDCANCEL, 142, 105, 48, 13 + PUSHBUTTON "Avbryt", IDCANCEL, 142, 105, 48, 13 END IDD_ABOUTBOX DIALOGEX 22,16,210,182 @@ -110,7 +120,7 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME //EXSTYLE WS_EX_LAYERED BEGIN - LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "ImageSoft v0.1\nEnerett (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15 ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Added: trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/l… ============================================================================== --- trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc (added) +++ trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,43 @@ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +/* Dialogs */ +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 180, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Valg" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "There are no options yet.", 0, 50, 95, 80, 8 +END + +IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Utføre valget" +FONT 8, "MS Shell Dlg" +BEGIN + + CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 + + CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 + + CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 + + PUSHBUTTON "Avbryt", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED +END + +IDR_POPUP MENU DISCARDABLE +BEGIN + POPUP "PopUp", MENUBARBREAK + BEGIN + MENUITEM "Ingen valg", 1, GRAYED + MENUITEM "Installere (anbefalt)", 2, GRAYED + MENUITEM "Installere fra kilde", 3, GRAYED + MENUITEM "Oppdater", 4, GRAYED + MENUITEM "Avinstaller", 5, GRAYED + MENUITEM SEPARATOR + MENUITEM "Valg", 8 + MENUITEM SEPARATOR + MENUITEM "Gjør det", 6 + END +END + Propchange: trunk/rosapps/applications/packmgr/gui/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/packmgr/gui/packmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/p… ============================================================================== --- trunk/rosapps/applications/packmgr/gui/packmgr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/gui/packmgr.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -22,5 +22,6 @@ #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/no-NO.rc" /* EOF */ Added: trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/l… ============================================================================== --- trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc (added) +++ trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,25 @@ + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +/* String Tables */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_LOAD "Laster ..." + ERR_OK "Arbeidsoppgave fullført." + ERR_PACK "Ikke alle pakke kunne bli installert\n\nVennligst se på logg filen for å få detaljer." + ERR_GENERIC "En feil har oppstått. \nFor mere informasjon vennligst se på logg filen." + ERR_DOWNL "En fil som trengs kunne ikke bli lastet ned!\nFor mere informasjon vennligst se på logg filen." + ERR_FILE "Feil med skript utførelse.\nFilen kunne ikke åpnes." + + ERR_SYNATX "Feil med skript utførelse.\nFeil Syntaks." + ERR_CALL "Feil med skript utførelse.\nKunne ikke finne funksjon." + ERR_PARAMETER "Feil med skript utførelse.\nFeil Parameter(e)." + + ERR_DEP1 "For å installere denne pakken trenger du også å installere disse pakken(e) også:\n\n:\n\n" + ERR_DEP2 "\nDVil du gjøre dette ?" + ERR_READY "Du har valg å installere %d pakke(r). For å installere disse må du lese og godta hver av disse lisensene. \n\nØnsker du fortsatt å fortsette ?" +END + +123 RCDATA "options.xml" + +/* EOF */ Propchange: trunk/rosapps/applications/packmgr/lib/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/packmgr/lib/package.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/p… ============================================================================== --- trunk/rosapps/applications/packmgr/lib/package.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/packmgr/lib/package.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -17,5 +17,6 @@ #include "lang/fr-FR.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/no-NO.rc" /* EOF */ Added: trunk/rosapps/applications/screensavers/blankscr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/lang/no-NO.rc (added) +++ trunk/rosapps/applications/screensavers/blankscr/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,7 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Tom skjerm" + IDS_TEXT "Ingen valg trenger å settes." +END Propchange: trunk/rosapps/applications/screensavers/blankscr/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -17,6 +17,7 @@ #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -17,6 +17,7 @@ #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc (added) +++ trunk/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,8 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Sylindere fraktal" + IDS_TITLE "Om" + IDS_TEXT "Sylindere fraktal av unC0Rr.\nSpesielt for ReactOS." +END Propchange: trunk/rosapps/applications/screensavers/cylfrac/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/matrix/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/lang/no-NO.rc (added) +++ trunk/rosapps/applications/screensavers/matrix/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,53 @@ +#include "resource.h" + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +IDD_CONFIG DIALOGEX DISCARDABLE 0, 0, 340, 183 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Matrix Skjermsparer konfigurasjon" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Dekode &hastighet",IDC_STATIC,7,7,128,36 + LTEXT "Tregere",IDC_STATIC,13,24,22,8 + CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,17,62,22 + LTEXT "Raskere",IDC_STATIC,104,24,20,8 + GROUPBOX "Siffer &tetthet",IDC_STATIC,7,50,128,36 + LTEXT "Mindre",IDC_STATIC,13,67,19,8 + CONTROL "Slider1",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,60,62,22 + LTEXT "Mere",IDC_STATIC,104,67,23,8 + GROUPBOX "&Melding skjermhastighet",IDC_MSGSPEEDGRP,7,93,127,36 + LTEXT "Tregere",IDC_STATIC,13,110,22,8 + CONTROL "Slider3",IDC_SLIDER3,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,103,62,22 + LTEXT "Raskere",IDC_STATIC,104,110,22,8 + GROUPBOX "&Skriftstørrelse",IDC_STATIC,7,137,127,36 + LTEXT "Mindre",IDC_STATIC,13,153,24,8 + CONTROL "Slider3",IDC_SLIDER4,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_BOTH | WS_TABSTOP,38,146,62,22 + LTEXT "Større",IDC_STATIC,104,153,25,8 + GROUPBOX "&Kodet meldinger",IDC_STATIC,145,7,188,142 + COMBOBOX IDC_COMBO1,153,22,172,62,CBS_DROPDOWN | WS_VSCROLL | + WS_TABSTOP + CONTROL "",IDC_PREVIEW,"Static",SS_LEFTNOWORDWRAP | + SS_CENTERIMAGE | WS_GROUP,154,39,116,72 + PUSHBUTTON "&Legg til",IDC_ADD,280,41,44,18 + PUSHBUTTON "&Fjern",IDC_REMOVE,280,66,44,18 + CONTROL "Tilfeldig melding",IDC_RANDOM,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,151,134,85,10 + DEFPUSHBUTTON "OK",IDOK,222,162,50,14 + PUSHBUTTON "Avbryt",IDCANCEL,283,162,50,14 + LTEXT "&Skrifttype:",IDC_STATIC,151,118,38,8 + COMBOBOX IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT | + WS_VSCROLL | WS_TABSTOP + CONTROL "&Fet skrift",IDC_BOLD,"Button",BS_AUTOCHECKBOX | + BS_MULTILINE | WS_TABSTOP,247,134,46,10 + CTEXT "Matrix Skjermsparer www.catch22.org.uk",IDC_ABOUT,140, + 158,75,18 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Matrix Skjermsparer" +END Propchange: trunk/rosapps/applications/screensavers/matrix/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -14,6 +14,7 @@ #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" Added: trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,8 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Maze Skjermsparer" + IDS_TITLE "Om" + IDS_TEXT "Ingen valg trengs å settes." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -18,3 +18,4 @@ #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" +#include "lang/no-NO.rc" Added: trunk/rosapps/applications/screensavers/starfield/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/lang/no-NO.rc (added) +++ trunk/rosapps/applications/screensavers/starfield/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,8 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Starfield Skjermsparer" + IDS_TITLE "Om" + IDS_TEXT "Ingen valg trenger å settes." +END Propchange: trunk/rosapps/applications/screensavers/starfield/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -17,6 +17,7 @@ #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Modified: trunk/rosapps/applications/sysutils/ctm/ctm.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/ctm.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/ctm/ctm.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -15,3 +15,4 @@ #include "lang/el-GR.rc" #include "lang/uk-UA.rc" #include "lang/ru-RU.rc" +#include "lang/no-NO.rc" Added: trunk/rosapps/applications/sysutils/ctm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/lang/no-NO.rc (added) +++ trunk/rosapps/applications/sysutils/ctm/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,32 @@ +// Norwegian (N.O.) resources + +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Konsoll oppgavebehandler v0.1 av Aleksey Bragin <aleksey(a)studiocerebral.com>" + + IDS_COLUMN_NUMBER "# " + IDS_COLUMN_IMAGENAME "Bilde navn " + IDS_COLUMN_PID "PID " + IDS_COLUMN_CPU "Prosesor" + IDS_COLUMN_MEM "Minnebruk" + IDS_COLUMN_MEM_UNIT "KB" + IDS_COLUMN_PF "Page Faults" + + IDS_IDLE_PROCESS "System Idle Process" + IDS_YES "J" + IDS_NO "N" + + IDS_MENU "Trykk: S - slutt, A - avslutt prosess" + IDS_MENU_QUIT "S" + IDS_MENU_KILL_PROCESS "A" + + IDS_KILL_PROCESS "Er du sikker på at du vil avslutte denne prosessen? (J/n)" + IDS_KILL_PROCESS_ERR1 "Ikke mulig og avslutte denne prosessen..." + IDS_KILL_PROCESS_ERR2 "Ikke mulig og avslutte prosess %d (Ikke mulig og ÅpneProsess)" + + IDS_CTM_GENERAL_ERR1 "ctm: kan ikke bruke konsoll." + IDS_CTM_GENERAL_ERR2 "ctm: Kan ikke GetConsoleMode() for input konsoll." + IDS_CTM_GENERAL_ERR3 "ctm: kan ikke GetConsoleMode() for output konsoll." +END Propchange: trunk/rosapps/applications/sysutils/ctm/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc (added) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -1,0 +1,64 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S system [/U brukernavn [/P [passord]]]] [/FO format] [/NH]\n\n\ +Description:\n\ + This command line tool enables an administrator to query for basic\n\ + system configuration information.\n\n\ +Parameter List:\n\ + /S system Specifies the remote system to connect to.\n\n\ + /U [domene\\]bruker Specifies the user context under which\n\ + the command should execute.\n\n\ + /P [passord] Specifies the password for the given\n\ + user context. Prompts for input if omitted.\n\n\ + /FO format Specifies the format in which the output\n\ + is to be displayed.\n\ + Valid values: \"TABLE\", \"LIST\", \"CSV\".\n\n\ + /NH Specifies that the \"Column Header\" should\n\ + not be displayed in the output.\n\ + Valid only for \"TABLE\" and \"CSV\" formats.\n\n\ + /? Displays this help/usage.\n\n\ +Eksempler:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S system\n\ + SYSTEMINFO /S system /U bruker\n\ + SYSTEMINFO /S system /U domene\\user /P passord /FO TABLE\n\ + SYSTEMINFO /S system /FO LIST\n\ + SYSTEMINFO /S system /FO CSV /NH\n" + +IDS_OS_NAME, "OS navn: %s\n" +IDS_OS_VERSION, "OS versjon: %d.%d.%d %s" +IDS_OS_BUILD, " Bygget %s\n" +IDS_OS_BUILD_TYPE, "OS bygg type: %s\n" +IDS_REG_OWNER, "Registert eier: %s\n" +IDS_REG_ORG, "Registerert organisasjon: %s\n" +IDS_PRODUCT_ID, "Produkt ID: %s\n" +IDS_INST_DATE, "Installert dato: %s, " +IDS_INST_TIME, "%s\n" +IDS_SYS_TYPE_UNKNOWN, "System type: Ukjent\n" +IDS_SYS_TYPE_X86, "System type: X86-basert PC\n" +IDS_SYS_TYPE_IA64, "System type: IA64-basert PC\n" +IDS_SYS_TYPE_AMD64, "System type: AMD64-based PC\n" +IDS_PROCESSORS, "Prosessor(er): %u Prosessor(er) installert.\n" +IDS_ROS_DIR, "ReactOS mappe: %s\n" +IDS_SYS_DIR, "System mappe: %s\n" +IDS_BOOT_DEV, "Oppstartsenhet: %s\n" +IDS_SYS_LOCALE, "System lokal: %s\n" +IDS_INPUT_LOCALE, "Input lokal: %s\n" +IDS_TOTAL_PHYS_MEM, "Total fysisk minne: %ld MB (%ld KB)\n" +IDS_AVAIL_PHISICAL_MEM, "Tilgjengelig fysisk minne: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_MAX, "Virtuelt minne: Maks Størrelse: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_AVAIL, "Virtuelt minne: Tilgjengelig: %ld MB (%ld KB)\n" +IDS_VIRT_MEM_INUSE, "Virtuelt minne: i bruk: %ld MB (%ld KB)\n" +IDS_HOST_NAME, "Datamaskin navn: %s\n" +IDS_PAGEFILE_LOC, "Sidevekslingsfil lokalsjon(er) %s\n" +IDS_TIME_ZONE, "Tidssone: %s\n" +IDS_DOMINE, "Domene: %s\n" +IDS_BIOS_DATE, "BIOS dato: %s\n" +IDS_BIOS_VERSION, "BIOS Versjon: %s\n" +IDS_NETWORK_CARDS, "Nettverkskort(er) %u installert.\n" + +END Propchange: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] Tue Sep 2 16:00:30 2008 @@ -7,3 +7,4 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/uk-UA.rc" +#include "lang/no-NO.rc"

1 0

[janderwald] 35879: - Copy classfactory interface to netcfgx - Required to implement netcfgx interfaces)
by janderwald＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: janderwald Date: Tue Sep 2 14:57:42 2008 New Revision: 35879 URL: http://svn.reactos.org/svn/reactos?rev=35879&view=rev Log: - Copy classfactory interface to netcfgx - Required to implement netcfgx interfaces) Added: trunk/reactos/dll/win32/netcfgx/classfactory.c - copied unchanged from r35878, trunk/reactos/dll/win32/netshell/classfactory.c

1 0

[cwittich] 35878: delete sysreg, it is obsolete now
by cwittich＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cwittich Date: Tue Sep 2 14:57:26 2008 New Revision: 35878 URL: http://svn.reactos.org/svn/reactos?rev=35878&view=rev Log: delete sysreg, it is obsolete now Removed: trunk/reactos/tools/sysreg/ Modified: trunk/reactos/tools/tools.rbuild Modified: trunk/reactos/tools/tools.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.rbuild?rev=358… ============================================================================== --- trunk/reactos/tools/tools.rbuild [iso-8859-1] (original) +++ trunk/reactos/tools/tools.rbuild [iso-8859-1] Tue Sep 2 14:57:26 2008 @@ -12,9 +12,6 @@ </directory> <directory name="rgenstat"> <xi:include href="rgenstat/rgenstat.rbuild" /> -</directory> -<directory name="sysreg"> - <xi:include href="sysreg/sysreg.rbuild" /> </directory> <directory name="unicode"> <xi:include href="unicode/unicode.rbuild" />

1 0

[dreimer] 35877: Fixed some typos.
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Tue Sep 2 14:39:17 2008 New Revision: 35877 URL: http://svn.reactos.org/svn/reactos?rev=35877&view=rev Log: Fixed some typos. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Tue Sep 2 14:39:17 2008 @@ -13,6 +13,7 @@ - Added: Update command (Daniel Reimer) - Fixed: Dependant on the Arch variable a crosscompiler will be used now. (Daniel Reimer) - Fixed: Clean only cleans the arch which is active right now. (Daniel Reimer) +- Fixed: "if defined xxx" with a nested "if %xxx% == foobar" does not work in batch. (Daniel Reimer) - Fixed: Stripped apps and removed Debug Symbols at once may not be possible. (Daniel Reimer) *** January 23rd, 2008 - RosBE 1.2 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Sep 2 14:39:17 2008 @@ -48,7 +48,7 @@ :DEL -if %ROS_ARCH% == arm ( +if .%ROS_ARCH%. == .arm. ( :: :: Check if we have something to clean, if so, clean it. :: @@ -68,7 +68,7 @@ echo ERROR: There is no compiler output to clean. ) ) -if %ROS_ARCH% == x86 ( +if .%ROS_ARCH%. == .x86. ( :: :: Check if we have something to clean, if so, clean it. :: @@ -88,7 +88,7 @@ echo ERROR: There is no compiler output to clean. ) ) -if %ROS_ARCH% == ppc ( +if .%ROS_ARCH%. == .ppc. ( :: :: Check if we have something to clean, if so, clean it. :: @@ -108,20 +108,40 @@ echo ERROR: There is no compiler output to clean. ) ) -if %ROS_ARCH% == amd64 ( +if .%ROS_ARCH%. == .amd64. ( :: :: Check if we have something to clean, if so, clean it. :: - if exist "obj-x86_64\." ( + if exist "obj-amd64\." ( echo Cleaning ReactOS source directory... :: : Remove directories created by the build. :: - if exist "obj-x86_64\." ( - rd /s /q "obj-x86_64" 1> NUL 2> NUL + if exist "obj-amd64\." ( + rd /s /q "obj-amd64" 1> NUL 2> NUL ) - if exist "output-x86_64\." ( - rd /s /q "output-x86_64" 1> NUL 2> NUL + if exist "output-amd64\." ( + rd /s /q "output-amd64" 1> NUL 2> NUL + ) + echo Done cleaning ReactOS source directory. + ) else ( + echo ERROR: There is no compiler output to clean. + ) +) +if .%ROS_ARCH%. == .. ( + :: + :: Check if we have something to clean, if so, clean it. + :: + if exist "obj-i386\." ( + echo Cleaning ReactOS source directory... + :: + : Remove directories created by the build. + :: + if exist "obj-i386\." ( + rd /s /q "obj-i386" 1> NUL 2> NUL + ) + if exist "output-i386\." ( + rd /s /q "output-i386" 1> NUL 2> NUL ) echo Done cleaning ReactOS source directory. ) else ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Sep 2 14:39:17 2008 @@ -35,12 +35,12 @@ goto :EOC ) if /i "%_1%" == "ppc" ( - set ROS_ARCH==ppc + set ROS_ARCH=ppc set ROS_PREFIX=mingw32-ppc goto :EOC ) if /i "%_1%" == "x64" ( - set ROS_ARCH==amd64 + set ROS_ARCH=amd64 set ROS_PREFIX=mingw32-x86_64 goto :EOC ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Tue Sep 2 14:39:17 2008 @@ -208,8 +208,6 @@ :: if exist GCC.7z ( for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF - ) else ( - set _ROSBE_GCCDATE=0 ) "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z @@ -232,8 +230,6 @@ :: if exist Tools.7z ( for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF - ) else ( - set _ROSBE_TOOOLSDATE=0 ) "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z

1 0

[cwittich] 35876: -don't try to destroy the domain when the state is VIR_DOMAIN_SHUTOFF
by cwittich＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: cwittich Date: Tue Sep 2 13:41:14 2008 New Revision: 35876 URL: http://svn.reactos.org/svn/reactos?rev=35876&view=rev Log: -don't try to destroy the domain when the state is VIR_DOMAIN_SHUTOFF Modified: trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=35876&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Tue Sep 2 13:41:14 2008 @@ -139,6 +139,7 @@ { virConnectPtr vConn; virDomainPtr vDom; + virDomainInfo info; int Stage; int Stages = 1; /* 1 for testing, should be set to 3 later */ char qemu_img_cmdline[300]; @@ -191,7 +192,10 @@ printf("Domain %s started.\n", virDomainGetName(vDom)); ProcessDebugData(GetConsole(vDom), AppSettings.Timeout, Stage); - virDomainDestroy(vDom); + + virDomainGetInfo(vDom, &info); + if (info.state != VIR_DOMAIN_SHUTOFF) + virDomainDestroy(vDom); virDomainUndefine(vDom); virDomainFree(vDom); }

1 0

[fireball] 35875: - Don't pass an unitialized variable as buffer size to RegQueryValueEx. This fixes "(lib\rtl\heap.c:777) Could not allocate 78010000 bytes" problem during 2nd stage install.
by fireball＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: fireball Date: Tue Sep 2 12:24:56 2008 New Revision: 35875 URL: http://svn.reactos.org/svn/reactos?rev=35875&view=rev Log: - Don't pass an unitialized variable as buffer size to RegQueryValueEx. This fixes "(lib\rtl\heap.c:777) Could not allocate 78010000 bytes" problem during 2nd stage install. Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c Modified: trunk/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/vmwinst… ============================================================================== --- trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/vmwinst.c [iso-8859-1] Tue Sep 2 12:24:56 2008 @@ -260,6 +260,7 @@ { return FALSE; } + Size = sizeof(DWORD); if(RegQueryValueEx(hReg, L"Start", 0, &Type, (BYTE*)&Value, &Size) != ERROR_SUCCESS || Type != REG_DWORD) {

1 0

[dreimer] 35874: fix some not working "if defined" Thx to Hackbunny for helping me
by dreimer＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: dreimer Date: Tue Sep 2 11:42:32 2008 New Revision: 35874 URL: http://svn.reactos.org/svn/reactos?rev=35874&view=rev Log: fix some not working "if defined" Thx to Hackbunny for helping me Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Tue Sep 2 11:42:32 2008 @@ -36,69 +36,64 @@ :: :: Check if strip or ccache are being used and set the appropriate options. :: -if defined _ROSBE_NOSTRIP ( - if %_ROSBE_NOSTRIP% == 1 ( - set ROS_BUILDNOSTRIP=yes - ) else ( - set ROS_BUILDNOSTRIP=no - ) -) -if defined _ROSBE_STRIP ( - if %_ROSBE_STRIP% == 1 ( - set ROS_LEAN_AND_MEAN=yes - ) else ( - set ROS_LEAN_AND_MEAN=no - ) -) - -if %ROS_LEAN_AND_MEAN% == yes ( - if %ROS_BUILDNOSTRIP% == yes ( +if .%_ROSBE_NOSTRIP%. == .1. ( + set ROS_BUILDNOSTRIP=yes +) else ( + set ROS_BUILDNOSTRIP=no +) + +if .%_ROSBE_STRIP%. == .1. ( + set ROS_LEAN_AND_MEAN=yes +) else ( + set ROS_LEAN_AND_MEAN=no +) + +if .%ROS_LEAN_AND_MEAN%. == .yes. ( + if .%ROS_BUILDNOSTRIP%. == .yes. ( cls echo Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them. goto :EOC ) ) -if defined _ROSBE_USECCACHE ( - if %_ROSBE_USECCACHE% == 1 ( - set CCACHE_DIR=%APPDATA%\RosBE\.ccache - set HOST_CC=ccache gcc - set HOST_CPP=ccache g++ - if %ROS_ARCH% == arm ( - set TARGET_CC=ccache arm-pc-mingw32-gcc - set TARGET_CPP=ccache arm-pc-mingw32-g++ - ) - if %ROS_ARCH% == x86 ( - set TARGET_CC=ccache gcc - set TARGET_CPP=ccache g++ - ) - if %ROS_ARCH% == amd64 ( - set TARGET_CC=ccache x86_64-pc-mingw32-gcc - set TARGET_CPP=ccache x86_64-pc-mingw32-g++ - ) - if %ROS_ARCH% == ppc ( - set TARGET_CC=ccache ppc-pc-mingw32-gcc - set TARGET_CPP=ccache ppc-pc-mingw32-g++ - ) - ) else ( - set HOST_CC=gcc - set HOST_CPP=g++ - if %ROS_ARCH% == arm ( - set TARGET_CC=arm-pc-mingw32-gcc - set TARGET_CPP=arm-pc-mingw32-g++ - ) - if %ROS_ARCH% == x86 ( - set TARGET_CC=gcc - set TARGET_CPP=g++ - ) - if %ROS_ARCH% == amd64 ( - set TARGET_CC=x86_64-pc-mingw32-gcc - set TARGET_CPP=x86_64-pc-mingw32-g++ - ) - if %ROS_ARCH% == ppc ( - set TARGET_CC=ppc-pc-mingw32-gcc - set TARGET_CPP=ppc-pc-mingw32-g++ - ) +if .%_ROSBE_USECCACHE%. == .1. ( + set CCACHE_DIR=%APPDATA%\RosBE\.ccache + set HOST_CC=ccache gcc + set HOST_CPP=ccache g++ + if .%ROS_ARCH%. == .arm. ( + set TARGET_CC=ccache arm-pc-mingw32-gcc + set TARGET_CPP=ccache arm-pc-mingw32-g++ + ) + if .%ROS_ARCH%. == .x86. ( + set TARGET_CC=ccache gcc + set TARGET_CPP=ccache g++ + ) + if .%ROS_ARCH%. == .amd64. ( + set TARGET_CC=ccache x86_64-pc-mingw32-gcc + set TARGET_CPP=ccache x86_64-pc-mingw32-g++ + ) + if .%ROS_ARCH%. == .ppc. ( + set TARGET_CC=ccache ppc-pc-mingw32-gcc + set TARGET_CPP=ccache ppc-pc-mingw32-g++ + ) +) else ( + set HOST_CC=gcc + set HOST_CPP=g++ + if .%ROS_ARCH%. == .arm. ( + set TARGET_CC=arm-pc-mingw32-gcc + set TARGET_CPP=arm-pc-mingw32-g++ + ) + if .%ROS_ARCH%. == .x86. ( + set TARGET_CC=gcc + set TARGET_CPP=g++ + ) + if .%ROS_ARCH%. == .amd64. ( + set TARGET_CC=x86_64-pc-mingw32-gcc + set TARGET_CPP=x86_64-pc-mingw32-g++ + ) + if .%ROS_ARCH%. == .ppc. ( + set TARGET_CC=ppc-pc-mingw32-gcc + set TARGET_CPP=ppc-pc-mingw32-g++ ) ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Sep 2 11:42:32 2008 @@ -26,23 +26,25 @@ :: :: Set the Arch Variables :: -if defined _ROSBE_ARCH ( - if %_ROSBE_ARCH% == 0 ( - set ROS_ARCH= - set ROS_PREFIX= - ) - if %_ROSBE_ARCH% == 1 ( - set ROS_ARCH=arm - set ROS_PREFIX=mingw32-arm - ) - if %_ROSBE_ARCH% == 2 ( - set ROS_ARCH=ppc - set ROS_PREFIX=mingw32-ppc - ) - if %_ROSBE_ARCH% == 3 ( - set ROS_ARCH=amd64 - set ROS_PREFIX=mingw32-x86_64 - ) +if .%_ROSBE_ARCH%. == .0. ( + set ROS_ARCH= + set ROS_PREFIX= +) +if .%_ROSBE_ARCH%. == .1. ( + set ROS_ARCH=arm + set ROS_PREFIX=mingw32-arm +) +if .%_ROSBE_ARCH%. == .2. ( + set ROS_ARCH=ppc + set ROS_PREFIX=mingw32-ppc +) +if .%_ROSBE_ARCH%. == .3. ( + set ROS_ARCH=amd64 + set ROS_PREFIX=mingw32-x86_64 +) +if .%_ROSBE_ARCH%. == .. ( + set ROS_ARCH= + set ROS_PREFIX= ) ::

1 0

[jimtabor] 35873: - We always supported global WH_KEYBOARD_LL and WH_MOUSE_LL.
by jimtabor＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: jimtabor Date: Tue Sep 2 10:44:41 2008 New Revision: 35873 URL: http://svn.reactos.org/svn/reactos?rev=35873&view=rev Log: - We always supported global WH_KEYBOARD_LL and WH_MOUSE_LL. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Tue Sep 2 10:44:41 2008 @@ -1045,7 +1045,7 @@ Global = TRUE; } - if ( Global || + if ( ( Global && (HookId != WH_KEYBOARD_LL || HookId != WH_MOUSE_LL) ) || WH_DEBUG == HookId || WH_JOURNALPLAYBACK == HookId || WH_JOURNALRECORD == HookId)

1 0

[fireball] 35872: - MmLoadSystemImage's last parameter (BaseAddress) is not marked as OPTIONAL. Fix callers.
by fireball＠svn.reactos.org 03 Sep '08

03 Sep '08

Author: fireball Date: Tue Sep 2 10:26:05 2008 New Revision: 35872 URL: http://svn.reactos.org/svn/reactos?rev=35872&view=rev Log: - MmLoadSystemImage's last parameter (BaseAddress) is not marked as OPTIONAL. Fix callers. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Sep 2 10:26:05 2008 @@ -277,6 +277,7 @@ UNICODE_STRING ServiceImagePath, CCSName; NTSTATUS Status; HANDLE CCSKey, ServiceKey; + PVOID BaseAddress; DPRINT("IopLoadServiceModule(%wZ, 0x%p)\n", ServiceName, ModuleObject); @@ -358,7 +359,7 @@ else { DPRINT("Loading module\n"); - Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, NULL); + Status = MmLoadSystemImage(&ServiceImagePath, NULL, NULL, 0, (PVOID)ModuleObject, &BaseAddress); } ExFreePool(ServiceImagePath.Buffer); @@ -1561,6 +1562,7 @@ PDEVICE_NODE DeviceNode; PDRIVER_OBJECT DriverObject; PLDR_DATA_TABLE_ENTRY ModuleObject; + PVOID BaseAddress; WCHAR *cur; /* Check if it's an unload request */ @@ -1671,7 +1673,7 @@ * Load the driver module */ - Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); + Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); if (!NT_SUCCESS(Status) && Status != STATUS_IMAGE_ALREADY_LOADED) { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Tue Sep 2 10:26:05 2008 @@ -694,6 +694,7 @@ ANSI_STRING ProcName; PIO_STACK_LOCATION StackPtr; PLDR_DATA_TABLE_ENTRY ModuleObject = NULL; + PVOID BaseAddress; Status = ZwFsControlFile(PageFileHandle, 0, @@ -766,13 +767,13 @@ } /* Load the diskdump driver. */ - Status = MmLoadSystemImage(&DiskDumpName, NULL, NULL, 0, (PVOID)&ModuleObject, NULL); + Status = MmLoadSystemImage(&DiskDumpName, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); if (ModuleObject == NULL) { return(STATUS_OBJECT_NAME_NOT_FOUND); } RtlInitAnsiString(&ProcName, "DiskDumpFunctions"); - MmCoreDumpFunctions = MiFindExportedRoutineByName(ModuleObject->DllBase, + MmCoreDumpFunctions = MiFindExportedRoutineByName(BaseAddress, &ProcName); if (!NT_SUCCESS(Status)) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008