Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[gedmurphy] 41446: Fix the version data in the registry to match what the kernel reports.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jun 18 14:59:15 2009 New Revision: 41446 URL: http://svn.reactos.org/svn/reactos?rev=41446&view=rev Log: Fix the version data in the registry to match what the kernel reports. Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Thu Jun 18 14:59:15 2009 @@ -44,9 +44,9 @@ HKLM,"SOFTWARE\Microsoft\Rpc",,0x00000012 ; Version Information -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.0" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 3" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"2195" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"3790" ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe) Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Thu Jun 18 14:59:15 2009 @@ -49,9 +49,9 @@ HKLM,"SOFTWARE\Microsoft\Rpc",,0x00000012 ; Version Information -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.0" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 3" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"2195" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentVersion",0x00020000,"5.2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CSDVersion",0x00020000,"Service Pack 2" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","CurrentBuildNumber",0x00020000,"3790" ; Image File Execution Options (NtGlobalFlag with FLG_SHOW_LDR_SNAPS set for loadlib.exe)

15 years, 4 months

[dreimer] 41445: Bug 4610: Dutch translation for Solitaire by reFly <wouterdevlieger@gmail.com> Bug 4619: Japanese translation update for syssetup and downloader by Tomoya Kitagawa

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jun 18 13:30:33 2009 New Revision: 41445 URL: http://svn.reactos.org/svn/reactos?rev=41445&view=rev Log: Bug 4610: Dutch translation for Solitaire by reFly <wouterdevlieger(a)gmail.com> Bug 4619: Japanese translation update for syssetup and downloader by Tomoya Kitagawa Added: trunk/reactos/base/applications/downloader/lang/ja-JP.rc (with props) trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc (with props) Modified: trunk/reactos/base/applications/downloader/rsrc.rc trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Added: trunk/reactos/base/applications/downloader/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/lang/ja-JP.rc (added) +++ trunk/reactos/base/applications/downloader/lang/ja-JP.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -1,0 +1,61 @@ +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_DOWNLOAD DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "_E[h..." +FONT 9, "MS UI Gothic" +BEGIN + CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12 + LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER + PUSHBUTTON "LZ", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP +END + +IDD_PROF DIALOGEX 6, 6, 267, 110 +STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +CAPTION "[UÝè" +FONT 9, "MS UI Gothic" +BEGIN + LTEXT "_E[h·étH_:", -1, 6, 10, 140, 8 + EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Ið(&H)...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14 + AUTOCHECKBOX "ZbgAbvãÉCXg[t@Cðí·é(&D)", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP + LTEXT "Abvf[gÉgp·éT[o:", -1, 6, 55, 140, 8 + EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK(&O)", IDOK, 147, 90, 54, 15 + PUSHBUTTON "LZ(&C)", IDCANCEL, 207, 90, 54, 15 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_WINDOW_TITLE "_E[h ! - ReactOS _E[_" + IDS_WELCOME_TITLE "ReactOS _E[_Öæ¤±»" + IDS_WELCOME "¶¤©çJeSðIðµÄ¾³¢B o[W 1.1Å·B" + IDS_NO_APP_TITLE "AvP[VªIð³êÄ¢Ü¹ñ" + IDS_NO_APP "_E[h{^ðNbN·éOÉAvP[VðIðµÄ¾³¢ wvªKvÈêAêÔEãÌH}[N{^ðNbNµÄ¾³¢B" + IDS_UPDATE_TITLE "Abvf[g" + IDS_UPDATE "\µó èÜ¹ñB±Ì@\Í¢ÀÅ·B" + IDS_HELP_TITLE "wv" + IDS_HELP "¶¤©çJeSðIðµAAvP[VðIðµÄ_E[h{^ðNbNµÄ¾³¢B AvP[VÌîñðAbvf[g·éÉÍwv{^×Ì{^ðNbNµÄ¾³¢B" + IDS_NO_APPS "\µó èÜ¹ñB±ÌJeSÉÍAvP[VªÜ¾ èÜ¹ñB è`ÁÄAàÁÆAvP[VðÇÁÅ«Ü·B" + IDS_CHOOSE_APP "AvP[VðIðµÄ¾³¢B" + IDS_CHOOSE_SUB "TuJeSðIðµÄ¾³¢B" + IDS_CHOOSE_CATEGORY "JeSðIðµÄ¾³¢B" + IDS_CHOOSE_BOTH "TuJeSàµÍAvP[VðIðµÄ¾³¢B" + IDS_XMLERROR_1 "xml t@Cª©Â©èÜ¹ñÅµ½ !" + IDS_XMLERROR_2 "xml t@CððÍÅ«Ü¹ñÅµ½ !" + IDS_DOWNLOAD_ERROR "t@Cð_E[hÅ«Ü¹ñÅµ½B\nC^[lbgÚ±ðmFµÄ¾³¢B" + IDS_VERSION "o[W: " + IDS_LICENCE "CZX: " + IDS_MAINTAINER "ÇÒ: " + IDS_APPS_TITLE "AvP[V" + IDS_CATS_TITLE "JeS" + IDS_CHOOSE_FOLDER "tH_ðIðµÄ¾³¢..." + IDS_NOTCREATE_REGKEY "WXgL[ðì¬Å«Ü¹ñÅµ½B" + IDS_DOWNLOAD_FOLDER "_E[_" + IDS_UNABLECREATE_FOLDER "±Ì¼OÅtH_ðì¬Å«Ü¹ñ!" + IDS_UPDATE_URL "http://svn.reactos.org" + IDS_INSTALL_DEP "%sÍ%sÌÀsÉKvÅ·B %sð¡·®CXg[µÜ·©?" + TTT_HELPBUTTON "±Ì_E[_ÉÖ·éwvðüè·é" + TTT_UPDATEBUTTON "Ü¾pÅ«Ü¹ñ" + TTT_PROFBUTTON "_E[_ðÝè³¹Ü·" +END Propchange: trunk/reactos/base/applications/downloader/lang/ja-JP.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/rsrc.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -32,6 +32,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/lt-LT.rc" Added: trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -1,0 +1,86 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/lang/nl-NL.rc + * PURPOSE: Dutch Language Resource File for Solitaire + * TRANSLATOR: Wouter De Vlieger + */ +#include "resource.h" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Opties" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Delen", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "&Eén kaart", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Drie kaarten", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + + AUTOCHECKBOX "Tijd &weergeven", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "S&tatusbalk", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Annuleren", IDCANCEL, 101, 97, 50, 14 +END + + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Achterzijde selecteren" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Annuleren", IDCANCEL, 162, 77, 54, 13 +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire door J Brown\n\nCardLib versie 1.0." + IDS_SOL_QUIT "Het huidige spel afsluiten?" + IDS_SOL_WIN "Gefeliciteerd, u heeft gewonnen!" + IDS_SOL_DEAL "Nogmaals spelen?" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "&Spel" + BEGIN + MENUITEM "&Delen\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Kaarten...", IDM_GAME_DECK + MENUITEM "&Opties...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Afsluiten", IDM_GAME_EXIT + END + POPUP "&Help" + BEGIN + MENUITEM "Help-onder&werpen\tF1", IDM_HELP_CONTENTS + MENUITEM "&Over Solitaire", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/nl-NL.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -18,6 +18,7 @@ #include "lang/it-IT.rc" #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" +#include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Thu Jun 18 13:30:33 2009 @@ -43,8 +43,8 @@ IDC_STATIC,15,7,286,19 LISTBOX IDC_PROJECTS,15,30,286,75,LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOS ÍGPLÌºÉCZX³êÄ¨èA·×ÄÜ½ÍêðÄpAÄzz·é "\ - "êÍGPLÉ]¤Kvª èÜ·B", + LTEXT "ReactOSÍGPLÌºÉCZX³êÄ¨èA·×ÄÜ½ÍêðÄpA "\ + "Äzz·éêÍGPLÉ]¤Kvª èÜ·B", IDC_STATIC,15,110,227,19 PUSHBUTTON "GPLð\\¦(&V)...",IDC_VIEWGPL,251,110,50,19 LTEXT "ZbgAbvð±s·éÉÍ [Ö] ðNbNµÄ¾³¢B",IDC_STATIC,15,136, @@ -79,7 +79,7 @@ LTEXT "Rs[^¼(&C):", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "AdministratorÆÄÎêé[U[AJEgðì¬µÜ·B"\ + LTEXT "AdministratorÆÄÎêé[U[AJEgðì¬µÜ·B "\ "Rs[^ÉtANZXªKvÈÆ«A±ÌAJEgðgpµÜ·B", IDC_STATIC, 54, 57, 250, 25 LTEXT "AdministratorÌpX[hð¼p 14 ¶ÈàÅüÍµÄ¾³¢B", @@ -214,7 +214,7 @@ IDS_CMT_SCREENSHOT "XN[VbgðBèÜ·" IDS_CMT_SERVMAN "T[rX }l[WðN®µÜ·" IDS_CMT_WORDPAD "hLgGfB^ðN®µÜ·" - IDS_CMT_PAINT "Launch Paint" + IDS_CMT_PAINT "yCgðN®µÜ·" END STRINGTABLE @@ -281,7 +281,7 @@ IDS_SHORT_SOLITAIRE "\\eBA.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" IDS_SHORT_WORDPAD "[hpbh.lnk" - IDS_SHORT_PAINT "Paint.lnk" + IDS_SHORT_PAINT "yCg.lnk" END STRINGTABLE

