Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[greatlrd] 25268: adding more define of IMAGE_SUBSYSTEM that we are missing
by greatlrd＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: greatlrd Date: Tue Jan 2 00:32:21 2007 New Revision: 25268 URL: http://svn.reactos.org/svn/reactos?rev=25268&view=rev Log: adding more define of IMAGE_SUBSYSTEM that we are missing Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Tue Jan 2 00:32:21 2007 @@ -1122,13 +1122,21 @@ #define IMAGE_SIZEOF_LINENUMBER 6 #define IMAGE_SIZEOF_ARCHIVE_MEMBER_HDR 60 #define SIZEOF_RFPO_DATA 16 -#define IMAGE_SUBSYSTEM_UNKNOWN 0 -#define IMAGE_SUBSYSTEM_NATIVE 1 -#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 -#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 -#define IMAGE_SUBSYSTEM_OS2_CUI 5 -#define IMAGE_SUBSYSTEM_POSIX_CUI 7 -#define IMAGE_SUBSYSTEM_XBOX 14 + +#define IMAGE_SUBSYSTEM_UNKNOWN 0 +#define IMAGE_SUBSYSTEM_NATIVE 1 +#define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 +#define IMAGE_SUBSYSTEM_WINDOWS_CUI 3 +#define IMAGE_SUBSYSTEM_OS2_CUI 5 +#define IMAGE_SUBSYSTEM_POSIX_CUI 7 +#define IMAGE_SUBSYSTEM_NATIVE_WINDOWS 8 +#define IMAGE_SUBSYSTEM_WINDOWS_CE_GUI 9 +#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 +#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11 +#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 +#define IMAGE_SUBSYSTEM_EFI_ROM 13 +#define IMAGE_SUBSYSTEM_XBOX 14 + #define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 #define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 #define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800

1 0

[mbosma] 25267: Add Samba TNG
by mbosma＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: mbosma Date: Mon Jan 1 23:42:15 2007 New Revision: 25267 URL: http://svn.reactos.org/svn/reactos?rev=25267&view=rev Log: Add Samba TNG Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml (original) +++ trunk/reactos/base/applications/downloader/downloader.xml Mon Jan 1 23:42:15 2007 @@ -11,6 +11,10 @@ <application name="SeaMonkey"> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> + </application> + <application name="Samba TNG"> + <description>This tool allows you to access your Windows shared folders and printers.</description> + <location>http://svn.reactos.org/packages/samba-tng.exe</location> </application> <application name="Mozilla ActiveX Control"> <description>Essential Component to get ReactOS Explorer's and other applications Internet Browsing feature running.</description>

1 0

[greatlrd] 25266: adding allot IMAGE_FILE_MACHINE to winnt that we where missing
by greatlrd＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: greatlrd Date: Mon Jan 1 23:21:43 2007 New Revision: 25266 URL: http://svn.reactos.org/svn/reactos?rev=25266&view=rev Log: adding allot IMAGE_FILE_MACHINE to winnt that we where missing Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Mon Jan 1 23:21:43 2007 @@ -1065,14 +1065,36 @@ #define IMAGE_FILE_UP_SYSTEM_ONLY 16384 #define IMAGE_FILE_BYTES_REVERSED_HI 32768 #define IMAGE_FILE_MACHINE_UNKNOWN 0 -#define IMAGE_FILE_MACHINE_I386 332 -#define IMAGE_FILE_MACHINE_R3000 354 -#define IMAGE_FILE_MACHINE_R4000 358 -#define IMAGE_FILE_MACHINE_R10000 360 -#define IMAGE_FILE_MACHINE_ALPHA 388 -#define IMAGE_FILE_MACHINE_POWERPC 496 -#define IMAGE_FILE_MACHINE_IA64 512 -#define IMAGE_FILE_MACHINE_AMD64 0x8664 + +#define IMAGE_FILE_MACHINE_AM33 0x1d3 +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_FILE_MACHINE_ARM 0x1c0 +#define IMAGE_FILE_MACHINE_EBC 0xebc +#define IMAGE_FILE_MACHINE_I386 0x14c +#define IMAGE_FILE_MACHINE_IA64 0x200 +#define IMAGE_FILE_MACHINE_M32R 0x9041 +#define IMAGE_FILE_MACHINE_MIPS16 0x266 +#define IMAGE_FILE_MACHINE_MIPSFPU 0x366 +#define IMAGE_FILE_MACHINE_MIPSFPU16 0x466 +#define IMAGE_FILE_MACHINE_POWERPC 0x1f0 +#define IMAGE_FILE_MACHINE_POWERPCFP 0x1f1 +#define IMAGE_FILE_MACHINE_R4000 0x166 +#define IMAGE_FILE_MACHINE_SH3 0x1a2 +#define IMAGE_FILE_MACHINE_SH3E 0x01a4 +#define IMAGE_FILE_MACHINE_SH3DSP 0x1a3 +#define IMAGE_FILE_MACHINE_SH4 0x1a6 +#define IMAGE_FILE_MACHINE_SH5 0x1a8 +#define IMAGE_FILE_MACHINE_THUMB 0x1c2 +#define IMAGE_FILE_MACHINE_WCEMIPSV2 0x169 +#define IMAGE_FILE_MACHINE_R3000 0x162 +#define IMAGE_FILE_MACHINE_R10000 0x168 +#define IMAGE_FILE_MACHINE_ALPHA 0x184 +#define IMAGE_FILE_MACHINE_ALPHA64 0x0284 +#define IMAGE_FILE_MACHINE_AXP64 IMAGE_FILE_MACHINE_ALPHA64 +#define IMAGE_FILE_MACHINE_CEE 0xC0EE +#define IMAGE_FILE_MACHINE_TRICORE 0x0520 +#define IMAGE_FILE_MACHINE_CEF 0x0CEF + #define IMAGE_DOS_SIGNATURE 0x5A4D #define IMAGE_OS2_SIGNATURE 0x454E #define IMAGE_OS2_SIGNATURE_LE 0x454C

