Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 43804: The winner of the 1st ReactOS Logon Sound contest has been elected. It is irc:LoneRifle (alwyn-dot-tan-at-gmail-dot-com) Congratulations - See http://www.reactos.org/forum/viewtopic.php?f=2&t=7339 for more details
by janderwald＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: janderwald Date: Wed Oct 28 10:21:18 2009 New Revision: 43804 URL: http://svn.reactos.org/svn/reactos?rev=43804&view=rev Log: The winner of the 1st ReactOS Logon Sound contest has been elected. It is irc:LoneRifle (alwyn-dot-tan-at-gmail-dot-com) Congratulations - See http://www.reactos.org/forum/viewtopic.php?f=2&t=7339 for more details Modified: trunk/reactos/media/sounds/ReactOS_LogOn.wav Modified: trunk/reactos/media/sounds/ReactOS_LogOn.wav URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/sounds/ReactOS_LogOn… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 43803: - [User32] Update MenuShowPopup with wine and add menu check for MenuTrackMenu. MenuTrackMenu menu check fixed the first stop with wine menu test.
by jimtabor＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: jimtabor Date: Wed Oct 28 02:43:59 2009 New Revision: 43803 URL: http://svn.reactos.org/svn/reactos?rev=43803&view=rev Log: - [User32] Update MenuShowPopup with wine and add menu check for MenuTrackMenu. MenuTrackMenu menu check fixed the first stop with wine menu test. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Oct 28 02:43:59 2009 @@ -1928,12 +1928,15 @@ * Display a popup menu. */ static BOOL FASTCALL -MenuShowPopup(HWND WndOwner, HMENU Menu, UINT Id, +MenuShowPopup(HWND WndOwner, HMENU Menu, UINT Id, UINT flags, INT X, INT Y, INT XAnchor, INT YAnchor ) { ROSMENUINFO MenuInfo; ROSMENUITEMINFO ItemInfo; UINT Width, Height; + POINT pt; + HMONITOR monitor; + MONITORINFO info; TRACE("owner=%x hmenu=%x id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n", WndOwner, Menu, Id, X, Y, XAnchor, YAnchor); @@ -1967,38 +1970,40 @@ Width = MenuInfo.Width + GetSystemMetrics(SM_CXBORDER); Height = MenuInfo.Height + GetSystemMetrics(SM_CYBORDER); - if (GetSystemMetrics(SM_CXSCREEN ) < X + Width) - { - if (0 != XAnchor && X >= Width - XAnchor) - { - X -= Width - XAnchor; - } - if (GetSystemMetrics(SM_CXSCREEN) < X + Width) - { - X = GetSystemMetrics(SM_CXSCREEN) - Width; - } - } - if (X < 0 ) - { - X = 0; - } - - if (GetSystemMetrics(SM_CYSCREEN) < Y + Height) - { - if (0 != YAnchor && Y >= Height + YAnchor) - { - Y -= Height + YAnchor; - } - if (GetSystemMetrics(SM_CYSCREEN) < Y + Height) - { - Y = GetSystemMetrics(SM_CYSCREEN) - Height; - } - } - if (Y < 0 ) - { - Y = 0; - } - + /* FIXME: should use item rect */ + pt.x = X; + pt.y = Y; + monitor = MonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST ); + info.cbSize = sizeof(info); + GetMonitorInfoW( monitor, &info ); + + if( flags & TPM_RIGHTALIGN ) X -= Width; + if( flags & TPM_CENTERALIGN ) X -= Width / 2; + + if( flags & TPM_BOTTOMALIGN ) Y -= Height; + if( flags & TPM_VCENTERALIGN ) Y -= Height / 2; + + if (X + Width > info.rcWork.right) + { + if ( XAnchor && X >= Width - XAnchor) + X -= Width - XAnchor; + + if ( X + Width > info.rcWork.right) + X = info.rcWork.right - Width; + } + + if ( X < info.rcWork.left ) X = info.rcWork.left; + + if (Y + Height > info.rcWork.bottom) + { + if ( YAnchor && Y >= Height + YAnchor) + Y -= Height + YAnchor; + + if ( Y + Height > info.rcWork.bottom) + Y = info.rcWork.bottom - Height; + } + + if ( Y < info.rcWork.top ) Y = info.rcWork.top; /* NOTE: In Windows, top menu popup is not owned. */ MenuInfo.Wnd = CreateWindowExW(0, POPUPMENU_CLASS_ATOMW, NULL, @@ -2413,7 +2418,7 @@ } } - MenuShowPopup(WndOwner, ItemInfo.hSubMenu, MenuInfo->FocusedItem, + MenuShowPopup(WndOwner, ItemInfo.hSubMenu, MenuInfo->FocusedItem, Flags, Rect.left, Rect.top, Rect.right, Rect.bottom ); if (SelectFirst && MenuGetRosMenuInfo(&SubMenuInfo, ItemInfo.hSubMenu)) { @@ -3389,8 +3394,13 @@ SetCapture(Mt.OwnerWnd); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt.OwnerWnd); + ERR("MenuTrackMenu 1\n"); while (! fEndMenu) { + PVOID menu = ValidateHandle(Mt.CurrentMenu, VALIDATE_TYPE_MENU); + if (!menu) /* sometimes happens if I do a window manager close */ + break; + /* we have to keep the message in the queue until it's * clear that menu loop is not over yet. */ @@ -3665,6 +3675,7 @@ Mt.TrackFlags &= ~TF_SKIPREMOVE; } } + ERR("MenuTrackMenu 2\n"); (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, NULL); SetCapture(NULL); /* release the capture */ @@ -4787,9 +4798,8 @@ IsMenu( HMENU Menu) { - ROSMENUINFO MenuInfo; - - return MenuGetRosMenuInfo(&MenuInfo, Menu); + if (ValidateHandle(Menu, VALIDATE_TYPE_MENU)) return TRUE; + return FALSE; } @@ -5205,12 +5215,11 @@ SendMessageW(Wnd, WM_INITMENUPOPUP, (WPARAM) Menu, 0); } - if (MenuShowPopup(Wnd, Menu, 0, x, y, 0, 0 )) + if (MenuShowPopup(Wnd, Menu, 0, Flags, x, y, 0, 0 )) { ret = MenuTrackMenu(Menu, Flags | TPM_POPUPMENU, 0, 0, Wnd, Rect); } MenuExitTracking(Wnd); - return ret; }

1 0

[dreimer] 43802: A dozen of Rapps Updates. Thx to Victor Martinez for fixing many dl links..
by dreimer＠svn.reactos.org 28 Oct '09

28 Oct '09