15 years, 4 months

[janderwald] 41444: - mmreg uses for all structures contained byte-aligned packing

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Jun 18 12:03:40 2009 New Revision: 41444 URL: http://svn.reactos.org/svn/reactos?rev=41444&view=rev Log: - mmreg uses for all structures contained byte-aligned packing Modified: trunk/reactos/include/psdk/mmreg.h Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Thu Jun 18 12:03:40 2009 @@ -20,6 +20,11 @@ #ifndef __WINE_MMREG_H #define __WINE_MMREG_H + +#ifndef RC_INVOKED +#include "pshpack1.h" +#endif + /*********************************************************************** * Defines/Enums @@ -509,4 +514,8 @@ #endif +#ifndef RC_INVOKED +#include "poppack.h" +#endif + #endif /* __WINE_MMREG_H */

15 years, 4 months

[cgutman] 41443: - Make NdisGeneratePartialCancelId safe by using Interlocked functions

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Jun 18 06:24:19 2009 New Revision: 41443 URL: http://svn.reactos.org/svn/reactos?rev=41443&view=rev Log: - Make NdisGeneratePartialCancelId safe by using Interlocked functions Modified: trunk/reactos/drivers/network/ndis/ndis/main.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Thu Jun 18 06:24:19 2009 @@ -20,6 +20,8 @@ ULONG DebugTraceLevel = MIN_TRACE; #endif /* DBG */ + +UCHAR CancelId; VOID NTAPI MainUnload( @@ -60,6 +62,8 @@ KeInitializeSpinLock(&AdapterListLock); DriverObject->DriverUnload = MainUnload; + + CancelId = 0; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Thu Jun 18 06:24:19 2009 @@ -5,6 +5,8 @@ */ #include "ndissys.h" + +extern UCHAR CancelId; /* * @implemented @@ -518,13 +520,13 @@ EXPORT NdisGeneratePartialCancelId(VOID) { - static UCHAR CancelId = 0; - - CancelId++; - - NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", CancelId)); - - return CancelId; + UCHAR PartialCancelId; + + PartialCancelId = InterlockedIncrement((PLONG)&CancelId); + + NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", PartialCancelId)); + + return PartialCancelId; } /* EOF */

15 years, 5 months