1 0

[janderwald] 25265: - msvc compability fix...
by janderwald＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: janderwald Date: Mon Jan 1 17:59:05 2007 New Revision: 25265 URL: http://svn.reactos.org/svn/reactos?rev=25265&view=rev Log: - msvc compability fix... Added: trunk/reactos/base/applications/downloader/rsrc.rc (with props) Removed: trunk/reactos/base/applications/downloader/resources/generic.rc Modified: trunk/reactos/base/applications/downloader/download.c trunk/reactos/base/applications/downloader/downloader.rc trunk/reactos/base/applications/downloader/main.c trunk/reactos/base/applications/downloader/resources.h (props changed) trunk/reactos/base/applications/downloader/structures.h (props changed) trunk/reactos/base/applications/downloader/xml.c Modified: trunk/reactos/base/applications/downloader/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/download.c (original) +++ trunk/reactos/base/applications/downloader/download.c Mon Jan 1 17:59:05 2007 @@ -1,4 +1,4 @@ -/* +/* $Id$ * PROJECT: ReactOS Downloader (was GetFirefox) * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/downloader/download.c Modified: trunk/reactos/base/applications/downloader/downloader.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.rc (original) +++ trunk/reactos/base/applications/downloader/downloader.rc Mon Jan 1 17:59:05 2007 @@ -7,6 +7,4 @@ #include <reactos/version.rc> -#include "resources/generic.rc" -#include "translations/en.rc" -#include "translations/de.rc" +#include "rsrc.rc" Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Mon Jan 1 17:59:05 2007 @@ -1,4 +1,4 @@ -/* +/* $Id$ * PROJECT: ReactOS Downloader * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/downloader/xml.c @@ -30,10 +30,11 @@ void ShowMessage (WCHAR* title, WCHAR* message) { + HWND hwnd; DescriptionHeadline = title; DescriptionText = message; - HWND hwnd = GetParent(hCategories); + hwnd = GetParent(hCategories); InvalidateRect(hwnd,NULL,TRUE); UpdateWindow(hwnd); } @@ -63,6 +64,7 @@ void CategoryChoosen (HWND hwnd, struct Category* Category) { struct Application* CurrentApplication; + TV_INSERTSTRUCTW Insert; SelectedApplication = NULL; if(Category->Children && !Category->Apps) @@ -77,7 +79,6 @@ (void)TreeView_DeleteItem(hwnd, TVI_ROOT); (void)TreeView_DeleteItem(hwnd, TVI_ROOT); // Delete twice to bypass bug in windows - TV_INSERTSTRUCTW Insert; Insert.item.mask = TVIF_TEXT|TVIF_PARAM; Insert.hInsertAfter = TVI_LAST; Insert.hParent = TVI_ROOT; @@ -96,6 +97,8 @@ BOOL SetupControls (HWND hwnd) { + TV_INSERTSTRUCTW Insert = {0}; + HIMAGELIST hImageList; HINSTANCE hInstance = GetModuleHandle(NULL); // Parse the XML file @@ -121,14 +124,13 @@ SendMessageW(hDownloadButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD))); // Set deflaut entry for hApps - TV_INSERTSTRUCTW Insert = {0}; Insert.item.mask = TVIF_TEXT; Insert.item.pszText = Strings[IDS_CHOOSE_CATEGORY]; Insert.item.cchTextMax = lstrlenW(Strings[IDS_CHOOSE_CATEGORY]); SendMessage(hApps, TVM_INSERTITEM, 0, (LPARAM)&Insert); // Create Tree Icons - HIMAGELIST hImageList = ImageList_Create(16, 16, ILC_COLORDDB, 1, 1); + hImageList = ImageList_Create(16, 16, ILC_COLORDDB, 1, 1); SendMessageW(hCategories, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hImageList); SendMessageW(hApps, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)(HIMAGELIST)hImageList); @@ -168,11 +170,13 @@ HFONT GetFont (BOOL Title) { + int Height; + int Scale; LOGFONT Font; GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(LOGFONT), &Font); - int Height = Title ? 20 : 19; - int Scale = Font.lfWidth/Font.lfHeight; + Height = Title ? 20 : 19; + Scale = Font.lfWidth/Font.lfHeight; return CreateFont(Height, Height*Scale, Font.lfEscapement, Font.lfOrientation, Title ? FW_EXTRABOLD : FW_NORMAL, Font.lfItalic, Font.lfUnderline, Font.lfStrikeOut, Font.lfCharSet, Font.lfOutPrecision, Font.lfClipPrecision, Font.lfQuality, @@ -182,6 +186,8 @@ static void DrawDescription (HDC hdc, RECT DescriptionRect) { int i; + HFONT Font; + RECT Rect = {DescriptionRect.left+5, DescriptionRect.top+3, DescriptionRect.right-2, DescriptionRect.top+22}; // Backgroud Rectangle(hdc, DescriptionRect.left, DescriptionRect.top, DescriptionRect.right, DescriptionRect.bottom); @@ -191,9 +197,8 @@ DrawBitmap(hdc, i, DescriptionRect.top+22, hUnderline); // less code then stretching ;) // Headline - HFONT Font = GetFont(TRUE); + Font = GetFont(TRUE); SelectObject(hdc, Font); - RECT Rect = {DescriptionRect.left+5, DescriptionRect.top+3, DescriptionRect.right-2, DescriptionRect.top+22}; DrawTextW(hdc, DescriptionHeadline, lstrlenW(DescriptionHeadline), &Rect, DT_SINGLELINE|DT_NOPREFIX); DeleteObject(Font); @@ -298,15 +303,21 @@ { int Split_Hozizontal = (HIWORD(lParam)-(45+60))/2 + 60; int Split_Vertical = 200; + RECT Rect = {Split_Vertical+5, Split_Hozizontal+5, LOWORD(lParam)-10, HIWORD(lParam)-50}; + RECT Top = {0,0,LOWORD(lParam),60}; + RECT Bottom = {Split_Vertical, Split_Hozizontal, LOWORD(lParam), HIWORD(lParam)}; ResizeControl(hCategories, 10, 60, Split_Vertical, HIWORD(lParam)-10); ResizeControl(hApps, Split_Vertical+5, 60, LOWORD(lParam)-10, Split_Hozizontal); - RECT Rect = {Split_Vertical+5, Split_Hozizontal+5, LOWORD(lParam)-10, HIWORD(lParam)-50}; DescriptionRect = Rect; MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, FALSE); MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, FALSE); MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, FALSE); + + + InvalidateRect(hwnd, &Top, TRUE); + InvalidateRect(hwnd, &Bottom, FALSE); } break; @@ -329,6 +340,8 @@ { HWND hwnd; int i; + WNDCLASSEXW WndClass = {0}; + MSG msg; InitCommonControls(); @@ -337,7 +350,6 @@ LoadStringW(hInstance, i, Strings[i], MAX_STRING_LENGHT); // if you know a better method please tell me. // Create the window - WNDCLASSEXW WndClass = {0}; WndClass.cbSize = sizeof(WNDCLASSEX); WndClass.lpszClassName = L"Downloader"; WndClass.lpfnWndProc = WndProc; @@ -363,7 +375,6 @@ UpdateWindow(hwnd); // Message Loop - MSG msg; while(GetMessage(&msg,NULL,0,0)) { TranslateMessage(&msg); Propchange: trunk/reactos/base/applications/downloader/resources.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Removed: trunk/reactos/base/applications/downloader/resources/generic.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/resources/generic.rc (original) +++ trunk/reactos/base/applications/downloader/resources/generic.rc (removed) @@ -1,18 +1,0 @@ -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -IDI_MAIN ICON DISCARDABLE "main.ico" -//IDB_UNDERLINE BITMAP DISCARDABLE "underline.bmp" -IDB_LOGO BITMAP DISCARDABLE "logo.bmp" -IDB_HELP BITMAP DISCARDABLE "help.bmp" -IDB_UPDATE BITMAP DISCARDABLE "update.bmp" -IDB_DOWNLOAD BITMAP DISCARDABLE "download.bmp" -IDB_UNDERLINE BITMAP DISCARDABLE "underline.bmp" -IDB_TREEVIEW_ICON_0 BITMAP DISCARDABLE "0.bmp" -IDB_TREEVIEW_ICON_1 BITMAP DISCARDABLE "1.bmp" -IDB_TREEVIEW_ICON_2 BITMAP DISCARDABLE "2.bmp" -IDB_TREEVIEW_ICON_3 BITMAP DISCARDABLE "3.bmp" -IDB_TREEVIEW_ICON_4 BITMAP DISCARDABLE "4.bmp" -IDB_TREEVIEW_ICON_5 BITMAP DISCARDABLE "5.bmp" -IDB_TREEVIEW_ICON_6 BITMAP DISCARDABLE "6.bmp" -IDB_TREEVIEW_ICON_7 BITMAP DISCARDABLE "7.bmp" -IDB_TREEVIEW_ICON_8 BITMAP DISCARDABLE "8.bmp" Added: 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 (added) +++ trunk/reactos/base/applications/downloader/rsrc.rc Mon Jan 1 17:59:05 2007 @@ -1,0 +1,22 @@ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_MAIN ICON DISCARDABLE "resources/main.ico" +//IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" +IDB_LOGO BITMAP DISCARDABLE "resources/logo.bmp" +IDB_HELP BITMAP DISCARDABLE "resources/help.bmp" +IDB_UPDATE BITMAP DISCARDABLE "resources/update.bmp" +IDB_DOWNLOAD BITMAP DISCARDABLE "resources/download.bmp" +IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" +IDB_TREEVIEW_ICON_0 BITMAP DISCARDABLE "resources/0.bmp" +IDB_TREEVIEW_ICON_1 BITMAP DISCARDABLE "resources/1.bmp" +IDB_TREEVIEW_ICON_2 BITMAP DISCARDABLE "resources/2.bmp" +IDB_TREEVIEW_ICON_3 BITMAP DISCARDABLE "resources/3.bmp" +IDB_TREEVIEW_ICON_4 BITMAP DISCARDABLE "resources/4.bmp" +IDB_TREEVIEW_ICON_5 BITMAP DISCARDABLE "resources/5.bmp" +IDB_TREEVIEW_ICON_6 BITMAP DISCARDABLE "resources/6.bmp" +IDB_TREEVIEW_ICON_7 BITMAP DISCARDABLE "resources/7.bmp" +IDB_TREEVIEW_ICON_8 BITMAP DISCARDABLE "resources/8.bmp" + + +#include "translations/en.rc" +#include "translations/de.rc" Propchange: trunk/reactos/base/applications/downloader/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/downloader/structures.h ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -Author Date Id Revision Modified: trunk/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/xml.c (original) +++ trunk/reactos/base/applications/downloader/xml.c Mon Jan 1 17:59:05 2007 @@ -1,4 +1,4 @@ -/* +/* $Id$ * PROJECT: ReactOS Downloader * LICENSE: GPL - See COPYING in the top level directory * FILE: base\applications\downloader\xml.c @@ -21,6 +21,8 @@ void tag_opened (void* usrdata, const char* tag, const char** arg) { + int i; + if(!strcmp(tag, "tree") && !CurrentApplication) { // check version @@ -49,7 +51,6 @@ } TagOpen = TRUE; - int i; for (i=0; arg[i]; i+=2) { if(!strcmp(arg[i], "name")) @@ -81,7 +82,6 @@ CurrentApplication = Current->Apps; } - int i; for (i=0; arg[i]; i+=2) { if(!strcmp(arg[i], "name")) @@ -147,6 +147,8 @@ { int done = 0; char buffer[255]; + FILE* file; + XML_Parser parser; if(Current) return FALSE; @@ -154,7 +156,7 @@ Current = Root; TagOpen = TRUE; - FILE* file = fopen(filename, "r"); + file = fopen(filename, "r"); if(!file) { file = fopen("downloader.xml", "r"); @@ -165,7 +167,7 @@ } } - XML_Parser parser = XML_ParserCreate(NULL); + parser = XML_ParserCreate(NULL); XML_SetElementHandler(parser, tag_opened, tag_closed); XML_SetCharacterDataHandler(parser, text);

1 0

[hpoussin] 25264: Better support for non X86 systems
by hpoussin＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: hpoussin Date: Mon Jan 1 17:50:16 2007 New Revision: 25264 URL: http://svn.reactos.org/svn/reactos?rev=25264&view=rev Log: Better support for non X86 systems Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/i386/mmtypes.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/mingw/cpu_features.c trunk/reactos/lib/mingw/wcrt1.c trunk/reactos/lib/pseh/pseh.rbuild trunk/reactos/lib/rossym/find.c trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild Mon Jan 1 17:50:16 2007 @@ -68,13 +68,15 @@ <file>pixel.c</file> <file>video.c</file> </directory> - <directory name="windows"> - <file>conversion.c</file> - <file>peloader.c</file> - <file>winldr.c</file> - <file>wlmemory.c</file> - <file>wlregistry.c</file> - </directory> + <if property="ARCH" value="i386"> + <directory name="windows"> + <file>conversion.c</file> + <file>peloader.c</file> + <file>winldr.c</file> + <file>wlmemory.c</file> + <file>wlregistry.c</file> + </directory> + </if> <file>freeldr.c</file> <file>debug.c</file> <file>version.c</file> Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Mon Jan 1 17:50:16 2007 @@ -5219,83 +5219,6 @@ ULONG Spare1; } KFLOATING_SAVE, *PKFLOATING_SAVE; -#define PAGE_SIZE 0x1000 -#define PAGE_SHIFT 12L - -extern NTKERNELAPI PVOID MmHighestUserAddress; -extern NTKERNELAPI PVOID MmSystemRangeStart; -extern NTKERNELAPI ULONG_PTR MmUserProbeAddress; - -#define MM_HIGHEST_USER_ADDRESS MmHighestUserAddress -#define MM_SYSTEM_RANGE_START MmSystemRangeStart -#define MM_USER_PROBE_ADDRESS MmUserProbeAddress -#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 -#define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xC0C00000 - -#define KI_USER_SHARED_DATA 0xffdf0000 -#define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) - -#define EFLAG_SIGN 0x8000 -#define EFLAG_ZERO 0x4000 -#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) - -#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) - -typedef enum _INTERLOCKED_RESULT { - ResultNegative = RESULT_NEGATIVE, - ResultZero = RESULT_ZERO, - ResultPositive = RESULT_POSITIVE -} INTERLOCKED_RESULT; - -typedef VOID -(NTAPI *PciPin2Line)( - IN struct _BUS_HANDLER *BusHandler, - IN struct _BUS_HANDLER *RootHandler, - IN PCI_SLOT_NUMBER SlotNumber, - IN PPCI_COMMON_CONFIG PciData -); - -typedef VOID -(NTAPI *PciLine2Pin)( - IN struct _BUS_HANDLER *BusHandler, - IN struct _BUS_HANDLER *RootHandler, - IN PCI_SLOT_NUMBER SlotNumber, - IN PPCI_COMMON_CONFIG PciNewData, - IN PPCI_COMMON_CONFIG PciOldData -); - -typedef VOID -(NTAPI *PciReadWriteConfig)( - IN struct _BUS_HANDLER *BusHandler, - IN PCI_SLOT_NUMBER Slot, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length -); - -#define PCI_DATA_TAG TAG('P', 'C', 'I', ' ') -#define PCI_DATA_VERSION 1 - -typedef struct _PCIBUSDATA -{ - ULONG Tag; - ULONG Version; - PciReadWriteConfig ReadConfig; - PciReadWriteConfig WriteConfig; - PciPin2Line Pin2Line; - PciLine2Pin Line2Pin; - PCI_SLOT_NUMBER ParentSlot; - PVOID Reserved[4]; -} PCIBUSDATA, *PPCIBUSDATA; - -NTHALAPI -KIRQL -DDKAPI -KeGetCurrentIrql( - VOID); - static __inline ULONG DDKAPI @@ -5319,6 +5242,84 @@ #error Unknown compiler #endif } +#endif /* _X86_ */ + +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L + +extern NTKERNELAPI PVOID MmHighestUserAddress; +extern NTKERNELAPI PVOID MmSystemRangeStart; +extern NTKERNELAPI ULONG_PTR MmUserProbeAddress; + +#define MM_HIGHEST_USER_ADDRESS MmHighestUserAddress +#define MM_SYSTEM_RANGE_START MmSystemRangeStart +#define MM_USER_PROBE_ADDRESS MmUserProbeAddress +#define MM_LOWEST_USER_ADDRESS (PVOID)0x10000 +#define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xC0C00000 + +#define KI_USER_SHARED_DATA 0xffdf0000 +#define SharedUserData ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA) + +#define EFLAG_SIGN 0x8000 +#define EFLAG_ZERO 0x4000 +#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) + +#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) +#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) + +typedef enum _INTERLOCKED_RESULT { + ResultNegative = RESULT_NEGATIVE, + ResultZero = RESULT_ZERO, + ResultPositive = RESULT_POSITIVE +} INTERLOCKED_RESULT; + +typedef VOID +(NTAPI *PciPin2Line)( + IN struct _BUS_HANDLER *BusHandler, + IN struct _BUS_HANDLER *RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + IN PPCI_COMMON_CONFIG PciData +); + +typedef VOID +(NTAPI *PciLine2Pin)( + IN struct _BUS_HANDLER *BusHandler, + IN struct _BUS_HANDLER *RootHandler, + IN PCI_SLOT_NUMBER SlotNumber, + IN PPCI_COMMON_CONFIG PciNewData, + IN PPCI_COMMON_CONFIG PciOldData +); + +typedef VOID +(NTAPI *PciReadWriteConfig)( + IN struct _BUS_HANDLER *BusHandler, + IN PCI_SLOT_NUMBER Slot, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length +); + +#define PCI_DATA_TAG TAG('P', 'C', 'I', ' ') +#define PCI_DATA_VERSION 1 + +typedef struct _PCIBUSDATA +{ + ULONG Tag; + ULONG Version; + PciReadWriteConfig ReadConfig; + PciReadWriteConfig WriteConfig; + PciPin2Line Pin2Line; + PciLine2Pin Line2Pin; + PCI_SLOT_NUMBER ParentSlot; + PVOID Reserved[4]; +} PCIBUSDATA, *PPCIBUSDATA; + +NTHALAPI +KIRQL +DDKAPI +KeGetCurrentIrql( + VOID); #if !defined(__INTERLOCKED_DECLARED) #define __INTERLOCKED_DECLARED @@ -5415,8 +5416,6 @@ #define RtlCopyMemoryNonTemporal RtlCopyMemory #define KeGetDcacheFillSize() 1L - -#endif /* _X86_ */ @@ -10579,13 +10578,13 @@ IN ULONG Status); ULONG -__cdecl +DDKCDECLAPI DbgPrint( IN PCCH Format, IN ...); ULONG -__cdecl +DDKCDECLAPI DbgPrintEx( IN ULONG ComponentId, IN ULONG Level, Modified: trunk/reactos/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/mmtypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/mmtypes.h (original) +++ trunk/reactos/include/ndk/i386/mmtypes.h Mon Jan 1 17:50:16 2007 @@ -34,7 +34,7 @@ // // Sanity checks for Paging Macros // -#ifndef __GNUC__ +#ifdef C_ASSERT C_ASSERT(PAGE_SIZE == (1 << PAGE_SHIFT)); C_ASSERT(MM_ALLOCATION_GRANULARITY == (1 << MM_ALLOCATION_GRANULARITY_SHIFT)); C_ASSERT(MM_ALLOCATION_GRANULARITY && Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h (original) +++ trunk/reactos/include/ndk/psfuncs.h Mon Jan 1 17:50:16 2007 @@ -229,6 +229,7 @@ ); #ifndef NTOS_MODE_USER +#if defined(_M_IX86) FORCEINLINE PTEB NtCurrentTeb(VOID) @@ -248,6 +249,9 @@ #endif } #endif +#else +struct _TEB * NtCurrentTeb(void); +#endif NTSYSCALLAPI NTSTATUS Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Mon Jan 1 17:50:16 2007 @@ -1216,7 +1216,7 @@ #endif union { - HARDWARE_PTE_X86 PagedirectoryPte; + HARDWARE_PTE PagedirectoryPte; ULONGLONG Filler; }; ULONG Session; Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h (original) +++ trunk/reactos/include/ndk/rtltypes.h Mon Jan 1 17:50:16 2007 @@ -138,7 +138,7 @@ HEAP_CREATE_ALIGN_16 | \ HEAP_CREATE_ENABLE_TRACING | \ HEAP_CREATE_ENABLE_EXECUTE) -#ifndef __GNUC__ +#ifdef C_ASSERT C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); #endif Modified: trunk/reactos/lib/mingw/cpu_features.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/mingw/cpu_features.c?r… ============================================================================== --- trunk/reactos/lib/mingw/cpu_features.c (original) +++ trunk/reactos/lib/mingw/cpu_features.c Mon Jan 1 17:50:16 2007 @@ -29,6 +29,7 @@ void __cpu_features_init (void) { +#ifdef __i386__ unsigned int eax, ebx, ecx, edx; /* Try to change the value of CPUID bit (bit 21) in EFLAGS. If the bit can be toggled, CPUID is supported. */ @@ -75,8 +76,7 @@ __cpu_features |= _CRT_3DNOW; if (edx & EDX_3DNOWP) __cpu_features |= _CRT_3DNOWP; - - return; +#endif } #ifdef TEST Modified: trunk/reactos/lib/mingw/wcrt1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/mingw/wcrt1.c?rev=2526… ============================================================================== --- trunk/reactos/lib/mingw/wcrt1.c (original) +++ trunk/reactos/lib/mingw/wcrt1.c Mon Jan 1 17:50:16 2007 @@ -218,7 +218,11 @@ /* Align the stack to 16 bytes for the sake of SSE ops in main or in functions inlined into main. */ +#if defined(__i386__) asm __volatile__ ("andl $-16, %%esp" : : : "%esp"); +#else +#error Unsupported architecture +#endif /* * Call the main function. If the user does not supply one Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=2… ============================================================================== --- trunk/reactos/lib/pseh/pseh.rbuild (original) +++ trunk/reactos/lib/pseh/pseh.rbuild Mon Jan 1 17:50:16 2007 @@ -1,8 +1,10 @@ <module name="pseh" type="staticlibrary"> <define name="__USE_W32API" /> - <directory name="i386"> - <file>framebased.asm</file> - <file>setjmp.asm</file> - </directory> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>framebased.asm</file> + <file>setjmp.asm</file> + </directory> + </if> <file>framebased.c</file> </module> Modified: trunk/reactos/lib/rossym/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym/find.c?rev=2526… ============================================================================== --- trunk/reactos/lib/rossym/find.c (original) +++ trunk/reactos/lib/rossym/find.c Mon Jan 1 17:50:16 2007 @@ -104,7 +104,6 @@ if (RosSymInfo->Symbols == NULL || RosSymInfo->SymbolsCount == 0 || RosSymInfo->Strings == NULL || RosSymInfo->StringsLength == 0) { -__asm__("int $3\n"); DPRINT1("Uninitialized RosSymInfo\n"); return FALSE; } Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=252… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Mon Jan 1 17:50:16 2007 @@ -35,7 +35,7 @@ <file>rtlmem.s</file> <file>pow_asm.s</file> <file>res_asm.s</file> - <file>seh.s</file> + <file>seh.s</file> <file>sin_asm.s</file> <file>sqrt_asm.s</file> <file>tan_asm.s</file> @@ -46,10 +46,10 @@ <file>tree.c</file> </directory> - <ifnot property="ARCH" value="i386"> - <file>memgen.c</file> - <file>mem.c</file> - </ifnot> + <ifnot property="ARCH" value="i386"> + <file>memgen.c</file> + <file>mem.c</file> + </ifnot> <file>access.c</file> <file>acl.c</file> Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Mon Jan 1 17:50:16 2007 @@ -857,6 +857,10 @@ if (FileNameWithoutPath == NULL) { FileNameWithoutPath = ModuleName->Buffer; + } + else + { + FileNameWithoutPath++; } /*

1 0

[mbosma] 25263: apps.xml => downloader.xml
by mbosma＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: mbosma Date: Mon Jan 1 17:30:40 2007 New Revision: 25263 URL: http://svn.reactos.org/svn/reactos?rev=25263&view=rev Log: apps.xml => downloader.xml Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Jan 1 17:30:40 2007 @@ -38,7 +38,7 @@ base\applications\devmgr\devmgrapp.exe 1 base\applications\devmgmt\devmgmt.exe 1 base\applications\downloader\downloader.exe 1 -base\applications\downloader\apps.xml 1 +base\applications\downloader\downloader.xml 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 base\applications\getfirefox\getfirefox.exe 1

1 0

[mbosma] 25262: - rename apps.xml to downloader.xml - look first for the xml file in system32 then in current dir.
by mbosma＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: mbosma Date: Mon Jan 1 17:29:26 2007 New Revision: 25262 URL: http://svn.reactos.org/svn/reactos?rev=25262&view=rev Log: - rename apps.xml to downloader.xml - look first for the xml file in system32 then in current dir. Added: trunk/reactos/base/applications/downloader/downloader.xml - copied unchanged from r25234, trunk/reactos/base/applications/downloader/apps.xml Removed: trunk/reactos/base/applications/downloader/apps.xml Modified: trunk/reactos/base/applications/downloader/downloader.rbuild trunk/reactos/base/applications/downloader/main.c trunk/reactos/base/applications/downloader/xml.c Removed: trunk/reactos/base/applications/downloader/apps.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/apps.xml (original) +++ trunk/reactos/base/applications/downloader/apps.xml (removed) @@ -1,78 +1,0 @@ -<tree Version="1">  - <category name="Internet & Network" icon="1"> - <application name="Firefox"> - <description>The most popular free webbrowser out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> - </application> - <application name="Thunderbird"> - <description>The most popular free Mail Client out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> - </application> - <application name="SeaMonkey"> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> - </application> - <application name="Mozilla ActiveX Control"> - <description>Essential Component to get ReactOS Explorer's and other applications Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> - </application> - <application name="Putty"> - <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.58-installer.exe</location> - </application> - </category> - <category name="Office" icon="2"> - <application name="Abiword"> - <description>Word processor.</description> - <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.…</location> - </application> - <application name="OpenOffice"> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_W…</location> - </application> - </category> - <category name="Graphics" icon="3"> - <application name="IrfanView"> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> - </application> - <application name="IrfanView Plugins"> - <description>Additional Plugins for supporting more File types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> - </application> - <application name="TuxPaint"> - <description>An open source bitmap graphics editor geared towards young children.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-in…</location> - </application> - </category> - <category name="Multimedia" icon="4"> - </category> - <category name="Development" icon="5"> - <application name="ReactOS Build Envirement"> - <description>Allows you to build the ReactOS Source. For more instructions see our wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.3.exe</location> - </application> - </category> - <category name="Games & Fun" icon="6"> - <application name="ScummVM"> - <description>SamNMax, Day of Tentacle, etc on ReactOS</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> - </application> - </category> - <category name="Tools" icon="7"> - <application name="7-Zip"> - <description>Utility to create and open zip, tar, rar and other archive files.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> - </application> - <application name="uTorrent"> - <description>Small and fast Torrent Client.</description> - <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> - </application> - <application name="Audio Grabber"> - <description>A very good CD Ripper/File Converter.</description> - <location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location> - </application> - </category> - <category name="Others" icon="8"> - </category> -</tree> Modified: trunk/reactos/base/applications/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.rbuild (original) +++ trunk/reactos/base/applications/downloader/downloader.rbuild Mon Jan 1 17:29:26 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<installfile base="system32">apps.xml</installfile> +<installfile base="system32">downloader.xml</installfile> <module name="downloader" type="win32gui" installbase="system32" installname="downloader.exe"> <include base="downloader">.</include> <include base="expat">.</include> Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Mon Jan 1 17:29:26 2007 @@ -12,6 +12,8 @@ #include <stdio.h> #include "resources.h" #include "structures.h" + +#define XML_PATH "C:\\ReactOS\\system32\\downloader.xml" HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton; HBITMAP hLogo, hUnderline; @@ -97,7 +99,7 @@ HINSTANCE hInstance = GetModuleHandle(NULL); // Parse the XML file - if (ProcessXML ("apps.xml", &Root) == FALSE) + if (ProcessXML (XML_PATH, &Root) == FALSE) return FALSE; // Set up the controls Modified: trunk/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/xml.c (original) +++ trunk/reactos/base/applications/downloader/xml.c Mon Jan 1 17:29:26 2007 @@ -157,8 +157,12 @@ FILE* file = fopen(filename, "r"); if(!file) { - MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); - return FALSE; + file = fopen("downloader.xml", "r"); + if(!file) + { + MessageBoxW(0,Strings[IDS_XMLERROR_1],0,0); + return FALSE; + } } XML_Parser parser = XML_ParserCreate(NULL);

1 0

[greatlrd] 25261: Adding stubed arm4 for my CpuToIntel tool. Now we got tree diffent arch we can port over to intel x86 asm. But this tool are experment tool
by greatlrd＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: greatlrd Date: Mon Jan 1 16:37:24 2007 New Revision: 25261 URL: http://svn.reactos.org/svn/reactos?rev=25261&view=rev Log: Adding stubed arm4 for my CpuToIntel tool. Now we got tree diffent arch we can port over to intel x86 asm. But this tool are experment tool Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/cputointel.rbuild Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Mon Jan 1 16:37:24 2007 @@ -3,8 +3,9 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "ARM/ARM.h" #include "m68k/m68k.h" -#include "ppc/ppc.h" +#include "PPC/PPC.h" #include "misc.h" int main(int argc, char * argv[]) @@ -21,6 +22,7 @@ printf(" -cpu m68030 : convert motorala 68030 to intel asm \n"); printf(" -cpu m68040 : convert motorala 68040 to intel asm \n"); printf(" -cpu ppc : convert PowerPC to intel asm \n"); + printf(" -cpu ARM4 : convert ARM4 to intel asm \n"); printf("--------------------------------------------------------------\n"); printf(".......-BaseAddress adr : the start base address only accpect \n"); printf("....... dec value"); @@ -71,6 +73,8 @@ return M68KBrain(infile, outfile, BaseAddress, 68040); else if (stricmp(argv[2],"ppc")) return PPCBrain(infile, outfile, BaseAddress, 0); + else if (stricmp(argv[2],"arm4")) + return ARMBrain(infile, outfile, BaseAddress, 4); } } return 0; Modified: trunk/rosapps/devutils/cputointel/cputointel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/cputoi… ============================================================================== --- trunk/rosapps/devutils/cputointel/cputointel.rbuild (original) +++ trunk/rosapps/devutils/cputointel/cputointel.rbuild Mon Jan 1 16:37:24 2007 @@ -9,6 +9,9 @@ <file>CpuToIntel.c</file> <file>misc.c</file> + <file>ARM/ARMBrain.c</file> + <file>ARM/ARMopcode.c</file> + <file>m68k/M68kBrain.c</file> <file>m68k/M68kopcode.c</file>

1 0

[mbosma] 25260: Remove flickering reducing trick, because it does not work under windows, and the problem does not exist under reactos anyway.
by mbosma＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: mbosma Date: Mon Jan 1 15:59:11 2007 New Revision: 25260 URL: http://svn.reactos.org/svn/reactos?rev=25260&view=rev Log: Remove flickering reducing trick, because it does not work under windows, and the problem does not exist under reactos anyway. Modified: trunk/reactos/base/applications/downloader/main.c Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Mon Jan 1 15:59:11 2007 @@ -305,11 +305,6 @@ MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, FALSE); MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, FALSE); MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, FALSE); - - RECT Top = {0,0,LOWORD(lParam),60}; - InvalidateRect(hwnd, &Top, TRUE); - RECT Bottom = {Split_Vertical, Split_Hozizontal, LOWORD(lParam), HIWORD(lParam)}; - InvalidateRect(hwnd, &Bottom, FALSE); } break; @@ -345,6 +340,7 @@ WndClass.lpszClassName = L"Downloader"; WndClass.lpfnWndProc = WndProc; WndClass.hInstance = hInstance; + WndClass.style = CS_HREDRAW | CS_VREDRAW; WndClass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); WndClass.hCursor = LoadCursor(NULL, IDC_ARROW);

1 0

[arty] 25259: - most of the churn here is from code and headers imported from trunk. - there are several improvements to freeldr for which ion and fireball are responsible. - also here is filip's cmlib. - my changes to freeldr mostly centered around managing the kernel slab and transitioning to the kernel memory map. the new map is built in a new area and installed once we have every page set up. this is a bit safer than the old method. - the video planes are handed off to ntoskrnl, and some tra
by arty＠svn.reactos.org 01 Jan '07

01 Jan '07

Author: arty Date: Mon Jan 1 14:32:44 2007 New Revision: 25259 URL: http://svn.reactos.org/svn/reactos?rev=25259&view=rev Log: - most of the churn here is from code and headers imported from trunk. - there are several improvements to freeldr for which ion and fireball are responsible. - also here is filip's cmlib. - my changes to freeldr mostly centered around managing the kernel slab and transitioning to the kernel memory map. the new map is built in a new area and installed once we have every page set up. this is a bit safer than the old method. - the video planes are handed off to ntoskrnl, and some trace macros using the frame buffer are available. - some hacks are removed. - current status: LdrInitModuleManagement tries to get the header from hal.dll but fails for some reason. i need to look into it. - this is a checkpoint, since there's been some interest in seeing how things are progressing. - you can put any pe-coff powerpc exe (based at 0x80000000) in place of ntoskrnl to test various aspects of the boot handoff. this will be useful for testing our trap handlers and such. - the toolchain didn't produce correct executables in all cases before, and didn't differentiate rva32 and rel32, causing some things to be linked wrong. so far, the current toolchain (20061231) links correctly, using R_PPC_UADDR32 as a surrogate for rva32, since it's never produced by gcc. - some earlyboot video tracing is in ntoskrnl so i can peek around a bit. Added: branches/powerpc/reactos/include/reactos/ppcdebug.h Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_base.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/mm/mm.c branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/powerpc/reactos/boot/freeldr/freeldr/windows/peloader.c branches/powerpc/reactos/boot/freeldr/freeldr/windows/winldr.c branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlmemory.c branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlregistry.c branches/powerpc/reactos/include/ddk/winddk.h branches/powerpc/reactos/include/ndk/powerpc/ketypes.h branches/powerpc/reactos/include/psdk/winnt.h branches/powerpc/reactos/include/reactos/arc/arc.h branches/powerpc/reactos/include/reactos/font.h branches/powerpc/reactos/include/reactos/ppcboot.h branches/powerpc/reactos/include/reactos/rosldr.h branches/powerpc/reactos/lib/cmlib/cmdata.h branches/powerpc/reactos/lib/cmlib/cminit.c branches/powerpc/reactos/lib/cmlib/cmlib.h branches/powerpc/reactos/lib/cmlib/cmlib.mak branches/powerpc/reactos/lib/cmlib/hivebin.c branches/powerpc/reactos/lib/cmlib/hivecell.c branches/powerpc/reactos/lib/cmlib/hivedata.h branches/powerpc/reactos/lib/cmlib/hiveinit.c branches/powerpc/reactos/lib/cmlib/hivewrt.c branches/powerpc/reactos/ntoskrnl/ex/rundown.c branches/powerpc/reactos/ntoskrnl/include/internal/ke_x.h branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/ke.h branches/powerpc/reactos/ntoskrnl/ke/freeldr.c branches/powerpc/reactos/ntoskrnl/ke/powerpc/main_asm.S branches/powerpc/reactos/ntoskrnl/ke/thrdobj.c branches/powerpc/reactos/ntoskrnl/ldr/loader.c branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/powerpc/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ReactOS-ppc.rbu… Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… Modified: branches/powerpc/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ddk/win… Modified: branches/powerpc/reactos/include/ndk/powerpc/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/ndk/pow… Modified: branches/powerpc/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/psdk/wi… Modified: branches/powerpc/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Modified: branches/powerpc/reactos/include/reactos/font.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Modified: branches/powerpc/reactos/include/reactos/ppcboot.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Added: branches/powerpc/reactos/include/reactos/ppcdebug.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Modified: branches/powerpc/reactos/include/reactos/rosldr.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/include/reactos… Modified: branches/powerpc/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/cmdat… Modified: branches/powerpc/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/cmini… Modified: branches/powerpc/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/cmlib… Modified: branches/powerpc/reactos/lib/cmlib/cmlib.mak URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/cmlib… Modified: branches/powerpc/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/hiveb… Modified: branches/powerpc/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/hivec… Modified: branches/powerpc/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/hived… Modified: branches/powerpc/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/hivei… Modified: branches/powerpc/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/lib/cmlib/hivew… Modified: branches/powerpc/reactos/ntoskrnl/ex/rundown.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ex/run… Modified: branches/powerpc/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… Modified: branches/powerpc/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… Modified: branches/powerpc/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/includ… Modified: branches/powerpc/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/fre… Modified: branches/powerpc/reactos/ntoskrnl/ke/powerpc/main_asm.S URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/pow… Modified: branches/powerpc/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ke/thr… Modified: branches/powerpc/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/ntoskrnl/ldr/lo… Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%…

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 January 2007