Author: dreimer Date: Wed Oct 28 01:18:45 2009 New Revision: 43802 URL: http://svn.reactos.org/svn/reactos?rev=43802&view=rev Log: A dozen of Rapps Updates. Thx to Victor Martinez for fixing many dl links.. Added: trunk/reactos/base/applications/rapps/rapps/7zip.txt (with props) trunk/reactos/base/applications/rapps/rapps/abyss.txt (with props) trunk/reactos/base/applications/rapps/rapps/scite.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt trunk/reactos/base/applications/rapps/rapps/firefox3.txt trunk/reactos/base/applications/rapps/rapps/irfanview.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt Added: trunk/reactos/base/applications/rapps/rapps/7zip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/7zip.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/7zip.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -1,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = 7-Zip +Version = 4.65 +Licence = LGPL +Description = Utility to create and open 7zip, zip, tar, rar and other archive files. +Size = 0.9M +Category = 1 +URLSite = http://www.7-zip.org/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z465.exe +CDPath = none + +[Section.0407] +Description = Tool zum Erstellen und Ãffnen von 7zip, zip, tar, rar und andrern Archiven. Propchange: trunk/reactos/base/applications/rapps/rapps/7zip.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abiword.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -7,8 +7,8 @@ Description = Word processor. Size = 5.9MB Category = 6 -URLSite = http://www.abiword.org -URLDownload = http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.… +URLSite = http://www.abisource.com/ +URLDownload = http://www.abisource.com/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.… CDPath = none [Section.0407] @@ -16,3 +16,6 @@ [Section.0415] Description = Edytor tekstu + +[Section.040a] +Description = Procesador de texto Added: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -1,0 +1,15 @@ +; UTF-8 + +[Section] +Name = Abyss Web server X1 +Version = 2.6 +Licence = Freeware +Description = Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle</description> +Size = 0.8M +Category = 5 +URLSite = http://www.aprelium.com/ +URLDownload = http://www.aprelium.com/data/abwsx1.exe +CDPath = none + +[Section.0407] +Description = Abyss Web Server ermöglicht es Webseiten auf Ihrem Computer zu hosten. Er unterstützt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP, ASP.NET, und Ruby on Rails Web Anwendungen ausführen, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstützt werden können.</description> Propchange: trunk/reactos/base/applications/rapps/rapps/abyss.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,7 +2,7 @@ [Section] Name = Mozilla Firefox 3.0 -Version = 3.0.13 +Version = 3.0.15 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Web Browsers out there. Size = 7.1M Modified: trunk/reactos/base/applications/rapps/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/irfanview.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,7 +2,7 @@ [Section] Name = IrfanView -Version = 4.23 +Version = 4.25 Licence = Freeware (for personal use) Description = Viewer for all kinds of graphics/audio files/video files. Size = 1.3MB Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.8.5 +Version = 0.8.9 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 1.6MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.5-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.9-unicode.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = OpenOffice 2.4 -Version = 2.4.2 +Version = 2.4.3 Licence = LGPL Description = THE Open Source Office Suite. Size = 127MB Category = 6 URLSite = http://www.openoffice.org -URLDownload = http://ftp.plusline.de/OpenOffice/stable/2.4.2/OOo_2.4.2_Win32Intel_install… +URLDownload = http://ftp.plusline.de/OpenOffice/stable/2.4.3/OOo_2.4.3_Win32Intel_install… CDPath = none @@ -16,7 +16,7 @@ Description = DIE Open Source Office Suite URLSite = http://de.openoffice.org Size = 114.2MB -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/2.4.2/OOo_2.4.2_Win32… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/2.4.3/OOo_2.4.3_Win32… [Section.0415] URLSite = http://pl.openoffice.org/ Modified: trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openoffice3.0.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = OpenOffice 3.0 -Version = 3.1.0 +Version = 3.1.1 Licence = LGPL Description = THE Open Source Office Suite. Size = 134.3MB Category = 6 URLSite = http://www.openoffice.org -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.1.0/OOo_3.1.0_Win32Intel_… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.1.1/OOo_3.1.1_Win32Intel_… CDPath = none @@ -23,4 +23,4 @@ Description = Otwarty pakiet biurowy URLSite = http://pl.openoffice.org Size = 147.1MB -URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.1.0/OOo_3.1.0_Win32… +URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.1.1/OOo_3.1.1_Win32… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/openttd.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = OpenTTD -Version = 0.7.2 +Version = 0.7.3 Licence = GPL v2 Description = Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon. Size = 2.9MB Category = 4 URLSite = http://www.openttd.org -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.7.2-win32.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.7.3-windows-win… CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = ReactOS Build Environment -Version = 1.4.4 +Version = 1.4.5 Licence = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. Size = 14.9MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.4.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.5.exe CDPath = none Added: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -1,0 +1,15 @@ +; UTF-8 + +[Section] +Name = SciTE +Version = 2.01 +Licence = Freeware +Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. +Size = 0.6M +Category = 7 +URLSite = http://www.scintilla.org/ +URLDownload = http://fastbull.dl.sourceforge.net/sourceforge/scintilla/Sc201.exe +CDPath = none + +[Section.0407] +Description = SciTE ist ein SCIntilla basierter Text Editor. Ursprünglich wurde er erstellt, um Scintilla vorzuführen, wuchs aber zu einem nützlichen Editor mit der Fähigkeit Programme zu erstellen und auszuführen. Propchange: trunk/reactos/base/applications/rapps/rapps/scite.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = Simple Direct Media Layer (SDL) Mixer -Version = 1.2.8 +Version = 1.2.9 Licence = LGPL Description = Needed for some Open Source Games to run. You need 7-Zip or a similar Utility to extract it. Size = 307kB Category = 14 URLSite = http://www.libsdl.org/projects/SDL_mixer/ -URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.8-win32.zip +URLDownload = http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.9-win32.zip CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,13 +2,13 @@ [Section] Name = Simple Direct Media Layer (SDL) Runtime -Version = 1.2.13 +Version = 1.2.14 Licence = LGPL Description = Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it. Size = 145kB Category = 14 URLSite = http://www.libsdl.org/ -URLDownload = http://www.libsdl.org/release/SDL-1.2.13-win32.zip +URLDownload = http://www.libsdl.org/release/SDL-1.2.14-win32.zip CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/seamonkey.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -2,26 +2,26 @@ [Section] Name = Mozilla SeaMonkey -Version = 1.1.17 +Version = 1.1.18 Licence = MPL/GPL/LGPL Description = Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need. Size = 12.4MB Category = 5 URLSite = http://www.seamonkey-project.org/ -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/seamonkey-1.1.17.en-… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/seamonkey-1.1.18.en-… CDPath = none [Section.0419] Description = ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Mozilla Suite. ÐÐºÐ»ÑÑÐ°ÐµÑ Ð±ÑÐ°ÑÐ·ÐµÑ, Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÐºÐ»Ð¸ÐµÐ½Ñ, IRC-ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸ HTML-ÑÐµÐ´Ð°ÐºÑÐ¾Ñ. Size = 9.0MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contr… [Section.0407] Description = Mozilla Suite ist lebendig. Dies ist das einzige Browser-, Mail-, Chat- and Composerwerkzeug-Bundle welches Sie benÃ¶tigen. Size = 9.0MB -URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.17/contrib-localized/se… +URLDownload = http://ftp.df.lth.se/mozilla/seamonkey/releases/1.1.18/contrib-localized/se… [Section.0415] Description = Pakiet Mozilla Å¼yje. W zestawie: przeglÄdarka, klient poczty, IRC oraz Edytor HTML - wszystko, czego potrzebujesz. Size = 12.4MB -URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.17/contr… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.18/contr… Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Wed Oct 28 01:18:45 2009 @@ -8,7 +8,7 @@ Size = 5.9MB Category = 4 URLSite = http://www.gnu.org/software/xboard/ -URLDownload = http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe +URLDownload = ftp://ftp.gnu.org/old-gnu/xboard/winboard/winboard-4_2_7b.exe CDPath = none [Section.0407]

1 0

