Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 25707: - Update kernel fun.
by ion＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: ion Date: Sat Feb 3 23:35:37 2007 New Revision: 25707 URL: http://svn.reactos.org/svn/reactos?rev=25707&view=rev Log: - Update kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=257… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Feb 3 23:35:37 2007 @@ -14,8 +14,7 @@ // // Global: // - TODO: Complete the list of bufxies -// - Fix hang/slowdown during boot -> New scheduler -// - Fix freelist.c errors with new scheduler enabled. +// - Fix DPCs interrupting code at DISPATCH_LEVEL // - Fix process reference count leak. // - Fix atapi.sys or serial.sys loading one more time at each boot. // - Fix LiveCD.

1 0

[ion] 25706: - Replace broken bootvid by a new bootvid based on TinyKRNL's version. It is a .DLL instead of a .SYS and takes advantage of my patch to FreeLDR which allows us to load DLLs that drivers/the kernel load. - This new version is also binary compatible, so Windows's bootvid can be dropped instead and our kernel can talk to it. It has been tested under Windows/TinyKRNL. - Write 90% of the Inbv component in the kernel. Displaying the boot bitmap hasn't yet been coded. - The HAL is missing
by ion＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: ion Date: Sat Feb 3 23:30:32 2007 New Revision: 25706 URL: http://svn.reactos.org/svn/reactos?rev=25706&view=rev Log: - Replace broken bootvid by a new bootvid based on TinyKRNL's version. It is a .DLL instead of a .SYS and takes advantage of my patch to FreeLDR which allows us to load DLLs that drivers/the kernel load. - This new version is also binary compatible, so Windows's bootvid can be dropped instead and our kernel can talk to it. It has been tested under Windows/TinyKRNL. - Write 90% of the Inbv component in the kernel. Displaying the boot bitmap hasn't yet been coded. - The HAL is missing required routines for bootvid.dll, so it doesn't work yet. - .BMP resources haven't yet been added to the kernel. I will add them soon. Added: trunk/reactos/drivers/base/bootvid/bootdata.c trunk/reactos/drivers/base/bootvid/precomp.h trunk/reactos/drivers/base/bootvid/vga.c trunk/reactos/include/ndk/inbvtypes.h trunk/reactos/include/reactos/drivers/bootvid/ trunk/reactos/include/reactos/drivers/bootvid/bootvid.h Removed: trunk/reactos/drivers/base/bootvid/bar.bmp trunk/reactos/drivers/base/bootvid/bootimage.bmp trunk/reactos/drivers/base/bootvid/bootvid.h trunk/reactos/drivers/base/bootvid/resource.h trunk/reactos/drivers/base/bootvid/vid.c trunk/reactos/drivers/base/bootvid/vid_vga.c trunk/reactos/drivers/base/bootvid/vid_vgatext.c trunk/reactos/drivers/base/bootvid/vid_xbox.c Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/dll/win32/kernel32/ (props changed) trunk/reactos/drivers/base/bootvid/bootvid.c trunk/reactos/drivers/base/bootvid/bootvid.def trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rc trunk/reactos/include/ndk/inbvfuncs.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/include/internal/inbv.h trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/drivers/base/bootvid/bar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bar.b… Added: trunk/reactos/drivers/base/bootvid/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootd… Removed: trunk/reactos/drivers/base/bootvid/bootimage.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/booti… Modified: trunk/reactos/drivers/base/bootvid/bootvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Removed: trunk/reactos/drivers/base/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Modified: trunk/reactos/drivers/base/bootvid/bootvid.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… Added: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… Removed: trunk/reactos/drivers/base/bootvid/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/resou… Added: trunk/reactos/drivers/base/bootvid/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vga.c… Removed: trunk/reactos/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid.c… Removed: trunk/reactos/drivers/base/bootvid/vid_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… Removed: trunk/reactos/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… Removed: trunk/reactos/drivers/base/bootvid/vid_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_x… Modified: trunk/reactos/include/ndk/inbvfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/inbvfuncs.h?re… Added: trunk/reactos/include/ndk/inbvtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/inbvtypes.h?re… Added: trunk/reactos/include/reactos/drivers/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/bo… Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=257… Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[ion] 25705: - Disgusting* hack by hto to temporarily work around Mm/DPC Interrupt bug in trunk after applying new scheduler. We both tested it and it makes trunk not crash anymore (but I do see a noticeable slowdown during bootup). Reminder: explorer will take 30-60 seconds to startup after GUI boot. Be patient. * This doesn't refer to hto's programming skills or code, but to the hackyness of the patch itself, which is a temporary solution.
by ion＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: ion Date: Sat Feb 3 23:28:24 2007 New Revision: 25705 URL: http://svn.reactos.org/svn/reactos?rev=25705&view=rev Log: - Disgusting* hack by hto to temporarily work around Mm/DPC Interrupt bug in trunk after applying new scheduler. We both tested it and it makes trunk not crash anymore (but I do see a noticeable slowdown during bootup). Reminder: explorer will take 30-60 seconds to startup after GUI boot. Be patient. * This doesn't refer to hto's programming skills or code, but to the hackyness of the patch itself, which is a temporary solution. Modified: trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mdl.c trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/pagefile.c trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c (original) +++ trunk/reactos/ntoskrnl/mm/balance.c Sat Feb 3 23:28:24 2007 @@ -13,6 +13,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeBalancer) Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c Sat Feb 3 23:28:24 2007 @@ -14,6 +14,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageList) Modified: trunk/reactos/ntoskrnl/mm/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdl.c?rev=2570… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdl.c (original) +++ trunk/reactos/ntoskrnl/mm/mdl.c Sat Feb 3 23:28:24 2007 @@ -13,6 +13,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializeMdlImplementation) @@ -965,3 +968,4 @@ + Modified: trunk/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/mm/npool.c (original) +++ trunk/reactos/ntoskrnl/mm/npool.c Sat Feb 3 23:28:24 2007 @@ -15,6 +15,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MiInitializeNonPagedPool) 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 (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c Sat Feb 3 23:28:24 2007 @@ -31,6 +31,9 @@ #define NDEBUG #include <internal/debug.h> +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } + #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitPagingFile) #endif Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c Sat Feb 3 23:28:24 2007 @@ -13,6 +13,9 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +#undef KeAcquireSpinLock +#define KeAcquireSpinLock(a,b) { _disable(); *(b) = KfAcquireSpinLock(a); } #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageOp) @@ -274,3 +277,4 @@ +