[hyperion] 41442: Miscellaneous Visual C++ compilation fixes modified include/crt/mingw32/intrin_x86.h modified include/crt/msc/intrin.h Fixed declarations of _InterlockedDecrement16 and _InterlockedIncrement16 Fixed declarations of __readcr0, __readcr2, __readcr3 and __readcr4 for x86 Implement __readdr and __writedr for x86 too Added missing semicolon modified include/crt/stdlib.h modified lib/3rdparty/mingw/crtexe.c Use Visual C++-compatible attribute placement modified lib/3rdparty/mingw/crt

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Jun 18 04:41:56 2009 New Revision: 41442 URL: http://svn.reactos.org/svn/reactos?rev=41442&view=rev Log: Miscellaneous Visual C++ compilation fixes modified include/crt/mingw32/intrin_x86.h modified include/crt/msc/intrin.h Fixed declarations of _InterlockedDecrement16 and _InterlockedIncrement16 Fixed declarations of __readcr0, __readcr2, __readcr3 and __readcr4 for x86 Implement __readdr and __writedr for x86 too Added missing semicolon modified include/crt/stdlib.h modified lib/3rdparty/mingw/crtexe.c Use Visual C++-compatible attribute placement modified lib/3rdparty/mingw/crtexe.c Get rid of useless assembly, replace with __writefsdword (it's still useless) modified lib/3rdparty/mingw/mingw.rbuild Disable Visual C++ warning C4733 ("Inline asm assigning to 'FS:0' : handler not registered as safe handler") for mingw_wmain modified lib/sdk/scrnsave/scrnsave.c Silence a warning modified ReactOS-generic.rbuild Disable Visual C++ warning C4711 ("function 'function' selected for inline expansion") globally modified tools/rbuild/backend/mingw/compilers/msc.mak Fix Visual C++ compiler rules to emit an uniquely named PDB for each object file Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/crt/stdlib.h trunk/reactos/lib/3rdparty/mingw/crtexe.c trunk/reactos/lib/3rdparty/mingw/mingw.rbuild trunk/reactos/lib/sdk/scrnsave/scrnsave.c trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -127,4 +127,6 @@ </directory> <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> + + <compilerflag compilerset="msc">/wd4711</compilerflag> </group> Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -479,12 +479,12 @@ return _InterlockedExchangeAdd(lpAddend, 1) + 1; } -__INTRIN_INLINE long _InterlockedDecrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedDecrement16(volatile short * const lpAddend) { return _InterlockedExchangeAdd16(lpAddend, -1) - 1; } -__INTRIN_INLINE long _InterlockedIncrement16(volatile short * const lpAddend) +__INTRIN_INLINE short _InterlockedIncrement16(volatile short * const lpAddend) { return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } @@ -1132,7 +1132,6 @@ { __asm__("mov %[Data], %%cr8" : : [Data] "q" (Data) : "memory"); } -#endif __INTRIN_INLINE unsigned __int64 __readcr0(void) { @@ -1162,11 +1161,38 @@ return value; } -#ifdef _M_AMD64 __INTRIN_INLINE unsigned __int64 __readcr8(void) { unsigned __int64 value; __asm__ __volatile__("movq %%cr8, %q[value]" : [value] "=q" (value)); + return value; +} +#else +__INTRIN_INLINE unsigned long __readcr0(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr0, %[value]" : [value] "=q" (value)); + return value; +} + +__INTRIN_INLINE unsigned long __readcr2(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr2, %[value]" : [value] "=q" (value)); + return value; +} + +__INTRIN_INLINE unsigned long __readcr3(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr3, %[value]" : [value] "=q" (value)); + return value; +} + +__INTRIN_INLINE unsigned long __readcr4(void) +{ + unsigned long value; + __asm__ __volatile__("mov %%cr4, %[value]" : [value] "=q" (value)); return value; } #endif @@ -1206,6 +1232,70 @@ } __INTRIN_INLINE void __writedr(unsigned reg, unsigned __int64 value) +{ + switch (reg) + { + case 0: + __asm__("movq %q[value], %%dr0" : : [value] "q" (value) : "memory"); + break; + case 1: + __asm__("movq %q[value], %%dr1" : : [value] "q" (value) : "memory"); + break; + case 2: + __asm__("movq %q[value], %%dr2" : : [value] "q" (value) : "memory"); + break; + case 3: + __asm__("movq %q[value], %%dr3" : : [value] "q" (value) : "memory"); + break; + case 4: + __asm__("movq %q[value], %%dr4" : : [value] "q" (value) : "memory"); + break; + case 5: + __asm__("movq %q[value], %%dr5" : : [value] "q" (value) : "memory"); + break; + case 6: + __asm__("movq %q[value], %%dr6" : : [value] "q" (value) : "memory"); + break; + case 7: + __asm__("movq %q[value], %%dr7" : : [value] "q" (value) : "memory"); + break; + } +} +#else +__INTRIN_INLINE unsigned int __readdr(unsigned int reg) +{ + unsigned int value; + switch (reg) + { + case 0: + __asm__ __volatile__("movq %%dr0, %q[value]" : [value] "=q" (value)); + break; + case 1: + __asm__ __volatile__("movq %%dr1, %q[value]" : [value] "=q" (value)); + break; + case 2: + __asm__ __volatile__("movq %%dr2, %q[value]" : [value] "=q" (value)); + break; + case 3: + __asm__ __volatile__("movq %%dr3, %q[value]" : [value] "=q" (value)); + break; + case 4: + __asm__ __volatile__("movq %%dr4, %q[value]" : [value] "=q" (value)); + break; + case 5: + __asm__ __volatile__("movq %%dr5, %q[value]" : [value] "=q" (value)); + break; + case 6: + __asm__ __volatile__("movq %%dr6, %q[value]" : [value] "=q" (value)); + break; + case 7: + __asm__ __volatile__("movq %%dr7, %q[value]" : [value] "=q" (value)); + break; + } + return value; +} + +__INTRIN_INLINE void __writedr(unsigned reg, unsigned int value) { switch (reg) { 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] Thu Jun 18 04:41:56 2009 @@ -35,8 +35,8 @@ long _InterlockedAddLargeStatistic(volatile __int64 * const Addend, const long Value); long _InterlockedDecrement(volatile long * const lpAddend); long _InterlockedIncrement(volatile long * const lpAddend); -long _InterlockedDecrement16(volatile short * const lpAddend); -long _InterlockedIncrement16(volatile short * const lpAddend); +short _InterlockedDecrement16(volatile short * const lpAddend); +short _InterlockedIncrement16(volatile short * const lpAddend); unsigned char _interlockedbittestandreset(volatile long * a, const long b); unsigned char _interlockedbittestandset(volatile long * a, const long b); @@ -92,7 +92,7 @@ void __incfsdword(const unsigned long Offset); void __addfsbyte(const unsigned long Offset, const unsigned char Data); void __addfsword(const unsigned long Offset, const unsigned short Data); -void __addfsdword(const unsigned long Offset, const unsigned int Data) +void __addfsdword(const unsigned long Offset, const unsigned int Data); #endif @@ -153,19 +153,21 @@ #ifdef _M_AMD64 void __writecr8(const unsigned __int64 Data); -#endif - unsigned __int64 __readcr0(void); unsigned __int64 __readcr2(void); unsigned __int64 __readcr3(void); unsigned __int64 __readcr4(void); - -#ifdef _M_AMD64 unsigned __int64 __readcr8(void); -#endif - unsigned __int64 __readdr(unsigned int reg); void __writedr(unsigned reg, unsigned __int64 value); +#else +unsigned long __readcr0(void); +unsigned long __readcr2(void); +unsigned long __readcr3(void); +unsigned long __readcr4(void); +unsigned int __readdr(unsigned int reg); +void __writedr(unsigned reg, unsigned int value); +#endif void __invlpg(void * const Address); Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -304,7 +304,7 @@ _CRTIMP __declspec(noreturn) void __cdecl _exit(int _Code); #if !defined __NO_ISOCEXT /* extern stub in static libmingwex.a */ /* C99 function name */ - void __cdecl __declspec(noreturn) _Exit(int); /* Declare to get noreturn attribute. */ + __declspec(noreturn) void __cdecl _Exit(int); /* Declare to get noreturn attribute. */ __CRT_INLINE void __cdecl _Exit(int status) { _exit(status); } #endif @@ -312,7 +312,7 @@ #pragma push_macro("abort") #undef abort #endif - void __cdecl __declspec(noreturn) abort(void); + __declspec(noreturn) void __cdecl abort(void); #if __MINGW_GNUC_PREREQ(4,4) #pragma pop_macro("abort") #endif Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -20,6 +20,7 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> +#include <intrin.h> #ifndef __winitenv extern wchar_t ***_imp____winitenv; @@ -86,7 +87,7 @@ static _startupinfo startinfo; extern void _pei386_runtime_relocator (void); -static CALLBACK long _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); +static long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data); static LONG __mingw_vex(EXCEPTION_POINTERS * exception_data); #ifdef WPRFLAG static void duplicate_ppstrings (int ac, wchar_t ***av); @@ -169,7 +170,7 @@ STARTUPINFO StartupInfo; BOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); - + if (mingw_app_type) GetStartupInfo (&StartupInfo); { @@ -206,26 +207,18 @@ _ASSERTE(__native_startup_state == __initialized); if (! nested) (VOID)InterlockedExchangePointer ((volatile PVOID *) &__native_startup_lock, 0); - + if (__dyn_tls_init_callback != NULL && _IsNonwritableInCurrentImage ((PBYTE) &__dyn_tls_init_callback)) __dyn_tls_init_callback (NULL, DLL_THREAD_ATTACH, NULL); - + _pei386_runtime_relocator (); - - #ifdef _WIN64 - __asm__ __volatile__ ( - "xorq %rax,%rax\n\t" - "decq %rax\n\t" - "movq %rax,%gs:0" "\n"); - #else - __asm__ __volatile__ ( - "xorl %eax,%eax\n\t" - "decl %eax\n\t" - "movl %eax,%fs:0" "\n"); - #endif + +#if defined(__i386__) || defined(_M_IX86) + __writefsdword(0, 0xffffffff); +#endif AddVectoredExceptionHandler (0, (PVECTORED_EXCEPTION_HANDLER)__mingw_vex); SetUnhandledExceptionFilter (_gnu_exception_handler); - + _fpreset (); if (mingw_app_type) @@ -330,7 +323,7 @@ return 0; } -static CALLBACK long +static long CALLBACK _gnu_exception_handler (EXCEPTION_POINTERS * exception_data) { void (*old_handler) (int); @@ -466,7 +459,7 @@ char **avl; int i; char **n = (char **) malloc (sizeof (char *) * (ac + 1)); - + avl=*av; for (i=0; i < ac; i++) { Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.r… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -39,6 +39,7 @@ <define name="_CRTBLD" /> <define name="WPRFLAG" /> <include base="ReactOS">include/reactos/mingw-w64</include> + <compilerflag compilerset="msc">/wd4733</compilerflag> <file>crt0_w.c</file> <file>crtexe.c</file> <file>dllargv.c</file> Modified: trunk/reactos/lib/sdk/scrnsave/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/scrnsave/scrnsave.… ============================================================================== --- trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/scrnsave/scrnsave.c [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -204,6 +204,9 @@ { LPTSTR p; + UNREFERENCED_PARAMETER(nCmdShow); + UNREFERENCED_PARAMETER(hPrevInst); + hMainInstance = hInst; // Parse the arguments Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] Thu Jun 18 04:41:56 2009 @@ -47,13 +47,13 @@ $(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TC /Fo$$@ ${call RBUILD_cflags,$(1),$(4)} /c $$< + $${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$< else $(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TC /Fo$$@ ${call RBUILD_cflags,$(1),$(4)} /c $$< + $${cl} /TC /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cflags,$(1),$(4)} /c $$< endif @@ -71,13 +71,13 @@ $(5): $(2) $(5).d $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TP /Fo$$@ ${call RBUILD_cxxflags,$(1),$(4)} /c $$< + $${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$< else $(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CC) - $${cl} /TP /Fo$$@ ${call RBUILD_cxxflags,$(1),$(4)} /c $$< + $${cl} /TP /Fo$$@ /Fd$(basename $$(a)).pdb ${call RBUILD_cxxflags,$(1),$(4)} /c $$< endif

15 years, 5 months

[hyperion] 41441: modified tools/rbuild/backend/mingw/rules.mak For now, only pass the -I, -D and -U preprocessor options to gas

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Jun 18 04:27:18 2009 New Revision: 41441 URL: http://svn.reactos.org/svn/reactos?rev=41441&view=rev Log: modified tools/rbuild/backend/mingw/rules.mak For now, only pass the -I, -D and -U preprocessor options to gas Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Thu Jun 18 04:27:18 2009 @@ -86,7 +86,8 @@ #(module, flags, includes) RBUILD_cflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),C} RBUILD_cxxflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),CXX} -RBUILD_asflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),AS} +#~ RBUILD_asflags=${call RBUILD_compiler_flags_with_cpp,$(1),$(2),$(3),AS} +RBUILD_asflags=${call RBUILD_compiler_flags_builtin_cpp,$(1),$(2),$(3),AS} RBUILD_nasmflags=${call RBUILD_compiler_flags_builtin_cpp,$(1),$(2),$(3),NASM} RBUILD_rc_pp_flags=${call RBUILD_compiler_flags_cpp,$(1),-DRC_INVOKED=1 -D__WIN32__=1 -D__FLAT__=1,$(3) -I.,RC} RBUILD_rc_flags=${call RBUILD_compiler_flags_with_includes,$(1),$(2),$(3),RC}

15 years, 5 months

[hyperion] 41440: modified include/crt/math.h Ported <math.h> to Visual C++ Fixed some miscellaneous stupidity. I see Arch has been committing to MinGW-W64 too

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Jun 18 03:25:22 2009 New Revision: 41440 URL: http://svn.reactos.org/svn/reactos?rev=41440&view=rev Log: modified include/crt/math.h Ported <math.h> to Visual C++ Fixed some miscellaneous stupidity. I see Arch has been committing to MinGW-W64 too Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=414… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Thu Jun 18 03:25:22 2009 @@ -100,7 +100,7 @@ _CRTIMP double __cdecl _y1(double _X); _CRTIMP double __cdecl _yn(int _X,double _Y); -#if(defined(_X86_) && !defined(__x86_64)) +#if defined(__i386__) || defined(_M_IX86) _CRTIMP int __cdecl _set_SSE2_enable(int _Flag); /* from libmingwex */ float __cdecl _hypotf(float _X,float _Y); @@ -131,7 +131,7 @@ float __cdecl fmodf(float _X,float _Y); float __cdecl _hypotf(float _X,float _Y); float __cdecl fabsf(float _X); -#if !defined(__ia64__) +#if !defined(__ia64__) && !defined(_M_IA64) /* from libmingwex */ float __cdecl _copysignf (float _Number,float _Sign); float __cdecl _chgsignf (float _X); @@ -142,57 +142,52 @@ int __cdecl _fpclassf(float _X); #endif -#ifndef __cplusplus +#if defined(__GNUC__) + +#define __fabs(x, res) \ + __asm__ ("fabs;" : "=t" (res) : "0" (x)) + +#elif defined(_MSC_VER) + +#define __fabs(x, res) \ + __asm { fld [(x)] } \ + __asm { fabs } \ + __asm { fstp [(res)] } + +#endif + __CRT_INLINE long double __cdecl fabsl (long double x) { long double res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); + __fabs(x, res); return res; } -#define _hypotl(x,y) ((long double)_hypot((double)(x),(double)(y))) -#define _matherrl _matherr + __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign((double)(_Number)); } __CRT_INLINE long double _copysignl(long double _Number,long double _Sign) { return _copysign((double)(_Number),(double)(_Sign)); } + __CRT_INLINE long double _hypotl(long double _X,long double _Y) { return _hypot((double)(_X),(double)(_Y)); } __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); } -#if !defined (__ia64__) +#if !defined (__ia64__) && !defined (_M_IA64) __CRT_INLINE float __cdecl fabsf (float x) { float res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); + __fabs(x, res); return res; } __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); } #endif -#else - // cplusplus - __CRT_INLINE long double __cdecl fabsl (long double x) - { - long double res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); - return res; - } + +#define _matherrl _matherr + __CRT_INLINE long double modfl(long double _X,long double *_Y) { double _Di,_Df = modf((double)_X,&_Di); *_Y = (long double)_Di; return (_Df); } - __CRT_INLINE long double _chgsignl(long double _Number) { return _chgsign(static_cast<double>(_Number)); } - __CRT_INLINE long double _copysignl(long double _Number,long double _Sign) { return _copysign(static_cast<double>(_Number),static_cast<double>(_Sign)); } - __CRT_INLINE float frexpf(float _X,int *_Y) { return ((float)frexp((double)_X,_Y)); } -#ifndef __ia64__ - __CRT_INLINE float __cdecl fabsf (float x) - { - float res; - __asm__ ("fabs;" : "=t" (res) : "0" (x)); - return res; - } - __CRT_INLINE float __cdecl ldexpf (float x, int expn) { return (float) ldexp (x, expn); } -#endif -#endif - -#ifndef __x86_64 + +#if !defined(__x86_64) && !defined(_M_AMD64) __CRT_INLINE float acosf(float _X) { return ((float)acos((double)_X)); } __CRT_INLINE float asinf(float _X) { return ((float)asin((double)_X)); } __CRT_INLINE float atanf(float _X) { return ((float)atan((double)_X)); } @@ -255,11 +250,26 @@ #define FP_SUBNORMAL (FP_NORMAL | FP_ZERO) /* 0x0200 is signbit mask */ +#if defined(__GNUC__) + +#define __fxam(x, sw) \ + __asm__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)) + +#elif defined(_MSC_VER) + +#define __fxam(x, sw) \ + __asm { fld [(x)] } \ + __asm { fxam } \ + __asm { wait } \ + __asm { fnstsw [(sw)] } \ + __asm { fstp st(0) } + +#endif /* We can't __CRT_INLINE float or double, because we want to ensure truncation - to semantic type before classification. - (A normal long double value might become subnormal when + to semantic type before classification. + (A normal long double value might become subnormal when converted to double, and zero when converted to float.) */ @@ -268,7 +278,7 @@ __CRT_INLINE int __cdecl __fpclassifyl (long double x){ unsigned short sw; - __asm__ ("fxam; fstsw %%ax;" : "=a" (sw): "t" (x)); + __fxam(x, sw); return sw & (FP_NAN | FP_NORMAL | FP_ZERO ); } @@ -310,8 +320,7 @@ __CRT_INLINE int __cdecl __isnan (double _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __fxam(_x, sw); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -319,8 +328,7 @@ __CRT_INLINE int __cdecl __isnanf (float _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __fxam(_x, sw); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -328,8 +336,7 @@ __CRT_INLINE int __cdecl __isnanl (long double _x) { unsigned short sw; - __asm__ ("fxam;" - "fstsw %%ax": "=a" (sw) : "t" (_x)); + __fxam(_x, sw); return (sw & (FP_NAN | FP_NORMAL | FP_INFINITE | FP_ZERO | FP_SUBNORMAL)) == FP_NAN; } @@ -345,19 +352,19 @@ /* 7.12.3.6 The signbit macro */ __CRT_INLINE int __cdecl __signbit (double x) { unsigned short stw; - __asm__ ( "fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __fxam(x, stw); return stw & 0x0200; } __CRT_INLINE int __cdecl __signbitf (float x) { unsigned short stw; - __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __fxam(x, stw); return stw & 0x0200; } __CRT_INLINE int __cdecl __signbitl (long double x) { unsigned short stw; - __asm__ ("fxam; fstsw %%ax;": "=a" (stw) : "t" (x)); + __fxam(x, stw); return stw & 0x0200; } @@ -387,27 +394,40 @@ extern float __cdecl logbf (float); extern long double __cdecl logbl (long double); +#if defined(__GNUC__) + +#define __fxtract(x, res) \ + __asm__ ("fxtract\n\t" \ + "fstp %%st" : "=t" (res) : "0" (x)) + +#elif defined(_MSC_VER) + +#define __fxtract(x, res) \ + __asm { fld [(x)] } \ + __asm { fxtract } \ + __asm { fstp st(0) } \ + __asm { fstp [(res)] } + +#endif + __CRT_INLINE double __cdecl logb (double x) { double res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __fxtract(x, res); return res; } __CRT_INLINE float __cdecl logbf (float x) { float res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __fxtract(x, res); return res; } __CRT_INLINE long double __cdecl logbl (long double x) { long double res; - __asm__ ("fxtract\n\t" - "fstp %%st" : "=t" (res) : "0" (x)); + __fxtract(x, res); return res; } @@ -423,7 +443,7 @@ extern long double __cdecl scalblnl (long double, long); /* 7.12.7.1 */ - /* Implementations adapted from Cephes versions */ + /* Implementations adapted from Cephes versions */ extern double __cdecl cbrt (double); extern float __cdecl cbrtf (float); extern long double __cdecl cbrtl (long double); @@ -449,14 +469,14 @@ extern float __cdecl erff (float); /* TODO extern long double __cdecl erfl (long double); - */ + */ /* 7.12.8.2 The erfc functions */ extern double __cdecl erfc (double); extern float __cdecl erfcf (float); /* TODO extern long double __cdecl erfcl (long double); - */ + */ /* 7.12.8.3 The lgamma functions */ extern double __cdecl lgamma (double); @@ -485,74 +505,102 @@ /* 7.12.9.4 */ /* round, using fpu control word settings */ +#if defined(__GNUC__) + +#define __frndint(x, res) \ + __asm__ ("fabs;" : "=t" (res) : "0" (x)) + +#elif defined(_MSC_VER) + +#define __frndint(x, res) \ + __asm { fld [(x)] } \ + __asm { frndint } \ + __asm { fstp [(res)] } + +#endif + __CRT_INLINE double __cdecl rint (double x) { double retval; - __asm__ ("frndint;": "=t" (retval) : "0" (x)); + __frndint(x, retval); return retval; } __CRT_INLINE float __cdecl rintf (float x) { float retval; - __asm__ ("frndint;" : "=t" (retval) : "0" (x) ); + __frndint(x, retval); return retval; } __CRT_INLINE long double __cdecl rintl (long double x) { long double retval; - __asm__ ("frndint;" : "=t" (retval) : "0" (x) ); + __frndint(x, retval); return retval; } /* 7.12.9.5 */ - __CRT_INLINE long __cdecl lrint (double x) - { - long retval; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintf (float x) +#if defined(__GNUC__) + +#define __fistpl(x, res) \ + __asm__ __volatile__("fistpl %0" : "=m" (res) : "t" (x) : "st") + +#define __fistpll(x, res) \ + __asm__ __volatile__("fistpll %0" : "=m" (res) : "t" (x) : "st") + +#elif defined(_MSC_VER) + +#define __fistpl(x, res) \ + __asm { fld [(x)] } \ + __asm { fistp [(res)] } + +#define __fistpll(x, res) \ + __asm { fld [(x)] } \ + __asm { fistp [(res)] } + +#endif + + __CRT_INLINE long __cdecl lrint (double x) { long retval; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long __cdecl lrintl (long double x) + __fistpl(x, retval); + return retval; + } + + __CRT_INLINE long __cdecl lrintf (float x) { long retval; - __asm__ __volatile__ \ - ("fistpl %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long long __cdecl llrint (double x) + __fistpl(x, retval); + return retval; + } + + __CRT_INLINE long __cdecl lrintl (long double x) + { + long retval; + __fistpl(x, retval); + return retval; + } + + __CRT_INLINE long long __cdecl llrint (double x) { long long retval; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long long __cdecl llrintf (float x) + __fistpll(x, retval); + return retval; + } + + __CRT_INLINE long long __cdecl llrintf (float x) { long long retval; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; - } - - __CRT_INLINE long long __cdecl llrintl (long double x) + __fistpll(x, retval); + return retval; + } + + __CRT_INLINE long long __cdecl llrintl (long double x) { long long retval; - __asm__ __volatile__ \ - ("fistpll %0" : "=m" (retval) : "t" (x) : "st"); \ - return retval; + __fistpll(x, retval); + return retval; } /* 7.12.9.6 */ @@ -578,7 +626,7 @@ extern long double __cdecl fmodl (long double, long double); - /* 7.12.10.2 */ + /* 7.12.10.2 */ extern double __cdecl remainder (double, double); extern float __cdecl remainderf (float, float); extern long double __cdecl remainderl (long double, long double); @@ -633,22 +681,22 @@ extern long double __cdecl fminl (long double, long double); /* 7.12.13.1 */ - /* return x * y + z as a ternary op */ + /* return x * y + z as a ternary op */ extern double __cdecl fma (double, double, double); extern float __cdecl fmaf (float, float, float); extern long double __cdecl fmal (long double, long double, long double); /* 7.12.14 */ - /* + /* * With these functions, comparisons involving quiet NaNs set the FP * condition code to "unordered". The IEEE floating-point spec * dictates that the result of floating-point comparisons should be - * false whenever a NaN is involved, with the exception of the != op, + * false whenever a NaN is involved, with the exception of the != op, * which always returns true: yes, (NaN != NaN) is true). */ -#if __GNUC__ >= 3 +#if defined(__GNUC__) && __GNUC__ >= 3 #define isgreater(x, y) __builtin_isgreater(x, y) #define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) @@ -662,8 +710,20 @@ __CRT_INLINE int __cdecl __fp_unordered_compare (long double x, long double y){ unsigned short retval; +#if defined(__GNUC__) __asm__ ("fucom %%st(1);" "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); +#elif defined(_MSC_VER) + __asm { + fld [x] + fld [y] + fxch st(1) + fucom st(1) + fnstsw [retval] + fstp st(0) + fstp st(0) + } +#endif return retval; } @@ -695,7 +755,7 @@ else _N = (unsigned int)(-_Y); for(_Ty _Z = _Ty(1);;_X *= _X) { if((_N & 1)!=0) _Z *= _X; - if((_N >>= 1)==0) return (_Y < 0 ? _Ty(1) / _Z : _Z); + if((_N >>= 1)==0) return (_Y < 0 ? _Ty(1) / _Z : _Z); } } } @@ -735,47 +795,4 @@ #define _FPCLASS_PINF 0x0200 /* Positive Infinity */ #endif /* __MINGW_FPCLASS_DEFINED */ -/* 7.12.14 */ -/* - * With these functions, comparisons involving quiet NaNs set the FP - * condition code to "unordered". The IEEE floating-point spec - * dictates that the result of floating-point comparisons should be - * false whenever a NaN is involved, with the exception of the != op, - * which always returns true: yes, (NaN != NaN) is true). - */ - -#if __GNUC__ >= 3 - -#define isgreater(x, y) __builtin_isgreater(x, y) -#define isgreaterequal(x, y) __builtin_isgreaterequal(x, y) -#define isless(x, y) __builtin_isless(x, y) -#define islessequal(x, y) __builtin_islessequal(x, y) -#define islessgreater(x, y) __builtin_islessgreater(x, y) -#define isunordered(x, y) __builtin_isunordered(x, y) - -#else -/* helper */ -__CRT_INLINE int __cdecl -__fp_unordered_compare (long double x, long double y){ - unsigned short retval; - __asm__ ("fucom %%st(1);" - "fnstsw;": "=a" (retval) : "t" (x), "u" (y)); - return retval; -} - -#define isgreater(x, y) ((__fp_unordered_compare(x, y) \ - & 0x4500) == 0) -#define isless(x, y) ((__fp_unordered_compare (y, x) \ - & 0x4500) == 0) -#define isgreaterequal(x, y) ((__fp_unordered_compare (x, y) \ - & FP_INFINITE) == 0) -#define islessequal(x, y) ((__fp_unordered_compare(y, x) \ - & FP_INFINITE) == 0) -#define islessgreater(x, y) ((__fp_unordered_compare(x, y) \ - & FP_SUBNORMAL) == 0) -#define isunordered(x, y) ((__fp_unordered_compare(x, y) \ - & 0x4500) == 0x4500) - -#endif - #endif /* !_INC_MATH */

15 years, 5 months

[cfinck] 436: Avoid using variables where this doesn't make the code easier. This also fixes a problem with a variable being used twice. (introduced by my previous commit)

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jun 18 01:57:27 2009 New Revision: 436 URL: http://svn.reactos.org/svn/reactos?rev=436&view=rev Log: Avoid using variables where this doesn't make the code easier. This also fixes a problem with a variable being used twice. (introduced by my previous commit) Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Thu Jun 18 01:57:27 2009 @@ -354,24 +354,15 @@ for(var i = 0; i < results.length; i++) { - var ResultID = GetTagData(results[i], "id"); - var ResultRevision = GetTagData(results[i], "revision"); - var ResultDate = GetTagData(results[i], "date"); - var ResultCount = GetTagData(results[i], "count"); - var ResultFailures = GetTagData(results[i], "failures"); - var ResultUser = GetTagData(results[i], "user"); - var ResultPlatform = GetTagData(results[i], "platform"); - var ResultComment = GetTagData(results[i], "comment"); - html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">'; - html += '<td><input onclick="ResultCheckbox_OnClick(this)" type="checkbox" id="test_' + ResultID + '" \/><\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultRevision + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultDate + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultCount + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultFailures + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultUser + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultPlatform + '<\/td>'; - html += '<td onclick="ResultCell_OnClick(this)">' + ResultComment + '<\/td>'; + html += '<td><input onclick="ResultCheckbox_OnClick(this)" type="checkbox" id="test_' + GetTagData(results[i], "id") + '" \/><\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "revision") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "date") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "count") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "failures") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "user") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "platform") + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + GetTagData(results[i], "comment") + '<\/td>'; html += '<\/tr>'; oddeven = !oddeven;

15 years, 5 months

[cfinck] 435: - Add general "Total Tests" and "Failed Tests" column headers to the search results to get sums of all executed and failed tests. A feature for comparing these general numbers through the Compare page will follow later. - Identify crashed tests by an extra column, not by a negative number of total tests. - Add a new status "CANCELED": If we can detect that a test was canceled by testman (maximum log size exceeded) or sysreg (timeout), we show that, otherwise "CRASH" is used. - Simp

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jun 18 01:27:17 2009 New Revision: 435 URL: http://svn.reactos.org/svn/reactos?rev=435&view=rev Log: - Add general "Total Tests" and "Failed Tests" column headers to the search results to get sums of all executed and failed tests. A feature for comparing these general numbers through the Compare page will follow later. - Identify crashed tests by an extra column, not by a negative number of total tests. - Add a new status "CANCELED": If we can detect that a test was canceled by testman (maximum log size exceeded) or sysreg (timeout), we show that, otherwise "CRASH" is used. - Simplify some code now that we have only one search result box to care about. - Also sort the results ascending if a user uses the "Compare first two Results" button. Modified: branches/danny-web/resources/testman/testman.sql branches/danny-web/www/www.reactos.org/testman/ajax-search.php branches/danny-web/www/www.reactos.org/testman/compare.php branches/danny-web/www/www.reactos.org/testman/css/compare.css branches/danny-web/www/www.reactos.org/testman/css/detail.css branches/danny-web/www/www.reactos.org/testman/detail.php branches/danny-web/www/www.reactos.org/testman/js/index.js.php branches/danny-web/www/www.reactos.org/testman/utils.inc.php branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… Modified: branches/danny-web/resources/testman/testman.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/resources/testman/tes… ============================================================================== --- branches/danny-web/resources/testman/testman.sql [iso-8859-1] (original) +++ branches/danny-web/resources/testman/testman.sql [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -15,6 +15,7 @@ `id` int(10) unsigned NOT NULL auto_increment, `test_id` int(10) unsigned NOT NULL, `suite_id` int(10) unsigned NOT NULL, + `status` enum('ok','crash','canceled') collate latin1_general_ci NOT NULL, `count` int(10) NOT NULL COMMENT 'Number of all executed tests', `failures` int(10) unsigned NOT NULL COMMENT 'Number of failed tests', `skipped` int(10) unsigned NOT NULL COMMENT 'Number of skipped tests', @@ -30,6 +31,8 @@ `revision` int(9) unsigned NOT NULL, `platform` varchar(24) collate latin1_general_ci NOT NULL, `comment` varchar(255) collate latin1_general_ci default NULL, + `count` int(10) unsigned NOT NULL COMMENT 'Sum of all executed tests', + `failures` int(10) unsigned NOT NULL COMMENT 'Sum of all test failures', PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; Modified: branches/danny-web/www/www.reactos.org/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/ajax-search.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -90,7 +90,7 @@ if($_GET["resultlist"]) { $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment " . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, a.name, r.revision, r.platform, r.comment, r.count, r.failures " . $tables . $where . $order . "LIMIT " . $result_count ) or die("<error>Query failed #2</error>"); @@ -113,6 +113,8 @@ printf("<revision>%d</revision>", $row["revision"]); printf("<platform>%s</platform>", GetPlatformString($row["platform"])); printf("<comment>%s</comment>", htmlspecialchars($row["comment"])); + printf("<count>%d</count>", $row["count"]); + printf("<failures>%d</failures>", $row["failures"]); echo "</result>"; $last_revision = $row["revision"]; Modified: branches/danny-web/www/www.reactos.org/testman/compare.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/compare.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -23,11 +23,8 @@ // Return   ("" is not possible because of IE...) if // - we have nothing to compare // - both values are identical - // - a crash occured in one of the results if(!$prev_result_row["id"] || - $current_result_row[$subject] == $prev_result_row[$subject] || - $current_result_row[$subject] == -1 || - $prev_result_row[$subject] == -1) + $current_result_row[$subject] == $prev_result_row[$subject]) { return " "; } @@ -45,7 +42,7 @@ if($changed) return; - if($temp == -2) + if($temp == -1) $temp = $current; else if($current != $temp) $changed = true; @@ -140,7 +137,7 @@ for($i = 0; $i < count($id_array); $i++) { $result_stmt[$i] = $dbh->prepare( - "SELECT e.id, e.count, e.failures, e.skipped " . + "SELECT e.id, e.status, e.count, e.failures, e.skipped " . "FROM " . DB_TESTMAN . ".winetest_suites s " . "LEFT JOIN " . DB_TESTMAN . ".winetest_results e ON e.suite_id = s.id AND e.test_id = :testid " . "WHERE s.id IN (" . $suite_idlist . ")" . @@ -194,9 +191,9 @@ $changed = false; $prev_result_row = null; - $temp_totaltests = -2; - $temp_failedtests = -2; - $temp_skippedtests = -2; + $temp_totaltests = -1; + $temp_failedtests = -1; + $temp_skippedtests = -1; for($i = 0; $i < count($result_stmt); $i++) { @@ -216,8 +213,8 @@ if($result_row["id"]) { - printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($result_row["count"]), GetDifference($result_row, $prev_result_row, "count")); - printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["count"] == -1) ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); + printf('<div title="%s" class="box totaltests">%s <span class="diff">%s</span></div>', $testman_langres["totaltests"], GetTotalTestsString($result_row), GetDifference($result_row, $prev_result_row, "count")); + printf('<div title="%s" class="box %s_failedtests">%d <span class="diff">%s</span></div>', $testman_langres["failedtests"], (($result_row["failures"] > 0 || $result_row["status"] != "ok") ? 'real' : 'zero'), $result_row["failures"], GetDifference($result_row, $prev_result_row, "failures")); printf('<div title="%s" class="box skippedtests">%d <span class="diff">%s</span></div>', $testman_langres["skippedtests"], $result_row["skipped"], GetDifference($result_row, $prev_result_row, "skipped")); } else Modified: branches/danny-web/www/www.reactos.org/testman/css/compare.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/compare.css [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -101,5 +101,5 @@ #comparetable td div.totaltests { font-weight: bold; - width: 120px; + width: 130px; } Modified: branches/danny-web/www/www.reactos.org/testman/css/detail.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/css/detail.css [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/css/detail.css [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -6,7 +6,7 @@ */ .datatable { - width: 800px; + width: 90%; } .datatable th, .datatable td { Modified: branches/danny-web/www/www.reactos.org/testman/detail.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/detail.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -52,7 +52,7 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT l.log, e.count, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . + "SELECT l.log, e.status, e.count, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, a.name, r.comment " . "FROM " . DB_TESTMAN . ".winetest_results e " . "JOIN " . DB_TESTMAN . ".winetest_logs l ON e.id = l.id " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . @@ -76,17 +76,17 @@ </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["totaltests"]; ?>:</td> - <td><?php echo GetTotalTestsString($row["count"]); ?></td> + <td><?php echo GetTotalTestsString($row); ?></td> </tr> <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["failedtests"]; ?>:</td> <td><?php echo $row["failures"]; ?></td> </tr> - <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["skippedtests"]; ?>:</td> <td><?php echo $row["skipped"]; ?></td> </tr> - <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["log"]; ?>:</td> <td><pre><?php $patterns[0] = "#^([a-z]*:?$)([a-zA-Z0-9\/]+.[a-z]+):([0-9]+)($)#m"; Modified: branches/danny-web/www/www.reactos.org/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/js/index.js.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -56,14 +56,8 @@ return; } - var id = checkbox.name.substr(5); - - // Make sure all checkboxes belonging to this test show the same state - var elems = document.getElementsByName(checkbox.name); - - for(var i = 0; i < elems.length; i++) - elems[i].checked = checkbox.checked; - + var id = checkbox.id.substr(5); + if(checkbox.checked) { SelectedResults[id] = true; @@ -86,19 +80,19 @@ { for(id in SelectedResults) { - var elems = document.getElementsByName("test_" + id); - - for(var i = 0; i < elems.length; i++) - elems[i].checked = true; - } -} - -function Result_OnCheckboxClick(checkbox) + var checkbox = document.getElementById("test_" + id); + + if(checkbox) + checkbox.checked = true; + } +} + +function ResultCheckbox_OnClick(checkbox) { UpdateSelectedResults(checkbox); } -function Result_OnCellClick(elem) +function ResultCell_OnClick(elem) { var checkbox = elem.parentNode.firstChild.firstChild; checkbox.checked = !checkbox.checked; @@ -340,6 +334,8 @@ html += '<th class="TestCheckbox"><\/th>'; html += '<th><?php echo addslashes($testman_langres["revision"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["date"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["totaltests"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["failedtests"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["user"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["platform"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["comment"]); ?><\/th>'; @@ -350,7 +346,7 @@ if(!results.length) { - html += '<tr class="even"><td colspan="6"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; + html += '<tr class="even"><td colspan="8"><?php echo addslashes($testman_langres["noresults"]); ?><\/td><\/tr>'; } else { @@ -361,17 +357,21 @@ var ResultID = GetTagData(results[i], "id"); var ResultRevision = GetTagData(results[i], "revision"); var ResultDate = GetTagData(results[i], "date"); + var ResultCount = GetTagData(results[i], "count"); + var ResultFailures = GetTagData(results[i], "failures"); var ResultUser = GetTagData(results[i], "user"); var ResultPlatform = GetTagData(results[i], "platform"); var ResultComment = GetTagData(results[i], "comment"); html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">'; - html += '<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_' + ResultID + '" \/><\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultRevision + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultDate + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultUser + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultPlatform + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultComment + '<\/td>'; + html += '<td><input onclick="ResultCheckbox_OnClick(this)" type="checkbox" id="test_' + ResultID + '" \/><\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultRevision + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultDate + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultCount + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultFailures + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultUser + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultPlatform + '<\/td>'; + html += '<td onclick="ResultCell_OnClick(this)">' + ResultComment + '<\/td>'; html += '<\/tr>'; oddeven = !oddeven; @@ -423,8 +423,30 @@ document.getElementById("ajax_loading_search").style.visibility = "hidden"; } -function OpenComparePage(parameters) -{ +/** + * Open the Compare page in the user-defined area + * + * @param ResultArray + * Array containing the result IDs to pass to the Compare page. + * The array will be sorted ascending before. + */ +function OpenComparePage(ResultArray) +{ + var parameters = "ids="; + + ResultArray.sort(NumericComparison); + + for(i = 0; i < ResultArray.length; i++) + { + if(!i) + { + parameters += ResultArray[i]; + continue; + } + + parameters += "," + ResultArray[i]; + } + if(document.getElementById("opennewwindow").checked || DetectObsoleteIE()) { window.open("compare.php?" + parameters); @@ -440,19 +462,20 @@ function CompareFirstTwoButton_OnClick() { - var parameters = "ids="; + var IDArray; var trs = document.getElementById("resulttable").getElementsByTagName("tbody")[0].getElementsByTagName("tr"); if(trs[0].firstChild.firstChild.nodeName != "INPUT") return; - // Get the IDs through the "name" attribute of the checkboxes - parameters += trs[0].firstChild.firstChild.name.substr(5); + // Get the IDs through the "id" attribute of the checkboxes + IDArray = new Array(); + IDArray.push(parseInt(trs[0].firstChild.firstChild.id.substr(5))); if(trs[1]) - parameters += "," + trs[1].firstChild.firstChild.name.substr(5); - - OpenComparePage(parameters); + IDArray.push(parseInt(trs[1].firstChild.firstChild.id.substr(5))); + + OpenComparePage(IDArray); } function PageSwitch(NewPage, StartID) @@ -502,7 +525,6 @@ function CompareSelectedButton_OnClick() { - var parameters = "ids="; var IDArray = new Array(); // Sort the selected IDs @@ -515,21 +537,7 @@ return; } - IDArray.sort(NumericComparison); - - for(i = 0; i < IDArray.length; i++) - { - if(!i) - { - parameters += IDArray[i]; - first = false; - continue; - } - - parameters += "," + IDArray[i]; - } - - OpenComparePage(parameters); + OpenComparePage(IDArray); } function OpenNewWindowCheckbox_OnClick(checkbox) Modified: branches/danny-web/www/www.reactos.org/testman/utils.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/utils.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/utils.inc.php [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -126,12 +126,11 @@ return date("Y-m-d H:i", $timestamp); } - function GetTotalTestsString($count) + function GetTotalTestsString($row) { - // The number of total tests being -1 indicates that the test crashed while running - if($count == -1) - return "CRASH"; + if($row["status"] != "ok") + return strtoupper($row["status"]); - return $count; + return $row["count"]; } ?> Modified: branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/lib/WineTest.clas… [iso-8859-1] Thu Jun 18 01:27:17 2009 @@ -85,24 +85,32 @@ } else if($result == 0) { - // We found no summary line, so the test probably crashed - // Indicate this by setting count to -1 and set the rest to zero. - $count = -1; + // We found no summary line, now check whether we find any signs that the test was canceled + $lastline = strrchr($log, "["); + + if($lastline && (strpos($lastline, "[SYSREG]") !== FALSE || strpos($lastline, "[TESTMAN]") !== FALSE)) + $status = "canceled"; + else + $status = "crash"; + + $count = 0; $failures = 0; $skipped = 0; } else { // Sum up the values of each summary line + $status = "ok"; $count = array_sum($matches[1]); $failures = array_sum($matches[2]); $skipped = array_sum($matches[3]); } // Add the information into the DB - $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, count, failures, skipped) VALUES (:testid, :suiteid, :count, :failures, :skipped)"); + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, status, count, failures, skipped) VALUES (:testid, :suiteid, :status, :count, :failures, :skipped)"); $stmt->bindValue(":testid", (int)$test_id); $stmt->bindValue(":suiteid", (int)$suite_id); + $stmt->bindParam(":status", $status); $stmt->bindParam(":count", $count); $stmt->bindParam(":failures", $failures); $stmt->bindParam(":skipped", $skipped); @@ -124,8 +132,15 @@ if(!isset($test_id)) return "Necessary sub-information not specified!"; - // Mark this test as finished, so no more results can be submitted for it - $stmt = $dbh->prepare("UPDATE " . DB_TESTMAN . ".winetest_runs SET finished = 1 WHERE id = :testid AND user_id = :userid"); + // Sum up all results and mark this test as finished, so no more results can be submitted for it + $stmt = $dbh->prepare( + "UPDATE " . DB_TESTMAN . ".winetest_runs " . + "SET " . + "finished = 1, " . + "count = (SELECT SUM(count) FROM " . DB_TESTMAN . ".winetest_results WHERE test_id = :testid), " . + "failures = (SELECT SUM(failures) FROM " . DB_TESTMAN . ".winetest_results WHERE test_id = :testid) " . + "WHERE id = :testid AND user_id = :userid" + ); $stmt->bindParam(":userid", $user_id); $stmt->bindParam(":testid", $test_id); $stmt->execute() or die("Finish(): SQL failed #1");

15 years, 5 months

[dgorbachev] 41439: Do not lie about compiler optimizations.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Jun 17 22:17:45 2009 New Revision: 41439 URL: http://svn.reactos.org/svn/reactos?rev=41439&view=rev Log: Do not lie about compiler optimizations. Modified: trunk/reactos/config-arm.template.rbuild trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild… ============================================================================== --- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Wed Jun 17 22:17:45 2009 @@ -55,8 +55,7 @@  <property name="DBG" value="1" /> Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config-ppc.template.rbuild [iso-8859-1] Wed Jun 17 22:17:45 2009 @@ -51,8 +51,7 @@  <property name="DBG" value="1" /> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Wed Jun 17 22:17:45 2009 @@ -59,8 +59,7 @@  <property name="DBG" value="1" />

15 years, 5 months

← Newer
1
...
25
26
27
28
29
30
31
...
50
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 June 2009