[tkreuzer] 43801: Sync kdcom from amd64 branch
by tkreuzer＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: tkreuzer Date: Wed Oct 28 00:38:56 2009 New Revision: 43801 URL: http://svn.reactos.org/svn/reactos?rev=43801&view=rev Log: Sync kdcom from amd64 branch Modified: trunk/reactos/drivers/base/kddll/kdcom.c trunk/reactos/drivers/base/kddll/kddll.c trunk/reactos/drivers/base/kddll/kddll.rbuild trunk/reactos/drivers/base/kddll/kdserial.c Modified: trunk/reactos/drivers/base/kddll/kdcom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdcom.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdcom.c [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -216,6 +216,11 @@ /* Wait for the port to be ready */ while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); + /* This is needed due to subtle timing issues */ + READ_PORT_UCHAR(ComPortBase + COM_MSR); + while ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_TBE) == 0); + READ_PORT_UCHAR(ComPortBase + COM_MSR); + /* Send the byte */ WRITE_PORT_UCHAR(ComPortBase + COM_DAT, Byte); } @@ -224,6 +229,8 @@ NTAPI KdpPollByte(OUT PBYTE OutByte) { + READ_PORT_UCHAR(ComPortBase + COM_MSR); // Timing + /* Check if data is available */ if ((READ_PORT_UCHAR(ComPortBase + COM_LSR) & LSR_DR)) { Modified: trunk/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -13,6 +13,7 @@ PFNDBGPRNT KdpDbgPrint = NULL; ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; +ULONG RemotePacketId = 0; /* PRIVATE FUNCTIONS **********************************************************/ @@ -148,24 +149,31 @@ KdStatus = KdpReceiveBuffer(&Packet.PacketType, sizeof(USHORT)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive a PacketType or PacketType is bad. Start over. */ - continue; + /* Didn't receive a PacketType. */ + return KdStatus; + } + + /* Check if we got a resend packet */ + if (Packet.PacketLeader == CONTROL_PACKET_LEADER && + Packet.PacketType == PACKET_TYPE_KD_RESEND) + { + return KDP_PACKET_RESEND; } /* Step 3 - Read ByteCount */ KdStatus = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); - if (KdStatus != KDP_PACKET_RECEIVED || Packet.ByteCount > PACKET_MAX_SIZE) - { - /* Didn't receive ByteCount or it's too big. Start over. */ - continue; + if (KdStatus != KDP_PACKET_RECEIVED) + { + /* Didn't receive ByteCount. */ + return KdStatus; } /* Step 4 - Read PacketId */ KdStatus = KdpReceiveBuffer(&Packet.PacketId, sizeof(ULONG)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive PacketId. Start over. */ - continue; + /* Didn't receive PacketId. */ + return KdStatus; } /* @@ -180,8 +188,8 @@ KdStatus = KdpReceiveBuffer(&Packet.Checksum, sizeof(ULONG)); if (KdStatus != KDP_PACKET_RECEIVED) { - /* Didn't receive Checksum. Start over. */ - continue; + /* Didn't receive Checksum. */ + return KdStatus; } /* Step 6 - Handle control packets */ @@ -205,6 +213,7 @@ KDDBGPRINT("KdReceivePacket - got a reset packet\n"); KdpSendControlPacket(PACKET_TYPE_KD_RESET, 0); CurrentPacketId = INITIAL_PACKET_ID; + RemotePacketId = INITIAL_PACKET_ID; /* Fall through */ case PACKET_TYPE_KD_RESEND: @@ -227,43 +236,18 @@ return KDP_PACKET_RECEIVED; } - /* Did we get the right packet type? */ - if (PacketType != Packet.PacketType) - { - /* We received something different, start over */ - KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); - continue; - } - /* Get size of the message header */ - switch (Packet.PacketType) - { - case PACKET_TYPE_KD_STATE_CHANGE64: - MessageHeader->Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); - break; - - case PACKET_TYPE_KD_STATE_MANIPULATE: - MessageHeader->Length = sizeof(DBGKD_MANIPULATE_STATE64); - break; - - case PACKET_TYPE_KD_DEBUG_IO: - MessageHeader->Length = sizeof(DBGKD_DEBUG_IO); - break; - - default: - KDDBGPRINT("KdReceivePacket - unknown PacketType\n"); - return KDP_PACKET_RESEND; - } - - //KDDBGPRINT("KdReceivePacket - got normal PacketType\n"); - - /* Packet smaller than expected? */ - if (MessageHeader->Length > Packet.ByteCount) + MessageHeader->Length = MessageHeader->MaximumLength; + + /* Packet smaller than expected or too big? */ + if (Packet.ByteCount < MessageHeader->Length || + Packet.ByteCount > PACKET_MAX_SIZE) { KDDBGPRINT("KdReceivePacket - too few data (%d) for type %d\n", Packet.ByteCount, MessageHeader->Length); MessageHeader->Length = Packet.ByteCount; + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; } //KDDBGPRINT("KdReceivePacket - got normal PacketType, Buffer = %p\n", MessageHeader->Buffer); @@ -316,6 +300,15 @@ } } + /* We must receive a PACKET_TRAILING_BYTE now */ + KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); + if (KdStatus != KDP_PACKET_RECEIVED || Byte != PACKET_TRAILING_BYTE) + { + KDDBGPRINT("KdReceivePacket - wrong trailing byte (0x%x), status 0x%x\n", Byte, KdStatus); + KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); + continue; + } + /* Compare checksum */ if (Packet.Checksum != Checksum) { @@ -325,21 +318,27 @@ continue; } - /* We must receive a PACKET_TRAILING_BYTE now */ - KdStatus = KdpReceiveBuffer(&Byte, sizeof(UCHAR)); - if (KdStatus != KDP_PACKET_RECEIVED || Byte != PACKET_TRAILING_BYTE) - { - KDDBGPRINT("KdReceivePacket - wrong trailing byte (0x%x), status 0x%x\n", Byte, KdStatus); - KdpSendControlPacket(PACKET_TYPE_KD_RESEND, 0); - continue; - } - /* Acknowledge the received packet */ KdpSendControlPacket(PACKET_TYPE_KD_ACKNOWLEDGE, Packet.PacketId); - //KDDBGPRINT("KdReceivePacket - all ok\n"); - - return KDP_PACKET_RECEIVED; + /* Check if the received PacketId is ok */ + if (Packet.PacketId != RemotePacketId) + { + /* Continue with next packet */ + continue; + } + + /* Did we get the right packet type? */ + if (PacketType == Packet.PacketType) + { + /* Yes, return success */ + //KDDBGPRINT("KdReceivePacket - all ok\n"); + RemotePacketId ^= 1; + return KDP_PACKET_RECEIVED; + } + + /* We received something different, ignore it. */ + KDDBGPRINT("KdReceivePacket - wrong PacketType\n"); } return KDP_PACKET_RECEIVED; @@ -352,10 +351,11 @@ IN ULONG PacketType, IN PSTRING MessageHeader, IN PSTRING MessageData, - IN OUT PKD_CONTEXT Context) + IN OUT PKD_CONTEXT KdContext) { KD_PACKET Packet; KDP_STATUS KdStatus; + ULONG Retries; /* Initialize a KD_PACKET */ Packet.PacketLeader = PACKET_LEADER; @@ -372,7 +372,9 @@ MessageData->Length); } - for (;;) + Retries = KdContext->KdpDefaultRetries; + + do { /* Set the packet id */ Packet.PacketId = CurrentPacketId; @@ -394,10 +396,10 @@ /* Wait for acknowledge */ KdStatus = KdReceivePacket(PACKET_TYPE_KD_ACKNOWLEDGE, - NULL, - NULL, - 0, - NULL); + NULL, + NULL, + 0, + KdContext); /* Did we succeed? */ if (KdStatus == KDP_PACKET_RECEIVED) @@ -413,9 +415,14 @@ return; } + if (KdStatus == KDP_PACKET_TIMEOUT) + { + Retries--; + } + /* Packet timed out, send it again */ + KDDBGPRINT("KdSendPacket got KdStatus 0x%x\n", KdStatus); } - - return; -} - + while (Retries > 0); +} + Modified: trunk/reactos/drivers/base/kddll/kddll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.r… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.rbuild [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -10,6 +10,7 @@ <module name="kdserial" type="staticlibrary"> <include base="kdserial">.</include> + <library>ntoskrnl</library> <file>kdserial.c</file> </module> Modified: trunk/reactos/drivers/base/kddll/kdserial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kdseria… ============================================================================== --- trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kdserial.c [iso-8859-1] Wed Oct 28 00:38:56 2009 @@ -124,7 +124,7 @@ /* Check for breakin byte */ if (Byte == BREAKIN_PACKET_BYTE) { - KdpDbgPrint("BREAKIN_PACKET_BYTE\n"); + KDDBGPRINT("BREAKIN_PACKET_BYTE\n"); Index = 0; Buffer[0] = Byte; continue; @@ -138,7 +138,7 @@ while (Index < 4); /* Enable the debugger */ -// KdDebuggerNotPresent = FALSE; + KdDebuggerNotPresent = FALSE; SharedUserData->KdDebuggerEnabled |= 0x00000002; /* Return the received packet leader */