1 0

[greatlrd] 25704: patch from : Paolo Devoti <devotip at gmail.com> fix issue : (Clean up patch) Removed variables formerly in use to handle pagination. Pagination belongs to ConOutPrintfPaging. Removed already commented out code of old pagination See issue #2016 for more details.
by greatlrd＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: greatlrd Date: Sat Feb 3 20:38:20 2007 New Revision: 25704 URL: http://svn.reactos.org/svn/reactos?rev=25704&view=rev Log: patch from : Paolo Devoti <devotip at gmail.com> fix issue : (Clean up patch) Removed variables formerly in use to handle pagination. Pagination belongs to ConOutPrintfPaging. Removed already commented out code of old pagination See issue #2016 for more details. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Sat Feb 3 20:38:20 2007 @@ -127,6 +127,11 @@ * * 1-Jul-2004 (Brandon Turner <turnerb7(a)msu.edu>) * Added /p back in using ConOutPrintfPaging + * + * 3-feb-2007 (Paolo Devoti devotip at gmail) + * Removed variables formerly in use to handle pagination + * Pagination belongs to ConOutPrintfPaging + * Removed already commented out code of old pagination */ #include <precomp.h> @@ -802,54 +807,12 @@ /* - * incline - * - * increment our line if paginating, display message at end of screen - */ -#if 0 -static BOOL -IncLine (LPINT pLine, LPDIRSWITCHFLAGS lpFlags) -{ - BOOL bError; - CONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo; - LONG WindowHeight; - - bError = GetConsoleScreenBufferInfo(hConsole, &lpConsoleScreenBufferInfo); - - WindowHeight = lpConsoleScreenBufferInfo.srWindow.Bottom - lpConsoleScreenBufferInfo.srWindow.Top; - - /* That prevents bad behiour if WindowHeight could not be calculated */ - if (!WindowHeight) - { - WindowHeight= 1000000; - } - - if (!(lpFlags->bPause)) - return FALSE; - - (*pLine)++; - - /* - * Because I don't know if WindowsHeight work in all cases, - * perhaps then maxy is the right value - */ - if (*pLine >= (int)maxy - 2 || *pLine >= WindowHeight) - { - *pLine = 0; - return (PagePrompt () == PROMPT_BREAK); - } - - return FALSE; -} -#endif - -/* * PrintDirectoryHeader * * print the header for the dir command */ static BOOL -PrintDirectoryHeader(LPTSTR szPath, LPINT pLine, LPDIRSWITCHFLAGS lpFlags) +PrintDirectoryHeader(LPTSTR szPath, LPDIRSWITCHFLAGS lpFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; TCHAR szRootName[MAX_PATH]; @@ -1114,7 +1077,6 @@ ULONG ulFiles, ULONG ulDirs, ULARGE_INTEGER u64Bytes, - LPINT pLine, LPDIRSWITCHFLAGS lpFlags) { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -1768,7 +1730,6 @@ static INT DirList(LPTSTR szPath, /* [IN] The path that dir starts */ LPTSTR szFilespec, /* [IN] The type of file that we are looking for */ - LPINT pLine, /* FIXME: Maybe used for paginating */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ { HANDLE hSearch; /* The handle of the search */ @@ -1950,7 +1911,7 @@ _tcscpy(szFullFileSpec, szFullPath); _tcscat(szFullFileSpec, wfdFileInfo.cFileName); /* We do the same for tha folder */ - if (DirList(szFullFileSpec, szFilespec, pLine,lpFlags) != 0) + if (DirList(szFullFileSpec, szFilespec, lpFlags) != 0) { return 1; } @@ -1988,7 +1949,6 @@ TCHAR szFilespec[MAX_PATH]; LPTSTR* params; INT entries = 0; - INT nLine = 0; UINT loop = 0; DIRSWITCHFLAGS stFlags; @@ -2078,7 +2038,7 @@ /* Print the drive header if the drive changed */ if(cDrive != szPath[0] && !stFlags.bBareFormat) { - if (!PrintDirectoryHeader (szPath, &nLine, &stFlags)) { + if (!PrintDirectoryHeader (szPath, &stFlags)) { nErrorLevel = 1; return 1; } @@ -2088,7 +2048,7 @@ /* do the actual dir */ - if (DirList (szPath, szFilespec, &nLine, &stFlags)) + if (DirList (szPath, szFilespec, &stFlags)) { nErrorLevel = 1; return 1; @@ -2100,7 +2060,6 @@ recurse_file_cnt, recurse_dir_cnt, recurse_bytes, - &nLine, &stFlags); return 0;

1 0

[greatlrd] 25703: patch from : Paolo Devoti <devotip at gmail.com> fix issue : The fix does a WriteFile per line insted of one per char. See issue #2015 for more details.
by greatlrd＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: greatlrd Date: Sat Feb 3 19:03:37 2007 New Revision: 25703 URL: http://svn.reactos.org/svn/reactos?rev=25703&view=rev Log: patch from : Paolo Devoti <devotip at gmail.com> fix issue : The fix does a WriteFile per line insted of one per char. See issue #2015 for more details. Modified: trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Sat Feb 3 19:03:37 2007 @@ -12,6 +12,9 @@ * * 01-Jul-2005 (Brandon Turner) <turnerb7(a)msu.edu>) * Added ConPrintfPaging and ConOutPrintfPaging + * + * 02-Feb-2007 (Paolo Devoti) <devotip at gmail.com>) + * Fixed ConPrintfPaging */ @@ -252,8 +255,8 @@ /* the number of chars in a roow */ int ScreenCol = 0; - /* chars since end of line */ - int CharEL = 0; + /* chars since start of line */ + int CharSL = 0; int i = 0; @@ -261,67 +264,54 @@ LineCount = 0; /* rest LineCount and return if no string have been given */ - if (szFormat == NULL) - return 0; + if (szFormat == NULL) + return 0; //get the size of the visual screen that can be printed too if (!GetConsoleScreenBufferInfo(hConsole, &csbi)) - { - // we assuming its a file handle - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } + { + // we assuming its a file handle + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; //make sure they didnt make the screen to small if(ScreenLines<4) - { - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } + { + ConPrintf(szFormat, arg_ptr, nStdHandle); + return 0; + } len = _vstprintf (szOut, szFormat, arg_ptr); pBuf = szOut; for(i = 0; i < len; i++) - { - - if(pBuf[i] == _T('\n')) - { - LineCount++; - CharEL=0; - } - else - { - CharEL++; - if (CharEL>=ScreenCol) - { - if (i+1<len) - { - if(pBuf[i+1] != _T('\n')) LineCount++; - } - CharEL=0; - } - } - - /* FIXME : write more that one char at time */ - WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(CHAR),&dwWritten,NULL); - if(LineCount >= ScreenLines) - { - if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) - WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); - - if(PagePrompt() != PROMPT_YES) - { - return 1; - } - //reset the number of lines being printed - LineCount = 0; - CharEL=0; - } + { + // search 'end of string' '\n' or 'end of screen line' + for(; (i < len) && (pBuf[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) + CharSL++; + + WriteFile (GetStdHandle (nStdHandle),&pBuf[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); + LineCount++; + CharSL=0; + + if(LineCount >= ScreenLines) + { + if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); + + if(PagePrompt() != PROMPT_YES) + { + return 1; + } + //reset the number of lines being printed + LineCount = 0; + CharSL=0; + } }

1 0

[spetreolle] 25702: translate hardcoded strings into 'edit variable' box
by spetreolle＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: spetreolle Date: Sat Feb 3 17:07:03 2007 New Revision: 25702 URL: http://svn.reactos.org/svn/reactos?rev=25702&view=rev Log: translate hardcoded strings into 'edit variable' box Modified: trunk/reactos/dll/cpl/sysdm/Ja.rc trunk/reactos/dll/cpl/sysdm/cz.rc trunk/reactos/dll/cpl/sysdm/de.rc trunk/reactos/dll/cpl/sysdm/dk.rc trunk/reactos/dll/cpl/sysdm/en.rc trunk/reactos/dll/cpl/sysdm/environment.c trunk/reactos/dll/cpl/sysdm/es.rc trunk/reactos/dll/cpl/sysdm/fr.rc trunk/reactos/dll/cpl/sysdm/hu.rc trunk/reactos/dll/cpl/sysdm/nl.rc trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/ru.rc trunk/reactos/dll/cpl/sysdm/sv.rc trunk/reactos/dll/cpl/sysdm/sysdm.rc trunk/reactos/dll/cpl/sysdm/uk.rc Modified: trunk/reactos/dll/cpl/sysdm/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/Ja.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/Ja.rc (original) +++ trunk/reactos/dll/cpl/sysdm/Ja.rc Sat Feb 3 17:07:03 2007 @@ -119,4 +119,6 @@ BEGIN IDS_CPLSYSTEMNAME "VXe" IDS_CPLSYSTEMDESCRIPTION "VXeÌî{îñð\\¦µAVXeân[hEFAÌlXÈÝèðÏXµÜ·B" + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/cz.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/cz.rc (original) +++ trunk/reactos/dll/cpl/sysdm/cz.rc Sat Feb 3 17:07:03 2007 @@ -119,4 +119,6 @@ BEGIN IDS_CPLSYSTEMNAME "Systém" IDS_CPLSYSTEMDESCRIPTION "Zobrazuje informace o Vaem poèítaèi, mìní rùzné systémové promìnné a hardwarové vlastnosti." + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/de.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/de.rc (original) +++ trunk/reactos/dll/cpl/sysdm/de.rc Sat Feb 3 17:07:03 2007 @@ -273,4 +273,6 @@ IDS_GIGABYTE "GB RAM" IDS_TERABYTE "TB RAM" IDS_PETABYTE "PB RAM" -END + IDS_VARIABLE "Variable" + IDS_VALUE "Value" +END Modified: trunk/reactos/dll/cpl/sysdm/dk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/dk.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/dk.rc (original) +++ trunk/reactos/dll/cpl/sysdm/dk.rc Sat Feb 3 17:07:03 2007 @@ -117,4 +117,6 @@ BEGIN IDS_CPLSYSTEMNAME "System Indstillinger" IDS_CPLSYSTEMDESCRIPTION "Se mere information omkring din computer, og skift diverse system og hardware indstillinger." + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/en.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/en.rc (original) +++ trunk/reactos/dll/cpl/sysdm/en.rc Sat Feb 3 17:07:03 2007 @@ -265,4 +265,6 @@ IDS_GIGABYTE "GB of RAM" IDS_TERABYTE "TB of RAM" IDS_PETABYTE "PB of RAM" -END + IDS_VARIABLE "Variable" + IDS_VALUE "Value" +END Modified: trunk/reactos/dll/cpl/sysdm/environment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/environment.… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/environment.c (original) +++ trunk/reactos/dll/cpl/sysdm/environment.c Sat Feb 3 17:07:03 2007 @@ -237,6 +237,7 @@ { RECT rect; LV_COLUMN column; + TCHAR szStr[32]; GetClientRect(hwndListView, &rect); @@ -245,12 +246,14 @@ column.fmt=LVCFMT_LEFT; column.cx = (INT)((rect.right - rect.left) * 0.32); column.iSubItem = 0; - column.pszText = _T("Variable"); + LoadString(hApplet, IDS_VARIABLE, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; (void)ListView_InsertColumn(hwndListView, 0, &column); column.cx = (INT)((rect.right - rect.left) * 0.63); column.iSubItem = 1; - column.pszText = _T("Value"); + LoadString(hApplet, IDS_VALUE, szStr, sizeof(szStr) / sizeof(szStr[0])); + column.pszText = szStr; (void)ListView_InsertColumn(hwndListView, 1, &column); } Modified: trunk/reactos/dll/cpl/sysdm/es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/es.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/es.rc (original) +++ trunk/reactos/dll/cpl/sysdm/es.rc Sat Feb 3 17:07:03 2007 @@ -123,4 +123,6 @@ BEGIN IDS_CPLSYSTEMNAME "Systema" IDS_CPLSYSTEMDESCRIPTION "Ver información de su Computadora y cambiar varias opciones del systema." + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/fr.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/fr.rc (original) +++ trunk/reactos/dll/cpl/sysdm/fr.rc Sat Feb 3 17:07:03 2007 @@ -269,4 +269,6 @@ IDS_GIGABYTE "GB de RAM" IDS_TERABYTE "TB de RAM" IDS_PETABYTE "PB de RAM" -END + IDS_VARIABLE "Variable" + IDS_VALUE "Valeur" +END Modified: trunk/reactos/dll/cpl/sysdm/hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/hu.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/hu.rc (original) +++ trunk/reactos/dll/cpl/sysdm/hu.rc Sat Feb 3 17:07:03 2007 @@ -120,4 +120,6 @@ BEGIN IDS_CPLSYSTEMNAME "Rendszer" IDS_CPLSYSTEMDESCRIPTION "A számítógéppel kapcsolatos információk megjelenítése, különbözõ rendszer és hardver beállítások módosítása." + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/nl.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/nl.rc (original) +++ trunk/reactos/dll/cpl/sysdm/nl.rc Sat Feb 3 17:07:03 2007 @@ -119,4 +119,6 @@ BEGIN IDS_CPLSYSTEMNAME "Systeem" IDS_CPLSYSTEMDESCRIPTION "Systeeminformatie weergeven en omgevingsinstellingen wijzigen." + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h Sat Feb 3 17:07:03 2007 @@ -18,6 +18,8 @@ #define IDS_TERABYTE 64 #define IDS_PETABYTE 65 +#define IDS_VARIABLE 66 +#define IDS_VALUE 67 /* propsheet - general */ #define IDD_PROPPAGEGENERAL 100 Modified: trunk/reactos/dll/cpl/sysdm/ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/ru.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/ru.rc (original) +++ trunk/reactos/dll/cpl/sysdm/ru.rc Sat Feb 3 17:07:03 2007 @@ -152,4 +152,6 @@ IDS_MIN "Ìèíèìàëüíî âîçìîæíîå: %s" IDS_REC "Ðåêîìåíäîâàííîå: %s" IDS_CUR "Òåêóùåå: %s" + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sv.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sv.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sv.rc Sat Feb 3 17:07:03 2007 @@ -121,4 +121,6 @@ BEGIN IDS_CPLSYSTEMNAME "System" IDS_CPLSYSTEMDESCRIPTION "Se information om din dator och ändra olika system- och hårdvaruinställningar." + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rc (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rc Sat Feb 3 17:07:03 2007 @@ -24,6 +24,7 @@ #include "en.rc" #include "de.rc" +#include "fr.rc" /* #include "cz.rc" #include "dk.rc" Modified: trunk/reactos/dll/cpl/sysdm/uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/uk.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/uk.rc (original) +++ trunk/reactos/dll/cpl/sysdm/uk.rc Sat Feb 3 17:07:03 2007 @@ -160,4 +160,6 @@ IDS_MIN "Ì³í³ìàëüíî ìîæëèâèé: %s" IDS_REC "Ðåêîìåíäîâàíèé: %s" IDS_CUR "Ïîòî÷íèé: %s" + IDS_VARIABLE "Variable" + IDS_VALUE "Value" END

1 0

[spetreolle] 25701: update french translation
by spetreolle＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: spetreolle Date: Sat Feb 3 16:53:13 2007 New Revision: 25701 URL: http://svn.reactos.org/svn/reactos?rev=25701&view=rev Log: update french translation Modified: trunk/reactos/dll/cpl/sysdm/fr.rc Modified: trunk/reactos/dll/cpl/sysdm/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/fr.rc?rev=25… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/fr.rc (original) +++ trunk/reactos/dll/cpl/sysdm/fr.rc Sat Feb 3 16:53:13 2007 @@ -4,121 +4,269 @@ IDI_DEVMGR ICON "resources/devmgr.ico" RC_LICENSE RTDATA "resources/gpl.txt" -IDD_PROPPAGEGENERAL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Système d'exploitation",-1,SYSTEM_COLUMN,LABELLINE(2),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT REACTOS_STR_PRODUCT_NAME,-1,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(3),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "Version "REACTOS_STR_PRODUCT_VERSION,-1,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(4),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - - LTEXT "Ordinateur",-1,SYSTEM_COLUMN,LABELLINE(6),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSORMANUFACTURER,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(7),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSOR,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(8),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_PROCESSORSPEED,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - LTEXT "",IDC_SYSTEMMEMORY,SYSTEM_COLUMN+PROPSHEETPADDING(1),LABELLINE(10),PROPSHEETWIDTH-SYSTEM_COLUMN-PROPSHEETPADDING(1),8 - - EDITTEXT IDC_LICENSEMEMO,PROPSHEETPADDING(1),LABELLINE(13),PROPSHEETWIDTH-PROPSHEETPADDING(2),PROPSHEETHEIGHT-LABELLINE(13)-PROPSHEETPADDING(1),ES_LEFT|WS_TABSTOP|WS_BORDER|WS_VSCROLL|WS_HSCROLL|WS_GROUP|ES_MULTILINE|ES_READONLY -END - -IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT + CONTROL "", IDC_ROSIMG, "Static", SS_OWNERDRAW, 4, 5, 248, 111 + LTEXT "Système d'exploitation :", IDC_STATIC, 4, 132, 75, 9 + LTEXT REACTOS_STR_PRODUCT_NAME, IDC_STATIC, 10, 144, 116, 9 + LTEXT "Version ", IDC_STATIC, 10, 153, 25, 9 + LTEXT REACTOS_STR_PRODUCT_VERSION, IDC_STATIC, 35, 153, 91, 9 + LTEXT "Machine :", IDC_STATIC, 124, 132, 34, 9 + LTEXT "", IDC_MACHINELINE1, 130, 144, 118, 9 + LTEXT "", IDC_MACHINELINE2, 130, 153, 118, 9 + LTEXT "", IDC_MACHINELINE3, 130, 162, 118, 9 + LTEXT "", IDC_MACHINELINE4, 130, 171, 118, 9 + LTEXT "", IDC_MACHINELINE5, 130, 180, 118, 9 + CONTROL "Visiter la <A HREF=""http://www.reactos.org/"">page d'accueil ReactOS </A>", IDC_ROSHOMEPAGE_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 20, 200, 93, 8 + PUSHBUTTON "Voir la &licence...", IDC_LICENCE, 170, 199, 78, 13 +END + +IDD_PROPPAGEHARDWARE DIALOGEX 0, 0, 256, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Matériel" FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - GROUPBOX "Assistant matériel",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - LTEXT "L'Assistant matériel vous aide à installer, désinstaller, réparer, débrancher, enlever et configurer votre matériel.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - PUSHBUTTON "Assistant &matériel...",IDC_HARDWARE_WIZARD,PROPSHEETWIDTH-PROPSHEETPADDING(21),LABELLINE(5)+2,PROPSHEETPADDING(19),14 - - GROUPBOX "Gestionnaire de périphériques",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2 - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(10)-3,ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Le Gestionnaire de périphériques liste tous les périphériques installés sur votre ordinateur. Utilisez le Gestionnaire de périphériques pour modifier les propriétés de tout périphérique.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - - PUSHBUTTON "&Gestionnaire de périphériques...",IDC_HARDWARE_DEVICE_MANAGER,PROPSHEETWIDTH-PROPSHEETPADDING(21),LABELLINE(13)+2,PROPSHEETPADDING(19),14 - - GROUPBOX "Profils matériels",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(18)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Les Profils matériels vous donnent un moyen de metttre en place et conserver différentes configurations matérielles.",0,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "Profils &matériels...",IDC_HARDWARE_PROFILE,PROPSHEETWIDTH-PROPSHEETPADDING(21),LABELLINE(20)+2,PROPSHEETPADDING(19),14 -END - -IDD_PROPPAGEUSERPROFILE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Profils utilisateurs" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(1),LABELLINE(1), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Les Profils utilisateurs contiennent les réglages bureau et d'autres informations associées à votre compte utilisateur. Un profil différent peut être créé sur chaque ordinateur que vous utilisez, ou vous pouvez choisir un profil nomade qui sera identique sur chaque ordinateur que vous utiliserez.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(5) - LTEXT "Profils sauvés sur cet ordinateur:",-1,PROPSHEETPADDING(1),LABELLINE(6),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1) - CONTROL "",IDC_USERPROFILE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|WS_BORDER|WS_TABSTOP,PROPSHEETPADDING(1),LABELLINE(8),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(11),WS_EX_CLIENTEDGE - - PUSHBUTTON "Effacer",IDC_USERPROFILE_DELETE,PROPSHEETPADDING(1),LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Modifier le type...",IDC_USERPROFILE_CHANGE,(PROPSHEETWIDTH/2)-30,LABELLINE(20),60,LABELLINE(1)+2 - PUSHBUTTON "Copier vers...",IDC_USERPROFILE_COPY,PROPSHEETWIDTH-PROPSHEETPADDING(1)-60,LABELLINE(20),60,LABELLINE(1)+2 -END - -IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +BEGIN + GROUPBOX "Gestionnaire de Périphériques", IDC_STATIC, 6, 7, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 18, 23, 21, SS_ICON + LTEXT "Le Gestionnaire de Périphériques liste tous les périphériques matériels de votre ordinateur. Utiliser le Gestionnaire de périphériques pour changer les propriétés d'un périphérique.", IDC_STATIC, 42, 18, 204, 24 + PUSHBUTTON "&Gestionnaire de Périphériques...", IDC_HARDWARE_DEVICE_MANAGER, 135, 48, 110, 15 + + GROUPBOX "Assistant Matériel", IDC_STATIC, 6, 79, 244, 61 + ICON IDI_DEVMGR, IDC_STATIC, 12, 90, 23, 21, SS_ICON + LTEXT "L'Assistant Matériel vous aide à installer, désinstaller, réparer, débrancher, éjecter et configurer votre matériel.", IDC_STATIC, 42, 90, 204, 24 + PUSHBUTTON "&Assistant Matériel...", IDC_HARDWARE_WIZARD, 135, 120, 110, 15 + + GROUPBOX "Profils Matériels", IDC_STATIC, 6, 149, 244, 61 + ICON IDI_HARDPROF, IDC_STATIC, 12, 160, 23, 21, SS_ICON + LTEXT "Les Profils Matériels sont un moyen de paramétrer et d'enregistrer différentes configurations matérielles.", IDC_STATIC, 42, 160, 204, 24 + PUSHBUTTON "&Profils Matériels...", IDC_HARDWARE_PROFILE, 135, 190, 110, 15 +END + + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, 256, 218 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Avancé" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Performances",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(2), ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Les options de performance controlent comment les applications utilisent la mémoire, ce qui affecte la vitesse de votre ordinateur.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Options Performances...",IDC_PERFOR,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(5)+2,PROPSHEETPADDING(18),14 - GROUPBOX "Variables d'environnement",-1,PROPSHEETPADDING(1),LABELLINE(8)+2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(10)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Les Variables d'environnement indiquent à votre ordinateur où trouver certains types d'informations.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "Variables d'&environnement...",IDC_ENVVAR,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(12)+2,PROPSHEETPADDING(18),14 - GROUPBOX "&Démarrage et récupération",-1,PROPSHEETPADDING(1),LABELLINE(15)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1) - ICON IDI_DEVMGR, IDC_ICON1, PROPSHEETPADDING(2),LABELLINE(17)-5, ICONSIZE, ICONSIZE, SS_ICON - LTEXT "Les options de d&émarrage et de récupération disent à votre ordinateur comment démarrer et quoi faire en cas d'arrêt dû à une erreur système.",0,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(17)-5,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) - PUSHBUTTON "&Démarrage et récupération...",IDC_STAREC,PROPSHEETWIDTH-PROPSHEETPADDING(20),LABELLINE(19)+2,PROPSHEETPADDING(18),14 -END + LTEXT "Administrator privileges are required for most of these settings.", IDC_STATIC, 12, 5, 236, 8 + GROUPBOX "Performance", IDC_STATIC, 6, 18, 244, 50 + LTEXT "Les options de performance contrôlent comment les applications utilisent la mémoire, ce qui affecte la vitesse de l'ordinateur.", IDC_STATIC, 16, 29, 210, 25 + PUSHBUTTON "Réglages", IDC_PERFOR, 194, 48, 50, 15 + + GROUPBOX "Profils Utilisateurs", IDC_STATIC, 6,75,244,48 + LTEXT "Réglages liés à votre compte utilsateur.", IDC_STATIC, 16, 88, 210, 20 + PUSHBUTTON "Réglages", IDC_USERPROFILE, 194, 103, 50, 15 + + GROUPBOX "Démarrage et Récupération", IDC_STATIC, 6, 131, 244, 52 + LTEXT "Les option Démarrage et Récupération indiquent à l'ordinateur comment démarrer et quoi faire si une erreur empêche l'ordinateur de s'arrêter.", IDC_STATIC, 16, 144, 210, 30 + PUSHBUTTON "Réglages", IDC_STAREC, 194, 162, 50, 15 + + PUSHBUTTON "Variables d'en&vironnement", IDC_ENVVAR, 70, 192, 94, 15 + PUSHBUTTON "Rapport d'e&rreurs", IDC_ERRORREPORT, 170, 192, 80, 15 +END + + +IDD_HARDWAREPROFILES DIALOGEX 6, 18, 254, 234 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Profils Matériels" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HARDPROF, IDC_STATIC, 8, 11, 18, 20, SS_ICON + LTEXT "Vous pouvez paramétrer des profils matériels pour différentes configurations matérielles. Au démarrage, vous pouvez choisir le profil désiré.", IDC_STATIC, 46, 11, 188, 25 + LTEXT "Profils Matériels disponibles:", IDC_STATIC, 8, 41, 120, 8 + LISTBOX IDC_HRDPROFLSTBOX, 8, 52, 215, 54, LBS_NOTIFY + PUSHBUTTON "", IDC_HRDPROFUP, 232, 59, 15, 15 + PUSHBUTTON "", IDC_HRDPROFDWN, 232, 79, 15, 15 + PUSHBUTTON "&Propriétés", IDC_HRDPROFPROP, 8, 106, 50, 14 + PUSHBUTTON "&Copier", IDC_HRDPROFCOPY, 63, 106, 50, 14 + PUSHBUTTON "&Renommer", IDC_HRDPROFRENAME, 118, 106, 50, 14 + PUSHBUTTON "&Effacer", IDC_HRDPROFDEL, 173, 106, 50, 14 + + GROUPBOX "Sélection de Profils Matériels ", IDC_STATIC, 7, 130, 240, 75 + LTEXT "Quand ReactOS démarre:", IDC_STATIC, 14, 142, 210, 8 + //RADIOBUTTON "&Wait until I select a hardware profile", IDC_HRDPROFWAIT, 14, 158, 133, 8 + //RADIOBUTTON "&Select the first profile listed if I don't select a profile in", IDC_HRDPROFSELECT, 14, 173, 190, 8 + CONTROL "&Attendre la sélection d'un profil matériel", IDC_HRDPROFWAIT, "button", BS_AUTORADIOBUTTON, 14, 158, 145, 8 + CONTROL "&Sélectionner le premier profil si aucun profil n'est sélectionné", IDC_HRDPROFSELECT, "button", BS_AUTORADIOBUTTON, 14, 173, 215, 8 + LTEXT "secondes", IDC_STATIC, 65, 187, 35, 8 + EDITTEXT IDC_HRDPROFEDIT, 25, 185, 35, 12 + CONTROL "", IDC_HRDPROFUPDWN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 25, 185, 7, 10 + + DEFPUSHBUTTON "OK", IDOK, 143, 213, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 197, 213, 50, 14 +END + + +IDD_RENAMEPROFILE DIALOGEX 12, 26, 256, 52 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Renommer Profil" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "De:", IDC_STATIC, 5, 10, 20, 8 + LTEXT "", IDC_RENPROFEDITFROM, 30, 10, 160, 10 + LTEXT "Vers:", IDC_STATIC, 5, 30, 20, 8 + EDITTEXT IDC_RENPROFEDITTO, 30, 30, 160, 12 + + DEFPUSHBUTTON "OK", IDOK, 196, 6, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 196, 24, 50, 14 +END + + +IDD_USERPROFILE DIALOGEX 0, 0, 256, 218 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Profils Utilisateurs" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_USERPROF, IDC_STATIC, 6, 11, 16, 16, SS_ICON + LTEXT "Les Profils Utilisateurs contiennent les réglages et autres informations liées à votre compte. Un profil différent peut être créé sur chaque ordinateur utilisé, ou vous pouvez sélectionner un profil mobile qui sera le même sur chaque ordinateur.", + IDC_STATIC, 40, 11, 204, 35 + LTEXT "Profils enregistrés sur cet ordinateur:", IDC_STATIC, 16, 51, 204, 9 + CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 6, 66, 244, 85, WS_EX_CLIENTEDGE + PUSHBUTTON "Chan&ger le type", IDC_USERPROFILE_CHANGE, 80, 156, 60, 13 + PUSHBUTTON "&Supprimer", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "&Copier vers...", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + + LTEXT "Pour créer des Profils Utilisateurs, ouvrir \ndans le Panneau de Configuration.", IDC_STATIC, 7, 175, 135, 26 + CONTROL "<A>Profils Utilisateurs</A>", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 140, 175, 60, 8 + + DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 + PUSHBUTTON "Annuler", IDCANCEL, 196, 200, 54, 13 +END + + +IDD_STARTUPRECOVERY DIALOGEX 6, 18, 252, 280 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Démarrage et Récupération" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Démarrage du système", IDC_STATIC, 7, 12, 238, 95 + LTEXT "Système d'exploitation par défaut:", IDC_STATIC, 14, 26, 110, 8 + COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST + //CHECKBOX "&Time to display list of operating systems:", IDC_STRECLIST, 14, 56, 150, 8 + CONTROL "&Affiche la liste des systèmes pendant:", IDC_STRECLIST, "button", BS_AUTOCHECKBOX, 14, 56, 150, 8 + EDITTEXT IDC_STRRECLISTEDIT, 179, 54, 30, 12 + CONTROL "", IDC_STRRECLISTUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "secondes", IDC_STATIC, 210, 56, 30, 8 + CONTROL "Affiche les options de récupération pendant:", IDC_STRRECREC, "button", BS_AUTOCHECKBOX, 14, 70, 163, 8 + EDITTEXT IDC_STRRECRECEDIT, 179, 68, 30, 12 + CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 + LTEXT "secondes", IDC_STATIC, 210, 70, 30, 8 + LTEXT "Pour éditer le fichier d'options de démarrage manuellement, cliquer sur Editer.", IDC_STATIC, 14, 85, 187, 18 + PUSHBUTTON "&Editer", IDC_STRRECEDIT, 188, 87, 50, 14 + + GROUPBOX "Erreur Système", IDC_STATIC, 7, 111, 238, 140 + CONTROL "&Ecrire un événement dans le journal système", IDC_STRRECWRITEEVENT, "button", BS_AUTOCHECKBOX, 14, 124, 160, 10 + CONTROL "Envoyer une alerte administrative", IDC_STRRECSENDALERT, "button", BS_AUTOCHECKBOX, 14, 138, 148, 10 + CONTROL "Redémarrer automatiquement", IDC_STRRECRESTART, "button", BS_AUTOCHECKBOX, 14, 152, 145, 10 + + GROUPBOX "Ecrire les informations de débogage", IDC_STATIC, 12, 167, 227, 76 + COMBOBOX IDC_STRRECDEBUGCOMBO, 17, 182, 151, 49, CBS_DROPDOWNLIST + LTEXT "Ficher &Dump :", IDC_STATIC, 17, 202, 150, 8 + EDITTEXT IDC_STRRECDUMPFILE, 17, 210, 153, 12 + CONTROL "&Ecraser tout fichier existant", IDC_STRRECOVERWRITE, "button", BS_AUTOCHECKBOX, 17, 228, 125, 10 + + DEFPUSHBUTTON "OK", IDOK, 141, 259, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 195, 259, 50, 14 +END + + +IDD_VIRTMEM DIALOGEX 6, 6, 223, 248 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Mémoire Virtuelle" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + LTEXT "Lecteur [Nom de Volume]", IDC_STATIC, 12, 5, 96, 9 + LTEXT "Taille de fichier swap (MB)", IDC_STATIC, 115, 5, 96, 9 + CONTROL "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP, + 10, 16, 204, 52, WS_EX_CLIENTEDGE + + GROUPBOX "Taille de fichier swap pour le disque sélectionné", IDC_DRIVEGROUP, 10, 70, 204, 104 + LTEXT "Lecteur :", IDC_STATIC, 20, 80, 30, 8 + LTEXT "", IDC_DRIVE, 88, 81, 100, 9 + LTEXT "Espace disponible :", IDC_STATIC, 20, 92, 66, 9 + LTEXT "", IDC_SPACEAVAIL, 88, 92, 104, 9 + LTEXT "Taille &Initiale (MB):", -1, 22, 118, 54, 9 + LTEXT "Taille Ma&ximum (MB):", -1, 22, 131, 64, 9 + CONTROL "&Taille personnalisée", IDC_CUSTOM, "Button", BS_AUTORADIOBUTTON, 20, 105, 75, 9 + CONTROL "&Taille &gérée par le système", IDC_SYSMANSIZE, "Button", BS_AUTORADIOBUTTON, 20, 145, 98, 9 + CONTROL "&Pas de mémoire virtuelle", IDC_NOPAGEFILE, "Button", BS_AUTORADIOBUTTON, 20, 158, 90,9 + EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + EDITTEXT IDC_MAXSIZE, 100, 129, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE + PUSHBUTTON "Régler", IDC_SET, 158, 155, 50, 13 + + GROUPBOX "Mémoire virtuelle totale pour tous les lecteurs", IDC_TOTALGROUP, 10, 177, 204, 46 + LTEXT "Minimum alloué:", IDC_STATIC, 18, 188, 58, 9 + LTEXT "", IDC_MINIMUM, 88, 188, 100, 9 + LTEXT "Recommandé:", IDC_STATIC, 18, 199, 52, 9 + LTEXT "", IDC_RECOMMENDED, 88, 197, 100, 9 + LTEXT "Alloué actuellement:", IDC_STATIC, 18, 210, 66, 9 + LTEXT "", IDC_CURRENT, 88, 208, 100, 9 + + DEFPUSHBUTTON "OK", IDOK, 114, 232, 48, 13 + PUSHBUTTON "Annuler", IDCANCEL, 168, 232, 48, 13 +END + IDD_ENVIRONMENT_VARIABLES DIALOGEX 6, 18, 252, 245 -STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Variables d'environnement" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Variables utilisateur",-1,7,12,238,100 - LTEXT "&Variables:",-1,14,24,224,8 - CONTROL "",IDC_USER_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,35,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "&Nouveau...",IDC_USER_VARIABLE_NEW,80,90,50,14 - PUSHBUTTON "&Modifier...",IDC_USER_VARIABLE_EDIT,134,90,50,14 - PUSHBUTTON "&Effacer",IDC_USER_VARIABLE_DELETE,188,90,50,14 - - GROUPBOX "Variables système",-1,7,116,238,100 - LTEXT "V&ariables:",-1,14,128,224,8 - CONTROL "",IDC_SYSTEM_VARIABLE_LIST,"SysListView32",LVS_REPORT|LVS_SINGLESEL|LVS_SHOWSELALWAYS|LVS_SORTASCENDING|LVS_NOSORTHEADER|WS_VSCROLL|WS_HSCROLL|WS_TABSTOP,14,139,224,48,WS_EX_CLIENTEDGE - PUSHBUTTON "&Nouveau......",IDC_SYSTEM_VARIABLE_NEW,80,194,50,14 - PUSHBUTTON "&Modifier...",IDC_SYSTEM_VARIABLE_EDIT,134,194,50,14 - PUSHBUTTON "&Effacer",IDC_SYSTEM_VARIABLE_DELETE,188,194,50,14 - - DEFPUSHBUTTON "OK",IDOK,141,224,50,14,WS_GROUP - PUSHBUTTON "Annuler",IDCANCEL,195,224,50,14 -END - - -IDD_EDIT_VARIABLE DIALOGEX 10, 15, 240, 71 + GROUPBOX "Variables utilisateur", IDC_STATIC, 7, 12, 238, 100 + + CONTROL "", IDC_USER_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 25, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "&Nouvelle...", IDC_USER_VARIABLE_NEW, 80, 90, 50, 14 + PUSHBUTTON "&Editer...", IDC_USER_VARIABLE_EDIT, 134, 90, 50, 14 + PUSHBUTTON "&Supprimer", IDC_USER_VARIABLE_DELETE, 188, 90, 50, 14 + GROUPBOX "Variables système", IDC_STATIC, 7, 116, 238, 100 + + CONTROL "", IDC_SYSTEM_VARIABLE_LIST, "SysListView32", + LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOSORTHEADER | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, 14, 129, 224, 58, WS_EX_CLIENTEDGE + PUSHBUTTON "Nou&velle...", IDC_SYSTEM_VARIABLE_NEW, 80, 194, 50, 14 + PUSHBUTTON "Edi&ter...", IDC_SYSTEM_VARIABLE_EDIT, 134, 194, 50, 14 + PUSHBUTTON "Su&pprimer", IDC_SYSTEM_VARIABLE_DELETE, 188, 194, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 141, 224, 50, 14, WS_GROUP + PUSHBUTTON "Annuler", IDCANCEL, 195, 224, 50, 14 +END + + +IDD_EDIT_VARIABLE DIALOGEX 10, 15, 227, 71 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Modifier la variable" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "&Nom de la variable:",-1,7,14,65,8 - EDITTEXT IDC_VARIABLE_NAME,85,12,145,12,ES_AUTOHSCROLL - LTEXT "&Valeur de la variable:",-1,7,32,70,8 - EDITTEXT IDC_VARIABLE_VALUE,85,30,145,12,ES_AUTOHSCROLL - - DEFPUSHBUTTON "OK",IDOK,116,50,50,14,WS_GROUP - PUSHBUTTON "Annuler",IDCANCEL,170,50,50,14 -END - - -STRINGTABLE -BEGIN - IDS_CPLSYSTEMNAME "Système" - IDS_CPLSYSTEMDESCRIPTION "Affiche des informations sur votre ordinateur et permet de change les paramètres du système et du matériel." -END + LTEXT "&Nom de la variable :", IDC_STATIC, 7, 14, 65, 8 + EDITTEXT IDC_VARIABLE_NAME, 75, 12, 145, 12, ES_AUTOHSCROLL + LTEXT "&Valeur de la variable :", IDC_STATIC, 7, 32, 65, 8 + EDITTEXT IDC_VARIABLE_VALUE, 75, 30, 145, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 50, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 170, 50, 50, 14 +END + + +IDD_LICENCE DIALOGEX 6, 5, 267, 159 +CAPTION "Licence" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +STYLE WS_BORDER | WS_THICKFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +BEGIN + EDITTEXT IDC_LICENCEEDIT, 6, 3, 255, 131, WS_VSCROLL | ES_READONLY | ES_MULTILINE + DEFPUSHBUTTON "OK", IDOK, 106, 142, 54, 13 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_CPLSYSTEMNAME "Système" + IDS_CPLSYSTEMDESCRIPTION "Affiche des informations à propos de l'ordinateur et change des réglages systèmes et matériels." + IDS_MEGABYTE "MB de RAM" + IDS_GIGABYTE "GB de RAM" + IDS_TERABYTE "TB de RAM" + IDS_PETABYTE "PB de RAM" +END

1 0

[spetreolle] 25700: avoid crash
by spetreolle＠svn.reactos.org 03 Feb '07

03 Feb '07

Author: spetreolle Date: Sat Feb 3 16:50:47 2007 New Revision: 25700 URL: http://svn.reactos.org/svn/reactos?rev=25700&view=rev Log: avoid crash 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 Feb 3 16:50:47 2007 @@ -47,7 +47,7 @@ { /* get Path to freeldr.ini or boot.ini */ szSystemDrive = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); - if (szSystemDrive != NULL) + if (szSystemDrive != NULL && szSystemDrive != NULL) { szSystemDrive = _tgetenv(_T("SystemDrive")); if (m_szFreeldrIni != NULL)

1 0

[greatlrd] 25699: fix buliding with optimze -O3 forget add <compilerflag>-Wno-strict-aliasing</compilerflag> to all level of optimze
by greatlrd＠svn.reactos.org 02 Feb '07

02 Feb '07

Author: greatlrd Date: Fri Feb 2 16:56:33 2007 New Revision: 25699 URL: http://svn.reactos.org/svn/reactos?rev=25699&view=rev Log: fix buliding with optimze -O3 forget add <compilerflag>-Wno-strict-aliasing</compilerflag> to all level of optimze Modified: trunk/reactos/ReactOS.rbuild Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=25699&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Fri Feb 2 16:56:33 2007 @@ -35,18 +35,22 @@ </if> <if property="OPTIMIZE" value="2"> <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if> <if property="OPTIMIZE" value="3"> <compilerflag>-O1</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if> <if property="OPTIMIZE" value="4"> <compilerflag>-O2</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if> <if property="OPTIMIZE" value="5"> <compilerflag>-O3</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-mpreferred-stack-boundary=2</compilerflag> </if> </if>

1 0

[greatlrd] 25698: part 2/2 adding a new value OPTIMIZE, easy way to enable diffent optimze level do not chamge it if u do not known what u doing
by greatlrd＠svn.reactos.org 02 Feb '07

02 Feb '07

Author: greatlrd Date: Fri Feb 2 16:02:17 2007 New Revision: 25698 URL: http://svn.reactos.org/svn/reactos?rev=25698&view=rev Log: part 2/2 adding a new value OPTIMIZE, easy way to enable diffent optimze level do not chamge it if u do not known what u doing Modified: trunk/reactos/ReactOS.rbuild Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=25698&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Fri Feb 2 16:02:17 2007 @@ -26,12 +26,31 @@ </if> <if property="GDB" value="0"> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </if> </if> + <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs