Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[tkreuzer] 56970: [WIN32K] - Take translation into account when inverting an XFORMOBJ - Always use the matrices from the DCATTR instead of DCLEVEL - Mark Device-to-World translation as invalid when...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Jul 28 18:31:24 2012 New Revision: 56970 URL: http://svn.reactos.org/svn/reactos?rev=56970&view=rev Log: [WIN32K] - Take translation into account when inverting an XFORMOBJ - Always use the matrices from the DCATTR instead of DCLEVEL - Mark Device-to-World translation as invalid when the Window Origin is modified Fixes 7088 See issue #7088 for more details. Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h trunk/reactos/win32ss/gdi/ntgdi/path.c trunk/reactos/win32ss/gdi/ntgdi/xformobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.c [iso-8859-1] Sat Jul 28 18:31:24 2012 @@ -635,7 +635,7 @@ pdcattr->ptlWindowOrg.x += XOffset; pdcattr->ptlWindowOrg.y += YOffset; - pdcattr->flXform |= PAGE_XLATE_CHANGED; + pdcattr->flXform |= PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID; DC_UnlockDc(dc); @@ -1052,8 +1052,6 @@ pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | INVALIDATE_ATTRIBUTES | DEVICE_TO_WORLD_INVALID); - -// DC_UpdateXforms(pdc); } // NtGdiSetLayout Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Sat Jul 28 18:31:24 2012 @@ -663,7 +663,7 @@ } /* Do we rotate or shear? */ - if (!(dc->dclevel.mxWorldToDevice.flAccel & XFORM_SCALE)) + if (!(dc->pdcattr->mxWorldToDevice.flAccel & XFORM_SCALE)) { POINTL DestCoords[4]; ULONG PolyCounts = 4; Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Jul 28 18:31:24 2012 @@ -1490,7 +1490,7 @@ pdcattr = dc->pdcattr; - MatrixS2XForm(&xForm, &dc->dclevel.mxWorldToDevice); + MatrixS2XForm(&xForm, &dc->pdcattr->mxWorldToDevice); eM11 = xForm.eM11; hFont = pdcattr->hlfntNew; Modified: trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdifloat… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdifloat.h [iso-8859-1] Sat Jul 28 18:31:24 2012 @@ -23,8 +23,8 @@ { FLOAT x, y; XFORM xformWorld2Vport; - - MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice); + + MatrixS2XForm(&xformWorld2Vport, &dc->pdcattr->mxWorldToDevice); /* Perform the transformation */ x = point->x; Modified: trunk/reactos/win32ss/gdi/ntgdi/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.c [iso-8859-1] Sat Jul 28 18:31:24 2012 @@ -76,7 +76,7 @@ { XFORMOBJ xo; - XFORMOBJ_vInit(&xo, &pdc->dclevel.mxDeviceToWorld); + XFORMOBJ_vInit(&xo, &pdc->pdcattr->mxDeviceToWorld); return XFORMOBJ_bApplyXform(&xo, XF_LTOL, count, (PPOINTL)ppt, (PPOINTL)ppt); } @@ -124,7 +124,7 @@ * tests show that resetting the graphics mode to GM_COMPATIBLE does * not reset the world transform. */ - MatrixS2XForm(&xform, &dc->dclevel.mxWorldToPage); + MatrixS2XForm(&xform, &dc->pdcattr->mxWorldToPage); /* Set MM_TEXT */ // IntGdiSetMapMode( dc, MM_TEXT ); @@ -1429,7 +1429,7 @@ szWindowExt = dc->pdcattr->szlWindowExt; ptWindowOrg = dc->pdcattr->ptlWindowOrg; - MatrixS2XForm(&xform, &dc->dclevel.mxWorldToPage); + MatrixS2XForm(&xform, &dc->pdcattr->mxWorldToPage); /* Set MM_TEXT */ pdcattr->iMapMode = MM_TEXT; @@ -1556,7 +1556,7 @@ pdcattr->ptlViewportOrg.y = ptViewportOrg.y; /* Restore the world transform */ - XForm2MatrixS(&dc->dclevel.mxWorldToPage, &xform); + XForm2MatrixS(&dc->pdcattr->mxWorldToPage, &xform); /* If we've moved the current point then get its new position which will be in device (MM_TEXT) co-ords, convert it to Modified: trunk/reactos/win32ss/gdi/ntgdi/xformobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/xformobj… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/xformobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/xformobj.c [iso-8859-1] Sat Jul 28 18:31:24 2012 @@ -288,6 +288,16 @@ FLOATOBJ_Div(&pmxDst->efM12, &foDet); pmxDst->efM21 = pmxSrc->efM21; FLOATOBJ_Div(&pmxDst->efM21, &foDet); + + /* Calculate the inverted x shift: Dx' = -Dx * M11' - Dy * M21' */ + pmxDst->efDx = pmxSrc->efDx; + FLOATOBJ_Neg(&pmxDst->efDx); + MulSub(&pmxDst->efDx, &pmxDst->efDx, &pmxDst->efM11, &pmxSrc->efDy, &pmxDst->efM21); + + /* Calculate the inverted y shift: Dy' = -Dy * M22' - Dx * M12' */ + pmxDst->efDy = pmxSrc->efDy; + FLOATOBJ_Neg(&pmxDst->efDy); + MulSub(&pmxDst->efDy, &pmxDst->efDy, &pmxDst->efM22, &pmxSrc->efDx, &pmxDst->efM12); /* Update accelerators and return complexity */ return XFORMOBJ_UpdateAccel(pxoDst);

12 years, 5 months

[akhaldi] 56969: [NEWINFLIB] * We don't need to define _CRT_NON_CONFORMING_SWPRINTFS for inflibhost.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jul 28 15:33:38 2012 New Revision: 56969 URL: http://svn.reactos.org/svn/reactos?rev=56969&view=rev Log: [NEWINFLIB] * We don't need to define _CRT_NON_CONFORMING_SWPRINTFS for inflibhost. Modified: trunk/reactos/lib/newinflib/CMakeLists.txt Modified: trunk/reactos/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Sat Jul 28 15:33:38 2012 @@ -20,7 +20,8 @@ infhostput.c infhostrtl.c) - add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_NON_CONFORMING_SWPRINTFS) + add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) + add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) if(NOT MSVC) add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings")

12 years, 5 months

[akhaldi] 56968: [CABMAN] * Define WIN32_LEAN_AND_MEAN before including windows.h

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jul 28 15:14:44 2012 New Revision: 56968 URL: http://svn.reactos.org/svn/reactos?rev=56968&view=rev Log: [CABMAN] * Define WIN32_LEAN_AND_MEAN before including windows.h Modified: trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Sat Jul 28 15:14:44 2012 @@ -8,6 +8,7 @@ #pragma once #if defined(_WIN32) +#define WIN32_LEAN_AND_MEAN #include <windows.h> #else #include <errno.h>

12 years, 5 months

[osiejka] 56967: [TRANSLATION] - slovak fontview translation update by Mario Kacmar (bug no. 7201); - polish fontview translation update by me;

by osiejka＠svn.reactos.org

Author: osiejka Date: Thu Jul 26 19:48:26 2012 New Revision: 56967 URL: http://svn.reactos.org/svn/reactos?rev=56967&view=rev Log: [TRANSLATION] - slovak fontview translation update by Mario Kacmar (bug no. 7201); - polish fontview translation update by me; Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc trunk/reactos/base/applications/fontview/lang/sk-SK.rc Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] Thu Jul 26 19:48:26 2012 @@ -1,5 +1,5 @@ /* - * translated by Caemyr - Olaf Siejka (Feb, 2008) + * translated by Caemyr - Olaf Siejka (Feb, 2008; Jul, 2012) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -10,10 +10,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_INSTALL, "Install" + IDS_INSTALL, "Instaluj" IDS_PRINT, "Drukuj" IDS_STRING, "ZaÅ¼Ã³ÅÄ gÄÅlÄ JaÅºÅ Å¼Ã³ÅwiÄtkiem. 1234567890. !@#$%^&*()_+=-/?" - IDS_OPEN, "Open Font..." + IDS_OPEN, "OtwÃ³rz czcionkÄ..." IDS_ERROR, "BÅÄd" IDS_ERROR_NOMEM, "Brakuje pamiÄci do ukoÅczenia tej operacji." IDS_ERROR_NOFONT, "Plik %1 nie jest poprawnym plikiem czcionki." Modified: trunk/reactos/base/applications/fontview/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] Thu Jul 26 19:48:26 2012 @@ -1,16 +1,16 @@ /* TRANSLATOR: MÃ¡rio KaÄmÃ¡r /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR: 31-07-2007 - * UPDATED : 28-05-2008 + * UPDATED : 21-07-2012 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN - IDS_INSTALL, "Install" + IDS_INSTALL, "NainÅ¡talovaÅ¥" IDS_PRINT, "TlaÄiÅ¥" IDS_STRING, "KÅdeÄ¾ ÄatÄ¾ov uÄÃ koÅa Å¾raÅ¥ kÃ´ru. 1234567890" - IDS_OPEN, "Open Font..." + IDS_OPEN, "OtvoriÅ¥ pÃsmo..." IDS_ERROR, "Chyba" IDS_ERROR_NOMEM, "Na vykonanie tejto operÃ¡cie nie je dostatok voÄ¾nej pamÃ¤te." IDS_ERROR_NOFONT, "PoÅ¾adovanÃ½ sÃºbor %1 nie je platnÃ½m sÃºborom pÃsiem."

12 years, 5 months

[tfaber] 56966: [DISKPART] - Rewrite argument parsing. Patch by Lee Schroeder. See issue #7170 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 24 20:23:24 2012 New Revision: 56966 URL: http://svn.reactos.org/svn/reactos?rev=56966&view=rev Log: [DISKPART] - Rewrite argument parsing. Patch by Lee Schroeder. See issue #7170 for more details. Modified: trunk/reactos/base/system/diskpart/diskpart.c trunk/reactos/base/system/diskpart/diskpart.h trunk/reactos/base/system/diskpart/interpreter.c trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/diskpart/resource.h Modified: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Tue Jul 24 20:23:24 2012 @@ -24,21 +24,38 @@ va_end(arg_ptr); } +VOID +ShowHeader(VOID) +{ + WCHAR szComputerName[MAX_STRING_SIZE]; + DWORD comp_size = MAX_STRING_SIZE; + + /* Get the name of the computer for us and change the value of comp_name */ + GetComputerName(szComputerName, &comp_size); + + /* TODO: Remove this section of code when program becomes stable enough for production use. */ + wprintf(L"\n*WARNING*: This program is incomplete and may not work properly.\n"); + + /* Print the header information */ + PrintResourceString(IDS_APP_HEADER); + PrintResourceString(IDS_APP_LICENSE); + PrintResourceString(IDS_APP_CURR_COMPUTER, szComputerName); +} /* - * run_script(const char *filename): + * RunScript(const char *filename): * opens the file, reads the contents, convert the text into readable * code for the computer, and then execute commands in order. */ BOOL -run_script(LPCWSTR filename) +RunScript(LPCWSTR filename) { - FILE *script_file; + FILE *script; WCHAR tmp_string[MAX_STRING_SIZE]; /* Open the file for processing */ - script_file = _wfopen(filename, L"r"); - if (script_file == NULL) + script = _wfopen(filename, L"r"); + if (script == NULL) { /* if there was problems opening the file */ PrintResourceString(IDS_ERROR_MSG_NO_SCRIPT, filename); @@ -46,14 +63,14 @@ } /* Read and process the script */ - while (fgetws(tmp_string, MAX_STRING_SIZE, script_file) != NULL) + while (fgetws(tmp_string, MAX_STRING_SIZE, script) != NULL) { - if (interpret_script(tmp_string) == FALSE) + if (InterpretScript(tmp_string) == FALSE) return FALSE; } /* Close the file */ - fclose(script_file); + fclose(script); return TRUE; } @@ -64,79 +81,96 @@ */ int wmain(int argc, const WCHAR *argv[]) { - WCHAR szComputerName[MAX_STRING_SIZE]; - DWORD comp_size = MAX_STRING_SIZE; - LPCWSTR file_name = NULL; - int i; - int timeout = 0; + LPCWSTR script = NULL; + LPCWSTR tmpBuffer = NULL; + int index, timeout; - /* Get the name of the computer for us and change the value of comp_name */ - GetComputerName(szComputerName, &comp_size); + /* Sets the timeout value to 0 just in case the user doesn't + specify a value. */ + timeout = 0; - /* TODO: Remove this section of code when program becomes stable enough for production use. */ - wprintf(L"\n*WARNING*: This program is incomplete and may not work properly.\n"); + /* If there are no command arguments, then go straight to the interpreter */ + if (argc < 2) + { + ShowHeader(); + InterpretMain(); + } + /* If there are command arguments, then process them */ + else + { + for (index = 1; index < argc; index++) + { + /* checks for flags */ + if ((argv[index][0] == '/')|| + (argv[index][0] == '-')) + { + tmpBuffer = argv[index] + 1; + } + else + { + /* If there is no flag, then return an error */ + PrintResourceString(IDS_ERROR_MSG_BAD_ARG, argv[index]); + return EXIT_FAILURE; + } - /* Print the header information */ - PrintResourceString(IDS_APP_HEADER, DISKPART_VERSION); - PrintResourceString(IDS_APP_LICENSE); - PrintResourceString(IDS_APP_CURR_COMPUTER, szComputerName); - - /* Process arguments */ - for (i = 1; i < argc; i++) - { - if ((argv[i][0] == L'-') || (argv[i][0] == L'/')) - { - if (wcsicmp(&argv[i][1], L"s") == 0) - { - /* - * Get the file name only if there is at least one more - * argument and it is not another option - */ - if ((i + 1 < argc) && - (argv[i + 1][0] != L'-') && - (argv[i + 1][0] != L'/')) - { - /* Next argument */ - i++; - - /* Get the file name */ - file_name = argv[i]; - } - } - else if (wcsicmp(&argv[i][1], L"t") == 0) - { - /* - * Get the timeout value only if there is at least one more - * argument and it is not another option - */ - if ((i + 1 < argc) && - (argv[i + 1][0] != L'-') && - (argv[i + 1][0] != L'/')) - { - /* Next argument */ - i++; - - /* Get the timeout value */ - timeout = _wtoi(argv[i]); - } - } - else if (wcscmp(&argv[i][1], L"?") == 0) + /* Checks for the /? flag first since the program + exits as soon as the usage list is shown. */ + if (_wcsicmp(tmpBuffer, L"?") == 0) { PrintResourceString(IDS_APP_USAGE); return EXIT_SUCCESS; } + /* Checks for the script flag */ + else if (_wcsicmp(tmpBuffer, L"s") == 0) + { + if ((index + 1) < argc) + { + index++; + script = argv[index]; + } + } + /* Checks for the timeout flag */ + else if (_wcsicmp(tmpBuffer, L"t") == 0) + { + if ((index + 1) < argc) + { + index++; + timeout = _wtoi(argv[index]); + + /* If the number is a negative number, then + change it so that the time is executed properly. */ + if (timeout < 0) + timeout = 0; + } + } + else + { + /* Assume that the flag doesn't exist. */ + PrintResourceString(IDS_ERROR_MSG_BAD_ARG, tmpBuffer); + return EXIT_FAILURE; + } } - } - /* Run the script if we got a script name or call the interpreter otherwise */ - if (file_name != NULL) - { - if (run_script(file_name) == FALSE) + /* Shows the program information */ + ShowHeader(); + + /* Now we process the filename if it exists */ + if (script != NULL) + { + /* if the timeout is greater than 0, then assume + that the user specified a specific time. */ + if (timeout > 0) + Sleep(timeout * 1000); + + if (RunScript(script) == FALSE) + return EXIT_FAILURE; + } + else + { + /* Exit failure since the user wanted to run a script */ + PrintResourceString(IDS_ERROR_MSG_NO_SCRIPT, script); return EXIT_FAILURE; - } - else - { - interpret_main(); + } } /* Let the user know the program is exiting */ Modified: trunk/reactos/base/system/diskpart/diskpart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Tue Jul 24 20:23:24 2012 @@ -138,9 +138,9 @@ VOID help_inactive(INT argc, WCHAR **argv); /* interpreter.c */ -BOOL interpret_script(WCHAR *line); -BOOL interpret_cmd(INT argc, WCHAR **argv); -VOID interpret_main(VOID); +BOOL InterpretScript(WCHAR *line); +BOOL InterpretCmd(INT argc, WCHAR **argv); +VOID InterpretMain(VOID); /* list.c */ BOOL list_main(INT argc, WCHAR **argv); Modified: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… ============================================================================== --- trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] Tue Jul 24 20:23:24 2012 @@ -73,12 +73,12 @@ /* - * interpret_cmd(char *cmd_line, char *arg_line): + * InterpretCmd(char *cmd_line, char *arg_line): * compares the command name to a list of available commands, and * determines which function to envoke. */ BOOL -interpret_cmd(int argc, WCHAR **argv) +InterpretCmd(int argc, WCHAR **argv) { PCOMMAND cmdptr; @@ -98,11 +98,11 @@ /* - * interpret_script(char *line): + * InterpretScript(char *line): * The main function used for when reading commands from scripts. */ BOOL -interpret_script(WCHAR *input_line) +InterpretScript(WCHAR *input_line) { WCHAR *args_vector[MAX_ARGS_COUNT]; INT args_count = 0; @@ -134,18 +134,18 @@ } /* sends the string to find the command */ - return interpret_cmd(args_count, args_vector); + return InterpretCmd(args_count, args_vector); } /* - * interpret_main(): + * InterpretMain(): * Contents for the main program loop as it reads each line, and then * it sends the string to interpret_line, where it determines what * command to use. */ VOID -interpret_main(VOID) +InterpretMain(VOID) { WCHAR input_line[MAX_STRING_SIZE]; WCHAR *args_vector[MAX_ARGS_COUNT]; @@ -187,6 +187,6 @@ } /* sends the string to find the command */ - bRun = interpret_cmd(args_count, args_vector); + bRun = InterpretCmd(args_count, args_vector); } } Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Tue Jul 24 20:23:24 2012 @@ -13,12 +13,12 @@ /* Basic application information */ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_HEADER, "\nReactOS DiskPart version %s\n" - IDS_APP_USAGE, "Diskpart command line syntax:\ndiskpart [/s <script file>] [/t <timeout value>] [/?]\n\ -/s <script file> - Runs the given script file.\n\ -/t <timeout value> - Waits for the given time (in seconds) after running a\n\ - script file.\n\ -/? - Shows this help text." + IDS_APP_HEADER, "\nReactOS DiskPart\n" + IDS_APP_USAGE, "\nDisk Partitioning Interpreter.\n\n\ +Usage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ +/S filename\tRuns the given script.\n\ +/T timeout\tTimeout in seconds to prevent diskpart usage overlap.\n\ +/?\t\tDisplay this help message.\n\n" IDS_APP_LICENSE, "Licensed under the GNU GPLv2\n" IDS_APP_CURR_COMPUTER, "On computer: %s\n\n" IDS_APP_LEAVING, "\nLeaving DiskPart...\n" @@ -120,7 +120,8 @@ /* Common Error Messages */ STRINGTABLE DISCARDABLE BEGIN - IDS_ERROR_MSG_NO_SCRIPT "Error opening script file: %s\n" + IDS_ERROR_MSG_NO_SCRIPT "Error opening script: %s\n" + IDS_ERROR_MSG_BAD_ARG "Error processing argument: %s\n" END Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Tue Jul 24 20:23:24 2012 @@ -15,12 +15,11 @@ /* Basic application information */ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_HEADER, "\nReactOS DiskPart versiune %s\n" - IDS_APP_USAGE, "Sintaxa liniei de comandÄ pentru Diskpart:\ndiskpart [/s <fiÈier-script>] [/t <valoare-temporalÄ-limitÄ>] [/?]\n\ -/s <fiÈier-script> - ExecutÄ scriptul din fiÈierul dat.\n\ -/t <valoare-temporalÄ-limitÄ> - AÈteaptÄ aceastÄ perioadÄ (Ã®n secunde)\n\ - dupÄ execuÈia unui fiÈier script.\n\ -/? - AfiÈeazÄ acest manual." + IDS_APP_HEADER, "\nReactOS DiskPart\n" + IDS_APP_USAGE, "Disk Partitioning Interpreter.\n\nUsage: DISKPART [/S filename] [/T timeout] [/?]\n\n\ +/S filename\tExecutÄ scriptul din fiÈierul dat.\n\ +/T timeout\tTimeout in seconds to prevent diskpart usage overlap.\n\ +/?\t\tAfiÈeazÄ acest manual.\n\n" IDS_APP_LICENSE, "LicenÈiere Ã®n termenii GNU GPLv2\n" IDS_APP_CURR_COMPUTER, "Pe calculatorul: %s\n\n" IDS_APP_LEAVING, "\nÃnchiderea DiskPart...\n" @@ -123,6 +122,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ERROR_MSG_NO_SCRIPT "Eroare la deschiderea fiÈierului script: %s\n" + IDS_ERROR_MSG_BAD_ARG "De prelucrare de eroare argumente: %s\n" END Modified: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Tue Jul 24 20:23:24 2012 @@ -88,6 +88,7 @@ #define IDS_HELP_CMD_DESC_UNIQUEID 97 #define IDS_ERROR_MSG_NO_SCRIPT 104 +#define IDS_ERROR_MSG_BAD_ARG 98 #define IDS_HELP_CMD_ACTIVE 105 #define IDS_HELP_CMD_ADD 106

12 years, 5 months

[tfaber] 56965: [CRT] - Fix typo

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 24 20:08:48 2012 New Revision: 56965 URL: http://svn.reactos.org/svn/reactos?rev=56965&view=rev Log: [CRT] - Fix typo Modified: trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Tue Jul 24 20:08:48 2012 @@ -320,7 +320,7 @@ #pragma intrinsic(__readdr) void __writedr(unsigned reg, unsigned __int64 value); #pragma intrinsic(__writedr) -#else if defined(_M_IX86) +#elif defined(_M_IX86) unsigned long __readcr0(void); unsigned long __readcr2(void); unsigned long __readcr3(void);

12 years, 5 months

[tkreuzer] 56964: [DDK/XDK] - Fix _XSTATE_SAVE definition for ARM [NDK] - #if out NtCurrentTeb() inline function for ARM, it's implemented in ARMLIB [CRT] - #if out some intrinsics in msc/intrin.h ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 24 19:02:29 2012 New Revision: 56964 URL: http://svn.reactos.org/svn/reactos?rev=56964&view=rev Log: [DDK/XDK] - Fix _XSTATE_SAVE definition for ARM [NDK] - #if out NtCurrentTeb() inline function for ARM, it's implemented in ARMLIB [CRT] - #if out some intrinsics in msc/intrin.h that don't exist on ARM - Add _crt_va_start, _crt_va_arg and _crt_va_end for ARM Modified: trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/crt/vadefs.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/xdk/ketypes.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Tue Jul 24 19:02:29 2012 @@ -10,8 +10,10 @@ #pragma intrinsic(_ReturnAddress) void * _AddressOfReturnAddress(void); #pragma intrinsic(_AddressOfReturnAddress) +#if defined(_M_IX86) || defined(_M_AMD64) unsigned int __getcallerseflags(void); #pragma intrinsic(__getcallerseflags) +#endif /*** Memory barriers ***/ void _ReadWriteBarrier(void); @@ -20,12 +22,14 @@ #pragma intrinsic(_ReadBarrier) void _WriteBarrier(void); #pragma intrinsic(_WriteBarrier) +#if defined(_M_IX86) || defined(_M_AMD64) void _mm_mfence(void); #pragma intrinsic(_mm_mfence) void _mm_lfence(void); #pragma intrinsic(_mm_lfence) void _mm_sfence(void); #pragma intrinsic(_mm_sfence) +#endif #ifdef _M_AMD64 void __faststorefence(void); #pragma intrinsic(__faststorefence) @@ -97,6 +101,7 @@ #pragma intrinsic(_interlockedbittestandset64) #endif +#if defined(_M_IX86) || defined(_M_AMD64) /*** String operations ***/ void __stosb(unsigned char * Dest, unsigned char Data, size_t Count); #pragma intrinsic(__stosb) @@ -110,6 +115,7 @@ #pragma intrinsic(__movsw) void __movsd(unsigned long * Destination, unsigned long const * Source, size_t Count); #pragma intrinsic(__movsd) +#endif #ifdef _M_AMD64 void __movsq(unsigned __int64 * Destination, unsigned __int64 const * Source, size_t Count); #pragma intrinsic(__movsq) @@ -203,33 +209,38 @@ #pragma intrinsic(_rotr8) unsigned short _rotr16(unsigned short value, unsigned char shift); #pragma intrinsic(_rotr16) +unsigned short _byteswap_ushort(unsigned short value); +#pragma intrinsic(_byteswap_ushort) +unsigned long _byteswap_ulong(unsigned long value); +#pragma intrinsic(_byteswap_ulong) +unsigned __int64 _byteswap_uint64(unsigned __int64 value); +#pragma intrinsic(_byteswap_uint64) +#if defined(_M_IX86) || defined(_M_AMD64) unsigned __int64 __ll_lshift(unsigned __int64 Mask, int Bit); #pragma intrinsic(__ll_lshift) __int64 __ll_rshift(__int64 Mask, int Bit); #pragma intrinsic(__ll_rshift) unsigned __int64 __ull_rshift(unsigned __int64 Mask, int Bit); #pragma intrinsic(__ull_rshift) -unsigned short _byteswap_ushort(unsigned short value); -#pragma intrinsic(_byteswap_ushort) -unsigned long _byteswap_ulong(unsigned long value); -#pragma intrinsic(_byteswap_ulong) -unsigned __int64 _byteswap_uint64(unsigned __int64 value); -#pragma intrinsic(_byteswap_uint64) +#endif #ifdef _M_AMD64 unsigned char _bittest64(__int64 const *a, __int64 b); #pragma intrinsic(_bittest64) #endif +#if defined(_M_IX86) || defined(_M_AMD64) /*** 64-bit math ***/ __int64 __emul(int a, int b); #pragma intrinsic(__emul) unsigned __int64 __emulu(unsigned int a, unsigned int b); #pragma intrinsic(__emulu) +#endif #ifdef _M_AMD64 unsigned __int64 __umulh(unsigned __int64 a, unsigned __int64 b); #pragma intrinsic(__umulh) #endif +#if defined(_M_IX86) || defined(_M_AMD64) /*** Port I/O ***/ unsigned char __inbyte(unsigned short Port); #pragma intrinsic(__inbyte) @@ -255,7 +266,9 @@ #pragma intrinsic(__outwordstring) void __outdwordstring(unsigned short Port, unsigned long * Buffer, unsigned long Count); #pragma intrinsic(__outdwordstring) - +#endif + +#if defined(_M_IX86) || defined(_M_AMD64) /*** System information ***/ void __cpuid(int CPUInfo[], int InfoType); #pragma intrinsic(__cpuid) @@ -265,27 +278,31 @@ #pragma intrinsic(__writeeflags) uintptr_t __readeflags(void); #pragma intrinsic(__readeflags) +#endif /*** Interrupts ***/ void __debugbreak(void); #pragma intrinsic(__debugbreak) -void __int2c(void); -#pragma intrinsic(__int2c) void _disable(void); #pragma intrinsic(_disable) void _enable(void); #pragma intrinsic(_enable) +#if defined(_M_IX86) || defined(_M_AMD64) +void __int2c(void); +#pragma intrinsic(__int2c) void __halt(void); #pragma intrinsic(__halt) +#endif /*** Protected memory management ***/ +#if defined(_M_IX86) || defined(_M_AMD64) void __writecr0(unsigned __int64 Data); #pragma intrinsic(__writecr0) void __writecr3(unsigned __int64 Data); #pragma intrinsic(__writecr3) void __writecr4(unsigned __int64 Data); #pragma intrinsic(__writecr4) - +#endif #ifdef _M_AMD64 void __writecr8(unsigned __int64 Data); #pragma intrinsic(__writecr8) @@ -303,7 +320,7 @@ #pragma intrinsic(__readdr) void __writedr(unsigned reg, unsigned __int64 value); #pragma intrinsic(__writedr) -#else +#else if defined(_M_IX86) unsigned long __readcr0(void); unsigned long __readcr2(void); unsigned long __readcr3(void); @@ -316,9 +333,6 @@ unsigned int __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned int value); #endif - -void __invlpg(void * Address); -#pragma intrinsic(__invlpg) #ifdef _M_IX86 // This intrinsic is broken and generates wrong opcodes, @@ -337,9 +351,13 @@ } #pragma warning(pop) #define __invlpg __invlpg_fixed +#elif defined(_M_AMD64) +void __invlpg(void * Address); +#pragma intrinsic(__invlpg) #endif /*** System operations ***/ +#if defined(_M_IX86) || defined(_M_AMD64) unsigned __int64 __readmsr(int reg); #pragma intrinsic(__readmsr) void __writemsr(unsigned long Register, unsigned __int64 Value); @@ -356,6 +374,7 @@ #pragma intrinsic(__sidt) void _mm_pause(void); #pragma intrinsic(_mm_pause) +#endif #ifdef __cplusplus } Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Tue Jul 24 19:02:29 2012 @@ -62,9 +62,7 @@ #if defined(__ia64__) #define _VA_ALIGN 8 #define _SLOTSIZEOF(t) ((sizeof(t) + _VA_ALIGN - 1) & ~(_VA_ALIGN - 1)) - #define _VA_STRUCT_ALIGN 16 - #define _ALIGNOF(ap) ((((ap)+_VA_STRUCT_ALIGN - 1) & ~(_VA_STRUCT_ALIGN -1)) - (ap)) #define _APALIGN(t,ap) (__alignof(t) > 8 ? _ALIGNOF((uintptr_t) ap) : 0) #else @@ -95,6 +93,15 @@ (*(t*)(((v) += sizeof(void*)) - sizeof(void*)))) #define _crt_va_end(v) ((void)((v) = (va_list)0)) #define __va_copy(d,s) ((void)((d) = (s))) +#elif defined(_M_ARM) +#ifdef __cplusplus + extern void __cdecl __va_start(va_list*, ...); + #define _crt_va_start(ap,v) __va_start(&ap, _ADDRESSOF(v), _SLOTSIZEOF(v), _ADDRESSOF(v)) +#else + #define _crt_va_start(ap,v) (ap = (va_list)_ADDRESSOF(v) + _SLOTSIZEOF(v)) +#endif +#define _crt_va_arg(ap,t) (*(t*)((ap += _SLOTSIZEOF(t) + _APALIGN(t,ap)) - _SLOTSIZEOF(t))) +#define _crt_va_end(ap) ( ap = (va_list)0 ) #else //if defined(_M_IA64) || defined(_M_CEE) #error Please implement me #endif Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5696… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Jul 24 19:02:29 2012 @@ -1540,7 +1540,7 @@ struct _KTHREAD* Thread; UCHAR Level; XSTATE_CONTEXT XStateContext; -#elif defined(_IA64_) +#elif defined(_IA64_) || defined(_ARM_) ULONG Dummy; #elif defined(_X86_) _ANONYMOUS_UNION union { Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Tue Jul 24 19:02:29 2012 @@ -371,6 +371,7 @@ IN BOOLEAN CreateSuspended ); +#ifndef _M_ARM #ifndef NTOS_MODE_USER FORCEINLINE struct _TEB * NtCurrentTeb(VOID) { @@ -383,6 +384,7 @@ #else struct _TEB * NtCurrentTeb(void); #endif +#endif NTSYSCALLAPI NTSTATUS Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Tue Jul 24 19:02:29 2012 @@ -968,7 +968,7 @@ struct _KTHREAD* Thread; UCHAR Level; XSTATE_CONTEXT XStateContext; -#elif defined(_IA64_) +#elif defined(_IA64_) || defined(_ARM_) ULONG Dummy; #elif defined(_X86_) _ANONYMOUS_UNION union {

12 years, 5 months

[tkreuzer] 56963: [GENINCDATA] - #if out some constants that ARM doesn't have

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 24 18:56:23 2012 New Revision: 56963 URL: http://svn.reactos.org/svn/reactos?rev=56963&view=rev Log: [GENINCDATA] - #if out some constants that ARM doesn't have Modified: trunk/reactos/include/asm/ksx.template.h Modified: trunk/reactos/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/ksx.template.h… ============================================================================== --- trunk/reactos/include/asm/ksx.template.h [iso-8859-1] (original) +++ trunk/reactos/include/asm/ksx.template.h [iso-8859-1] Tue Jul 24 18:56:23 2012 @@ -15,9 +15,11 @@ CONSTANT(CONTEXT_FULL), CONSTANT(CONTEXT_CONTROL), CONSTANT(CONTEXT_INTEGER), +#ifndef _M_ARM CONSTANT(CONTEXT_SEGMENTS), CONSTANT(CONTEXT_FLOATING_POINT), CONSTANT(CONTEXT_DEBUG_REGISTERS), +#endif HEADER("Exception flags"), CONSTANT(EXCEPTION_NONCONTINUABLE), @@ -246,19 +248,21 @@ //CONSTANT(KERNEL_STACK_CONTROL_LARGE_STACK), //CONSTANT(KI_DPC_ALL_FLAGS), //CONSTANT(DISPATCH_LENGTH), +//CONSTANT(MAXIMUM_PRIMARY_VECTOR), +//CONSTANT(KTHREAD_AUTO_ALIGNMENT_BIT), +//CONSTANT(KTHREAD_GUI_THREAD_MASK), +//CONSTANT(KI_SLIST_FAULT_COUNT_MAXIMUM), +#ifndef _M_ARM CONSTANT(MAXIMUM_IDTVECTOR), -//CONSTANT(MAXIMUM_PRIMARY_VECTOR), CONSTANT(PRIMARY_VECTOR_BASE), CONSTANT(RPL_MASK), CONSTANT(MODE_MASK), -//CONSTANT(KTHREAD_AUTO_ALIGNMENT_BIT), -//CONSTANT(KTHREAD_GUI_THREAD_MASK), -//CONSTANT(KI_SLIST_FAULT_COUNT_MAXIMUM), CONSTANT(NUMBER_SERVICE_TABLES), CONSTANT(SERVICE_NUMBER_MASK), CONSTANT(SERVICE_TABLE_SHIFT), CONSTANT(SERVICE_TABLE_MASK), CONSTANT(SERVICE_TABLE_TEST), +#endif

12 years, 5 months

[tkreuzer] 56962: [CMAKE] - Add ARM architecture support - disable makefile debugging

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 24 18:54:31 2012 New Revision: 56962 URL: http://svn.reactos.org/svn/reactos?rev=56962&view=rev Log: [CMAKE] - Add ARM architecture support - disable makefile debugging Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake trunk/reactos/cmake/Platform/Windows.cmake Modified: trunk/reactos/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] Tue Jul 24 18:54:31 2012 @@ -61,6 +61,28 @@ set(ENV{STL_VER} 60) endif() endif() + +############ + +# Set lib path for ARM compiler +if(${ARCH} MATCHES arm) + message("Using ARM build for cross compilation. Host tools are x86.") + + # Force C/C++ Compilers + include(CMakeForceCompiler) + CMAKE_FORCE_C_COMPILER(cl MSVC) + CMAKE_FORCE_CXX_COMPILER(cl MSVC) + + if(NOT CMAKE_CROSSCOMPILING) + message("Using x86 target for ARM host tools.") + set(ARCH i386) + + LINK_DIRECTORIES($ENV{WindowsSdkDir}\\Lib\\win8\\um\\x86) + endif() + + #LINK_DIRECTORIES($ENV{LIB}) +endif() + ############ @@ -234,6 +256,10 @@ IF(NOT _MACHINE_ARCH_FLAG) SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) ENDIF(NOT _MACHINE_ARCH_FLAG) +# HACK +if(${ARCH} MATCHES arm) + SET(_MACHINE_ARCH_FLAG ARM) +endif() SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}") Modified: trunk/reactos/cmake/Platform/Windows.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows.cma… ============================================================================== --- trunk/reactos/cmake/Platform/Windows.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows.cmake [iso-8859-1] Tue Jul 24 18:54:31 2012 @@ -30,7 +30,7 @@ INCLUDE(Platform/WindowsPaths) # uncomment these out to debug nmake and borland makefiles -SET(CMAKE_START_TEMP_FILE "") -SET(CMAKE_END_TEMP_FILE "") +#SET(CMAKE_START_TEMP_FILE "") +#SET(CMAKE_END_TEMP_FILE "") #SET(CMAKE_VERBOSE_MAKEFILE 1)

12 years, 5 months

[tfaber] 56961: [CRT][NTDLL] - Separate some _CI* functions into their own files and export them from ntdll. Patch by Vincenzo Cotugno. See issue #7085 for more details.

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jul 24 16:45:50 2012 New Revision: 56961 URL: http://svn.reactos.org/svn/reactos?rev=56961&view=rev Log: [CRT][NTDLL] - Separate some _CI* functions into their own files and export them from ntdll. Patch by Vincenzo Cotugno. See issue #7085 for more details. Added: trunk/reactos/lib/sdk/crt/math/i386/cicos.c - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c trunk/reactos/lib/sdk/crt/math/i386/cilog.c - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c trunk/reactos/lib/sdk/crt/math/i386/cipow.c - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c trunk/reactos/lib/sdk/crt/math/i386/cisin.c - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c trunk/reactos/lib/sdk/crt/math/i386/cisqrt.c - copied, changed from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/include/internal/math.h trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/math/i386/ci.c trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -1292,11 +1292,11 @@ @ stdcall ZwWriteRequestData(ptr ptr long ptr long ptr) @ stdcall ZwWriteVirtualMemory(long ptr ptr long ptr) @ stdcall ZwYieldExecution() -;@ cdecl _CIcos -;@ cdecl _CIlog -;@ cdecl -private -arch=i386 _CIpow() -;@ cdecl _CIsin -;@ cdecl _CIsqrt +@ cdecl -arch=i386 _CIcos() +@ cdecl -arch=i386 _CIlog() +@ cdecl -arch=i386 _CIpow() +@ cdecl -arch=i386 _CIsin() +@ cdecl -arch=i386 _CIsqrt() @ cdecl -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ cdecl __isascii(long) @ cdecl __iscsym(long) Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -131,11 +131,11 @@ misc/stubs.c misc/tls.c printf/_cprintf.c - printf/_cwprintf.c + printf/_cwprintf.c printf/_snprintf.c printf/_snwprintf.c printf/_vcprintf.c - printf/_vcwprintf.c + printf/_vcwprintf.c printf/_vscprintf.c printf/_vscwprintf.c printf/_vsnprintf.c @@ -377,6 +377,11 @@ math/i386/tan_asm.s math/i386/atan2_asm.s math/i386/ci.c + math/i386/cicos.c + math/i386/cilog.c + math/i386/cipow.c + math/i386/cisin.c + math/i386/cisqrt.c math/i386/exp_asm.s math/i386/fmod_asm.s math/i386/fmodf_asm.s Modified: trunk/reactos/lib/sdk/crt/include/internal/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/math.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/math.h [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -9,4 +9,18 @@ int _isnanl (long double); /* not exported */ int _isinfl (long double); /* not exported */ +#if defined(__GNUC__) +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) +#elif defined(_MSC_VER) +#define FPU_DOUBLE(var) double var; \ + __asm { fstp [var] }; __asm { fwait }; +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm { fstp [var1] }; __asm { fwait }; \ + __asm { fstp [var2] }; __asm { fwait }; #endif + +#endif Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -94,6 +94,11 @@ math/i386/sqrt_asm.s math/i386/tan_asm.s math/i386/ci.c + math/i386/cicos.c + math/i386/cilog.c + math/i386/cipow.c + math/i386/cisin.c + math/i386/cisqrt.c misc/i386/readcr4.S) if(NOT MSVC) list(APPEND LIBCNTPR_SOURCE except/i386/chkstk_ms.s) Modified: trunk/reactos/lib/sdk/crt/math/i386/ci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ci.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -1,36 +1,5 @@ #include <precomp.h> -#include <math.h> -#if defined(__GNUC__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) -#elif defined(_MSC_VER) -#define FPU_DOUBLE(var) double var; \ - __asm { fstp [var] }; __asm { fwait }; -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm { fstp [var1] }; __asm { fwait }; \ - __asm { fstp [var2] }; __asm { fwait }; -#endif - -/* - * @implemented - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return sin(x); -} -/* - * @implemented - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return cos(x); -} /* * @implemented */ @@ -106,34 +75,10 @@ /* * @implemented */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return log(x); -} -/* - * @implemented - */ double CDECL _CIlog10(void) { FPU_DOUBLE(x); return log10(x); -} -/* - * @implemented - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x, y); - return pow(x, y); -} -/* - * @implemented - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return sqrt(x); } /* * @implemented Copied: trunk/reactos/lib/sdk/crt/math/i386/cicos.c (from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cico… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/cicos.c [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -1,28 +1,5 @@ #include <precomp.h> -#include <math.h> -#if defined(__GNUC__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) -#elif defined(_MSC_VER) -#define FPU_DOUBLE(var) double var; \ - __asm { fstp [var] }; __asm { fwait }; -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm { fstp [var1] }; __asm { fwait }; \ - __asm { fstp [var2] }; __asm { fwait }; -#endif - -/* - * @implemented - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return sin(x); -} /* * @implemented */ @@ -31,115 +8,3 @@ FPU_DOUBLE(x); return cos(x); } -/* - * @implemented - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return tan(x); -} -/* - * @implemented - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return sinh(x); -} -/* - * @implemented - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return cosh(x); -} -/* - * @implemented - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return tanh(x); -} -/* - * @implemented - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return asin(x); -} -/* - * @implemented - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return acos(x); -} -/* - * @implemented - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return atan(x); -} -/* - * @implemented - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x, y); - return atan2(x, y); -} -/* - * @implemented - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return exp(x); -} -/* - * @implemented - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return log(x); -} -/* - * @implemented - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return log10(x); -} -/* - * @implemented - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x, y); - return pow(x, y); -} -/* - * @implemented - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return sqrt(x); -} -/* - * @implemented - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x, y); - return fmod(x, y); -} Copied: trunk/reactos/lib/sdk/crt/math/i386/cilog.c (from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cilo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/cilog.c [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -1,108 +1,5 @@ #include <precomp.h> -#include <math.h> -#if defined(__GNUC__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) -#elif defined(_MSC_VER) -#define FPU_DOUBLE(var) double var; \ - __asm { fstp [var] }; __asm { fwait }; -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm { fstp [var1] }; __asm { fwait }; \ - __asm { fstp [var2] }; __asm { fwait }; -#endif - -/* - * @implemented - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return sin(x); -} -/* - * @implemented - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return cos(x); -} -/* - * @implemented - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return tan(x); -} -/* - * @implemented - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return sinh(x); -} -/* - * @implemented - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return cosh(x); -} -/* - * @implemented - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return tanh(x); -} -/* - * @implemented - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return asin(x); -} -/* - * @implemented - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return acos(x); -} -/* - * @implemented - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return atan(x); -} -/* - * @implemented - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x, y); - return atan2(x, y); -} -/* - * @implemented - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return exp(x); -} /* * @implemented */ @@ -111,35 +8,3 @@ FPU_DOUBLE(x); return log(x); } -/* - * @implemented - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return log10(x); -} -/* - * @implemented - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x, y); - return pow(x, y); -} -/* - * @implemented - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return sqrt(x); -} -/* - * @implemented - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x, y); - return fmod(x, y); -} Copied: trunk/reactos/lib/sdk/crt/math/i386/cipow.c (from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cipo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/cipow.c [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -1,124 +1,5 @@ #include <precomp.h> -#include <math.h> -#if defined(__GNUC__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) -#elif defined(_MSC_VER) -#define FPU_DOUBLE(var) double var; \ - __asm { fstp [var] }; __asm { fwait }; -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm { fstp [var1] }; __asm { fwait }; \ - __asm { fstp [var2] }; __asm { fwait }; -#endif - -/* - * @implemented - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return sin(x); -} -/* - * @implemented - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return cos(x); -} -/* - * @implemented - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return tan(x); -} -/* - * @implemented - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return sinh(x); -} -/* - * @implemented - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return cosh(x); -} -/* - * @implemented - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return tanh(x); -} -/* - * @implemented - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return asin(x); -} -/* - * @implemented - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return acos(x); -} -/* - * @implemented - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return atan(x); -} -/* - * @implemented - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x, y); - return atan2(x, y); -} -/* - * @implemented - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return exp(x); -} -/* - * @implemented - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return log(x); -} -/* - * @implemented - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return log10(x); -} /* * @implemented */ @@ -127,19 +8,3 @@ FPU_DOUBLES(x, y); return pow(x, y); } -/* - * @implemented - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return sqrt(x); -} -/* - * @implemented - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x, y); - return fmod(x, y); -} Copied: trunk/reactos/lib/sdk/crt/math/i386/cisin.c (from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cisi… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/cisin.c [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -1,19 +1,4 @@ #include <precomp.h> -#include <math.h> - -#if defined(__GNUC__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) -#elif defined(_MSC_VER) -#define FPU_DOUBLE(var) double var; \ - __asm { fstp [var] }; __asm { fwait }; -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm { fstp [var1] }; __asm { fwait }; \ - __asm { fstp [var2] }; __asm { fwait }; -#endif /* * @implemented @@ -23,123 +8,3 @@ FPU_DOUBLE(x); return sin(x); } -/* - * @implemented - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return cos(x); -} -/* - * @implemented - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return tan(x); -} -/* - * @implemented - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return sinh(x); -} -/* - * @implemented - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return cosh(x); -} -/* - * @implemented - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return tanh(x); -} -/* - * @implemented - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return asin(x); -} -/* - * @implemented - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return acos(x); -} -/* - * @implemented - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return atan(x); -} -/* - * @implemented - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x, y); - return atan2(x, y); -} -/* - * @implemented - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return exp(x); -} -/* - * @implemented - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return log(x); -} -/* - * @implemented - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return log10(x); -} -/* - * @implemented - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x, y); - return pow(x, y); -} -/* - * @implemented - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return sqrt(x); -} -/* - * @implemented - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x, y); - return fmod(x, y); -} Copied: trunk/reactos/lib/sdk/crt/math/i386/cisqrt.c (from r56958, trunk/reactos/lib/sdk/crt/math/i386/ci.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cisq… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/ci.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/cisqrt.c [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -1,132 +1,5 @@ #include <precomp.h> -#include <math.h> -#if defined(__GNUC__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) -#elif defined(_MSC_VER) -#define FPU_DOUBLE(var) double var; \ - __asm { fstp [var] }; __asm { fwait }; -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm { fstp [var1] }; __asm { fwait }; \ - __asm { fstp [var2] }; __asm { fwait }; -#endif - -/* - * @implemented - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return sin(x); -} -/* - * @implemented - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return cos(x); -} -/* - * @implemented - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return tan(x); -} -/* - * @implemented - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return sinh(x); -} -/* - * @implemented - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return cosh(x); -} -/* - * @implemented - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return tanh(x); -} -/* - * @implemented - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return asin(x); -} -/* - * @implemented - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return acos(x); -} -/* - * @implemented - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return atan(x); -} -/* - * @implemented - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x, y); - return atan2(x, y); -} -/* - * @implemented - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return exp(x); -} -/* - * @implemented - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return log(x); -} -/* - * @implemented - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return log10(x); -} -/* - * @implemented - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x, y); - return pow(x, y); -} /* * @implemented */ @@ -135,11 +8,3 @@ FPU_DOUBLE(x); return sqrt(x); } -/* - * @implemented - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x, y); - return fmod(x, y); -} Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Tue Jul 24 16:45:50 2012 @@ -50,6 +50,11 @@ except/i386/chkstk_asm.s except/i386/chkstk_ms.s math/i386/ci.c + math/i386/cicos.c + math/i386/cilog.c + math/i386/cipow.c + math/i386/cisin.c + math/i386/cisqrt.c math/i386/ftol2_asm.s math/i386/alldiv_asm.s) elseif(ARCH MATCHES amd64)

12 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2012