1 0

[tkreuzer] 43800: merge r43777 from amd64 branch
by tkreuzer＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: tkreuzer Date: Wed Oct 28 00:28:17 2009 New Revision: 43800 URL: http://svn.reactos.org/svn/reactos?rev=43800&view=rev Log: merge r43777 from amd64 branch Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Wed Oct 28 00:28:17 2009 @@ -10417,7 +10417,14 @@ #endif /* !DBG */ -#if defined(_NTDDK_) || defined(_NTHAL_) || defined(_WDMDDK_) || defined(_NTOSP_) +#if defined(__GNUC__) + +extern NTKERNELAPI BOOLEAN KdDebuggerNotPresent; +extern NTKERNELAPI BOOLEAN KdDebuggerEnabled; +#define KD_DEBUGGER_ENABLED KdDebuggerEnabled +#define KD_DEBUGGER_NOT_PRESENT KdDebuggerNotPresent + +#elif defined(_NTDDK_) || defined(_NTHAL_) || defined(_WDMDDK_) || defined(_NTOSP_) extern NTKERNELAPI PBOOLEAN KdDebuggerNotPresent; extern NTKERNELAPI PBOOLEAN KdDebuggerEnabled;

1 0

[janderwald] 43799: [WDMAUD.DRV][MMEBUDDY] - Implement support for DRV_QUERYDEVICEINTERFACESIZE, DRV_QUERYDEVICEINTERFACE for recording / mixer / midi-in midi-out
by janderwald＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: janderwald Date: Wed Oct 28 00:28:09 2009 New Revision: 43799 URL: http://svn.reactos.org/svn/reactos?rev=43799&view=rev Log: [WDMAUD.DRV][MMEBUDDY] - Implement support for DRV_QUERYDEVICEINTERFACESIZE, DRV_QUERYDEVICEINTERFACE for recording / mixer / midi-in midi-out Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Wed Oct 28 00:28:09 2009 @@ -609,6 +609,13 @@ (LPVOID) &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), NULL); + + if ( MMSUCCESS(Result) && InterfaceLength > 2) + { + Interface[1] = L'\\'; + Interface[InterfaceLength-1] = L'\0'; + } + return Result; } Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Wed Oct 28 00:28:09 2009 @@ -52,6 +52,19 @@ Parameter2); break; } + + case DRV_QUERYDEVICEINTERFACESIZE : + { + Result = MmeGetDeviceInterfaceString(MIDI_IN_DEVICE_TYPE, DeviceId, NULL, 0, (DWORD*)Parameter1); //FIXME DWORD_PTR + break; + } + + case DRV_QUERYDEVICEINTERFACE : + { + Result = MmeGetDeviceInterfaceString(MIDI_IN_DEVICE_TYPE, DeviceId, (LPWSTR)Parameter1, Parameter2, NULL); //FIXME DWORD_PTR + break; + } + } SND_TRACE(L"midMessage returning MMRESULT %d\n", Result); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Wed Oct 28 00:28:09 2009 @@ -52,6 +52,18 @@ Parameter2); break; } + + case DRV_QUERYDEVICEINTERFACESIZE : + { + Result = MmeGetDeviceInterfaceString(MIDI_OUT_DEVICE_TYPE, DeviceId, NULL, 0, (DWORD*)Parameter1); //FIXME DWORD_PTR + break; + } + + case DRV_QUERYDEVICEINTERFACE : + { + Result = MmeGetDeviceInterfaceString(MIDI_OUT_DEVICE_TYPE, DeviceId, (LPWSTR)Parameter1, Parameter2, NULL); //FIXME DWORD_PTR + break; + } } SND_TRACE(L"modMessage returning MMRESULT %d\n", Result); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Wed Oct 28 00:28:09 2009 @@ -243,6 +243,19 @@ break; } + + case DRV_QUERYDEVICEINTERFACESIZE : + { + Result = MmeGetDeviceInterfaceString(MIXER_DEVICE_TYPE, DeviceId, NULL, 0, (DWORD*)Parameter1); //FIXME DWORD_PTR + break; + } + + case DRV_QUERYDEVICEINTERFACE : + { + Result = MmeGetDeviceInterfaceString(MIXER_DEVICE_TYPE, DeviceId, (LPWSTR)Parameter1, Parameter2, NULL); //FIXME DWORD_PTR + break; + } + } SND_TRACE(L"mxdMessage returning MMRESULT %d\n", Result); Modified: trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmebuddy… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Wed Oct 28 00:28:09 2009 @@ -109,6 +109,19 @@ break; } + case DRV_QUERYDEVICEINTERFACESIZE : + { + Result = MmeGetDeviceInterfaceString(WAVE_IN_DEVICE_TYPE, DeviceId, NULL, 0, (DWORD*)Parameter1); //FIXME DWORD_PTR + break; + } + + case DRV_QUERYDEVICEINTERFACE : + { + Result = MmeGetDeviceInterfaceString(WAVE_IN_DEVICE_TYPE, DeviceId, (LPWSTR)Parameter1, Parameter2, NULL); //FIXME DWORD_PTR + break; + } + + } SND_TRACE(L"widMessage returning MMRESULT %d\n", Result);

1 0

[cfinck] 43798: - Added a script for compiling a working GNU toolchain using newer Binutils and GCC 4.4.2. These will be used in RosBE-Windows 1.5 and RosBE-Unix 1.5. The build and preliminary source packages are up at http://reactos.coliinfinck.de ("toolchain_1.5.7z" and "sources_1.5.7z") - Overhauled my tutorial about compiling GCC for Windows, including the new steps necessary for 4.4.2 and possible issues. Special thanks to Dmitry Gorbachev for his help on getting GCC 4.4.2 to compile and to
by cfinck＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: cfinck Date: Wed Oct 28 00:24:31 2009 New Revision: 43798 URL: http://svn.reactos.org/svn/reactos?rev=43798&view=rev Log: - Added a script for compiling a working GNU toolchain using newer Binutils and GCC 4.4.2. These will be used in RosBE-Windows 1.5 and RosBE-Unix 1.5. The build and preliminary source packages are up at http://reactos.coliinfinck.de ("toolchain_1.5.7z" and "sources_1.5.7z") - Overhauled my tutorial about compiling GCC for Windows, including the new steps necessary for 4.4.2 and possible issues. Special thanks to Dmitry Gorbachev for his help on getting GCC 4.4.2 to compile and to Caemyr for providing me with a powerful machine over RDP to get the builds done faster :-) Added: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/ (with props) trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/Compiling a working GNU toolchain under Windows.odt - copied, changed from r43511, trunk/tools/RosBE/RosBE-Windows/Compiling a working GNU toolchain under Windows.odt trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/ (with props) trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/buildtoolchain.sh - copied, changed from r42638, trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/ (with props) trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/buildtoolchain.sh (with props) Removed: trunk/tools/RosBE/RosBE-Windows/Compiling a working GNU toolchain under Windows.odt trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 28 00:24:31 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Copied: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/Compiling a working GNU toolchain under Windows.odt (from r43511, trunk/tools/RosBE/RosBE-Windows/Compiling a working GNU toolchain under Windows.odt) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo… ============================================================================== Binary files - no diff available. Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 28 00:24:31 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Copied: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/buildtoolchain.sh (from r42638, trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh) URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.1.3/buildtoolchain.sh [iso-8859-1] Wed Oct 28 00:24:31 2009 @@ -7,11 +7,20 @@ # Released under GNU GPL v2 or any later version. ################################################################################## -# This script was tested with the following toolchain versions: -# - binutils v2.19.51-20090127 (snapshot) using the corresponding ReactOS patches -# - gcc v4.1.3-20071015 (snapshot) using the corresponding ReactOS patches +# This script was built for the following toolchain versions: +# - binutils v2.19.51-20090127 (snapshot) +# patched with: +# * http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/binutils-2.18.… +# - gcc v4.1.3-20071015 (snapshot) +# patched with: +# * http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293… +# * http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1293… +# * http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Patches/GCC-v4.1-r1294… # - mingw-runtime 3.13 # - w32api 3.10 +# +# These versions are used in RosBE-Windows 1.4.2-1.4.5 and RosBE-Unix 1.4-1.4.2. +# Get the toolchain packages from one of these RosBE-Unix versions. ################################################################################## # @@ -71,6 +80,7 @@ # Entry point # echo "buildtoolchain - Build a binutils/GCC/mingw-runtime/w32api toolchain for Windows" +echo "Script for gcc_4.1.3 (see script header for details)" echo "by Colin Finck <colin(a)reactos.org>" echo Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 28 00:24:31 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/buildtoolchain.sh (added) +++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/buildtoolchain.sh [iso-8859-1] Wed Oct 28 00:24:31 2009 @@ -1,0 +1,316 @@ +#!/bin/bash +# +# ReactOS Build Environment for Windows - Script for building a binutils/GCC/mingw-runtime/w32api toolchain for Windows +# Partly based on RosBE-Unix' "RosBE-Builder.sh" +# Copyright 2009 Colin Finck <colin(a)reactos.org> +# +# Released under GNU GPL v2 or any later version. + +######################################################################################################################## +# This script was built for the following toolchain versions: +# - binutils 2.20.51-20091017 (snapshot) +# - gcc 4.4.2 +# patched with: +# * http://gcc.gnu.org/bugzilla/attachment.cgi?id=18882&action=view (committed in GCC r153606) +# - gmp 4.3.1 +# - mingw-runtime 3.16 +# - mpfr 2.4.2-rc1 +# - w32api 3.13 +# +# These tools were compiled under MSYS with "gcc version 3.4.5 (mingw-vista special r3)" +# +# These versions are used in RosBE-Windows 1.5 and RosBE-Unix 1.5. +# Get the toolchain packages from this RosBE-Unix version. +######################################################################################################################## + + +# +# Constants +# +WORKDIR="/c/buildtoolchain" + +HOST_CFLAGS="-pipe -fno-common -O3 -march=pentium3 -mfpmath=sse" +HOST_GCC_VERSION="gcc version 3.4.5 (mingw-vista special r3)" +INSTALLDIR="$WORKDIR/mingw" +NEEDED_TOOLS="bison flex gcc g++ grep make makeinfo" +SUPPORTDIR="$WORKDIR/support" +SYSHEADERDIR="/mingw/include" +TARGET="mingw32" +TARGET_CFLAGS="-pipe -gstabs+ -O3 -march=pentium -mtune=i686" + + +# +# Functions +# +boldmsg() +{ + echo -e $2 "\e[1m$1\e[0m" +} + +greenmsg() +{ + echo -e $2 "\e[32m$1\e[0m" +} + +redmsg() +{ + echo -e $2 "\e[31m$1\e[0m" +} + +check_run() +{ + if [ $? -ne 0 ]; then + redmsg "FAILED" + echo "Please take a look at the log file \"$WORKDIR/build.log\"" + echo "Aborted!" + exit 1 + else + greenmsg "OK" + rm "$WORKDIR/build.log" + fi +} + +mkdir_if_not_exists() +{ + if ! [ -d "$1" ]; then + mkdir -p "$1" + fi +} + +mkdir_empty() +{ + if [ -d "$1" ]; then + rm -rf "$1" + fi + + mkdir -p "$1" +} + +prepare_module() +{ + # Check if the module shall be built and extract it then + process_it=$1 + module=$2 + + if [ "$process_it" = "0" ]; then + return 1 + fi + + cd "$WORKDIR" + rm -rf "$module" + rm -rf "$module-build" + + echo -n "Extracting $module... " + tar -xjf "$source_path/$module.tar.bz2" >& build.log + check_run + + mkdir "$module-build" + cd "$module-build" + + return 0 +} + +do_command() +{ + echo -n "Running \"$*\"... " + $* >& "$WORKDIR/build.log" + check_run +} + +clean_module() +{ + echo "Cleaning up $1..." + cd "$WORKDIR" + rm -rf "$1-build" + rm -rf "$1" +} + + +# +# Entry point +# +echo "buildtoolchain - Build a binutils/GCC/mingw-runtime/w32api toolchain for Windows" +echo "Script for gcc_4.4.2 (see script header for details)" +echo "by Colin Finck <colin(a)reactos.org>" +echo + +if [ "`uname -o`" != "Msys" ]; then + echo "You can only run this script under a MSYS environment!" + exit 1 +fi + +# We don't want too less parameters +if [ "$1" == "" ]; then + echo "Syntax: ./buildtoolchain.sh <sources> [w32api] [mingw-runtime] [gmp] [mpfr] [binutils] [gcc]" + echo + echo " sources - Path to the directory containing RosBE-Unix toolchain packages (.tar.bz2 files)" + echo + echo "The rest of the arguments are optional. You specify them if you want to prevent a component" + echo "from being (re)built. Do this by passing 0 as the argument of the appropriate component." + echo "Pass 1 if you want them to be built." + echo "By default, all of these components are built, so you don't need to pass any of these parameters." + exit 1 +fi + +# Get the absolute path to the script directory +cd `dirname $0` +SCRIPTDIR="$PWD" + +# Find out whether the script directory contains spaces +case "$SCRIPTDIR" in +*" "*) + redmsg "The script directory \"$SCRIPTDIR\" contains spaces!" + redmsg "Therefore some build tools cannot be compiled properly." + echo + redmsg "Please move \"$SCRIPTDIR\" to a directory, which does not contain spaces." + + exit 1;; +esac + +# Check if all necessary tools exist +boldmsg "Checking for the needed tools..." + +toolmissing=false +for tool in $NEEDED_TOOLS; do + echo -n "Checking for $tool... " + + if which "$tool" >& /dev/null; then + greenmsg "OK" + else + redmsg "MISSING" + toolmissing=true + fi +done + +# Check for the correct GCC version +echo -n "Checking for the correct GCC version... " + +if gcc -v 2>&1 | grep "$HOST_GCC_VERSION" >& /dev/null; then + greenmsg "OK" +else + redmsg "MISSING" + toolmissing=true +fi + +if $toolmissing; then + echo "At least one needed tool is missing, aborted!" + exit 1 +fi + +echo + +# Get the absolute path to the source directory +cd "$1" +source_path="$PWD" + +# Create all necessary directories +mkdir_if_not_exists "$INSTALLDIR/$TARGET" +mkdir_empty "$SYSHEADERDIR" +mkdir_if_not_exists "$SUPPORTDIR" + +# Process each module +boldmsg "Building..." + + +if [ "$2" != "0" ]; then + echo -n "Extracting w32api... " + + cd "$INSTALLDIR/$TARGET" + tar -xjf "$source_path/w32api.tar.bz2" >& "$WORKDIR/build.log" + check_run +fi + +if prepare_module "$3" "mingw-runtime"; then + export CFLAGS="$TARGET_CFLAGS" + export C_INCLUDE_PATH="$INSTALLDIR/$TARGET/include" + + do_command ../mingw-runtime/configure --prefix="$INSTALLDIR/$TARGET" --host="$TARGET" --build="$TARGET" + do_command make + do_command make install + + # libmingwex.a of the MinGW Runtime 3.15 and later references to _get_output_format, which is exported by msvcr80.dll and later. + # For older Runtime DLLs (such as the msvcrt.dll we primarily use for ReactOS), MinGW adds a _get_output_format function returning 0 to libmsvcrt.a. + # As we use MinGW's libmingwex.a, but our own libmsvcrt.a, linking to MinGW's libmingwex.a will fail by default. Therefore we have to create an archive for the compiled + # _get_output_format stub, copy it to our "lib" directory and include it when linking to libmingwex.a. + ar r ofmt_stub.a ofmt_stub.o >& /dev/null + cp ofmt_stub.a "$INSTALLDIR/$TARGET/lib" + + clean_module mingw-runtime + + export CFLAGS="" + export C_INCLUDE_PATH="" +fi + +if prepare_module "$4" "gmp"; then + export CFLAGS="$HOST_CFLAGS" + + do_command ../gmp/configure ABI=32 --prefix="$SUPPORTDIR" --host="$TARGET" --build="$TARGET" --disable-shared + do_command make + do_command make check + do_command make install + clean_module gmp + + export CFLAGS="" +fi + +if prepare_module "$5" "mpfr"; then + export CFLAGS="$HOST_CFLAGS" + + do_command ../mpfr/configure --prefix="$SUPPORTDIR" --host="$TARGET" --build="$TARGET" --with-gmp="$SUPPORTDIR" --disable-shared + do_command make + do_command make check + do_command make install + clean_module mpfr + + export CFLAGS="" +fi + +if prepare_module "$6" "binutils"; then + export CFLAGS="$HOST_CFLAGS" + + do_command ../binutils/configure --prefix="$INSTALLDIR" --host="$TARGET" --build="$TARGET" --target="$TARGET" --disable-nls + do_command make + do_command make install + clean_module binutils + + export CFLAGS="" +fi + +if prepare_module "$7" "gcc"; then + export STAGE1_CFLAGS="$HOST_CFLAGS" + export BOOT_CFLAGS="$HOST_CFLAGS" + export CFLAGS_FOR_TARGET="$TARGET_CFLAGS" + export CXXFLAGS_FOR_TARGET="$TARGET_CFLAGS" + export C_INCLUDE_PATH="$INSTALLDIR/$TARGET/include" + export LIBRARY_PATH="$INSTALLDIR/$TARGET/lib" + + do_command ../gcc/configure --prefix="$INSTALLDIR" --host="$TARGET" --build="$TARGET" --target="$TARGET" --with-gmp="$SUPPORTDIR" --with-mpfr="$SUPPORTDIR" --enable-languages=c,c++ --enable-checking=release --enable-version-specific-runtime-libs --enable-threads=win32 --disable-win32-registry --disable-shared --disable-nls + do_command make profiledbootstrap + do_command make install + clean_module gcc + + export STAGE1_CFLAGS="" + export BOOT_CFLAGS="" + export CFLAGS_FOR_TARGET="" + export CXXFLAGS_FOR_TARGET="" + export C_INCLUDE_PATH="" + export LIBRARY_PATH="" +fi + + +# Final actions +echo +boldmsg "Final actions" +cd "$INSTALLDIR" + +echo "Removing unneeded files..." +rm -rf $TARGET/bin $TARGET/doc $TARGET/share include info man share +rm -f lib/* >& /dev/null +rm -f bin/c++.exe bin/gccbug bin/$TARGET-* + +echo "Removing debugging symbols..." +find -name "*.exe" -type f -exec strip -s {} ";" +find -name "*.a" -type f -exec strip -d {} ";" +find -name "*.o" -type f -exec strip -d {} ";" + +echo "Finished!" Propchange: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/gcc_4.4.2/buildtoolchain.sh ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/tools/RosBE/RosBE-Windows/Compiling a working GNU toolchain under Windows.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Compilin… ============================================================================== Binary file - no diff available. Removed: trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/buildtoo… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/buildtoolchain.sh (removed) @@ -1,258 +1,0 @@ -#!/bin/bash -# -# ReactOS Build Environment for Windows - Script for building a binutils/GCC/mingw-runtime/w32api toolchain for Windows -# Partly based on RosBE-Unix' "RosBE-Builder.sh" -# Copyright 2009 Colin Finck <colin(a)reactos.org> -# -# Released under GNU GPL v2 or any later version. - -################################################################################## -# This script was tested with the following toolchain versions: -# - binutils v2.19.51-20090127 (snapshot) using the corresponding ReactOS patches -# - gcc v4.1.3-20071015 (snapshot) using the corresponding ReactOS patches -# - mingw-runtime 3.13 -# - w32api 3.10 -################################################################################## - -# -# Constants -# -CFLAGS="-O2" -CXXFLAGS="$CFLAGS" -INSTALLDIR="/c/buildtoolchain/mingw" -LDFLAGS="-s" -MINGWDIR="/mingw" -NEEDED_TOOLS="bison flex gcc g++ grep make makeinfo" -TARGET="mingw32" -TEMPDIR="/c/buildtoolchain" -WIN32_INSTALLDIR="c:/buildtoolchain/mingw" - -# Make sure we build an entirely native compiler, since MSYS might report subtle differences (i.e. "i686-pc-mingw32" instead of "mingw32") -BUILD="$TARGET" -HOST="$TARGET" - -# The following variables need to be accessed by Make and its subprocesses. -export CFLAGS -export CXXFLAGS -export LDFLAGS - -# -# Functions -# -boldmsg() -{ - echo -e $2 "\e[1m$1\e[0m" -} - -greenmsg() -{ - echo -e $2 "\e[32m$1\e[0m" -} - -redmsg() -{ - echo -e $2 "\e[31m$1\e[0m" -} - -check_run() -{ - if [ $? -ne 0 ]; then - redmsg "FAILED" - echo "Please take a look at the log file \"$TEMPDIR/build.log\"" - echo "Aborted!" - exit 1 - else - greenmsg "OK" - rm "$TEMPDIR/build.log" - fi -} - -# -# Entry point -# -echo "buildtoolchain - Build a binutils/GCC/mingw-runtime/w32api toolchain for Windows" -echo "by Colin Finck <colin(a)reactos.org>" -echo - -if [ "`uname -o`" != "Msys" ]; then - echo "You can only run this script under a MSYS environment!" - exit 1 -fi - -# We don't want too less nor too many parameters -if [ "$1" == "" ] || [ "$4" != "" ]; then - echo "Syntax: ./buildtoolchain.sh <sources> [binutils] [gcc]" - echo - echo " sources - Path to the directory containing RosBE-Unix toolchain packages (.tar.bz2 files)" - echo " binutils - optional; whether binutils shall be built (0/1, default is 1)" - echo " gcc - optional; whether gcc shall be built (0/1, default is 1)" - exit 1 -fi - -# Get the absolute path to the script directory -cd `dirname $0` -SCRIPTDIR="$PWD" - -# Find out whether the script directory contains spaces -case "$SCRIPTDIR" in -*" "*) - redmsg "The script directory \"$SCRIPTDIR\" contains spaces!" - redmsg "Therefore some build tools cannot be compiled properly." - echo - redmsg "Please move \"$SCRIPTDIR\" to a directory, which does not contain spaces." - - exit 1;; -esac - -# Check if all necessary tools exist -boldmsg "Checking for the needed tools..." - -toolmissing=false -for tool in $NEEDED_TOOLS; do - echo -n "Checking for $tool... " - - if which "$tool" >& /dev/null; then - greenmsg "OK" - else - redmsg "MISSING" - toolmissing=true - fi -done - -if $toolmissing; then - echo "At least one needed tool is missing, aborted!" - exit 1 -fi - -echo - -# Get the absolute path to the source directory -cd "$1" -source_path="$PWD" - -# What do we need to process? -if [ "$2" == "0" ]; then - process_binutils=false -else - process_binutils=true -fi - -if [ "$3" == "0" ]; then - process_gcc=false -else - process_gcc=true -fi - -# Create all necessary directories -if ! [ -d "$INSTALLDIR/$TARGET" ]; then - mkdir -p "$INSTALLDIR/$TARGET" -fi - -if [ -d "$MINGWDIR" ]; then - rm -rf "$MINGWDIR" -fi - -mkdir -p "$MINGWDIR" - -if ! [ -d "$TEMPDIR" ]; then - mkdir -p "$TEMPDIR" -fi - -cd "$MINGWDIR" - -boldmsg "Building..." - -# mingw-runtime -echo -n "Extracting mingw-runtime... " -tar -xjf "$source_path/mingw-runtime.tar.bz2" >& "$TEMPDIR/build.log" -check_run - -# w32api -echo -n "Extracting w32api... " -tar -xjf "$source_path/w32api.tar.bz2" >& "$TEMPDIR/build.log" -check_run - -# Copy the same stuff to the target directory (needed for building gcc and later getting the files located properly) -echo "Copying files... " -cp -R $MINGWDIR/* "$INSTALLDIR/$TARGET" - -cd "$TEMPDIR" - -# binutils -if $process_binutils; then - rm -rf "binutils" - rm -rf "binutils-build" - - echo -n "Extracting binutils... " - tar -xjf "$source_path/binutils.tar.bz2" >& build.log - check_run - - echo -n "Configuring binutils... " - mkdir "binutils-build" - cd "binutils-build" - ../binutils/configure --prefix="$INSTALLDIR" --build="$BUILD" --host="$HOST" --target="$TARGET" --disable-nls --disable-shared >& "$TEMPDIR/build.log" - check_run - - echo -n "Building binutils... " - make >& "$TEMPDIR/build.log" - check_run - - echo -n "Installing binutils... " - make install >& "$TEMPDIR/build.log" - check_run - - echo "Cleaning up binutils..." - cd "$TEMPDIR" - rm -rf "binutils-build" - rm -rf "binutils" -fi - -# gcc -if $process_gcc; then - rm -rf "gcc" - rm -rf "gcc-build" - - echo -n "Extracting gcc... " - tar -xjf "$source_path/gcc.tar.bz2" >& build.log - check_run - - echo -n "Configuring gcc... " - mkdir "gcc-build" - cd "gcc-build" - - ../gcc/configure --prefix="$WIN32_INSTALLDIR" --build="$BUILD" --host="$HOST" --target="$TARGET" --with-ld=/bin/ld \ - --enable-languages=c,c++ --enable-checking=release \ - --enable-threads=win32 --disable-win32-registry --disable-nls \ - --disable-shared >& "$TEMPDIR/build.log" - check_run - - echo -n "Building gcc... " - make >& "$TEMPDIR/build.log" - check_run - - echo -n "Installing gcc... " - make install >& "$TEMPDIR/build.log" - check_run - - echo "Cleaning up gcc..." - cd "$TEMPDIR" - rm -rf "gcc-build" - rm -rf "gcc" -fi - -# Final actions -echo -boldmsg "Final actions" -cd "$INSTALLDIR" - -echo "Removing unneeded files..." -mv $TARGET/bin/* bin -mv $TARGET/include/* include -mv $TARGET/lib/* lib -rm -rf $TARGET info man share -rm -f bin/c++.exe bin/gccbug bin/$TARGET-* - -echo "Removing debugging symbols..." -find -name "*.exe" -type f -exec strip -s {} ";" - -echo "Finished!"

1 0

[tkreuzer] 43797: Remove fail point support from swprintf, too. Yay boot!
by tkreuzer＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: tkreuzer Date: Tue Oct 27 23:56:22 2009 New Revision: 43797 URL: http://svn.reactos.org/svn/reactos?rev=43797&view=rev Log: Remove fail point support from swprintf, too. Yay boot! Modified: branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/swprintf.c [iso-8859-1] Tue Oct 27 23:56:22 2009 @@ -33,7 +33,7 @@ unsigned int exponent:11; unsigned int sign:1; } double_t; - +#if 0 static __inline int @@ -62,7 +62,7 @@ x.__x = &__x; return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); } - +#endif static __inline @@ -178,6 +178,7 @@ return buf; } +#if 0 static wchar_t * numberf(wchar_t * buf, wchar_t * end, double num, int base, int size, int precision, int type) { @@ -283,6 +284,7 @@ } return buf; } +#endif static wchar_t* string(wchar_t* buf, wchar_t* end, const char* s, int len, int field_width, int precision, int flags) @@ -394,7 +396,7 @@ const char *s; const wchar_t *sw; const wchar_t *ss; - double _double; +// double _double; int flags; /* flags to number() */ @@ -591,6 +593,7 @@ *ip = (str - buf); } continue; +#if 0 /* float number formats - set up the flags and "break" */ case 'e': case 'E': @@ -633,7 +636,7 @@ } continue; - +#endif /* integer number formats - set up the flags and "break" */

1 0

[jimtabor] 43796: - Move TI flages to main header file.
by jimtabor＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: jimtabor Date: Tue Oct 27 20:02:02 2009 New Revision: 43796 URL: http://svn.reactos.org/svn/reactos?rev=43796&view=rev Log: - Move TI flages to main header file. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Oct 27 20:02:02 2009 @@ -118,6 +118,37 @@ UNICODE_STRING ModuleName; /* Module name for global hooks */ } HOOK, *PHOOK; +/* THREADINFO Flags */ +#define TIF_INCLEANUP 0x00000001 +#define TIF_16BIT 0x00000002 +#define TIF_SYSTEMTHREAD 0x00000004 +#define TIF_CSRSSTHREAD 0x00000008 +#define TIF_TRACKRECTVISIBLE 0x00000010 +#define TIF_ALLOWFOREGROUNDACTIVATE 0x00000020 +#define TIF_DONTATTACHQUEUE 0x00000040 +#define TIF_DONTJOURNALATTACH 0x00000080 +#define TIF_WOW64 0x00000100 +#define TIF_INACTIVATEAPPMSG 0x00000200 +#define TIF_SPINNING 0x00000400 +#define TIF_PALETTEAWARE 0x00000800 +#define TIF_SHAREDWOW 0x00001000 +#define TIF_FIRSTIDLE 0x00002000 +#define TIF_WAITFORINPUTIDLE 0x00004000 +#define TIF_MOVESIZETRACKING 0x00008000 +#define TIF_VDMAPP 0x00010000 +#define TIF_DOSEMULATOR 0x00020000 +#define TIF_GLOBALHOOKER 0x00040000 +#define TIF_DELAYEDEVENT 0x00080000 +#define TIF_MSGPOSCHANGED 0x00100000 +#define TIF_SHUTDOWNCOMPLETE 0x00200000 +#define TIF_IGNOREPLAYBACKDELAY 0x00400000 +#define TIF_ALLOWOTHERACCOUNTHOOK 0x00800000 +#define TIF_GUITHREADINITIALIZED 0x02000000 +#define TIF_DISABLEIME 0x04000000 +#define TIF_INGETTEXTLENGTH 0x08000000 +#define TIF_ANSILENGTH 0x10000000 +#define TIF_DISABLEHOOKS 0x20000000 + typedef struct _CALLBACKWND { HWND hWnd; @@ -139,7 +170,7 @@ DWORD dwExpWinVer; DWORD dwCompatFlags; DWORD dwCompatFlags2; - DWORD dwTIFlags; + DWORD dwTIFlags; // ThreadInfo TIF_Xxx flags for User space. PDESKTOPINFO pDeskInfo; ULONG_PTR ulClientDelta; PHOOK phkCurrent; Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Tue Oct 27 20:02:02 2009 @@ -30,37 +30,6 @@ #define W32PF_NOWINDOWGHOSTING (0x01000000) #define W32PF_MANUALGUICHECK (0x02000000) #define W32PF_CREATEDWINORDC (0x04000000) - -/* THREADINFO Flags */ -#define TIF_INCLEANUP 0x00000001 -#define TIF_16BIT 0x00000002 -#define TIF_SYSTEMTHREAD 0x00000004 -#define TIF_CSRSSTHREAD 0x00000008 -#define TIF_TRACKRECTVISIBLE 0x00000010 -#define TIF_ALLOWFOREGROUNDACTIVATE 0x00000020 -#define TIF_DONTATTACHQUEUE 0x00000040 -#define TIF_DONTJOURNALATTACH 0x00000080 -#define TIF_WOW64 0x00000100 -#define TIF_INACTIVATEAPPMSG 0x00000200 -#define TIF_SPINNING 0x00000400 -#define TIF_PALETTEAWARE 0x00000800 -#define TIF_SHAREDWOW 0x00001000 -#define TIF_FIRSTIDLE 0x00002000 -#define TIF_WAITFORINPUTIDLE 0x00004000 -#define TIF_MOVESIZETRACKING 0x00008000 -#define TIF_VDMAPP 0x00010000 -#define TIF_DOSEMULATOR 0x00020000 -#define TIF_GLOBALHOOKER 0x00040000 -#define TIF_DELAYEDEVENT 0x00080000 -#define TIF_MSGPOSCHANGED 0x00100000 -#define TIF_SHUTDOWNCOMPLETE 0x00200000 -#define TIF_IGNOREPLAYBACKDELAY 0x00400000 -#define TIF_ALLOWOTHERACCOUNTHOOK 0x00800000 -#define TIF_GUITHREADINITIALIZED 0x02000000 -#define TIF_DISABLEIME 0x04000000 -#define TIF_INGETTEXTLENGTH 0x08000000 -#define TIF_ANSILENGTH 0x10000000 -#define TIF_DISABLEHOOKS 0x20000000 extern BOOL ClientPfnInit; extern HINSTANCE hModClient; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue Oct 27 20:02:02 2009 @@ -493,6 +493,7 @@ pci->ppi = ppi; pci->fsHooks = pti->fsHooks; if (pti->KeyboardLayout) pci->hKL = pti->KeyboardLayout->hkl; + pci->dwTIFlags = pti->TIF_flags; /* CI may not have been initialized. */ if (!pci->pDeskInfo && pti->pDeskInfo) {

1 0

[cwittich] 43795: [rapps] install Firefox 3.0.15 instead of 3.0.13
by cwittich＠svn.reactos.org 27 Oct '09

27 Oct '09

Author: cwittich Date: Tue Oct 27 19:45:58 2009 New Revision: 43795 URL: http://svn.reactos.org/svn/reactos?rev=43795&view=rev Log: [rapps] install Firefox 3.0.15 instead of 3.0.13 Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt Modified: trunk/reactos/base/applications/rapps/rapps/firefox3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox3.txt [iso-8859-1] Tue Oct 27 19:45:58 2009 @@ -8,30 +8,30 @@ Size = 7.1M Category = 5 URLSite = http://www.mozilla.com/en-US/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/e… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/e… CDPath = none [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð±ÑÐ°ÑÐ·ÐµÑÐ¾Ð². Size = 7.4M URLSite = http://www.mozilla-europe.org/ru/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/r… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/r… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Size = 6.9M URLSite = http://www.mozilla-europe.org/de/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/d… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/d… [Section.0405] Description = Mest populÃÂ¦re og best ogsÃÂ¥ gratis nettleserene der ute. Size = 6.9M URLSite = http://www.mozilla-europe.org/no/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/n… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/n… [Section.0415] Description = Najpopularniejsza i jedna z najlepszych darmowych przeglÄdarek internetowych. Size = 7.8M URLSite = http://www.mozilla-europe.org/pl/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.13/win32/p… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.15/win32/p…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs